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

server: don't try to load the certificates if they're not needed

Browse Source
This commit is contained in:
Valentin Tolmer 2022-05-07 14:46:45 +02:00 committed by nitnelave
parent 89ae7c200c
commit d6c2805847
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,10 +117,7 @@ where
config.ldap_user_dn.clone(), config.ldap_user_dn.clone(),
); );
let tls_context = ( let context_for_tls = context.clone();
context.clone(),
get_tls_acceptor(config).context("while setting up the SSL certificate")?,
);
let binder = move || { let binder = move || {
let context = context.clone(); let context = context.clone();
@ -134,23 +131,27 @@ where
.map_err(|err: anyhow::Error| error!("[LDAP] Service Error: {:#}", err)) .map_err(|err: anyhow::Error| error!("[LDAP] Service Error: {:#}", err))
}; };
let server_builder = server_builder
.bind("ldap", ("0.0.0.0", config.ldap_port), binder)
.with_context(|| format!("while binding to the port {}", config.ldap_port));
if config.ldaps_options.enabled {
let tls_context = (
context_for_tls,
get_tls_acceptor(config).context("while setting up the SSL certificate")?,
);
let tls_binder = move || { let tls_binder = move || {
let tls_context = tls_context.clone(); let tls_context = tls_context.clone();
fn_service(move |stream: TcpStream| { fn_service(move |stream: TcpStream| {
let tls_context = tls_context.clone(); let tls_context = tls_context.clone();
async move { async move {
let ((handler, base_dn, user_dn), tls_acceptor) = tls_context; let ((handler, base_dn, user_dn), tls_acceptor) = tls_context;
let tls_stream = tls_acceptor.clone().accept(stream).await?; let tls_stream = tls_acceptor.accept(stream).await?;
handle_ldap_stream(tls_stream, handler, base_dn, user_dn).await handle_ldap_stream(tls_stream, handler, base_dn, user_dn).await
} }
}) })
.map_err(|err: anyhow::Error| error!("[LDAPS] Service Error: {:#}", err)) .map_err(|err: anyhow::Error| error!("[LDAPS] Service Error: {:#}", err))
}; };
let server_builder = server_builder
.bind("ldap", ("0.0.0.0", config.ldap_port), binder)
.with_context(|| format!("while binding to the port {}", config.ldap_port));
if config.ldaps_options.enabled {
server_builder.and_then(|s| { server_builder.and_then(|s| {
s.bind("ldaps", ("0.0.0.0", config.ldaps_options.port), tls_binder) s.bind("ldaps", ("0.0.0.0", config.ldaps_options.port), tls_binder)
.with_context(|| format!("while binding to the port {}", config.ldaps_options.port)) .with_context(|| format!("while binding to the port {}", config.ldaps_options.port))