From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id DA0BD1FF0DE for ; Thu, 19 Nov 2026 12:24:21 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 058FF2174D; Thu, 19 Nov 2026 12:24:07 +0100 (CET) From: Shannon Sterz To: pve-devel@lists.proxmox.com Subject: [PATCH cluster v2 2/2] cluster: setup: match PermitRootLogin option more precisely Date: Thu, 19 Nov 2026 12:23:18 +0100 Message-ID: <20261119112318.118471-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119112318.118471-1-s.sterz@proxmox.com> References: <20261119112318.118471-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795087440801 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.547 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: UPO676KFNNFVZEFQ5GS2MZ6MZQEHQL4B X-Message-ID-Hash: UPO676KFNNFVZEFQ5GS2MZ6MZQEHQL4B X-MailFrom: s.sterz@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: `setup_sshd_config()` tries to find a line relating to the setting `PermitRootLogin` in the sshd config. the previous regex did not match certain cases (e.g., " PermitRootLogin yes"; " # PermitRootLogin no"). if nothing is matched the function added a "PermitRootLogin yes" line to the end of the file. this would allow for cases where " PermitRootLogin no" and "PermitRootLogin yes" are present in the same file. sshd applies the first option it finds, so root login would be disabled. without "PermitRootLogin yes" set any cluster join and certain functionality, such as zfs replication, would break. adjust the regex so that the "PermitRootLogin" option is picked up in those cases too. also match case insensitively and allow statements such as `permitrootlogin=yes` as OpenSSH also accepts them. if a `Match` statement is present, split off the global section first. check it for a global `PermitRootLogin` option and operate on that section only. so a missing `PermitRootLogin` option is added at the end of the global section before the first `Match` statement. this way it cannot unintentionally end up as part of a `Match` block. concatenate the global section with the rest of the file again before writing it back out. further, the early return is extended to only care about the first occurrence of the `PermitRootLogin` option as that's the one OpenSSH cares about. not checking included files is intentional. an included file can override the global `PermitRootLogin` option as well as adding a `Match` block that restricts root access. this gives admins a convenient way to restrict root logins to, for example, specific networks or addresses. Signed-off-by: Shannon Sterz --- Notes: note that by default on our installs the setting is "PermitRootLogin yes". so this scenario could only happen if a user manually adjusts it. however, setting "PermitRootLogin no" is often recommended so someone accidentally adding a space in front of that line is not impossible. Changelog --------- * also handle `Match` statements src/PVE/Cluster/Setup.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/PVE/Cluster/Setup.pm b/src/PVE/Cluster/Setup.pm index 2550f70..f0ba401 100644 --- a/src/PVE/Cluster/Setup.pm +++ b/src/PVE/Cluster/Setup.pm @@ -150,13 +150,23 @@ sub setup_sshd_config { my $conf = PVE::Tools::file_get_contents($ssh_system_server_config); - return if $conf =~ m/^PermitRootLogin\s+yes\s*$/m; + # split off global section from the rest of config. the global section is everything before the + # first `Match` (`man sshd_config(5)`): + # + # > Introduces a conditional block. If all of the criteria on the Match line are satisfied, the + # > keywords on the following lines override those set in the global section of the config file, + # > until either another Match line or the end of the file. + my ($global, $separator, $rest) = split(/^(\h*Match(?:\h|=))/mi, $conf, 2); + $rest = defined($separator) ? $separator . $rest : ''; - if ($conf !~ s/^#?PermitRootLogin.*$/PermitRootLogin yes/m) { - chomp $conf; - $conf .= "\nPermitRootLogin yes\n"; + return if $global =~ m/^\h*PermitRootLogin(?:\h*=\h*|\h+)(\S+)/mi && lc($1) eq 'yes'; + + if ($global !~ s/^(?:\h*#)*\h*PermitRootLogin.*$/PermitRootLogin yes/mi) { + chomp $global; + $global .= "\nPermitRootLogin yes\n"; } + $conf = $global . $rest; my $mode = (stat($ssh_system_server_config))[2] & 07777; PVE::Tools::file_set_contents($ssh_system_server_config, $conf, $mode); -- 2.47.3