From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] api-types: ldap: add verification regex for LDAP DNs
Date: Tue, 28 Mar 2023 16:20:14 +0200 [thread overview]
Message-ID: <20230328142014.727880-1-l.wagner@proxmox.com> (raw)
Regex was taken from the LDAP implementation in PVE.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
pbs-api-types/src/ldap.rs | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/pbs-api-types/src/ldap.rs b/pbs-api-types/src/ldap.rs
index 316b5a65..eabc5249 100644
--- a/pbs-api-types/src/ldap.rs
+++ b/pbs-api-types/src/ldap.rs
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
-use proxmox_schema::{api, ApiStringFormat, ApiType, ArraySchema, Schema, StringSchema, Updater};
+use proxmox_schema::{
+ api, const_regex, ApiStringFormat, ApiType, ArraySchema, Schema, StringSchema, Updater,
+};
use super::{REALM_ID_SCHEMA, SINGLE_LINE_COMMENT_SCHEMA};
@@ -45,6 +47,13 @@ pub enum LdapMode {
optional: true,
schema: USER_CLASSES_SCHEMA,
},
+ "base-dn" : {
+ schema: LDAP_DOMAIN_SCHEMA,
+ },
+ "bind-dn" : {
+ schema: LDAP_DOMAIN_SCHEMA,
+ optional: true,
+ }
},
)]
#[derive(Serialize, Deserialize, Updater, Clone)]
@@ -133,6 +142,28 @@ pub enum RemoveVanished {
Properties,
}
+macro_rules! DOMAIN_PART_REGEX {
+ () => {
+ r#"("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])"#
+ };
+}
+
+const_regex! {
+ pub LDAP_DOMAIN_REGEX = concat!(
+ r#"\w+="#,
+ DOMAIN_PART_REGEX!(),
+ r#"(,\s*\w+="#,
+ DOMAIN_PART_REGEX!(),
+ ")*"
+ );
+}
+
+pub const LDAP_DOMAIN_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&LDAP_DOMAIN_REGEX);
+
+pub const LDAP_DOMAIN_SCHEMA: Schema = StringSchema::new("LDAP Domain")
+ .format(&LDAP_DOMAIN_FORMAT)
+ .schema();
+
pub const SYNC_DEFAULTS_STRING_SCHEMA: Schema = StringSchema::new("sync defaults options")
.format(&ApiStringFormat::PropertyString(
&SyncDefaultsOptions::API_SCHEMA,
--
2.30.2
next reply other threads:[~2023-03-28 14:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 14:20 Lukas Wagner [this message]
2023-03-29 8:00 ` [pbs-devel] applied: " Thomas Lamprecht
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=20230328142014.727880-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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal