From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2] utils: verify_username: allow quarantine logins again
Date: Thu, 27 Feb 2025 10:53:08 +0100 [thread overview]
Message-ID: <20250227095308.646506-1-s.ivanov@proxmox.com> (raw)
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 <s.ivanov@proxmox.com>
---
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
next reply other threads:[~2025-02-27 9:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 9:53 Stoiko Ivanov [this message]
2025-02-27 10:12 ` [pmg-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250227095308.646506-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal