mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding max_ber_size option in config for ldap sync (#2416)

Browse source
This commit is contained in:
James Hodgkinson 2024-01-19 10:42:04 +10:00 committed by GitHub
parent cf87993a1c
commit e02e0501eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -3523,9 +3523,9 @@ dependencies = [
[[package]] [[package]]
name = "ldap3_client" name = "ldap3_client"
version = "0.4.2" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bec3fe7dd2cd58ea17bf49e794dd89b7773bff180300fc8667a8ca8f38e4aed0" checksum = "4f294d8b0c3a0906caca55d2004f1192e174b895afa3f0f177ead05f314544d2"
dependencies = [ dependencies = [
"base64 0.21.5", "base64 0.21.5",
"base64urlsafedata", "base64urlsafedata",
@ -3543,9 +3543,9 @@ dependencies = [
[[package]] [[package]]
name = "ldap3_proto" name = "ldap3_proto"
version = "0.4.2" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4598dd32dbd16d4fd06a1eb423bf569563d7c65e808ceae5ef3c12179134bc36" checksum = "a29eca0a9fef365d6d376a1b262e269a17b1c8c6de2cee76618642cd3c923506"
dependencies = [ dependencies = [
"base64 0.21.5", "base64 0.21.5",
"bytes", "bytes",

4
Cargo.toml
View file

@ -148,8 +148,8 @@ js-sys = "^0.3.65"
kanidmd_web_ui_shared = { path = "./server/web_ui/shared" } kanidmd_web_ui_shared = { path = "./server/web_ui/shared" }
# REMOVE this # REMOVE this
lazy_static = "^1.4.0" lazy_static = "^1.4.0"
ldap3_client = "^0.4.2" ldap3_client = "^0.4.3"
ldap3_proto = { version = "^0.4.2", features = ["serde"] } ldap3_proto = { version = "^0.4.3", features = ["serde"] }
libc = "^0.2.150" libc = "^0.2.150"
libnss = "^0.4.0" libnss = "^0.4.0"

3
tools/iam_migrations/ldap/src/config.rs
View file

@ -105,6 +105,9 @@ pub struct Config {
#[serde(flatten)] #[serde(flatten)]
pub entry_map: BTreeMap<Uuid, EntryConfig>, pub entry_map: BTreeMap<Uuid, EntryConfig>,
/// Maximum LDAP message size (in kilobytes)
pub max_ber_size: Option<usize>,
} }
#[derive(Debug, Deserialize, Default, Clone)] #[derive(Debug, Deserialize, Default, Clone)]

1
tools/iam_migrations/ldap/src/main.rs
View file

@ -268,6 +268,7 @@ async fn run_sync(
// Preflight check. // Preflight check.
// * can we connect to ldap? // * can we connect to ldap?
let mut ldap_client = match LdapClientBuilder::new(&sync_config.ldap_uri) let mut ldap_client = match LdapClientBuilder::new(&sync_config.ldap_uri)
.max_ber_size(sync_config.max_ber_size)
.add_tls_ca(&sync_config.ldap_ca) .add_tls_ca(&sync_config.ldap_ca)
.build() .build()
.await .await