git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-11 07:33:01 +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
}