From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pmg-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 68DE91FF16F
for <inbox@lore.proxmox.com>; Thu, 27 Feb 2025 10:52:19 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 149272E505;
Thu, 27 Feb 2025 10:52:18 +0100 (CET)
Date: Thu, 27 Feb 2025 10:51:45 +0100
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Message-ID: <20250227105145.49cce2b4@rosa.proxmox.com>
In-Reply-To: <20250227094951.646359-1-s.ivanov@proxmox.com>
References: <20250227094951.646359-1-s.ivanov@proxmox.com>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu)
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: Re: [pmg-devel] [PATCH pmg-api] 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
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pmg-devel-bounces@lists.proxmox.com
Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com>
On Thu, 27 Feb 2025 10:49:51 +0100
Stoiko Ivanov <s.ivanov@proxmox.com> wrote:
> 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>
> ---
> tested minimally with my local setup (and with Dominik's GUI patches)
>
> 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..9cbcfd1 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 =~/@/;;
Dominik pointed the ;; out - will send a v2
> +
> 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'.",
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel