git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-10 08:52:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat: add ldap_only config option

Browse source
This commit is contained in:
RatCornu 2025-08-14 22:48:55 +02:00 • committed by Ellis Git
commit 57d7743037
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/api/client/session.rs
View file

@ -3,10 +3,10 @@ use std::time::Duration;
use axum::extract::State;
use axum_client_ip::InsecureClientIp;
use conduwuit::{
Err, Error, Result, debug, err, info, utils,
utils::{ReadyExt, hash},
Err, Error, Result, debug, err, info,
utils::{self, ReadyExt, hash},
};
use conduwuit_core::debug_error;
use conduwuit_core::{debug_error, debug_warn};
use conduwuit_service::{Services, uiaa::SESSION_ID_LENGTH};
use futures::StreamExt;
use ruma::{
@ -185,7 +185,14 @@ pub(crate) async fn handle_login(
}
if cfg!(feature = "ldap") && services.config.ldap.enable {
Box::pin(ldap_login(services, &user_id, &lowercased_user_id, password)).await
match Box::pin(ldap_login(services, &user_id, &lowercased_user_id, password)).await {
| Ok(user_id) => Ok(user_id),
| Err(err) if services.config.ldap.ldap_only => Err(err),
| Err(err) => {
debug_warn!("{err}");
password_login(services, &user_id, &lowercased_user_id, password).await
},
}
} else {
password_login(services, &user_id, &lowercased_user_id, password).await
}

16
src/core/config/mod.rs
View file

@ -2055,9 +2055,19 @@ pub struct LdapConfig {
#[serde(default)]
pub enable: bool,
/// Whether to force LDAP authentication or authorize classical password
/// login.
///
/// example: "true"
#[serde(default)]
pub ldap_only: bool,
/// URI of the LDAP server.
///
/// example: "ldap://ldap.example.com:389"
///
/// default: ""
#[serde(default)]
pub uri: Option<Url>,
/// Root of the searches.
@ -2079,7 +2089,7 @@ pub struct LdapConfig {
/// example: "cn=ldap-reader,dc=example,dc=org" or
/// "cn={username},ou=users,dc=example,dc=org"
///
/// default:
/// default: ""
#[serde(default)]
pub bind_dn: Option<String>,
@ -2087,6 +2097,8 @@ pub struct LdapConfig {
/// `bind_dn`.
///
/// The server must be able to access the file, and it must not be empty.
///
/// default: ""
#[serde(default)]
pub bind_password_file: Option<PathBuf>,
@ -2137,7 +2149,7 @@ pub struct LdapConfig {
///
/// example: "(objectClass=conduwuitAdmin)" or "(uid={username})"
///
/// default:
/// default: ""
#[serde(default)]
pub admin_filter: String,
}