From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 5E2251FF16F for ; Thu, 27 Feb 2025 10:53:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 33FB22E6CA; Thu, 27 Feb 2025 10:53:52 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Thu, 27 Feb 2025 10:53:08 +0100 Message-Id: <20250227095308.646506-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api v2] utils: verify_username: allow quarantine logins again X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" verify_username is used in many places to split into realms (the part after the last '@') and usernames (everthing before). The commit disallowing '@' in usernames broke quarantine login (users login with `localpart@domainname.com@quarantine`) Fixes: 9665bbc ("utils: user schema: explicitly forbid @ in user-names") Signed-off-by: Stoiko Ivanov --- v2: drop double `;` in the PMG::API2::Users patch src/PMG/API2/Users.pm | 2 ++ src/PMG/Utils.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PMG/API2/Users.pm b/src/PMG/API2/Users.pm index 132783d..1cc7a33 100644 --- a/src/PMG/API2/Users.pm +++ b/src/PMG/API2/Users.pm @@ -126,6 +126,8 @@ __PACKAGE__->register_method ({ my ($userid, $username, $realm) = PMG::Utils::verify_username($entry->{userid}); die "invalid realm '$realm' in userid\n" if !PMG::Auth::Plugin::is_valid_realm($realm); + die "'@' forbidden in username\n" if $username =~/@/; + if ($entry->{realm}) { die "realm parameter does not fit userid ('$entry->{realm}' != '$realm')\n" if $entry->{realm} ne $realm; diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index 70e8317..3e7adbb 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -49,7 +49,7 @@ postgres_admin_cmd try_decode_utf8 ); -my $user_regex = qr![^\s:@/]+!; +my $user_regex = qr![^\s:/]+!; PVE::JSONSchema::register_standard_option('pmg-starttime', { description => "Only consider entries newer than 'starttime' (unix epoch). Default is 'now - 1day'.", -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel