Same-origin CSRF: the platform co-hosts user-route HTML on the same origin as /api/v1/admin/*; SameSite=Lax did not block a same-origin POST from a malicious script at /<route>, riding the admin's picloud_session cookie. The dashboard already uses Bearer (dashboard/src/lib/auth.ts + api.ts:495), so cookie auth was dead weight on the admin side and exploitable. Cuts the cookie path entirely: - auth_middleware::extract_token is Bearer-only; cookie branch removed. - auth_api::login no longer sets Set-Cookie. - auth_api::logout no longer clears the cookie (the bearer token is still revoked by deleting the session row). - extract_token_for_logout matches. - SESSION_COOKIE const + PICLOUD_COOKIE_SECURE env var deleted. Audit ref: security_audit/07_http_cors_csrf_xss.md#c07-01. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
230 lines
7.8 KiB
Rust
230 lines
7.8 KiB
Rust
//! `/api/v1/admin/auth/*` — login, logout, who-am-I.
|
|
//!
|
|
//! Login mints an opaque session token, stores its SHA-256, and returns
|
|
//! the raw token in the JSON body. Clients must send it as
|
|
//! `Authorization: Bearer …` on subsequent requests; the same token is
|
|
//! used for the session and admin-API authentication paths (there is no
|
|
//! separate "API token" concept yet).
|
|
//!
|
|
//! Cookie auth was removed in the audit 2026-06-11 C-1 fix — same-origin
|
|
//! user-route HTML defeated the previous `SameSite=Lax` cookie. The
|
|
//! dashboard already uses Bearer; non-browser clients always have.
|
|
//!
|
|
//! Logout deletes the session row regardless of whether the supplied
|
|
//! token matched anything (idempotent). `me` returns the row that the
|
|
//! middleware already attached to the request extensions.
|
|
|
|
use axum::body::Body;
|
|
use axum::extract::{Extension, Request, State};
|
|
use axum::http::{header, StatusCode};
|
|
use axum::middleware::from_fn_with_state;
|
|
use axum::response::{IntoResponse, Json, Response};
|
|
use axum::routing::{get, post};
|
|
use axum::Router;
|
|
use chrono::{DateTime, Duration as ChronoDuration, Utc};
|
|
use picloud_shared::{AdminUserId, InstanceRole};
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::json;
|
|
|
|
use picloud_shared::Principal;
|
|
|
|
use crate::auth::{generate_session_token, hash_token, verify_password};
|
|
use crate::auth_middleware::{require_authenticated, AuthState};
|
|
|
|
pub fn auth_router(state: AuthState) -> Router {
|
|
// /login + /logout are unguarded (login is how you get in; logout
|
|
// is idempotent). /me is guarded — by definition it needs to know
|
|
// who you are, so the middleware must run first.
|
|
let guarded = Router::new()
|
|
.route("/auth/me", get(me))
|
|
.route_layer(from_fn_with_state(state.clone(), require_authenticated));
|
|
|
|
Router::new()
|
|
.route("/auth/login", post(login))
|
|
.route("/auth/logout", post(logout))
|
|
.merge(guarded)
|
|
.with_state(state)
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// DTOs
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
pub struct LoginRequest {
|
|
pub username: String,
|
|
pub password: String,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
pub struct LoginResponse {
|
|
pub user: AdminUserDto,
|
|
pub token: String,
|
|
pub expires_at: DateTime<Utc>,
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
pub struct AdminUserDto {
|
|
pub id: AdminUserId,
|
|
pub username: String,
|
|
pub instance_role: InstanceRole,
|
|
pub email: Option<String>,
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Handlers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
async fn login(State(state): State<AuthState>, Json(input): Json<LoginRequest>) -> Response {
|
|
// Always perform a verify, even on missing/inactive users, to flatten
|
|
// timing and prevent username enumeration. The dummy hash is the
|
|
// shared `TIMING_FLAT_DUMMY_HASH` constant from `auth.rs` so the
|
|
// single PHC value lives in exactly one place (v1.1.9 F4 dedup).
|
|
let creds = match state
|
|
.users
|
|
.get_credentials_by_username(&input.username)
|
|
.await
|
|
{
|
|
Ok(c) => c,
|
|
Err(err) => {
|
|
tracing::error!(?err, "admin_users credentials lookup failed");
|
|
return internal_error();
|
|
}
|
|
};
|
|
|
|
// username from creds is discarded — the re-fetch below carries the
|
|
// canonical row used in the response DTO.
|
|
let (stored_hash, user_id, is_active) = match creds {
|
|
Some(c) => (c.password_hash, Some(c.id), c.is_active),
|
|
None => (crate::auth::TIMING_FLAT_DUMMY_HASH.to_string(), None, false),
|
|
};
|
|
|
|
// F-P-002: Argon2id verify off the async worker.
|
|
let password = input.password.clone();
|
|
let password_ok =
|
|
match tokio::task::spawn_blocking(move || verify_password(&stored_hash, &password)).await {
|
|
Ok(b) => b,
|
|
Err(err) => {
|
|
tracing::error!(?err, "verify_password spawn_blocking join failed");
|
|
return internal_error();
|
|
}
|
|
};
|
|
if !password_ok || user_id.is_none() || !is_active {
|
|
return invalid_credentials();
|
|
}
|
|
let user_id = user_id.unwrap();
|
|
|
|
// Re-fetch the full row so the login response carries the same
|
|
// shape /me does (instance_role, email). The credentials struct
|
|
// intentionally omits email; one extra query per login is fine.
|
|
let user_row = match state.users.get(user_id).await {
|
|
Ok(Some(row)) => row,
|
|
Ok(None) => return invalid_credentials(),
|
|
Err(err) => {
|
|
tracing::error!(?err, "admin_users lookup after login failed");
|
|
return internal_error();
|
|
}
|
|
};
|
|
|
|
let token = generate_session_token();
|
|
let expires_at = Utc::now()
|
|
+ ChronoDuration::from_std(state.ttl).unwrap_or_else(|_| ChronoDuration::hours(24));
|
|
|
|
if let Err(err) = state
|
|
.sessions
|
|
.create(user_id, &token.hash, expires_at)
|
|
.await
|
|
{
|
|
tracing::error!(?err, "admin_sessions insert failed");
|
|
return internal_error();
|
|
}
|
|
if let Err(err) = state.users.touch_last_login(user_id).await {
|
|
// Non-fatal — log and continue. Login itself succeeded.
|
|
tracing::warn!(?err, "failed to touch admin last_login_at");
|
|
}
|
|
|
|
(
|
|
StatusCode::OK,
|
|
Json(LoginResponse {
|
|
user: AdminUserDto {
|
|
id: user_row.id,
|
|
username: user_row.username,
|
|
instance_role: user_row.instance_role,
|
|
email: user_row.email,
|
|
},
|
|
token: token.raw,
|
|
expires_at,
|
|
}),
|
|
)
|
|
.into_response()
|
|
}
|
|
|
|
async fn logout(State(state): State<AuthState>, req: Request<Body>) -> Response {
|
|
// Pull token without requiring a valid session (logout is idempotent).
|
|
let token = extract_token_for_logout(&req);
|
|
if let Some(raw) = token {
|
|
let hash = hash_token(&raw);
|
|
if let Err(err) = state.sessions.delete(&hash).await {
|
|
tracing::error!(?err, "admin_sessions delete failed");
|
|
}
|
|
}
|
|
StatusCode::NO_CONTENT.into_response()
|
|
}
|
|
|
|
async fn me(
|
|
State(state): State<AuthState>,
|
|
Extension(principal): Extension<Principal>,
|
|
) -> Response {
|
|
// /me consumes the resolved Principal directly; we re-fetch the
|
|
// user row only to surface a fresh username (it can change via
|
|
// PATCH while a session/key is still valid).
|
|
match state.users.get(principal.user_id).await {
|
|
Ok(Some(row)) => Json(AdminUserDto {
|
|
id: row.id,
|
|
username: row.username,
|
|
instance_role: row.instance_role,
|
|
email: row.email,
|
|
})
|
|
.into_response(),
|
|
Ok(None) => invalid_credentials(),
|
|
Err(err) => {
|
|
tracing::error!(?err, "admin_users lookup for /me failed");
|
|
internal_error()
|
|
}
|
|
}
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Helpers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
fn extract_token_for_logout(req: &Request<Body>) -> Option<String> {
|
|
// Duplicated from auth_middleware::extract_token because logout runs
|
|
// before the auth middleware (logout is idempotent and must accept
|
|
// already-expired tokens). Cookie auth was dropped in the audit
|
|
// 2026-06-11 C-1 fix — Bearer only.
|
|
let value = req.headers().get(header::AUTHORIZATION)?;
|
|
let s = value.to_str().ok()?;
|
|
let token = s.strip_prefix("Bearer ")?.trim();
|
|
if token.is_empty() {
|
|
return None;
|
|
}
|
|
Some(token.to_string())
|
|
}
|
|
|
|
fn invalid_credentials() -> Response {
|
|
(
|
|
StatusCode::UNAUTHORIZED,
|
|
Json(json!({ "error": "invalid credentials" })),
|
|
)
|
|
.into_response()
|
|
}
|
|
|
|
fn internal_error() -> Response {
|
|
(
|
|
StatusCode::INTERNAL_SERVER_ERROR,
|
|
Json(json!({ "error": "internal error" })),
|
|
)
|
|
.into_response()
|
|
}
|