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

ldap: Add context to the errors

Browse Source
This commit is contained in:
Valentin Tolmer 2021-11-08 10:13:48 +01:00
parent f192f9d0f4
commit 0f2108dfb0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ use crate::domain::{
}, },
opaque_handler::OpaqueHandler, opaque_handler::OpaqueHandler,
}; };
use anyhow::{bail, Result}; use anyhow::{bail, Context, Result};
use futures::stream::StreamExt; use futures::stream::StreamExt;
use futures_util::TryStreamExt; use futures_util::TryStreamExt;
use ldap3_server::proto::{ use ldap3_server::proto::{
@ -47,7 +47,7 @@ fn get_group_id_from_distinguished_name(
base_tree: &[(String, String)], base_tree: &[(String, String)],
base_dn_str: &str, base_dn_str: &str,
) -> Result<String> { ) -> Result<String> {
let parts = parse_distinguished_name(dn)?; let parts = parse_distinguished_name(dn).context("while parsing a group ID")?;
if !is_subtree(&parts, base_tree) { if !is_subtree(&parts, base_tree) {
bail!("Not a subtree of the base tree"); bail!("Not a subtree of the base tree");
} }
@ -74,7 +74,7 @@ fn get_user_id_from_distinguished_name(
base_tree: &[(String, String)], base_tree: &[(String, String)],
base_dn_str: &str, base_dn_str: &str,
) -> Result<String> { ) -> Result<String> {
let parts = parse_distinguished_name(dn)?; let parts = parse_distinguished_name(dn).context("while parsing a user ID")?;
if !is_subtree(&parts, base_tree) { if !is_subtree(&parts, base_tree) {
bail!("Not a subtree of the base tree"); bail!("Not a subtree of the base tree");
} }
@ -452,7 +452,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
Err(e) => { Err(e) => {
return vec![make_search_error( return vec![make_search_error(
LdapResultCode::UnwillingToPerform, LdapResultCode::UnwillingToPerform,
format!("Unsupported user filter: {}", e), format!("Unsupported user filter: {:#}", e),
)] )]
} }
}; };
@ -461,7 +461,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
Err(e) => { Err(e) => {
return vec![make_search_error( return vec![make_search_error(
LdapResultCode::Other, LdapResultCode::Other,
format!(r#"Error during searching user "{}": {}"#, request.base, e), format!(r#"Error during searching user "{}": {:#}"#, request.base, e),
)] )]
} }
}; };
@ -485,7 +485,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
Err(e) => { Err(e) => {
return vec![make_search_error( return vec![make_search_error(
LdapResultCode::UnwillingToPerform, LdapResultCode::UnwillingToPerform,
format!("Unsupported group filter: {}", e), format!("Unsupported group filter: {:#}", e),
)] )]
} }
}; };
@ -511,7 +511,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
return vec![make_search_error( return vec![make_search_error(
LdapResultCode::Other, LdapResultCode::Other,
format!( format!(
r#"Error while listing user groups: "{}": {}"#, r#"Error while listing user groups: "{}": {:#}"#,
request.base, e request.base, e
), ),
)] )]
@ -526,7 +526,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
Err(e) => { Err(e) => {
return vec![make_search_error( return vec![make_search_error(
LdapResultCode::Other, LdapResultCode::Other,
format!(r#"Error while listing user groups: "{}": {}"#, request.base, e), format!(r#"Error while listing user groups: "{}": {:#}"#, request.base, e),
)] )]
} }
} }
@ -536,7 +536,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
Err(e) => { Err(e) => {
return vec![make_search_error( return vec![make_search_error(
LdapResultCode::Other, LdapResultCode::Other,
format!(r#"Error while listing groups "{}": {}"#, request.base, e), format!(r#"Error while listing groups "{}": {:#}"#, request.base, e),
)] )]
} }
} }