make session cookie samesite=lax by default

This commit is contained in:
Lennart
2025-08-25 19:09:24 +02:00
parent f3a1f27caf
commit 2cf481d4e6
3 changed files with 9 additions and 1 deletions

View File

@@ -38,6 +38,7 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
oidc_config: Option<OidcConfig>, oidc_config: Option<OidcConfig>,
nextcloud_login_config: NextcloudLoginConfig, nextcloud_login_config: NextcloudLoginConfig,
dav_push_enabled: bool, dav_push_enabled: bool,
session_cookie_samesite_strict: bool,
) -> Router<()> { ) -> Router<()> {
let combined_cal_store = Arc::new(CombinedCalendarStore::new( let combined_cal_store = Arc::new(CombinedCalendarStore::new(
cal_store.clone(), cal_store.clone(),
@@ -128,7 +129,11 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
SessionManagerLayer::new(session_store) SessionManagerLayer::new(session_store)
.with_name("rustical_session") .with_name("rustical_session")
.with_secure(true) .with_secure(true)
.with_same_site(SameSite::Strict) .with_same_site(if session_cookie_samesite_strict {
SameSite::Strict
} else {
SameSite::Lax
})
.with_expiry(Expiry::OnInactivity( .with_expiry(Expiry::OnInactivity(
tower_sessions::cookie::time::Duration::hours(2), tower_sessions::cookie::time::Duration::hours(2),
)), )),

View File

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
pub struct HttpConfig { pub struct HttpConfig {
pub host: String, pub host: String,
pub port: u16, pub port: u16,
pub session_cookie_samesite_strict: bool,
} }
impl Default for HttpConfig { impl Default for HttpConfig {
@@ -14,6 +15,7 @@ impl Default for HttpConfig {
Self { Self {
host: "0.0.0.0".to_owned(), host: "0.0.0.0".to_owned(),
port: 4000, port: 4000,
session_cookie_samesite_strict: false,
} }
} }
} }

View File

@@ -116,6 +116,7 @@ async fn main() -> Result<()> {
config.oidc.clone(), config.oidc.clone(),
config.nextcloud_login.clone(), config.nextcloud_login.clone(),
config.dav_push.enabled, config.dav_push.enabled,
config.http.session_cookie_samesite_strict,
); );
let app = ServiceExt::<Request>::into_make_service( let app = ServiceExt::<Request>::into_make_service(
NormalizePathLayer::trim_trailing_slash().layer(app), NormalizePathLayer::trim_trailing_slash().layer(app),