From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9FB8092D3B for ; Thu, 23 Mar 2023 14:14:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E7BDA2C142 for ; Thu, 23 Mar 2023 14:14:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 23 Mar 2023 14:14:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 522B44664C for ; Thu, 23 Mar 2023 14:14:31 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 23 Mar 2023 14:14:29 +0100 Message-Id: <20230323131430.3185211-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230323131430.3185211-1-d.csapak@proxmox.com> References: <20230323131430.3185211-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.060 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ietf.org] Subject: [pve-devel] [PATCH access-control 1/1] fix #4609: allow valid DN in ldap/ad realm config 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: , X-List-Received-Date: Thu, 23 Mar 2023 13:14:43 -0000 we previously added support for ',' in the dns attribute by allowing a quoted format. the regex was sadly too restrictive: in a quoted attribute we'd only allow \w (alphanumeric + _) and the restricted characters. this patch now changes that to everything except " (nearer to the original regex which allowed everything aside from ',') the unquoted attributes now did not allow spaces, but reading the RFC[0] again, spaces are only forbidden at the beginning (also #) and end so fix the regex to accommodate for that Fixes 1aa2355 ("ldap: Allow quoted values for DN attribute values") 0: https://www.ietf.org/rfc/rfc2253.txt Signed-off-by: Dominik Csapak --- src/PVE/Auth/LDAP.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/Auth/LDAP.pm b/src/PVE/Auth/LDAP.pm index 4d771e7..57782ad 100755 --- a/src/PVE/Auth/LDAP.pm +++ b/src/PVE/Auth/LDAP.pm @@ -10,7 +10,8 @@ use PVE::Tools; use base qw(PVE::Auth::Plugin); -our $dn_regex = qr!\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*!; +my $dn_part_regex = qr!("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^,+"/<>;=#])!; +our $dn_regex = qr!\w+=${dn_part_regex}(,\s*\w+=${dn_part_regex})*!; sub type { return 'ldap'; -- 2.30.2