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 05C7190EB4 for ; Tue, 31 Jan 2023 13:50:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB68B23AD5 for ; Tue, 31 Jan 2023 13:50:47 +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 ; Tue, 31 Jan 2023 13:50:47 +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 1A41B45501 for ; Tue, 31 Jan 2023 13:50:47 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 31 Jan 2023 13:50:42 +0100 Message-Id: <20230131125043.380402-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230131125043.380402-1-c.heiss@proxmox.com> References: <20230131125043.380402-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.167 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. [ldap.pm] Subject: [pve-devel] [PATCH access-control 1/2] ldap: Allow quoted values for DN attribute values 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: Tue, 31 Jan 2023 12:50:48 -0000 Signed-off-by: Christoph Heiss --- src/PVE/Auth/LDAP.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PVE/Auth/LDAP.pm b/src/PVE/Auth/LDAP.pm index 4792586..4d771e7 100755 --- a/src/PVE/Auth/LDAP.pm +++ b/src/PVE/Auth/LDAP.pm @@ -10,6 +10,8 @@ use PVE::Tools; use base qw(PVE::Auth::Plugin); +our $dn_regex = qr!\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*!; + sub type { return 'ldap'; } @@ -19,7 +21,7 @@ sub properties { base_dn => { description => "LDAP base domain name", type => 'string', - pattern => '\w+=[^,]+(,\s*\w+=[^,]+)*', + pattern => $dn_regex, optional => 1, maxLength => 256, }, @@ -33,7 +35,7 @@ sub properties { bind_dn => { description => "LDAP bind domain name", type => 'string', - pattern => '\w+=[^,]+(,\s*\w+=[^,]+)*', + pattern => $dn_regex, optional => 1, maxLength => 256, }, @@ -91,7 +93,7 @@ sub properties { description => "LDAP base domain name for group sync. If not set, the" ." base_dn will be used.", type => 'string', - pattern => '\w+=[^,]+(,\s*\w+=[^,]+)*', + pattern => $dn_regex, optional => 1, maxLength => 256, }, -- 2.34.1