diff --git a/.github/workflows/Dockerfile.dev b/.github/workflows/Dockerfile.dev index 50f1f26..b873d53 100644 --- a/.github/workflows/Dockerfile.dev +++ b/.github/workflows/Dockerfile.dev @@ -1,5 +1,5 @@ # Keep tracking base image -FROM rust:1.71-slim-bookworm +FROM rust:1.74-slim-bookworm # 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" diff --git a/Cargo.lock b/Cargo.lock index f885381..661bea7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2366,9 +2366,9 @@ dependencies = [ [[package]] name = "ldap3_proto" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db993ebb4a1acda7ac25fa7e8609cff225a65f1f4a668e378eb252a1a6de433a" +checksum = "4598dd32dbd16d4fd06a1eb423bf569563d7c65e808ceae5ef3c12179134bc36" dependencies = [ "base64 0.21.0", "bytes", diff --git a/server/Cargo.toml b/server/Cargo.toml index 49c4819..28b164e 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -35,7 +35,7 @@ itertools = "0.10" juniper = "0.15" jwt = "0.16" lber = "0.4.1" -ldap3_proto = "^0.4" +ldap3_proto = "^0.4.2" log = "*" orion = "0.17" rand_chacha = "0.3" @@ -54,7 +54,7 @@ tracing-actix-web = "0.7" tracing-attributes = "^0.1.21" tracing-log = "*" urlencoding = "2" -webpki-roots = "*" +webpki-roots = "0.22.2" [dependencies.chrono] features = ["serde"] diff --git a/server/src/infra/ldap_handler.rs b/server/src/infra/ldap_handler.rs index cc0666b..902c4f7 100644 --- a/server/src/infra/ldap_handler.rs +++ b/server/src/infra/ldap_handler.rs @@ -274,7 +274,14 @@ impl LdapHandler s, 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 .get_login_handler() .bind(BindRequest {