From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] ldap: surround user filter expression in parenthesis if not already
Date: Wed, 24 May 2023 10:41:19 +0200 [thread overview]
Message-ID: <20230524084119.286653-1-l.wagner@proxmox.com> (raw)
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 incosistency, so I decieded 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 <l.wagner@proxmox.com>
---
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.30.2
next reply other threads:[~2023-05-24 8:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 8:41 Lukas Wagner [this message]
2023-05-25 7:18 ` Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230524084119.286653-1-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.