56993d2ca3
Security
- Sign pending_restore.json (SHA256 stored in AppSetting, verified on
startup apply) + refuse path outside data_dir, tighten to 0600.
- Require same-origin Origin/Referer on POST /api/backup/apply-restart —
Bearer-in-localStorage is CSRF-reachable from any XSS'd admin tab.
- Bump token_version on role/username change and admin password reset so
demoted admins lose admin in already-issued JWTs. Guard last-admin
TOCTOU via COUNT + post-commit re-check that rolls back a race.
- SSRF guard (validate_outbound_url) in ImmichClient.__init__ and the
external_domain setter — admin-mutable URLs were bypassing the check
that webhook/slack/discord paths already used. Dev restart script now
sets NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS=1 so homelab Immich still works.
- Redact + cap Immich error bodies to ~120 chars before they flow into
ActionExecution.error / EventLog.details (both UI-visible).
- Deny-list sensitive keys (api_key / token / secret / password /
authorization / cookie / ...) in template-context merges so a rogue
template can't exfiltrate provider creds via {{ api_key }}.
- Cap user-controlled Immich search params (query ≤256, person_ids ≤50,
size ≤100) so a Telegram listener can't DoS upstream.
- Stream upload reads with running byte counter + content-length precheck
instead of buffering the full body and then rejecting.
- Log Telegram parse_mode fallbacks instead of swallowing silently;
template escape bugs now surface in server logs.
- Rollback partial imports on pending-restore failure (error recorded on
a fresh session).
Performance
- Fix N+1 in _refresh_telegram_chat_titles: single IN query instead of
session.get per chat.
- Parallelize album + shared-link fetches in test_dispatch (asyncio.gather)
and per-receiver Telegram test sends in notifier (semaphore 5).
- Early-exit collect_scheduled_assets(limit=0) so the periodic-summary
test path skips full per-album filter/sample (was O(album_assets)).
- Emit explicit CREATE INDEX IF NOT EXISTS for event_log user_id /
action_id / provider_id so the first boot after upgrade isn't left
unindexed for the dashboard query.
- Add AbortController timeout (120s) to fetchAuth so uploads/downloads
don't hang indefinitely.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
231 lines
7.2 KiB
TypeScript
231 lines
7.2 KiB
TypeScript
/**
|
|
* API client with JWT auth for the Notify Bridge backend.
|
|
*/
|
|
|
|
const API_BASE = '/api';
|
|
|
|
/** Normalize a caught error to a user-safe message. */
|
|
export function errMsg(err: unknown, fallback = 'Unexpected error'): string {
|
|
if (err instanceof Error && err.message) return err.message;
|
|
if (typeof err === 'string' && err) return err;
|
|
return fallback;
|
|
}
|
|
|
|
/** Structured 409 blocked-by payload attached to ApiError.blockedBy. */
|
|
export interface BlockedByDetail {
|
|
message: string;
|
|
entity: string;
|
|
blocked_by: string[];
|
|
}
|
|
|
|
export class ApiError extends Error {
|
|
status: number;
|
|
blockedBy?: BlockedByDetail;
|
|
constructor(message: string, status: number, blockedBy?: BlockedByDetail) {
|
|
super(message);
|
|
this.name = 'ApiError';
|
|
this.status = status;
|
|
this.blockedBy = blockedBy;
|
|
}
|
|
}
|
|
|
|
/** Parse a server-issued datetime string as UTC (appends Z if no timezone info present). */
|
|
export function parseDate(dateStr: string): Date {
|
|
if (!dateStr) return new Date(NaN);
|
|
if (!/Z$|[+-]\d{2}:?\d{2}$/.test(dateStr)) return new Date(dateStr + 'Z');
|
|
return new Date(dateStr);
|
|
}
|
|
|
|
/** If the thrown error was a structured 409 from delete_protection, return its payload. */
|
|
export function getBlockedBy(err: unknown): BlockedByDetail | null {
|
|
if (err instanceof ApiError && err.blockedBy) return err.blockedBy;
|
|
return null;
|
|
}
|
|
|
|
function getToken(): string | null {
|
|
if (typeof window === 'undefined') return null;
|
|
return localStorage.getItem('access_token');
|
|
}
|
|
|
|
export function setTokens(access: string, refresh: string) {
|
|
localStorage.setItem('access_token', access);
|
|
localStorage.setItem('refresh_token', refresh);
|
|
}
|
|
|
|
export function clearTokens() {
|
|
localStorage.removeItem('access_token');
|
|
localStorage.removeItem('refresh_token');
|
|
}
|
|
|
|
export function isAuthenticated(): boolean {
|
|
return !!getToken();
|
|
}
|
|
|
|
let refreshPromise: Promise<boolean> | null = null;
|
|
|
|
async function refreshAccessToken(): Promise<boolean> {
|
|
if (refreshPromise) return refreshPromise;
|
|
refreshPromise = doRefreshAccessToken().finally(() => {
|
|
refreshPromise = null;
|
|
});
|
|
return refreshPromise;
|
|
}
|
|
|
|
async function doRefreshAccessToken(): Promise<boolean> {
|
|
if (typeof window === 'undefined') return false;
|
|
const refreshToken = localStorage.getItem('refresh_token');
|
|
if (!refreshToken) return false;
|
|
|
|
try {
|
|
const res = await fetch(`${API_BASE}/auth/refresh`, {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ refresh_token: refreshToken })
|
|
});
|
|
if (res.ok) {
|
|
const data = await res.json();
|
|
setTokens(data.access_token, data.refresh_token);
|
|
return true;
|
|
}
|
|
} catch (e) {
|
|
console.warn('Token refresh failed:', e);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
// Longer cap for fetchAuth — it's used for multipart uploads (backup restore)
|
|
// and binary downloads where a 30s limit can cut off a legit slow upload.
|
|
const DEFAULT_FETCHAUTH_TIMEOUT_MS = 120_000;
|
|
|
|
export async function api<T = any>(
|
|
path: string,
|
|
options: RequestInit & { timeoutMs?: number } = {}
|
|
): Promise<T> {
|
|
const token = getToken();
|
|
const headers: Record<string, string> = {
|
|
'Content-Type': 'application/json',
|
|
...(options.headers as Record<string, string>)
|
|
};
|
|
if (token) {
|
|
headers['Authorization'] = `Bearer ${token}`;
|
|
}
|
|
|
|
const { timeoutMs, ...fetchOptions } = options;
|
|
const controller = new AbortController();
|
|
const timeout = setTimeout(() => controller.abort(), timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
const signal = options.signal ?? controller.signal;
|
|
|
|
try {
|
|
let res = await fetch(`${API_BASE}${path}`, { ...fetchOptions, headers, signal });
|
|
|
|
// Try token refresh on 401
|
|
if (res.status === 401 && token) {
|
|
const refreshed = await refreshAccessToken();
|
|
if (refreshed) {
|
|
headers['Authorization'] = `Bearer ${getToken()}`;
|
|
res = await fetch(`${API_BASE}${path}`, { ...fetchOptions, headers, signal });
|
|
}
|
|
}
|
|
|
|
if (res.status === 401 && token) {
|
|
clearTokens();
|
|
if (typeof window !== 'undefined') {
|
|
window.location.href = '/login';
|
|
}
|
|
throw new Error('Unauthorized');
|
|
}
|
|
|
|
if (res.status === 204) return undefined as T;
|
|
|
|
if (!res.ok) {
|
|
const err = await res.json().catch(() => ({ detail: res.statusText }));
|
|
// Structured blocked-by detail (from delete_protection.raise_if_used)
|
|
if (err && err.detail && typeof err.detail === 'object' && Array.isArray(err.detail.blocked_by)) {
|
|
const bb: BlockedByDetail = {
|
|
message: err.detail.message || `HTTP ${res.status}`,
|
|
entity: err.detail.entity || '',
|
|
blocked_by: err.detail.blocked_by,
|
|
};
|
|
throw new ApiError(bb.message, res.status, bb);
|
|
}
|
|
const msg = typeof err.detail === 'string' ? err.detail : (err.detail?.message || `HTTP ${res.status}`);
|
|
throw new ApiError(msg, res.status);
|
|
}
|
|
|
|
return res.json();
|
|
} finally {
|
|
clearTimeout(timeout);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Auth-aware ``fetch`` wrapper for calls that can't go through ``api()`` —
|
|
* typically multipart/form-data uploads or binary downloads where we need the
|
|
* raw ``Response`` object rather than parsed JSON.
|
|
*
|
|
* - Injects the Bearer token automatically.
|
|
* - Does NOT set ``Content-Type`` (the caller's body — e.g. ``FormData`` —
|
|
* decides the encoding; browsers add the boundary).
|
|
* - Attempts a one-shot token refresh on 401, matching ``api()``.
|
|
* - Translates non-OK responses to ``ApiError`` so callers can use the same
|
|
* ``getBlockedBy`` / ``err.message`` handling pattern.
|
|
*/
|
|
export async function fetchAuth(
|
|
path: string,
|
|
options: RequestInit & { timeoutMs?: number } = {},
|
|
): Promise<Response> {
|
|
const token = getToken();
|
|
const headers: Record<string, string> = { ...(options.headers as Record<string, string>) };
|
|
if (token) headers['Authorization'] = `Bearer ${token}`;
|
|
|
|
const url = path.startsWith('http') ? path : `${API_BASE}${path}`;
|
|
|
|
// Abort after timeout so uploads/downloads don't hang indefinitely if
|
|
// the backend stops responding. Callers can override per-request via
|
|
// options.timeoutMs or pass their own signal to opt out.
|
|
const { timeoutMs, ...fetchOptions } = options;
|
|
const controller = new AbortController();
|
|
const timeout = setTimeout(
|
|
() => controller.abort(),
|
|
timeoutMs ?? DEFAULT_FETCHAUTH_TIMEOUT_MS,
|
|
);
|
|
const signal = options.signal ?? controller.signal;
|
|
|
|
try {
|
|
let res = await fetch(url, { ...fetchOptions, headers, signal });
|
|
|
|
if (res.status === 401 && token) {
|
|
const refreshed = await refreshAccessToken();
|
|
if (refreshed) {
|
|
headers['Authorization'] = `Bearer ${getToken()}`;
|
|
res = await fetch(url, { ...fetchOptions, headers, signal });
|
|
}
|
|
}
|
|
|
|
if (res.status === 401) {
|
|
clearTokens();
|
|
if (typeof window !== 'undefined') window.location.href = '/login';
|
|
throw new ApiError('Unauthorized', 401);
|
|
}
|
|
|
|
if (!res.ok) {
|
|
const err = await res.clone().json().catch(() => ({ detail: res.statusText }));
|
|
if (err && err.detail && typeof err.detail === 'object' && Array.isArray(err.detail.blocked_by)) {
|
|
const bb: BlockedByDetail = {
|
|
message: err.detail.message || `HTTP ${res.status}`,
|
|
entity: err.detail.entity || '',
|
|
blocked_by: err.detail.blocked_by,
|
|
};
|
|
throw new ApiError(bb.message, res.status, bb);
|
|
}
|
|
const msg = typeof err.detail === 'string' ? err.detail : (err.detail?.message || `HTTP ${res.status}`);
|
|
throw new ApiError(msg, res.status);
|
|
}
|
|
|
|
return res;
|
|
} finally {
|
|
clearTimeout(timeout);
|
|
}
|
|
}
|