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: handle "present" filters for groups

Browse Source
This commit is contained in:
Valentin Tolmer 2022-05-29 17:41:37 +02:00 committed by nitnelave
parent 55bcced476
commit 7e62cc6eda
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,6 +724,15 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
LdapFilter::Not(filter) => Ok(GroupRequestFilter::Not(Box::new( LdapFilter::Not(filter) => Ok(GroupRequestFilter::Not(Box::new(
self.convert_group_filter(&*filter)?, self.convert_group_filter(&*filter)?,
))), ))),
LdapFilter::Present(field) => {
if ALL_GROUP_ATTRIBUTE_KEYS.contains(&field.to_lowercase().as_str()) {
Ok(GroupRequestFilter::And(vec![]))
} else {
Ok(GroupRequestFilter::Not(Box::new(GroupRequestFilter::And(
vec![],
))))
}
}
_ => bail!("Unsupported group filter: {:?}", filter), _ => bail!("Unsupported group filter: {:?}", filter),
} }
} }
@ -1304,6 +1313,11 @@ mod tests {
GroupRequestFilter::Member(UserId::new("bob")), GroupRequestFilter::Member(UserId::new("bob")),
GroupRequestFilter::And(vec![]), GroupRequestFilter::And(vec![]),
GroupRequestFilter::And(vec![]), GroupRequestFilter::And(vec![]),
GroupRequestFilter::And(vec![]),
GroupRequestFilter::And(vec![]),
GroupRequestFilter::Not(Box::new(GroupRequestFilter::Not(Box::new(
GroupRequestFilter::And(vec![]),
)))),
])))) ]))))
.times(1) .times(1)
.return_once(|_| { .return_once(|_| {
@ -1324,6 +1338,11 @@ mod tests {
), ),
LdapFilter::Equality("objectclass".to_string(), "groupOfUniqueNames".to_string()), LdapFilter::Equality("objectclass".to_string(), "groupOfUniqueNames".to_string()),
LdapFilter::Equality("objectclass".to_string(), "groupOfNames".to_string()), LdapFilter::Equality("objectclass".to_string(), "groupOfNames".to_string()),
LdapFilter::Present("objectclass".to_string()),
LdapFilter::Present("dn".to_string()),
LdapFilter::Not(Box::new(LdapFilter::Present(
"random_attribute".to_string(),
))),
]), ]),
vec!["1.1"], vec!["1.1"],
); );