From patchwork Wed Apr 18 10:01:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Lebleu X-Patchwork-Id: 900016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sUV75E2I"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HAyVCpcu"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40QyM81hKXz9s4n for ; Wed, 18 Apr 2018 20:01:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=gqoLfd7YIoKNDW2TX5Hyy+1il1W+edumZ0VkK6iToZk=; b=sUV75E2In+EHzR ZSTR27aDZ2+joGlXzRvBD64Ib9ycCpUAxFSa6jpyioIznOo1AfaTB6DntV7xOGrtm26RcKp/h4xD/ q9F/T6iyKhTpPV0Pl4JH+lMuNmReEzruwk3+sLpnvOfzK8jwTTXueE0IYZ4OJ/q8z0JPk7T//vM8a ySUFYRo0ODaVQ/sfHVdnBA6tGi4NUTT1vNiuCvCHBKHBN0HFOJc8rBV8FjgrVQxZAsJ/2Ya2SNJuX TlnvfpaWRP+L8Af0dXT6ryxFu1Hp9+68O+ebB2h2BqWGupg2uIhP51+kAdzFHMgRDpWGdXQk2DvNO o6v0J7JUtrMbwergUwzw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8juC-0007GM-AF; Wed, 18 Apr 2018 10:01:36 +0000 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8jtu-00076R-JE for lede-dev@lists.infradead.org; Wed, 18 Apr 2018 10:01:33 +0000 Received: by mail-wr0-x22d.google.com with SMTP id o15-v6so3130332wro.11 for ; Wed, 18 Apr 2018 03:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7QqrK/GWtCeXIdrTovgHzzz3RpmPDRiFuGTS0XMdzOk=; b=HAyVCpcuUv+SRIWFZa/uMqIfGPrT4grjXyo22t1fQw4ZJRXcAOIved0AGhT4OzRdQY DCoIOavZsPMNQ/xlRuX08DPr7t2Mj3Qfjx6jGjJ+VraSlrxbguI2ooePwBAQwLlTmaBU RMxDfId+zgKHdOlfepZQL3W8Gj4iXVfZskCkykaGlAbBU9x9nBsmIqbI5ajJuGKIWMeO GhGhAfL0WqUzZTj5Z/atCBG78y4opcY+NxatQp4tjiyAFJwkUlckf6NvaBHndAuJM4V9 L6pjqKbfScvi3MZqFp1eloM6Q8NYvLFLiHKqvdxJUdylPfnQ2o8FzvwdxLwHFvZEj+8S 1vQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7QqrK/GWtCeXIdrTovgHzzz3RpmPDRiFuGTS0XMdzOk=; b=PWGjK3iQDcoXJJ4DBNhRS3LckQihIcOZDl1Qzt9zpzQrQiDYcCcuIw/sAUxh7LmBzd roC5iEhyEaQxYm2qxMv2m7yVXqZfOgTTjbOqAhUTUx/eIW0kpnqlyogNhtfg6ii5Uzpz bc4SYWBJFcyappAK0ebHTxhACISHWdeBtvH/bnWP4GyrEj5iMiYUljuNYAc4Nwmk9TvN pb/vyYiFppO4whzT6S5tmD69EI+gILxZzswyCR+2FNLOFkoD6zwi+eQg1FacmX1U04MU Y8JmO4noMRpa7N02UfrTtT3voK3NY3POXbeNSKGt90HIOelhUAAsFdS1TX12l8fQrZmC fw7g== X-Gm-Message-State: ALQs6tDlXpYwAboa7L6Iw4ll3H8VzH36NLFAJJkDpcyApnkx1r33v4q2 rakavvpnn07O75qqZKPkRxpP6w== X-Google-Smtp-Source: AIpwx4/0Oj29gzKsWLvLuRYZ0JClvWnk8G95x8jggqpuizdKmd0WhWyZWmpMARFzZ08O0A+QkJBx2Q== X-Received: by 10.28.214.5 with SMTP id n5mr1273953wmg.108.1524045665418; Wed, 18 Apr 2018 03:01:05 -0700 (PDT) Received: from localhost (14.125.146.82.ipv4.evonet.be. [82.146.125.14]) by smtp.gmail.com with ESMTPSA id k35-v6sm613469wre.55.2018.04.18.03.01.04 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 18 Apr 2018 03:01:04 -0700 (PDT) From: Pierre Lebleu To: lede-dev@lists.infradead.org Date: Wed, 18 Apr 2018 12:01:02 +0200 Message-Id: <1524045662-2745-1-git-send-email-pme.lebleu@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180418_030118_680984_F54097E4 X-CRM114-Status: GOOD ( 10.70 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:22d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (pme.lebleu[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] dropbear: automatically add firewall rules based on the config X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre Lebleu , John Crispin MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org An extra option (AllowedClientIPs:list) is available to allow specific clients to use this service. Testing done: root@OpenWrt:~# uci show dropbear dropbear.lan=dropbear dropbear.lan.enable='1' dropbear.lan.Interface='lan' dropbear.lan.PasswordAuth='on' dropbear.lan.RootPasswordAuth='on' dropbear.lan.Port='22' dropbear.lan.IdleTimeout='600' dropbear.wan=dropbear dropbear.wan.Interface='wan' dropbear.wan.PasswordAuth='on' dropbear.wan.RootPasswordAuth='on' dropbear.wan.Port='2223' dropbear.wan.IdleTimeout='600' dropbear.wan.enable='1' dropbear.wan.AllowedClientIPs='1.2.3.4' dropbear.wan.RootLogin='0' root@OpenWrt:~# fw3 print | grep dropbear iptables -t filter -A zone_lan_input -p tcp -m tcp --dport 22 -m comment --comment "!fw3: ubus:dropbear[lan] rule 0" -j ACCEPT iptables -t filter -A zone_wan_input -p tcp -s 1.2.3.4/255.255.255.255 -m tcp --dport 2223 -m comment --comment "!fw3: ubus:dropbear[wan] rule 0" -j ACCEPT Signed-off-by: Pierre Lebleu --- package/network/services/dropbear/files/dropbear.init | 47 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 2225113..2704554 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -43,15 +43,37 @@ validate_section_dropbear() 'IdleTimeout:uinteger:0' \ 'MaxAuthTries:uinteger:3' \ 'RecvWindowSize:uinteger:0' \ + 'AllowedClientIPs:list(ipaddr)' \ 'mdns:bool:1' } +add_fw_rules() +{ + local intf="$1" + local port="$2" + local client="$3" + + [ -z "${intf}" ] && return + local zone=$(fw3 -q network "${intf}") + [ -z "${zone}" ] && return + + json_add_object "" + json_add_string type rule + json_add_string src "${zone}" + json_add_string proto tcp + json_add_string dest_port "${port}" + [ -n "${client}" ] && json_add_string src_ip "${client}" + json_add_string target ACCEPT + json_close_object +} + dropbear_instance() { local PasswordAuth enable Interface GatewayPorts \ RootPasswordAuth RootLogin rsakeyfile \ BannerFile Port SSHKeepAlive IdleTimeout \ - MaxAuthTries RecvWindowSize mdns ipaddrs + MaxAuthTries RecvWindowSize AllowedClientIPs \ + mdns ipaddrs validate_section_dropbear "${1}" || { echo "validation failed" @@ -69,7 +91,8 @@ dropbear_instance() PIDCOUNT="$(( ${PIDCOUNT} + 1))" local pid_file="/var/run/${NAME}.${PIDCOUNT}.pid" - procd_open_instance + procd_open_instance "${1}" + procd_set_param command "$PROG" -F -P "$pid_file" [ "${PasswordAuth}" -eq 0 ] && procd_append_param command -s [ "${GatewayPorts}" -eq 1 ] && procd_append_param command -a @@ -83,8 +106,22 @@ dropbear_instance() [ "${MaxAuthTries}" -ne 0 ] && procd_append_param command -T "${MaxAuthTries}" [ "${RecvWindowSize}" -gt 0 -a "${RecvWindowSize}" -le 1048576 ] && \ procd_append_param command -W "${RecvWindowSize}" - [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear" procd_set_param respawn + + procd_open_data + + [ "${mdns}" -ne 0 ] && { + json_add_object "mdns" + procd_add_mdns_service "ssh" "tcp" "$Port" "daemon=dropbear" + json_close_object + } + + json_add_array firewall + add_fw_rules "${Interface}" "${Port}" "${AllowedClientIPs}" + json_close_array + + procd_close_data + procd_close_instance } @@ -130,6 +167,10 @@ start_service() config_foreach dropbear_instance dropbear } +service_started() { + procd_set_config_changed firewall +} + service_triggers() { local interfaces