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

address some PR comments

Browse Source
This commit is contained in:
Luca 2023-01-14 15:22:05 +01:00
parent bb4de05bd8
commit cc36754ba8
No known key found for this signature in database
GPG Key ID: 3133FC373370010F
4 changed files with 11 additions and 13 deletions

7
Cargo.lock generated
View File

@ -2201,7 +2201,7 @@ dependencies = [
[[package]]
name = "ldap3_proto"
version = "0.3.0"
source = "git+https://github.com/kanidm/ldap3#b3c7653471916e803dc8f24d2163fd2710dfb161"
source = "git+https://github.com/kanidm/ldap3/?rev=b3c7653471916e803dc8f24d2163fd2710dfb161#b3c7653471916e803dc8f24d2163fd2710dfb161"
dependencies = [
"bytes",
"lber",
@ -5035,8 +5035,3 @@ dependencies = [
"cc",
"libc",
]
[[patch.unused]]
name = "ldap3_proto"
version = "0.2.3"
source = "git+https://github.com/nitnelave/ldap3_server/?rev=7b50b2b82c383f5f70e02e11072bb916629ed2bc#7b50b2b82c383f5f70e02e11072bb916629ed2bc"

4
Cargo.toml
View File

@ -10,8 +10,8 @@ default-members = ["server"]
# Remove once https://github.com/kanidm/ldap3_proto/pull/8 is merged.
[patch.crates-io.ldap3_proto]
git = 'https://github.com/nitnelave/ldap3_server/'
rev = '7b50b2b82c383f5f70e02e11072bb916629ed2bc'
git = 'https://github.com/kanidm/ldap3/'
rev = 'b3c7653471916e803dc8f24d2163fd2710dfb161'
[patch.crates-io.opaque-ke]
git = 'https://github.com/nitnelave/opaque-ke/'

2
server/Cargo.toml
View File

@ -28,7 +28,7 @@ itertools = "0.10.1"
juniper = "0.15.10"
juniper_actix = "0.4.0"
jwt = "0.13"
ldap3_proto = { git = "https://github.com/kanidm/ldap3", package = "ldap3_proto" }
ldap3_proto = "*"
log = "*"
orion = "0.16"
rustls = "0.20"

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

@ -558,6 +558,13 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
code: LdapResultCode::OperationsError,
message: "Search request returned nothing".to_string(),
})?;
if res.len() > 1 {
return Err(LdapError {
code: LdapResultCode::OperationsError,
message: "Search request returned nothing".to_string(),
});
}
match entry {
LdapOp::SearchResultEntry(entry) => {
let mut available = false;
@ -2212,10 +2219,6 @@ mod tests {
user: User {
user_id: UserId::new("bob"),
email: "bob@bobmail.bob".to_string(),
display_name: Some("bôb böbberson".to_string()),
first_name: Some("bôb".to_string()),
last_name: Some("böbberson".to_string()),
uuid: uuid!("698e1d5f-7a40-3151-8745-b9b8a37839da"),
..Default::default()
},
groups: None,