From patchwork Mon Dec 21 20:55:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3737 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D0BZZ4SH1z3wgG for ; Mon, 21 Dec 2020 20:55:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4D0BZY54hTz2qH; Mon, 21 Dec 2020 20:55:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4D0BZY3pDlz2yNV; Mon, 21 Dec 2020 20:55:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D0BZX2DXvz2xfd for ; Mon, 21 Dec 2020 20:55:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4D0BZW0t6czSH for ; Mon, 21 Dec 2020 20:55:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1608584147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CdBJsF+VA4JcA6Hq2SVzZQelFi3bCUtqfzv6tb8QdIY=; b=cWNQGrtmWxcAwlb5bVrkwrruxvM2rIz48U8gzb6LM7z3ChEJBal5owXMrHmlJ9EF1s9R9v NWtYyceBp55I5+Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1608584147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CdBJsF+VA4JcA6Hq2SVzZQelFi3bCUtqfzv6tb8QdIY=; b=EhihB9i1D70HzPh1SoloPBLY4WB9ZdqQ1GHFh4CqGb4/h7ysGXaCsIE7PRcFRbmeGQA0qh DFFpD077l81eVEyYsakNxZEwrLA8SnSb6z8JPoO+oMwBlR0PwVTPQUPWM79s2mw55/gCmU 76CJ4iuHue0CCkZTfXPLNz0vMwFIOub0Rc2mwjP4JtspQ0PqN+8mGAEVf8PfmP8f/gE+gu NdKwDve2KFrCBLSpxK94d/ZonTX05BAYfcWQJOJHpf32nj41uFCLyumaK3Bircj+zGEpXe IK8cYqD85c76f4s/yP9iwelj0Xbx0A/q5dXBZJwyZCAUpmS0NN00h1hEaPzN5g== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] sshctrl: when enable or disable AllowTcpForwarding, change PermitOpen accordingly Message-ID: <193f6bcf-8ca5-7b34-e70e-0ebab2872ae9@ipfire.org> Date: Mon, 21 Dec 2020 21:55:43 +0100 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes: #12546 Signed-off-by: Peter Müller --- src/misc-progs/sshctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index f855c5a4a..6e8652c84 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -67,10 +67,10 @@ int main(int argc, char *argv[]) strlcat(command, "s/^PasswordAuthentication .*$/PasswordAuthentication yes/;", STRING_SIZE - 1 ); if(findkey(kv, "ENABLE_SSH_PORTFW", buffer) && !strcmp(buffer,"on")) - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;", STRING_SIZE - 1 ); + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;" "s/^PermitOpen .*$/PermitOpen any/;", STRING_SIZE - 1 ); else - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;", STRING_SIZE - 1 ); - + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;" "s/^PermitOpen .*$/PermitOpen none/;", STRING_SIZE - 1 ); + if(findkey(kv, "SSH_PORT", buffer) && !strcmp(buffer,"on")) strlcat(command, "s/^Port .*$/Port 22/;", STRING_SIZE - 1 ); else