From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E4AC91FF184 for ; Thu, 20 Nov 2025 13:04:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3826453E5; Thu, 20 Nov 2025 13:04:19 +0100 (CET) From: Robert Obkircher To: pve-devel@lists.proxmox.com Date: Thu, 20 Nov 2025 13:00:41 +0100 Message-ID: <20251120120346.95633-1-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763640223627 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.077 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pbsplugin.pm] Subject: [pve-devel] [PATCH v2 pve-storage] fix #6900: correctly detect PBS API tokens in storage plugin X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The PBS storage plugin used PVE code to detect if an API token was entered in the username field. This lead to bad requests for some valid PBS tokens which are not valid PVE tokens. Examples are "root@pam!1234" and "root@pam!_-". Relax the token pattern to allow token names and realms that start with numbers or underscores. Also allow single character token names, which are allowed on the backend even though they can't be created through the PBS Web UI. Signed-off-by: Robert Obkircher --- src/PVE/Storage/PBSPlugin.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm index 5842004..b8dfa09 100644 --- a/src/PVE/Storage/PBSPlugin.pm +++ b/src/PVE/Storage/PBSPlugin.pm @@ -14,6 +14,7 @@ use POSIX qw(mktime strftime ENOENT); use POSIX::strptime; use PVE::APIClient::LWP; +use PVE::Auth::Plugin; use PVE::JSONSchema qw(get_standard_option); use PVE::Network; use PVE::PBSClient; @@ -701,6 +702,21 @@ my sub snapshot_files_encrypted { return $any && $all; } +# SAFE_ID_REGEX_STR: &str = r"(?:[A-Za-z0-9_][A-Za-z0-9._\-]*)"; +my $safe_id_regex = qr/(?:[A-Za-z0-9_][A-Za-z0-9\._\-]*)/; + +# TOKEN_NAME_REGEX_STR: = SAFE_ID_REGEX_STR +my $token_name_regex = $safe_id_regex; + +# USER_NAME_REGEX_STR: &str = r"(?:[^\s:/[:cntrl:]]+)"; +my $user_name_regex = qr/(?:[^\s:\/\p{PosixCntrl}]+)/; + +# USER_ID_REGEX_STR: &str = concatcp!(USER_NAME_REGEX_STR, r"@", SAFE_ID_REGEX_STR); +my $user_id_regex = qr/${user_name_regex}\@${safe_id_regex}/; + +# APITOKEN_ID_REGEX_STR: &str = concatcp!(USER_ID_REGEX_STR, r"!", TOKEN_NAME_REGEX_STR); +my $apitoken_id_regex = qr/${user_id_regex}\!${token_name_regex}/; + # TODO: use a client with native rust/proxmox-backup bindings to profit from # API schema checks and types my sub pbs_api_connect { @@ -710,8 +726,8 @@ my sub pbs_api_connect { my $user = $scfg->{username} // 'root@pam'; - if (my $tokenid = PVE::AccessControl::pve_verify_tokenid($user, 1)) { - $params->{apitoken} = "PBSAPIToken=${tokenid}:${password}"; + if ($user =~ qr/^${apitoken_id_regex}$/) { + $params->{apitoken} = "PBSAPIToken=${user}:${password}"; } else { $params->{password} = $password; $params->{username} = $user; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel