mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

ldap: add entryUUID to the default fields

Browse Source 
It should help with #293.
This commit is contained in:
Valentin Tolmer 2022-10-12 17:57:47 +02:00 committed by nitnelave
parent 92178d2e77
commit 32850d4ff9
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/infra/ldap_handler.rs
View File

@ -246,6 +246,7 @@ const ALL_USER_ATTRIBUTE_KEYS: &[&str] = &[
"cn", "cn",
"jpegPhoto", "jpegPhoto",
"createtimestamp", "createtimestamp",
"entryuuid",
]; ];
fn make_ldap_search_user_result_entry( fn make_ldap_search_user_result_entry(
@ -328,7 +329,14 @@ fn get_group_attribute(
} }
} }
const ALL_GROUP_ATTRIBUTE_KEYS: &[&str] = &["objectclass", "uid", "cn", "member", "uniquemember"]; const ALL_GROUP_ATTRIBUTE_KEYS: &[&str] = &[
"objectclass",
"uid",
"cn",
"member",
"uniquemember",
"entryuuid",
];
fn make_ldap_search_group_result_entry( fn make_ldap_search_group_result_entry(
group: Group, group: Group,
@ -2084,6 +2092,7 @@ mod tests {
display_name: "Bôb Böbberson".to_string(), display_name: "Bôb Böbberson".to_string(),
last_name: "Böbberson".to_string(), last_name: "Böbberson".to_string(),
avatar: JpegPhoto::for_tests(), avatar: JpegPhoto::for_tests(),
uuid: uuid!("b4ac75e0-2900-3e21-926c-2f732c26b3fc"),
..Default::default() ..Default::default()
}, },
groups: None, groups: None,
@ -2146,6 +2155,10 @@ mod tests {
atype: "createtimestamp".to_string(), atype: "createtimestamp".to_string(),
vals: vec![chrono::Utc.timestamp(0, 0).to_rfc3339().into_bytes()], vals: vec![chrono::Utc.timestamp(0, 0).to_rfc3339().into_bytes()],
}, },
LdapPartialAttribute {
atype: "entryuuid".to_string(),
vals: vec![b"b4ac75e0-2900-3e21-926c-2f732c26b3fc".to_vec()],
},
], ],
}), }),
// "objectclass", "dn", "uid", "cn", "member", "uniquemember" // "objectclass", "dn", "uid", "cn", "member", "uniquemember"
@ -2180,6 +2193,10 @@ mod tests {
b"uid=john,ou=people,dc=example,dc=com".to_vec(), b"uid=john,ou=people,dc=example,dc=com".to_vec(),
], ],
}, },
LdapPartialAttribute {
atype: "entryuuid".to_string(),
vals: vec![b"04ac75e0-2900-3e21-926c-2f732c26b3fc".to_vec()],
},
], ],
}), }),
make_search_success(), make_search_success(),