gandc/lldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: update ldap3_proto dependency

Browse Source 
This will fix the issue with some unhandled controls
This commit is contained in:
Valentin Tolmer
2024-01-08 12:47:46 +01:00
committed by nitnelave
parent dc140f1675
commit 337101edea
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/Dockerfile.dev vendored
View File

@@ -1,5 +1,5 @@
# Keep tracking base image # Keep tracking base image
FROM rust:1.71-slim-bookworm FROM rust:1.74-slim-bookworm
# Set needed env path # Set needed env path
ENV PATH="/opt/armv7l-linux-musleabihf-cross/:/opt/armv7l-linux-musleabihf-cross/bin/:/opt/aarch64-linux-musl-cross/:/opt/aarch64-linux-musl-cross/bin/:/opt/x86_64-linux-musl-cross/:/opt/x86_64-linux-musl-cross/bin/:$PATH" ENV PATH="/opt/armv7l-linux-musleabihf-cross/:/opt/armv7l-linux-musleabihf-cross/bin/:/opt/aarch64-linux-musl-cross/:/opt/aarch64-linux-musl-cross/bin/:/opt/x86_64-linux-musl-cross/:/opt/x86_64-linux-musl-cross/bin/:$PATH"

4
Cargo.lock generated
View File

@@ -2366,9 +2366,9 @@ dependencies = [
[[package]] [[package]]
name = "ldap3_proto" name = "ldap3_proto"
version = "0.4.0" version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db993ebb4a1acda7ac25fa7e8609cff225a65f1f4a668e378eb252a1a6de433a" checksum = "4598dd32dbd16d4fd06a1eb423bf569563d7c65e808ceae5ef3c12179134bc36"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.0",
"bytes", "bytes",

4
server/Cargo.toml
View File

@@ -35,7 +35,7 @@ itertools = "0.10"
juniper = "0.15" juniper = "0.15"
jwt = "0.16" jwt = "0.16"
lber = "0.4.1" lber = "0.4.1"
ldap3_proto = "^0.4" ldap3_proto = "^0.4.2"
log = "*" log = "*"
orion = "0.17" orion = "0.17"
rand_chacha = "0.3" rand_chacha = "0.3"
@@ -54,7 +54,7 @@ tracing-actix-web = "0.7"
tracing-attributes = "^0.1.21" tracing-attributes = "^0.1.21"
tracing-log = "*" tracing-log = "*"
urlencoding = "2" urlencoding = "2"
webpki-roots = "*" webpki-roots = "0.22.2"
[dependencies.chrono] [dependencies.chrono]
features = ["serde"] features = ["serde"]

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

@@ -274,7 +274,14 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
Ok(s) => s, Ok(s) => s,
Err(e) => return (LdapResultCode::NamingViolation, e.to_string()), Err(e) => return (LdapResultCode::NamingViolation, e.to_string()),
}; };
let LdapBindCred::Simple(password) = &request.cred; let password = if let LdapBindCred::Simple(password) = &request.cred {
password
} else {
return (
LdapResultCode::UnwillingToPerform,
"SASL not supported".to_string(),
);
};
match self match self
.get_login_handler() .get_login_handler()
.bind(BindRequest { .bind(BindRequest {