filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add STALWART_HTTPS_PORT variable

Browse Source
This commit is contained in:
Maurus Decimus
2026-04-22 08:41:46 +02:00
parent 04b673587d
commit 2fd3f208bd
11 changed files with 32 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/http/src/api/mod.rs
View File

@@ -81,7 +81,7 @@ impl ManagementApi for Server {
if let Some(email) = path.get(1).copied() {
self.is_http_anonymous_request_allowed(session.remote_ip)
.await?;
self.handle_discover_request(req, session, decode_path_element(email).as_ref())
self.handle_discover_request(decode_path_element(email).as_ref())
.await
} else {
Err(trc::ResourceEvent::NotFound.into_err())

27
crates/http/src/auth/oauth/auth.rs
View File

@@ -49,8 +49,6 @@ pub struct OAuthMetadata {
pub trait OAuthApiHandler: Sync + Send {
fn handle_discover_request(
&self,
req: &HttpRequest,
session: &HttpSessionData,
account_name: &str,
) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
@@ -66,11 +64,7 @@ pub trait OAuthApiHandler: Sync + Send {
session: &HttpSessionData,
) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
fn handle_oauth_metadata(
&self,
req: HttpRequest,
session: &HttpSessionData,
) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
fn handle_oauth_metadata(&self) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
}
#[derive(Debug, serde::Serialize, serde::Deserialize)]
@@ -120,12 +114,7 @@ pub enum LoginResponse {
}
impl OAuthApiHandler for Server {
async fn handle_discover_request(
&self,
req: &HttpRequest,
session: &HttpSessionData,
account_name: &str,
) -> trc::Result<HttpResponse> {
async fn handle_discover_request(&self, account_name: &str) -> trc::Result<HttpResponse> {
let account_name = account_name.trim().to_lowercase();
if let Some(domain_name) = account_name.try_domain_part()
&& let Some(endpoint) = self
@@ -137,7 +126,7 @@ impl OAuthApiHandler for Server {
.no_cache()
.into_http_response())
} else {
self.handle_oidc_metadata(req, session).await
self.handle_oidc_metadata().await
}
}
@@ -423,7 +412,7 @@ impl OAuthApiHandler for Server {
.await?;
// Build response
let base_url = HttpContext::new(session, req).resolve_response_url(self);
let base_url = &self.core.network.http.url_https;
Ok(JsonResponse::new(DeviceAuthResponse {
verification_uri: format!("{base_url}/device"),
verification_uri_complete: format!("{base_url}/device/?code={user_code}"),
@@ -436,12 +425,8 @@ impl OAuthApiHandler for Server {
.into_http_response())
}
async fn handle_oauth_metadata(
&self,
req: HttpRequest,
session: &HttpSessionData,
) -> trc::Result<HttpResponse> {
let base_url = HttpContext::new(session, &req).resolve_response_url(self);
async fn handle_oauth_metadata(&self) -> trc::Result<HttpResponse> {
let base_url = &self.core.network.http.url_https;
Ok(JsonResponse::new(OAuthMetadata {
authorization_endpoint: format!("{base_url}/login",),

14
crates/http/src/auth/oauth/openid.rs
View File

@@ -33,11 +33,7 @@ pub trait OpenIdHandler: Sync + Send {
account_id: u32,
) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
fn handle_oidc_metadata(
&self,
req: &HttpRequest,
session: &HttpSessionData,
) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
fn handle_oidc_metadata(&self) -> impl Future<Output = trc::Result<HttpResponse>> + Send;
}
impl OpenIdHandler for Server {
@@ -56,12 +52,8 @@ impl OpenIdHandler for Server {
.into_http_response())
}
async fn handle_oidc_metadata(
&self,
req: &HttpRequest,
session: &HttpSessionData,
) -> trc::Result<HttpResponse> {
let base_url = HttpContext::new(session, req).resolve_response_url(self);
async fn handle_oidc_metadata(&self) -> trc::Result<HttpResponse> {
let base_url = &self.core.network.http.url_https;
Ok(JsonResponse::new(OpenIdMetadata {
authorization_endpoint: format!("{base_url}/login",),

4
crates/http/src/auth/oauth/token.rs
View File

@@ -64,9 +64,7 @@ impl TokenHandler for Server {
let mut response = TokenResponse::error(ErrorType::InvalidGrant);
let issuer = HttpContext::new(&session, req)
.resolve_response_url(self)
.to_string();
let issuer = self.core.network.http.url_https.to_string();
if grant_type.eq_ignore_ascii_case("authorization_code") {
response = if let (Some(code), Some(client_id), Some(redirect_uri)) = (

8
crates/http/src/request.rs
View File

@@ -197,14 +197,14 @@ impl ParseHttp for Server {
self.authenticate_headers(&req, &session).await?;
self.handle_session_resource(
ctx.resolve_response_url(self).to_string(),
self.core.network.http.url_https.to_string(),
&access_token,
)
.await
.map(|s| s.into_http_response())
} else {
Ok(Session::new(
ctx.resolve_response_url(self),
&self.core.network.http.url_https,
&self.core.jmap.capabilities,
)
.into_http_response())
@@ -271,14 +271,14 @@ impl ParseHttp for Server {
self.is_http_anonymous_request_allowed(session.remote_ip)
.await?;
return self.handle_oauth_metadata(req, &session).await;
return self.handle_oauth_metadata().await;
}
("openid-configuration", &Method::GET) => {
// Limit anonymous requests
self.is_http_anonymous_request_allowed(session.remote_ip)
.await?;
return self.handle_oidc_metadata(&req, &session).await;
return self.handle_oidc_metadata().await;
}
("acme-challenge", &Method::GET) if self.has_acme_http_providers() => {
if let Some(token) = path.next() {