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 B19B78F46 for ; Fri, 23 Jun 2023 11:21:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8A806316AB for ; Fri, 23 Jun 2023 11:21:02 +0200 (CEST) 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 ; Fri, 23 Jun 2023 11:21:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 92A5E4303C for ; Fri, 23 Jun 2023 11:21:01 +0200 (CEST) Date: Fri, 23 Jun 2023 11:20:57 +0200 From: Wolfgang Bumiller To: Lukas Wagner Cc: pbs-devel@lists.proxmox.com Message-ID: <2cevbpgtexwsaajwezxm7v25laxnk7xemgtaud2brhsay33khj@owtqyhuuoafa> References: <20230623081637.94583-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230623081637.94583-1-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.124 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs, proxmox.com] Subject: [pbs-devel] applied: [PATCH v2 proxmox] ldap: surround user filter expression in parenthesis if not already X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jun 2023 09:21:32 -0000 applied (and added a rustfmt fixup commit) On Fri, Jun 23, 2023 at 10:16:37AM +0200, Lukas Wagner wrote: > In PVE, the `filter` attribute is surrounded in () if it is not already, > allowing "uid=test" as well as "(uid=test)" [1]. > > A forum user [2] just ran into this inconsistency, so I decided to adjust > the behavior. > > [1] https://git.proxmox.com/?p=pve-common.git;a=blob;f=src/PVE/LDAP.pm;h=ff98e367e63265bf76c0f302847c3749eea095a6;hb=HEAD#l115 > [2] https://forum.proxmox.com/threads/ldap-query-for-security-group-members.127882/ > > Signed-off-by: Lukas Wagner > --- > > Notes: > Wanted to ping the patch, noticed 2 small typos in the commit message, > so I sent a v2. No changes in the code. > > proxmox-ldap/src/lib.rs | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/proxmox-ldap/src/lib.rs b/proxmox-ldap/src/lib.rs > index ea210b3e..4fa866d8 100644 > --- a/proxmox-ldap/src/lib.rs > +++ b/proxmox-ldap/src/lib.rs > @@ -351,7 +351,14 @@ impl<'a> Display for FilterElement<'a> { > FilterElement::Condition(attr, value) => { > write!(f, "({attr}={value})")?; > } > - FilterElement::Verbatim(verbatim) => write!(f, "{verbatim}")?, > + FilterElement::Verbatim(verbatim) => { > + > + if !verbatim.starts_with('(') && !verbatim.ends_with(')') { > + write!(f, "({verbatim})")? > + } else { > + write!(f, "{verbatim}")? > + } > + }, > } > > Ok(()) > @@ -371,6 +378,7 @@ mod tests { > ); > > assert_eq!("(foo=bar)", &Verbatim("(foo=bar)").to_string()); > + assert_eq!("(foo=bar)", &Verbatim("foo=bar").to_string()); > > let filter_string = And(vec![ > Condition("givenname", "john"), > -- > 2.39.2