studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix LDAP configuration default semantics. (fixes #30)

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-04-28 22:22:54 +00:00
parent 7665d47e59
commit f242ebdb04
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/config/mod.rs
View File

@@ -1806,6 +1806,7 @@ pub struct Config {
pub blurhashing: BlurhashConfig, pub blurhashing: BlurhashConfig,
// external structure; separate section // external structure; separate section
#[serde(default)]
pub ldap: LdapConfig, pub ldap: LdapConfig,
#[serde(flatten)] #[serde(flatten)]
@@ -1889,7 +1890,7 @@ pub struct BlurhashConfig {
pub blurhash_max_raw_size: u64, pub blurhash_max_raw_size: u64,
} }
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Default, Deserialize)]
#[config_example_generator(filename = "tuwunel-example.toml", section = "global.ldap")] #[config_example_generator(filename = "tuwunel-example.toml", section = "global.ldap")]
pub struct LdapConfig { pub struct LdapConfig {
/// Whether to enable LDAP login. /// Whether to enable LDAP login.
@@ -1901,8 +1902,7 @@ pub struct LdapConfig {
/// URI of the LDAP server. /// URI of the LDAP server.
/// ///
/// example: "ldap://ldap.example.com:389" /// example: "ldap://ldap.example.com:389"
#[serde(deserialize_with = "crate::utils::deserialize_from_str")] pub uri: Option<Url>,
pub uri: Url,
/// Root of the searches. /// Root of the searches.
/// ///

16
src/service/users/mod.rs
View File

@@ -1185,7 +1185,13 @@ impl Service {
use tuwunel_core::{debug, error, result::LogErr}; use tuwunel_core::{debug, error, result::LogErr};
let config = &self.services.server.config.ldap; let config = &self.services.server.config.ldap;
let (conn, mut ldap) = LdapConnAsync::new(config.uri.as_str()) let uri = config
.uri
.as_ref()
.ok_or_else(|| err!(Ldap(error!("LDAP URI is not configured."))))?;
debug!(?uri, "LDAP creating connection...");
let (conn, mut ldap) = LdapConnAsync::new(uri.as_str())
.await .await
.map_err(|e| err!(Ldap(error!(?user_id, "LDAP connection setup error: {e}"))))?; .map_err(|e| err!(Ldap(error!(?user_id, "LDAP connection setup error: {e}"))))?;
@@ -1255,7 +1261,13 @@ impl Service {
use tuwunel_core::{debug, error, result::LogErr}; use tuwunel_core::{debug, error, result::LogErr};
let config = &self.services.server.config.ldap; let config = &self.services.server.config.ldap;
let (conn, mut ldap) = LdapConnAsync::new(config.uri.as_str()) let uri = config
.uri
.as_ref()
.ok_or_else(|| err!(Ldap(error!("LDAP URI is not configured."))))?;
debug!(?uri, "LDAP creating connection...");
let (conn, mut ldap) = LdapConnAsync::new(uri.as_str())
.await .await
.map_err(|e| err!(Ldap(error!(?user_dn, "LDAP connection setup error: {e}"))))?; .map_err(|e| err!(Ldap(error!(?user_dn, "LDAP connection setup error: {e}"))))?;