Proxmox/proxmox-backup
5
0
Fork 0
mirror of git://git.proxmox.com/git/proxmox-backup.git synced 2025-02-09 09:57:40 +03:00
Code Releases Activity

realm sync: generic-ify LdapSyncSettings and GeneralSyncSettings

Browse Source 
Since both only needs a handful of attributes anyway, pass them
explicitly instead of as an LDAP-specific config object, such that these
types can be reused for other realms like the new Active Directory one.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Christoph Heiss 2024-01-12 17:16:01 +01:00 committed by Thomas Lamprecht
parent ab09f409be
commit 132e9722dd
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/server/realm_sync_job.rs
View File

@ -81,9 +81,14 @@ impl LdapRealmSyncJob {
};
let sync_settings = GeneralSyncSettings::default()
.apply_config(&config)?
.apply_config(config.sync_defaults_options.as_deref())?
.apply_override(override_settings)?;
let sync_attributes = LdapSyncSettings::from_config(&config)?;
let sync_attributes = LdapSyncSettings::new(
&config.user_attr,
config.sync_attributes.as_deref(),
config.user_classes.as_deref(),
config.filter.as_deref(),
)?;
let ldap_config = auth::LdapAuthenticator::api_type_to_config(&config)?;
@ -385,14 +390,19 @@ struct LdapSyncSettings {
}
impl LdapSyncSettings {
fn from_config(config: &LdapRealmConfig) -> Result<Self, Error> {
let mut attributes = vec![config.user_attr.clone()];
fn new(
user_attr: &str,
sync_attributes: Option<&str>,
user_classes: Option<&str>,
user_filter: Option<&str>,
) -> Result<Self, Error> {
let mut attributes = vec![user_attr.to_owned()];
let mut email = None;
let mut firstname = None;
let mut lastname = None;
if let Some(sync_attributes) = &config.sync_attributes {
if let Some(sync_attributes) = &sync_attributes {
let value = LdapSyncAttributes::API_SCHEMA.parse_property_string(sync_attributes)?;
let sync_attributes: LdapSyncAttributes = serde_json::from_value(value)?;
@ -400,20 +410,20 @@ impl LdapSyncSettings {
firstname = sync_attributes.firstname.clone();
lastname = sync_attributes.lastname.clone();
if let Some(email_attr) = sync_attributes.email {
attributes.push(email_attr);
if let Some(email_attr) = &sync_attributes.email {
attributes.push(email_attr.clone());
}
if let Some(firstname_attr) = sync_attributes.firstname {
attributes.push(firstname_attr);
if let Some(firstname_attr) = &sync_attributes.firstname {
attributes.push(firstname_attr.clone());
}
if let Some(lastname_attr) = sync_attributes.lastname {
attributes.push(lastname_attr);
if let Some(lastname_attr) = &sync_attributes.lastname {
attributes.push(lastname_attr.clone());
}
}
let user_classes = if let Some(user_classes) = &config.user_classes {
let user_classes = if let Some(user_classes) = &user_classes {
let a = USER_CLASSES_ARRAY.parse_property_string(user_classes)?;
serde_json::from_value(a)?
} else {
@ -426,13 +436,13 @@ impl LdapSyncSettings {
};
Ok(Self {
user_attr: config.user_attr.clone(),
user_attr: user_attr.to_owned(),
firstname_attr: firstname,
lastname_attr: lastname,
email_attr: email,
attributes,
user_classes,
user_filter: config.filter.clone(),
user_filter: user_filter.map(ToOwned::to_owned),
})
}
}
@ -447,11 +457,11 @@ impl Default for GeneralSyncSettings {
}
impl GeneralSyncSettings {
fn apply_config(self, config: &LdapRealmConfig) -> Result<Self, Error> {
fn apply_config(self, sync_defaults_options: Option<&str>) -> Result<Self, Error> {
let mut enable_new = None;
let mut remove_vanished = None;
if let Some(sync_defaults_options) = &config.sync_defaults_options {
if let Some(sync_defaults_options) = sync_defaults_options {
let sync_defaults_options = Self::parse_sync_defaults_options(sync_defaults_options)?;
enable_new = sync_defaults_options.enable_new;