diff --git a/dashboard/src/auth.rs b/dashboard/src/auth.rs index 71f5b04d9839d0acbfa52afdf1bbe25e81371bc3..ec17f4e6d5a0fbdcc29e7d994f6908e682bd17f4 100644 --- a/dashboard/src/auth.rs +++ b/dashboard/src/auth.rs @@ -10,6 +10,7 @@ use webauthn_rs::prelude::*; const COOKIE: &str = "__Host-snow-session"; const FLOW_COOKIE: &str = "__Host-snow-flow"; +const CSRF_COOKIE: &str = "__Host-snow-csrf"; const SESSION_TTL: i64 = 30 * 86400; const GROUPS: &[&str] = &["infra-admin", "media", "media-manage", "metrics", "vm", "ai"]; @@ -32,8 +33,12 @@ pub fn cookie(headers: &HeaderMap, name: &str) -> Option { (key == name).then(|| value.to_owned()) }) } -pub(crate) fn set_cookie(name: &str, value: &str, ttl: i64) -> String { - format!("{name}={value}; Path=/; Secure; HttpOnly; SameSite=Lax; Max-Age={ttl}") +pub(crate) fn set_cookie(name: &str, value: &str, ttl: Option) -> String { + let mut cookie = format!("{name}={value}; Path=/; Secure; HttpOnly; SameSite=Lax"); + if let Some(ttl) = ttl { + cookie.push_str(&format!("; Max-Age={ttl}")); + } + cookie } fn row(db: &Connection, statement: &str, key: &str) -> Result { let value: Option = db.query_row(statement, [key], |r| r.get(0)).optional()?; @@ -430,7 +435,7 @@ impl Store { now() as i64 ], )?; - Ok(set_cookie(COOKIE, &token, SESSION_TTL)) + Ok(set_cookie(COOKIE, &token, Some(SESSION_TTL))) } pub(crate) fn limit(&self, headers: &HeaderMap, name: &str) -> Result<()> { let ip = headers @@ -476,15 +481,11 @@ impl Store { { return Err(Error::new(403, "Open sign-in on Snowglobe and try again.")); } - let cookie = cookie(headers, FLOW_COOKIE).unwrap_or_default(); + let cookie = cookie(headers, CSRF_COOKIE).unwrap_or_default(); if cookie.is_empty() || !bool::from(cookie.as_bytes().ct_eq(string(&body["csrf"]).as_bytes())) - || pending(&self.db.lock().unwrap(), &cookie, "csrf", false)?.is_null() { - return Err(Error::new( - 403, - "Sign-in expired. Reload the page and try again.", - )); + return Err(Error::new(403, "Reload the page to sign in.")); } Ok(()) } @@ -635,7 +636,7 @@ pub async fn route(State(app): State>, request: Request) -> Result>, request: Request) -> Result>, request: Request) -> Result>, request: Request) -> Result>, request: Request) -> Result Result { StatusCode::FOUND, [ ("location", target.to_string()), - ("set-cookie", auth::set_cookie(COOKIE, &state, 300)), + ("set-cookie", auth::set_cookie(COOKIE, &state, Some(300))), ], ) .into_response()); @@ -633,7 +633,7 @@ async fn handle(app: &App, request: Request) -> Result { Ok(session) => Ok(( StatusCode::FOUND, [("location", next), ("set-cookie", session)], - axum::response::AppendHeaders([("set-cookie", auth::set_cookie(COOKIE, "", 0))]), + axum::response::AppendHeaders([("set-cookie", auth::set_cookie(COOKIE, "", Some(0)))]), ) .into_response()), Err(error) => { @@ -648,7 +648,7 @@ async fn handle(app: &App, request: Request) -> Result { "location", format!("/sign-in?next={}&guest_error=1", encoded(&next)), ), - ("set-cookie", auth::set_cookie(COOKIE, "", 0)), + ("set-cookie", auth::set_cookie(COOKIE, "", Some(0))), ], ) .into_response()) diff --git a/tools/dashboard-auth-test.py b/tools/dashboard-auth-test.py index dd31db830b27634fd4edbea0ed9252c462287ad3..d26b74316223dde4884f0c155bc4cc24983cc0b6 100644 --- a/tools/dashboard-auth-test.py +++ b/tools/dashboard-auth-test.py @@ -121,8 +121,18 @@ def main(): request('/api/me', status=401, extra={'User-Name': name, 'User-Groups': 'infra-admin'}) request('/auth/status', status=403, extra={'Studio-Proxy-Token': 'wrong'}) csrf = request('/auth/status', cookies=cookies)['csrf'] + csrf_headers = request('/auth/status', cookies=cookies, include_headers=True) + assert csrf_headers['set-cookie'].startswith('__Host-snow-csrf=') + assert 'Max-Age=' not in csrf_headers['set-cookie'] and 'Expires=' not in csrf_headers['set-cookie'] + assert request('/auth/status', cookies=cookies)['csrf'] == csrf + with sqlite3.connect(data / 'accounts.sqlite') as db: + db.execute("UPDATE pending SET expires=0 WHERE kind='csrf'") login = {'csrf': csrf, 'username': name, 'password': password, 'next': '/users'} request('/auth/password', 'POST', login, cookies, 403, {'Origin': 'https://evil.example'}) + request('/auth/password', 'POST', login, cookies, 403, {'Origin': 'https://shale.paperclover.net'}) + request('/auth/password', 'POST', login, cookies, 403, {'Origin': ''}) + request('/auth/password', 'POST', login, {}, 403) + request('/auth/password', 'POST', {**login, 'csrf': ''}, cookies, 403) request('/auth/password', 'POST', {**login, 'csrf': 'wrong'}, cookies, 403) request('/auth/password', 'POST', {**login, 'password': 'wrong'}, cookies, 401) assert request('/auth/password', 'POST', login, cookies)['next'] == '/users' @@ -138,6 +148,8 @@ def main(): phc = json.loads(db.execute("SELECT data FROM credentials WHERE kind='password'").fetchone()[0])['phc'] assert '$m=7168,t=5,p=1$' in phc other = {}; csrf2 = request('/auth/status', cookies=other)['csrf'] + assert csrf2 != csrf + request('/auth/password', 'POST', login, other, 403) begun = request('/auth/passkey/start', 'POST', {'csrf': csrf2, 'username': name}, other) assert begun['options']['publicKey']['rpId'] == rp @@ -260,6 +272,7 @@ def main(): request('/api/users/' + invitation['id'], 'PATCH', {'enabled': False}, cookies, 204) request('/api/me', cookies=newcomer, status=401) stop(); start() + assert request('/auth/password', 'POST', login, cookies)['next'] == '/users' request('/api/me', cookies=cookies) request('/auth/file/check', cookies=file_cookies, status=204, host=file) shale_session = {}; shale_csrf = request('/auth/status', cookies=shale_session)['csrf']