Compare commits
1 Commits
feat/auth-
...
bugfix/api
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8667f8b957 |
@@ -29,13 +29,6 @@ COOKIE_DOMAIN=
|
|||||||
# get reaped lazily.
|
# get reaped lazily.
|
||||||
SESSION_TTL_DAYS=30
|
SESSION_TTL_DAYS=30
|
||||||
|
|
||||||
# ----- Auth brute-force rate limits -----
|
|
||||||
# Token-bucket budget shared across /auth/login, /auth/register, and
|
|
||||||
# /auth/me/password. Set per_sec=0 to disable (e.g. behind a
|
|
||||||
# rate-limiting reverse proxy that already enforces a budget).
|
|
||||||
AUTH_RATE_PER_SEC=5
|
|
||||||
AUTH_RATE_BURST=10
|
|
||||||
|
|
||||||
# ----- CORS -----
|
# ----- CORS -----
|
||||||
# Comma-separated origins allowed to call the API with credentials.
|
# Comma-separated origins allowed to call the API with credentials.
|
||||||
# Default is empty: same-origin only. Set when frontend and backend live
|
# Default is empty: same-origin only. Set when frontend and backend live
|
||||||
|
|||||||
2
backend/Cargo.lock
generated
2
backend/Cargo.lock
generated
@@ -1470,7 +1470,7 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.35.0"
|
version = "0.34.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"argon2",
|
"argon2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.35.0"
|
version = "0.34.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "mangalord"
|
default-run = "mangalord"
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ async fn register(
|
|||||||
jar: CookieJar,
|
jar: CookieJar,
|
||||||
Json(input): Json<Credentials>,
|
Json(input): Json<Credentials>,
|
||||||
) -> AppResult<impl IntoResponse> {
|
) -> AppResult<impl IntoResponse> {
|
||||||
check_auth_rate_limit(&state, "register")?;
|
|
||||||
let username = input.username.trim();
|
let username = input.username.trim();
|
||||||
validate_username(username)?;
|
validate_username(username)?;
|
||||||
validate_password(&input.password)?;
|
validate_password(&input.password)?;
|
||||||
@@ -96,7 +95,6 @@ async fn login(
|
|||||||
jar: CookieJar,
|
jar: CookieJar,
|
||||||
Json(input): Json<Credentials>,
|
Json(input): Json<Credentials>,
|
||||||
) -> AppResult<impl IntoResponse> {
|
) -> AppResult<impl IntoResponse> {
|
||||||
check_auth_rate_limit(&state, "login")?;
|
|
||||||
let username = input.username.trim();
|
let username = input.username.trim();
|
||||||
if username.is_empty() || input.password.is_empty() {
|
if username.is_empty() || input.password.is_empty() {
|
||||||
return Err(AppError::InvalidInput(
|
return Err(AppError::InvalidInput(
|
||||||
@@ -151,7 +149,6 @@ async fn change_password(
|
|||||||
jar: CookieJar,
|
jar: CookieJar,
|
||||||
Json(input): Json<ChangePassword>,
|
Json(input): Json<ChangePassword>,
|
||||||
) -> AppResult<impl IntoResponse> {
|
) -> AppResult<impl IntoResponse> {
|
||||||
check_auth_rate_limit(&state, "change_password")?;
|
|
||||||
if !verify_password(&input.current_password, &user.password_hash) {
|
if !verify_password(&input.current_password, &user.password_hash) {
|
||||||
return Err(AppError::Unauthenticated);
|
return Err(AppError::Unauthenticated);
|
||||||
}
|
}
|
||||||
@@ -233,8 +230,24 @@ async fn create_token(
|
|||||||
Json(input): Json<CreateTokenInput>,
|
Json(input): Json<CreateTokenInput>,
|
||||||
) -> AppResult<impl IntoResponse> {
|
) -> AppResult<impl IntoResponse> {
|
||||||
let name = input.name.trim();
|
let name = input.name.trim();
|
||||||
|
// Both arms use `ValidationFailed` (422 with field details) to
|
||||||
|
// match the structured-error shape `attach_tag` returns for the
|
||||||
|
// same kind of free-form-identifier validation. The other
|
||||||
|
// /auth/* handlers in this file use `InvalidInput` (400); the
|
||||||
|
// divergence is pre-existing and would warrant a project-wide
|
||||||
|
// pass to flip them all if the client side wants uniform per-
|
||||||
|
// field error rendering.
|
||||||
if name.is_empty() {
|
if name.is_empty() {
|
||||||
return Err(AppError::InvalidInput("token name is required".into()));
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "token name is required".into(),
|
||||||
|
details: serde_json::json!({ "name": "required" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if name.chars().count() > 64 {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "token name too long".into(),
|
||||||
|
details: serde_json::json!({ "name": "max 64 characters" }),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
let (raw, hash) = generate_token();
|
let (raw, hash) = generate_token();
|
||||||
let token = repo::api_token::create(&state.db, user.id, name, &hash).await?;
|
let token = repo::api_token::create(&state.db, user.id, name, &hash).await?;
|
||||||
@@ -296,33 +309,6 @@ fn build_expired_cookie(cfg: &AuthConfig) -> Cookie<'static> {
|
|||||||
builder.build()
|
builder.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Consume one token from the shared auth rate limiter. Called at the
|
|
||||||
/// start of `register`, `login`, and `change_password` so credential
|
|
||||||
/// stuffing / spraying / username-probe loops are throttled by the
|
|
||||||
/// configured budget (default 5/sec with a 10-request burst).
|
|
||||||
///
|
|
||||||
/// All three endpoints share one bucket — they all expose the same
|
|
||||||
/// argon2-verify-or-create work and the same enumeration channels, so
|
|
||||||
/// any one of them in a tight loop should trip the limit. `endpoint`
|
|
||||||
/// is included in the rate-limit-hit log line so operators can tell
|
|
||||||
/// which endpoint is being probed.
|
|
||||||
fn check_auth_rate_limit(state: &AppState, endpoint: &'static str) -> AppResult<()> {
|
|
||||||
use crate::auth::rate_limit::AcquireResult;
|
|
||||||
match state.auth_limiter.try_acquire() {
|
|
||||||
AcquireResult::Allowed => Ok(()),
|
|
||||||
AcquireResult::Denied { retry_after_secs } => {
|
|
||||||
tracing::warn!(
|
|
||||||
endpoint,
|
|
||||||
retry_after_secs,
|
|
||||||
"auth rate limit hit; returning 429"
|
|
||||||
);
|
|
||||||
Err(AppError::TooManyRequests {
|
|
||||||
retry_after_secs: Some(retry_after_secs),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn validate_username(u: &str) -> AppResult<()> {
|
fn validate_username(u: &str) -> AppResult<()> {
|
||||||
if u.is_empty() {
|
if u.is_empty() {
|
||||||
return Err(AppError::InvalidInput("username is required".into()));
|
return Err(AppError::InvalidInput("username is required".into()));
|
||||||
|
|||||||
@@ -348,6 +348,7 @@ async fn attach_tag(
|
|||||||
Path(id): Path<Uuid>,
|
Path(id): Path<Uuid>,
|
||||||
Json(body): Json<AttachTagBody>,
|
Json(body): Json<AttachTagBody>,
|
||||||
) -> AppResult<(StatusCode, Json<TagRef>)> {
|
) -> AppResult<(StatusCode, Json<TagRef>)> {
|
||||||
|
validate_tag_name(&body.name)?;
|
||||||
if !repo::manga::exists(&state.db, id).await? {
|
if !repo::manga::exists(&state.db, id).await? {
|
||||||
return Err(AppError::NotFound);
|
return Err(AppError::NotFound);
|
||||||
}
|
}
|
||||||
@@ -394,6 +395,27 @@ async fn detach_tag(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Request-side validation for `POST /mangas/:id/tags` body. Mirrors
|
||||||
|
/// the repo-level cap in `repo::tag::upsert_by_name` (max 64 chars
|
||||||
|
/// after trim) but surfaces the failure at the handler boundary with
|
||||||
|
/// the same envelope shape other validations use.
|
||||||
|
fn validate_tag_name(name: &str) -> AppResult<()> {
|
||||||
|
let trimmed = name.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "tag name cannot be empty".into(),
|
||||||
|
details: json!({ "name": "required" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if trimmed.chars().count() > 64 {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "tag name too long".into(),
|
||||||
|
details: json!({ "name": "max 64 characters" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn validate_new_manga(input: &NewManga) -> AppResult<()> {
|
fn validate_new_manga(input: &NewManga) -> AppResult<()> {
|
||||||
if input.title.trim().is_empty() {
|
if input.title.trim().is_empty() {
|
||||||
return Err(AppError::ValidationFailed {
|
return Err(AppError::ValidationFailed {
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ use tokio_util::sync::CancellationToken;
|
|||||||
use tower_http::cors::{AllowOrigin, CorsLayer};
|
use tower_http::cors::{AllowOrigin, CorsLayer};
|
||||||
use tower_http::trace::TraceLayer;
|
use tower_http::trace::TraceLayer;
|
||||||
|
|
||||||
use crate::auth::rate_limit::AuthRateLimiter;
|
|
||||||
use crate::config::{AuthConfig, Config, CrawlerConfig, CrawlerModePref, UploadConfig};
|
use crate::config::{AuthConfig, Config, CrawlerConfig, CrawlerModePref, UploadConfig};
|
||||||
use crate::crawler::browser_manager::{self, BrowserManager};
|
use crate::crawler::browser_manager::{self, BrowserManager};
|
||||||
use crate::crawler::content::{self, SyncOutcome};
|
use crate::crawler::content::{self, SyncOutcome};
|
||||||
@@ -31,10 +30,6 @@ pub struct AppState {
|
|||||||
pub storage: Arc<dyn Storage>,
|
pub storage: Arc<dyn Storage>,
|
||||||
pub auth: AuthConfig,
|
pub auth: AuthConfig,
|
||||||
pub upload: UploadConfig,
|
pub upload: UploadConfig,
|
||||||
/// Shared rate limiter guarding the `/auth/*` mutation endpoints.
|
|
||||||
/// One instance per AppState so tests stay isolated across the
|
|
||||||
/// same process.
|
|
||||||
pub auth_limiter: Arc<AuthRateLimiter>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Bundle returned by [`build`]. The router is what `axum::serve` consumes;
|
/// Bundle returned by [`build`]. The router is what `axum::serve` consumes;
|
||||||
@@ -69,13 +64,11 @@ pub async fn build(config: Config) -> anyhow::Result<AppHandle> {
|
|||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
let auth_limiter = Arc::new(AuthRateLimiter::new(config.auth.rate_limit));
|
|
||||||
let state = AppState {
|
let state = AppState {
|
||||||
db,
|
db,
|
||||||
storage,
|
storage,
|
||||||
auth: config.auth.clone(),
|
auth: config.auth.clone(),
|
||||||
upload: config.upload.clone(),
|
upload: config.upload.clone(),
|
||||||
auth_limiter,
|
|
||||||
};
|
};
|
||||||
let router = router(state).layer(cors_layer(&config.cors_allowed_origins));
|
let router = router(state).layer(cors_layer(&config.cors_allowed_origins));
|
||||||
Ok(AppHandle { router, daemon })
|
Ok(AppHandle { router, daemon })
|
||||||
|
|||||||
@@ -7,5 +7,4 @@
|
|||||||
|
|
||||||
pub mod extractor;
|
pub mod extractor;
|
||||||
pub mod password;
|
pub mod password;
|
||||||
pub mod rate_limit;
|
|
||||||
pub mod token;
|
pub mod token;
|
||||||
|
|||||||
@@ -1,179 +0,0 @@
|
|||||||
//! Per-process token-bucket rate limiter for the auth endpoints.
|
|
||||||
//!
|
|
||||||
//! Protects `/auth/login`, `/auth/register`, and `/auth/me/password`
|
|
||||||
//! from credential stuffing / password spraying / username probing.
|
|
||||||
//!
|
|
||||||
//! The current deploy puts SvelteKit's hooks.server.ts proxy in front
|
|
||||||
//! of axum without forwarding the original client IP (no
|
|
||||||
//! `X-Forwarded-For`), so per-IP buckets would all collapse to the
|
|
||||||
//! proxy container's address. Until the proxy learns to forward the
|
|
||||||
//! peer address, a single global bucket gives equivalent protection
|
|
||||||
//! against mass-attack patterns and trades a small DoS surface
|
|
||||||
//! (legitimate users sharing the limit) for simplicity.
|
|
||||||
//!
|
|
||||||
//! Each `AppState` carries its own [`AuthRateLimiter`] instance, so
|
|
||||||
//! tests run in isolated buckets and won't bleed across `#[sqlx::test]`
|
|
||||||
//! cases that share a process.
|
|
||||||
|
|
||||||
use std::sync::Mutex;
|
|
||||||
use std::time::Instant;
|
|
||||||
|
|
||||||
/// Tunable limits. `per_sec == 0` disables the limiter — used by the
|
|
||||||
/// test harness and by anyone who wants to opt out via env config.
|
|
||||||
#[derive(Clone, Copy, Debug)]
|
|
||||||
pub struct RateLimitConfig {
|
|
||||||
pub per_sec: u32,
|
|
||||||
pub burst: u32,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for RateLimitConfig {
|
|
||||||
/// Disabled by default. The production `AuthConfig::from_env`
|
|
||||||
/// overrides to a real limit; the test harness keeps the default
|
|
||||||
/// so existing tests don't flake against shared buckets.
|
|
||||||
fn default() -> Self {
|
|
||||||
Self {
|
|
||||||
per_sec: 0,
|
|
||||||
burst: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Production defaults: 5 requests/sec sustained, 10-request burst.
|
|
||||||
/// Tight enough to make brute force impractical, loose enough that a
|
|
||||||
/// real user mistyping their password three times in a row doesn't
|
|
||||||
/// hit it.
|
|
||||||
pub const PRODUCTION_PER_SEC: u32 = 5;
|
|
||||||
pub const PRODUCTION_BURST: u32 = 10;
|
|
||||||
|
|
||||||
struct Bucket {
|
|
||||||
tokens: f64,
|
|
||||||
last_refill: Instant,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Outcome of [`AuthRateLimiter::try_acquire`]. When `Denied`, the
|
|
||||||
/// caller can use `retry_after_secs` for a `Retry-After: N` header
|
|
||||||
/// (RFC 6585 §4) so well-behaved clients back off correctly rather
|
|
||||||
/// than retrying in a tight loop.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
||||||
pub enum AcquireResult {
|
|
||||||
Allowed,
|
|
||||||
Denied { retry_after_secs: u64 },
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Single-bucket token-bucket limiter. `try_acquire` is cheap (one
|
|
||||||
/// mutex acquire, no allocations) so the auth path doesn't pay a real
|
|
||||||
/// cost for the check.
|
|
||||||
pub struct AuthRateLimiter {
|
|
||||||
cfg: RateLimitConfig,
|
|
||||||
bucket: Mutex<Bucket>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AuthRateLimiter {
|
|
||||||
pub fn new(cfg: RateLimitConfig) -> Self {
|
|
||||||
Self {
|
|
||||||
cfg,
|
|
||||||
bucket: Mutex::new(Bucket {
|
|
||||||
tokens: cfg.burst as f64,
|
|
||||||
last_refill: Instant::now(),
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Consume one token if available. Returns `Denied` with a
|
|
||||||
/// rounded-up seconds-until-refill so the caller can emit a
|
|
||||||
/// `Retry-After` header.
|
|
||||||
pub fn try_acquire(&self) -> AcquireResult {
|
|
||||||
if self.cfg.per_sec == 0 {
|
|
||||||
return AcquireResult::Allowed;
|
|
||||||
}
|
|
||||||
let now = Instant::now();
|
|
||||||
let mut bucket = self.bucket.lock().expect("rate limiter mutex poisoned");
|
|
||||||
let elapsed = now.duration_since(bucket.last_refill).as_secs_f64();
|
|
||||||
bucket.tokens =
|
|
||||||
(bucket.tokens + elapsed * f64::from(self.cfg.per_sec)).min(f64::from(self.cfg.burst));
|
|
||||||
bucket.last_refill = now;
|
|
||||||
if bucket.tokens >= 1.0 {
|
|
||||||
bucket.tokens -= 1.0;
|
|
||||||
AcquireResult::Allowed
|
|
||||||
} else {
|
|
||||||
// ceil((1 - tokens) / per_sec), minimum 1 — a `Retry-After: 0`
|
|
||||||
// would tell clients to retry immediately, which is what we're
|
|
||||||
// actively trying to discourage.
|
|
||||||
let deficit = 1.0 - bucket.tokens;
|
|
||||||
let wait_secs = (deficit / f64::from(self.cfg.per_sec)).ceil() as u64;
|
|
||||||
AcquireResult::Denied {
|
|
||||||
retry_after_secs: wait_secs.max(1),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn disabled_limiter_always_allows() {
|
|
||||||
let rl = AuthRateLimiter::new(RateLimitConfig {
|
|
||||||
per_sec: 0,
|
|
||||||
burst: 0,
|
|
||||||
});
|
|
||||||
for _ in 0..1000 {
|
|
||||||
assert_eq!(rl.try_acquire(), AcquireResult::Allowed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn burst_lets_through_initial_window_then_blocks() {
|
|
||||||
// 0 refill, burst 3 → first three pass, fourth blocks.
|
|
||||||
let rl = AuthRateLimiter::new(RateLimitConfig {
|
|
||||||
per_sec: 1,
|
|
||||||
burst: 3,
|
|
||||||
});
|
|
||||||
assert_eq!(rl.try_acquire(), AcquireResult::Allowed);
|
|
||||||
assert_eq!(rl.try_acquire(), AcquireResult::Allowed);
|
|
||||||
assert_eq!(rl.try_acquire(), AcquireResult::Allowed);
|
|
||||||
match rl.try_acquire() {
|
|
||||||
AcquireResult::Denied { retry_after_secs } => {
|
|
||||||
// Bucket is at ~0 tokens, refill rate 1/sec → ~1s wait.
|
|
||||||
assert!(
|
|
||||||
retry_after_secs >= 1,
|
|
||||||
"retry_after must be at least 1s, got {retry_after_secs}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
AcquireResult::Allowed => panic!("fourth request must be denied"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn tokens_refill_over_time() {
|
|
||||||
// 10/sec → after ~120ms we should have at least one token back.
|
|
||||||
let rl = AuthRateLimiter::new(RateLimitConfig {
|
|
||||||
per_sec: 10,
|
|
||||||
burst: 1,
|
|
||||||
});
|
|
||||||
assert_eq!(rl.try_acquire(), AcquireResult::Allowed);
|
|
||||||
assert!(matches!(rl.try_acquire(), AcquireResult::Denied { .. }));
|
|
||||||
std::thread::sleep(std::time::Duration::from_millis(150));
|
|
||||||
assert_eq!(
|
|
||||||
rl.try_acquire(),
|
|
||||||
AcquireResult::Allowed,
|
|
||||||
"token should have refilled"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn retry_after_scales_inversely_with_refill_rate() {
|
|
||||||
// 1/sec → wait ~1s after burst exhausted.
|
|
||||||
// 10/sec → wait <1s, but we clamp to a minimum of 1s.
|
|
||||||
let slow = AuthRateLimiter::new(RateLimitConfig {
|
|
||||||
per_sec: 1,
|
|
||||||
burst: 1,
|
|
||||||
});
|
|
||||||
slow.try_acquire();
|
|
||||||
match slow.try_acquire() {
|
|
||||||
AcquireResult::Denied { retry_after_secs } => assert_eq!(retry_after_secs, 1),
|
|
||||||
_ => panic!("expected Denied"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -21,7 +21,6 @@ pub struct AuthConfig {
|
|||||||
pub cookie_secure: bool,
|
pub cookie_secure: bool,
|
||||||
pub cookie_domain: Option<String>,
|
pub cookie_domain: Option<String>,
|
||||||
pub session_ttl_days: i64,
|
pub session_ttl_days: i64,
|
||||||
pub rate_limit: crate::auth::rate_limit::RateLimitConfig,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AuthConfig {
|
impl Default for AuthConfig {
|
||||||
@@ -30,11 +29,6 @@ impl Default for AuthConfig {
|
|||||||
cookie_secure: true,
|
cookie_secure: true,
|
||||||
cookie_domain: None,
|
cookie_domain: None,
|
||||||
session_ttl_days: 30,
|
session_ttl_days: 30,
|
||||||
// Disabled by default so the test harness inherits a
|
|
||||||
// non-throttling limiter. Production `from_env` overrides
|
|
||||||
// to the [`PRODUCTION_PER_SEC`]/[`PRODUCTION_BURST`]
|
|
||||||
// defaults.
|
|
||||||
rate_limit: crate::auth::rate_limit::RateLimitConfig::default(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -141,16 +135,6 @@ impl Config {
|
|||||||
.ok()
|
.ok()
|
||||||
.filter(|s| !s.is_empty()),
|
.filter(|s| !s.is_empty()),
|
||||||
session_ttl_days: env_i64("SESSION_TTL_DAYS", 30),
|
session_ttl_days: env_i64("SESSION_TTL_DAYS", 30),
|
||||||
rate_limit: crate::auth::rate_limit::RateLimitConfig {
|
|
||||||
per_sec: env_u64(
|
|
||||||
"AUTH_RATE_PER_SEC",
|
|
||||||
crate::auth::rate_limit::PRODUCTION_PER_SEC.into(),
|
|
||||||
) as u32,
|
|
||||||
burst: env_u64(
|
|
||||||
"AUTH_RATE_BURST",
|
|
||||||
crate::auth::rate_limit::PRODUCTION_BURST.into(),
|
|
||||||
) as u32,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
upload: UploadConfig {
|
upload: UploadConfig {
|
||||||
max_request_bytes: env_usize("MAX_REQUEST_BYTES", 200 * 1024 * 1024),
|
max_request_bytes: env_usize("MAX_REQUEST_BYTES", 200 * 1024 * 1024),
|
||||||
|
|||||||
@@ -21,11 +21,6 @@ pub enum AppError {
|
|||||||
PayloadTooLarge(String),
|
PayloadTooLarge(String),
|
||||||
#[error("unsupported media type: {0}")]
|
#[error("unsupported media type: {0}")]
|
||||||
UnsupportedMediaType(String),
|
UnsupportedMediaType(String),
|
||||||
/// 429 with an optional `Retry-After` header value (in seconds).
|
|
||||||
#[error("too many requests")]
|
|
||||||
TooManyRequests {
|
|
||||||
retry_after_secs: Option<u64>,
|
|
||||||
},
|
|
||||||
/// Semantic per-field validation failure. `details` is rendered into the
|
/// Semantic per-field validation failure. `details` is rendered into the
|
||||||
/// envelope so the client can highlight the bad field(s).
|
/// envelope so the client can highlight the bad field(s).
|
||||||
#[error("validation failed")]
|
#[error("validation failed")]
|
||||||
@@ -56,7 +51,6 @@ impl AppError {
|
|||||||
AppError::Conflict(_) => "conflict",
|
AppError::Conflict(_) => "conflict",
|
||||||
AppError::PayloadTooLarge(_) => "payload_too_large",
|
AppError::PayloadTooLarge(_) => "payload_too_large",
|
||||||
AppError::UnsupportedMediaType(_) => "unsupported_media_type",
|
AppError::UnsupportedMediaType(_) => "unsupported_media_type",
|
||||||
AppError::TooManyRequests { .. } => "too_many_requests",
|
|
||||||
AppError::ValidationFailed { .. } => "validation_failed",
|
AppError::ValidationFailed { .. } => "validation_failed",
|
||||||
AppError::Database(sqlx::Error::RowNotFound) => "not_found",
|
AppError::Database(sqlx::Error::RowNotFound) => "not_found",
|
||||||
AppError::Database(_) => "internal_error",
|
AppError::Database(_) => "internal_error",
|
||||||
@@ -85,31 +79,6 @@ impl IntoResponse for AppError {
|
|||||||
AppError::UnsupportedMediaType(msg) => {
|
AppError::UnsupportedMediaType(msg) => {
|
||||||
(StatusCode::UNSUPPORTED_MEDIA_TYPE, msg.clone(), None)
|
(StatusCode::UNSUPPORTED_MEDIA_TYPE, msg.clone(), None)
|
||||||
}
|
}
|
||||||
AppError::TooManyRequests { retry_after_secs } => {
|
|
||||||
// Emit `Retry-After: N` (RFC 6585 §4) so a well-behaved
|
|
||||||
// client can back off correctly. Done by building the
|
|
||||||
// response by hand below — the `(status, headers,
|
|
||||||
// body)` tuple shape doesn't fit the standard
|
|
||||||
// `(status, body)` IntoResponse path for the other
|
|
||||||
// variants.
|
|
||||||
let body = json!({
|
|
||||||
"error": {
|
|
||||||
"code": code,
|
|
||||||
"message": "too many requests; slow down",
|
|
||||||
}
|
|
||||||
});
|
|
||||||
let mut resp = (StatusCode::TOO_MANY_REQUESTS, Json(body)).into_response();
|
|
||||||
if let Some(secs) = retry_after_secs {
|
|
||||||
// `HeaderValue: From<u64>` skips both the
|
|
||||||
// intermediate `String` allocation and the
|
|
||||||
// fallible-by-shape `from_str` path.
|
|
||||||
resp.headers_mut().insert(
|
|
||||||
axum::http::header::RETRY_AFTER,
|
|
||||||
axum::http::HeaderValue::from(*secs),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return resp;
|
|
||||||
}
|
|
||||||
AppError::ValidationFailed { message, details } => (
|
AppError::ValidationFailed { message, details } => (
|
||||||
StatusCode::UNPROCESSABLE_ENTITY,
|
StatusCode::UNPROCESSABLE_ENTITY,
|
||||||
message.clone(),
|
message.clone(),
|
||||||
|
|||||||
@@ -16,6 +16,13 @@ impl LocalStorage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn resolve(&self, key: &str) -> Result<PathBuf, StorageError> {
|
fn resolve(&self, key: &str) -> Result<PathBuf, StorageError> {
|
||||||
|
// NUL bytes are rejected by the Linux syscall layer, but the
|
||||||
|
// error surfaces as an opaque IO failure rather than the
|
||||||
|
// explicit `BadKey` the rest of the contract uses. Catch it
|
||||||
|
// here so the error path is consistent.
|
||||||
|
if key.contains('\0') {
|
||||||
|
return Err(StorageError::BadKey);
|
||||||
|
}
|
||||||
let key = key.trim_start_matches('/');
|
let key = key.trim_start_matches('/');
|
||||||
if key.is_empty() {
|
if key.is_empty() {
|
||||||
return Err(StorageError::BadKey);
|
return Err(StorageError::BadKey);
|
||||||
@@ -114,6 +121,9 @@ mod tests {
|
|||||||
assert!(matches!(s.get(".").await, Err(StorageError::BadKey)));
|
assert!(matches!(s.get(".").await, Err(StorageError::BadKey)));
|
||||||
// Empty segment via doubled slash.
|
// Empty segment via doubled slash.
|
||||||
assert!(matches!(s.get("a//b").await, Err(StorageError::BadKey)));
|
assert!(matches!(s.get("a//b").await, Err(StorageError::BadKey)));
|
||||||
|
// NUL byte (rejected explicitly so callers see BadKey rather
|
||||||
|
// than an opaque IO error from the kernel).
|
||||||
|
assert!(matches!(s.put("a\0b", b"x").await, Err(StorageError::BadKey)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|||||||
@@ -567,81 +567,6 @@ async fn user_a_cannot_delete_user_b_token(pool: PgPool) {
|
|||||||
assert_eq!(resp.status(), StatusCode::NO_CONTENT);
|
assert_eq!(resp.status(), StatusCode::NO_CONTENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Brute-force / spray protection: at default production limits, a
|
|
||||||
/// tight loop of /auth/login attempts should burst through the bucket
|
|
||||||
/// and then 429 every subsequent request until the bucket refills.
|
|
||||||
#[sqlx::test(migrations = "./migrations")]
|
|
||||||
async fn login_rate_limited_under_burst_pressure(pool: PgPool) {
|
|
||||||
let h = common::harness_with_auth_rate_limit(pool, 1, 3);
|
|
||||||
|
|
||||||
// Register a victim so the wrong-password branch is real work.
|
|
||||||
let _ = h
|
|
||||||
.app
|
|
||||||
.clone()
|
|
||||||
.oneshot(common::post_json("/api/v1/auth/register", creds("victim")))
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Register consumed one token from the burst-3 bucket. Fire 30
|
|
||||||
// wrong-password logins back-to-back; with per_sec=1 the refill
|
|
||||||
// is too slow to keep up and at least one must come back 429.
|
|
||||||
let mut saw_429 = false;
|
|
||||||
for _ in 0..30 {
|
|
||||||
let resp = h
|
|
||||||
.app
|
|
||||||
.clone()
|
|
||||||
.oneshot(common::post_json(
|
|
||||||
"/api/v1/auth/login",
|
|
||||||
json!({ "username": "victim", "password": "wrong" }),
|
|
||||||
))
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
if resp.status() == StatusCode::TOO_MANY_REQUESTS {
|
|
||||||
// RFC 6585 §4: 429 SHOULD include a Retry-After header. The
|
|
||||||
// value is in seconds; with per_sec=1 the bucket needs ~1s
|
|
||||||
// to refill, so the header should be 1 or 2.
|
|
||||||
let retry_after = resp
|
|
||||||
.headers()
|
|
||||||
.get(axum::http::header::RETRY_AFTER)
|
|
||||||
.and_then(|v| v.to_str().ok())
|
|
||||||
.and_then(|s| s.parse::<u32>().ok())
|
|
||||||
.expect("Retry-After header present and numeric");
|
|
||||||
assert!(
|
|
||||||
retry_after >= 1,
|
|
||||||
"Retry-After must be at least 1s, got {retry_after}"
|
|
||||||
);
|
|
||||||
let body = common::body_json(resp).await;
|
|
||||||
assert_eq!(body["error"]["code"], "too_many_requests");
|
|
||||||
saw_429 = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
assert!(
|
|
||||||
saw_429,
|
|
||||||
"expected at least one 429 within 30 rapid login attempts"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Default (test-harness) limits are disabled, so existing tests that
|
|
||||||
/// fire multiple auth requests don't start failing.
|
|
||||||
#[sqlx::test(migrations = "./migrations")]
|
|
||||||
async fn default_test_harness_does_not_rate_limit(pool: PgPool) {
|
|
||||||
let h = common::harness(pool);
|
|
||||||
for i in 0..50 {
|
|
||||||
let resp = h
|
|
||||||
.app
|
|
||||||
.clone()
|
|
||||||
.oneshot(common::post_json(
|
|
||||||
"/api/v1/auth/login",
|
|
||||||
json!({ "username": format!("nobody-{i}"), "password": "x" }),
|
|
||||||
))
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
// None of these should be 429 — only 401.
|
|
||||||
assert_eq!(resp.status(), StatusCode::UNAUTHORIZED, "iter {i}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[sqlx::test(migrations = "./migrations")]
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
async fn delete_unknown_token_is_404(pool: PgPool) {
|
async fn delete_unknown_token_is_404(pool: PgPool) {
|
||||||
let h = common::harness(pool);
|
let h = common::harness(pool);
|
||||||
@@ -656,3 +581,27 @@ async fn delete_unknown_token_is_404(pool: PgPool) {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
|
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Bot token names are user-supplied free-form strings; a 10 MB name
|
||||||
|
/// was accepted before. Cap at 64 chars to match the other free-form
|
||||||
|
/// identifier caps (tags, collection names). The response uses
|
||||||
|
/// `ValidationFailed` (422 with per-field details) so clients can
|
||||||
|
/// render the same shape they already handle for `attach_tag`.
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn create_token_rejects_name_over_64_chars(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
"/api/v1/auth/tokens",
|
||||||
|
json!({ "name": "x".repeat(65) }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["error"]["code"], "validation_failed");
|
||||||
|
assert!(body["error"]["details"]["name"].is_string());
|
||||||
|
}
|
||||||
|
|||||||
@@ -59,6 +59,31 @@ async fn reattach_same_tag_is_idempotent_and_returns_200(pool: PgPool) {
|
|||||||
assert_eq!(second.status(), StatusCode::OK);
|
assert_eq!(second.status(), StatusCode::OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Tag names over 64 chars are rejected at the handler boundary. The
|
||||||
|
/// repo enforces the same cap, but doing it at the handler keeps the
|
||||||
|
/// envelope consistent with the other validation paths
|
||||||
|
/// (username, collection name, etc.).
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn attach_rejects_tag_name_over_64_chars(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
|
||||||
|
let long_name: String = "x".repeat(65);
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": long_name }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["error"]["code"], "validation_failed");
|
||||||
|
}
|
||||||
|
|
||||||
#[sqlx::test(migrations = "./migrations")]
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
async fn tag_names_dedup_case_insensitively(pool: PgPool) {
|
async fn tag_names_dedup_case_insensitively(pool: PgPool) {
|
||||||
let h = common::harness(pool);
|
let h = common::harness(pool);
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ use tempfile::TempDir;
|
|||||||
use tower::ServiceExt;
|
use tower::ServiceExt;
|
||||||
|
|
||||||
use mangalord::app::{router, AppState};
|
use mangalord::app::{router, AppState};
|
||||||
use mangalord::auth::rate_limit::AuthRateLimiter;
|
|
||||||
use mangalord::config::{AuthConfig, UploadConfig};
|
use mangalord::config::{AuthConfig, UploadConfig};
|
||||||
use mangalord::storage::{LocalStorage, Storage, StorageError, StreamingFile};
|
use mangalord::storage::{LocalStorage, Storage, StorageError, StreamingFile};
|
||||||
|
|
||||||
@@ -50,51 +49,20 @@ fn harness_inner(
|
|||||||
storage: Arc<dyn Storage>,
|
storage: Arc<dyn Storage>,
|
||||||
storage_dir: TempDir,
|
storage_dir: TempDir,
|
||||||
) -> Harness {
|
) -> Harness {
|
||||||
harness_with_auth_config(pool, storage, storage_dir, AuthConfig {
|
|
||||||
cookie_secure: false,
|
|
||||||
..AuthConfig::default()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn harness_with_auth_config(
|
|
||||||
pool: PgPool,
|
|
||||||
storage: Arc<dyn Storage>,
|
|
||||||
storage_dir: TempDir,
|
|
||||||
auth: AuthConfig,
|
|
||||||
) -> Harness {
|
|
||||||
let auth_limiter = Arc::new(AuthRateLimiter::new(auth.rate_limit));
|
|
||||||
let state = AppState {
|
let state = AppState {
|
||||||
db: pool,
|
db: pool,
|
||||||
storage,
|
storage,
|
||||||
auth,
|
auth: AuthConfig { cookie_secure: false, ..AuthConfig::default() },
|
||||||
upload: UploadConfig {
|
upload: UploadConfig {
|
||||||
// Keep file caps small in tests so the size-cap path is cheap to
|
// Keep file caps small in tests so the size-cap path is cheap to
|
||||||
// exercise without producing tens of MBs of bytes.
|
// exercise without producing tens of MBs of bytes.
|
||||||
max_request_bytes: 4 * 1024 * 1024,
|
max_request_bytes: 4 * 1024 * 1024,
|
||||||
max_file_bytes: 256 * 1024,
|
max_file_bytes: 256 * 1024,
|
||||||
},
|
},
|
||||||
auth_limiter,
|
|
||||||
};
|
};
|
||||||
Harness { app: router(state), _storage_dir: storage_dir }
|
Harness { app: router(state), _storage_dir: storage_dir }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Like [`harness`] but configures a tight auth rate limit. Used by
|
|
||||||
/// the brute-force-rate-limiting test.
|
|
||||||
pub fn harness_with_auth_rate_limit(
|
|
||||||
pool: PgPool,
|
|
||||||
per_sec: u32,
|
|
||||||
burst: u32,
|
|
||||||
) -> Harness {
|
|
||||||
let storage_dir = tempfile::tempdir().expect("tempdir");
|
|
||||||
let storage = Arc::new(LocalStorage::new(storage_dir.path()));
|
|
||||||
let auth = AuthConfig {
|
|
||||||
cookie_secure: false,
|
|
||||||
rate_limit: mangalord::auth::rate_limit::RateLimitConfig { per_sec, burst },
|
|
||||||
..AuthConfig::default()
|
|
||||||
};
|
|
||||||
harness_with_auth_config(pool, storage, storage_dir, auth)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Wraps a real `Storage` and fails on the N-th `put` call so tests can
|
/// Wraps a real `Storage` and fails on the N-th `put` call so tests can
|
||||||
/// assert that handlers roll their DB writes back when storage errors
|
/// assert that handlers roll their DB writes back when storage errors
|
||||||
/// mid-upload. Reads and other operations delegate to `inner`.
|
/// mid-upload. Reads and other operations delegate to `inner`.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mangalord-frontend",
|
"name": "mangalord-frontend",
|
||||||
"version": "0.35.0",
|
"version": "0.34.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -94,6 +94,11 @@ describe('auth api client', () => {
|
|||||||
expect(url).toMatch(/\/v1\/auth\/logout$/);
|
expect(url).toMatch(/\/v1\/auth\/logout$/);
|
||||||
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
||||||
expect(init.method).toBe('POST');
|
expect(init.method).toBe('POST');
|
||||||
|
// Consistent content-type for all mutation requests, matching
|
||||||
|
// the rest of the module — axum doesn't require it but the
|
||||||
|
// header keeps the request style uniform.
|
||||||
|
const headers = new Headers(init.headers);
|
||||||
|
expect(headers.get('content-type')).toBe('application/json');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('me returns the user on 200', async () => {
|
it('me returns the user on 200', async () => {
|
||||||
|
|||||||
@@ -32,7 +32,14 @@ export async function login(creds: Credentials): Promise<User> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function logout(): Promise<void> {
|
export async function logout(): Promise<void> {
|
||||||
await request<void>('/v1/auth/logout', { method: 'POST' });
|
await request<void>('/v1/auth/logout', {
|
||||||
|
method: 'POST',
|
||||||
|
// Consistent with the other POST/PATCH helpers in this module.
|
||||||
|
// axum doesn't require it (no body), but keeping the header
|
||||||
|
// on every mutation request avoids the false-flag in logs and
|
||||||
|
// matches the project's style.
|
||||||
|
headers: { 'content-type': 'application/json' }
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export type ChangePassword = {
|
export type ChangePassword = {
|
||||||
|
|||||||
@@ -350,30 +350,24 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `fetch()` initiated during `pagehide` / `beforeunload` is
|
* Flush read-progress as the tab is closing. A plain `fetch()`
|
||||||
* cancelled by every browser by default. `sendBeacon` is the
|
* during `pagehide` / `beforeunload` is cancelled by every
|
||||||
* supported way to ship a small payload during unload — it's
|
* browser; `fetch(..., { keepalive: true })` is the supported
|
||||||
* guaranteed to survive even if the tab is closing. Failure here
|
* escape hatch and survives the close.
|
||||||
* is silent because the API is fire-and-forget.
|
*
|
||||||
|
* `sendBeacon` would be the textbook alternative, but it's
|
||||||
|
* POST-only and `/me/read-progress` takes PUT — so a beacon
|
||||||
|
* always 405s, adds server-log noise, then falls through to this
|
||||||
|
* same keepalive path anyway. The beacon was dropped; the
|
||||||
|
* keepalive fetch is the only path.
|
||||||
*/
|
*/
|
||||||
function beaconFinalProgress() {
|
function flushFinalProgress() {
|
||||||
if (!session.user) return;
|
if (!session.user) return;
|
||||||
const body = JSON.stringify({
|
const body = JSON.stringify({
|
||||||
manga_id: manga.id,
|
manga_id: manga.id,
|
||||||
chapter_id: chapter.id,
|
chapter_id: chapter.id,
|
||||||
page: progressPage
|
page: progressPage
|
||||||
});
|
});
|
||||||
const blob = new Blob([body], { type: 'application/json' });
|
|
||||||
// sendBeacon only supports POST — the server's PUT route is
|
|
||||||
// strict on method. The dedicated POST alias is omitted; in
|
|
||||||
// practice the in-app navigation path (back-link, chapter
|
|
||||||
// links) already covers the common-case unmount via the
|
|
||||||
// onDestroy fetch. Fall through to fetch+keepalive for browser
|
|
||||||
// implementations that don't honor sendBeacon for this endpoint.
|
|
||||||
try {
|
|
||||||
const ok = navigator.sendBeacon('/api/v1/me/read-progress', blob);
|
|
||||||
if (!ok) throw new Error('sendBeacon rejected');
|
|
||||||
} catch {
|
|
||||||
try {
|
try {
|
||||||
void fetch('/api/v1/me/read-progress', {
|
void fetch('/api/v1/me/read-progress', {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
@@ -383,21 +377,21 @@
|
|||||||
credentials: 'include'
|
credentials: 'include'
|
||||||
});
|
});
|
||||||
} catch {
|
} catch {
|
||||||
// Final fallback failed; the in-app onDestroy flush
|
// keepalive fetch was rejected (very old Firefox etc.);
|
||||||
// below catches the SPA-navigation case.
|
// the in-app onDestroy flush below catches the SPA-
|
||||||
}
|
// navigation case, which is the common one anyway.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
window.addEventListener('pagehide', beaconFinalProgress);
|
window.addEventListener('pagehide', flushFinalProgress);
|
||||||
});
|
});
|
||||||
|
|
||||||
onDestroy(() => {
|
onDestroy(() => {
|
||||||
observer?.disconnect();
|
observer?.disconnect();
|
||||||
if (progressTimer) clearTimeout(progressTimer);
|
if (progressTimer) clearTimeout(progressTimer);
|
||||||
if (typeof window !== 'undefined') {
|
if (typeof window !== 'undefined') {
|
||||||
window.removeEventListener('pagehide', beaconFinalProgress);
|
window.removeEventListener('pagehide', flushFinalProgress);
|
||||||
}
|
}
|
||||||
// Don't let the fullscreen flag leak to non-reader pages —
|
// Don't let the fullscreen flag leak to non-reader pages —
|
||||||
// otherwise the layout header would stay slid-off on /upload
|
// otherwise the layout header would stay slid-off on /upload
|
||||||
|
|||||||
Reference in New Issue
Block a user