Skip to content

use session timeout setting for cookies #2143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wojcik91 merged 2 commits into from
Feb 26, 2026
Merged

use session timeout setting for cookies #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e84cf
mark deprecated cookie timeout
wojcik91 Feb 26, 2026
01599a7
replace usages of deprecated timeout
wojcik91 Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions crates/defguard_common/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub struct DefGuardConfig {

#[arg(long, env = "DEFGUARD_AUTH_COOKIE_TIMEOUT", default_value = "7d")]
#[serde(skip_serializing)]
#[deprecated(since = "2.0.0", note = "Use Settings.default_authentication instead")]
pub auth_cookie_timeout: Duration,

#[arg(long, env = "DEFGUARD_SECRET_KEY")]
Expand Down Expand Up @@ -93,7 +94,9 @@ pub struct DefGuardConfig {
// relying party id and relying party origin for WebAuthn
#[arg(long, env = "DEFGUARD_WEBAUTHN_RP_ID")]
pub webauthn_rp_id: Option<String>,

#[arg(long, env = "DEFGUARD_URL", value_parser = Url::parse, default_value = "http://localhost:8000")]
#[serde(skip_serializing)]
#[deprecated(since = "2.0.0", note = "Use Settings.defguard_url instead")]
pub url: Url,

Expand All @@ -112,6 +115,7 @@ pub struct DefGuardConfig {
pub stats_purge_threshold: Duration,

#[arg(long, env = "DEFGUARD_ENROLLMENT_URL", value_parser = Url::parse, default_value = "http://localhost:8080")]
#[serde(skip_serializing)]
#[deprecated(since = "2.0.0", note = "Use Settings.public_proxy_url instead")]
pub enrollment_url: Url,

Expand Down
6 changes: 5 additions & 1 deletion crates/defguard_core/src/enterprise/handlers/openid_login.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,11 @@ pub(crate) async fn auth_callback(
let (session, user_info, mfa_info) =
create_session(&appstate.pool, insecure_ip, user_agent.as_str(), &mut user).await?;

let max_age = Duration::seconds(config.auth_cookie_timeout.as_secs() as i64);
let timeout = Settings::get_current_settings().authentication_timeout();
let max_age = Duration::try_from(timeout).map_err(|err| {
error!("Failed to convert authentication timeout for cookie max-age: {err}");
WebError::Http(StatusCode::INTERNAL_SERVER_ERROR)
})?;
let cookie_domain = config
.cookie_domain
.as_ref()
Expand Down
6 changes: 5 additions & 1 deletion crates/defguard_core/src/handlers/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,11 @@ pub(crate) async fn authenticate(
let (session, user_info, mfa_info) =
create_session(&appstate.pool, insecure_ip, user_agent.as_str(), &mut user).await?;

let max_age = Duration::seconds(server_config().auth_cookie_timeout.as_secs() as i64);
let timeout = Settings::get_current_settings().authentication_timeout();
let max_age = Duration::try_from(timeout).map_err(|err| {
error!("Failed to convert authentication timeout for cookie max-age: {err}");
WebError::Http(StatusCode::INTERNAL_SERVER_ERROR)
})?;
let config = server_config();
let cookie_domain = config
.cookie_domain
Expand Down
Loading