081f3edcdf
Auth/access-control audit fixes (all pre-existing on main; none are regressions). Verified end-to-end where noted. HIGH - Thumbnail enumeration: photoAuth granted any gallery token access to any flat /thumbnails/thumb_* file, so a visitor to one gallery could enumerate another (password-protected) gallery's entire thumbnail set. Scope thumbnail access to the token's event via photos.thumbnail_path. Live-verified: cross-event fetch now 404s, own-event still 200s. - Bulk ownership bypass: bulk-archive/bulk-delete acted on body-supplied event ids with no owner filter (single-event routes enforce requireEventOwnership), letting admin/editor archive or cascade-delete any event. Add filterOwnedEventIds; also guard rename + import-external; tighten photo-retry to scope admin (not just editor). Fix misleading bulk-delete comment. MED - verifyGalleryAccess never checked decoded.type — assert 'gallery' instead of relying on other token types incidentally lacking eventId. - secure-images generate-token/secure-download missing denySlideshowToken (#646 bypass): a leaked slideshow token could download originals. - Frontend: AuthenticatedImage + api.ts attached the gallery bearer token to absolute/external URLs — only attach to relative same-app paths. LOW hardening - Pin algorithms:['HS256'] on all auth-boundary jwt.verify calls. - crypto.timingSafeEqual for share-token + HMAC compares (utils/timingSafe). - Remove dead photoAuth import in galleryFeedback. Tests: new regression suites for thumbnail scoping + filterOwnedEventIds; fixed verifyGalleryAccess.customerRevoke fixture (real customer tokens carry type:'gallery'). Full backend suite at the pre-existing baseline (5 suites/27 tests fail on main too), zero new failures.
187 lines
7.0 KiB
TypeScript
187 lines
7.0 KiB
TypeScript
import axios, { AxiosHeaders } from 'axios';
|
|
import {
|
|
getActiveGallerySlug,
|
|
getGalleryToken,
|
|
inferGallerySlugFromLocation,
|
|
resolveSlugFromRequestUrl,
|
|
} from '../utils/galleryAuthStorage';
|
|
import { getGuestToken } from '../utils/guestIdentityStorage';
|
|
import { getApiBaseUrl } from '../utils/url';
|
|
|
|
// Maintenance mode callback
|
|
let maintenanceModeCallback: ((enabled: boolean) => void) | null = null;
|
|
|
|
// Set true the moment we kick off a hard redirect to /admin/login so
|
|
// subsequent 401s in the same tick don't queue more navigations on top
|
|
// (each `window.location.href = …` aborts the previous, producing a
|
|
// flicker storm — see the response interceptor below).
|
|
let adminLoginRedirectPending = false;
|
|
|
|
export const setMaintenanceModeCallback = (callback: (enabled: boolean) => void) => {
|
|
maintenanceModeCallback = callback;
|
|
};
|
|
|
|
// Create axios instance
|
|
export const api = axios.create({
|
|
baseURL: getApiBaseUrl(),
|
|
headers: {
|
|
'Content-Type': 'application/json',
|
|
},
|
|
withCredentials: true,
|
|
});
|
|
|
|
// Request interceptor: drop Content-Type for FormData payloads so the browser can set boundaries
|
|
api.interceptors.request.use(
|
|
(config) => {
|
|
if (config.data instanceof FormData) {
|
|
delete config.headers?.['Content-Type'];
|
|
}
|
|
|
|
if (typeof window !== 'undefined') {
|
|
const pathSlug = resolveSlugFromRequestUrl(config.url || '');
|
|
const params = config.params as Record<string, unknown> | undefined;
|
|
const paramSlug = typeof params?.slug === 'string' ? (params.slug as string) : null;
|
|
|
|
const rawPath = (() => {
|
|
if (!config.url) return '';
|
|
try {
|
|
if (config.url.startsWith('http://') || config.url.startsWith('https://')) {
|
|
return new URL(config.url).pathname;
|
|
}
|
|
} catch (error) {
|
|
return config.url;
|
|
}
|
|
return config.url;
|
|
})();
|
|
|
|
const pathname = rawPath.startsWith('/') ? rawPath : `/${rawPath}`;
|
|
|
|
// Never attach the gallery token to an absolute URL. Requests to the
|
|
// app's own API use relative paths (axios prepends baseURL); an
|
|
// absolute URL could point at any origin, and extracting its
|
|
// `/gallery/...` pathname would otherwise match below and leak the
|
|
// bearer token cross-origin.
|
|
const isAbsoluteUrl = /^https?:\/\//i.test(config.url || '');
|
|
|
|
const isGalleryEndpoint = !isAbsoluteUrl && (
|
|
/^\/gallery\//.test(pathname)
|
|
|| /^\/secure-images\//.test(pathname)
|
|
|| /^\/auth\/gallery\//.test(pathname));
|
|
|
|
const isGallerySessionCheck = !isAbsoluteUrl && pathname === '/auth/session'
|
|
&& (!!paramSlug || window.location.pathname.startsWith('/gallery/'));
|
|
|
|
if (isGalleryEndpoint || isGallerySessionCheck) {
|
|
const fallbackSlug = getActiveGallerySlug()
|
|
|| inferGallerySlugFromLocation();
|
|
const slug = pathSlug || paramSlug || fallbackSlug;
|
|
|
|
if (slug) {
|
|
const token = getGalleryToken(slug);
|
|
if (token) {
|
|
if (!config.headers) {
|
|
config.headers = new AxiosHeaders();
|
|
}
|
|
|
|
if (config.headers instanceof AxiosHeaders) {
|
|
const existing = config.headers.get('Authorization');
|
|
if (!existing) {
|
|
config.headers.set('Authorization', `Bearer ${token}`);
|
|
}
|
|
} else {
|
|
const headersRecord = config.headers as Record<string, string | undefined>;
|
|
if (!headersRecord.Authorization) {
|
|
headersRecord.Authorization = `Bearer ${token}`;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Also inject guest token (x-guest-token) for per-person identity.
|
|
// Separate header so gallery auth and guest identity are independent.
|
|
const guestToken = getGuestToken(slug);
|
|
if (guestToken) {
|
|
if (!config.headers) {
|
|
config.headers = new AxiosHeaders();
|
|
}
|
|
if (config.headers instanceof AxiosHeaders) {
|
|
if (!config.headers.get('x-guest-token')) {
|
|
config.headers.set('x-guest-token', guestToken);
|
|
}
|
|
} else {
|
|
const headersRecord = config.headers as Record<string, string | undefined>;
|
|
if (!headersRecord['x-guest-token']) {
|
|
headersRecord['x-guest-token'] = guestToken;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return config;
|
|
},
|
|
(error) => {
|
|
return Promise.reject(error);
|
|
}
|
|
);
|
|
|
|
// Response interceptor to handle errors
|
|
api.interceptors.response.use(
|
|
(response) => response,
|
|
(error) => {
|
|
// Handle maintenance mode (503)
|
|
if (error.response?.status === 503) {
|
|
const isAdminRoute = error.config?.url?.includes('/admin');
|
|
|
|
// Only trigger maintenance mode for non-admin routes or unauthenticated admin routes
|
|
if (!isAdminRoute) {
|
|
if (maintenanceModeCallback) {
|
|
maintenanceModeCallback(true);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (error.response?.status === 401) {
|
|
// Check if it's an admin route (but not public endpoints)
|
|
const isAdminRoute = error.config?.url?.includes('/admin') && !error.config?.url?.includes('/public/');
|
|
const currentPath = window.location.pathname;
|
|
|
|
if (isAdminRoute) {
|
|
// Only redirect if we're not already on the admin login page.
|
|
// `window.location.href = …` is async — `pathname` doesn't change
|
|
// synchronously — so a fan-out of 401s (the dashboard fires 7 admin
|
|
// queries in parallel) would each see the old pathname and each
|
|
// call `location.href`, producing a navigation storm where every
|
|
// request is aborted by the next. Guard with a module-level flag
|
|
// so only the first 401 triggers the redirect.
|
|
if (!currentPath.includes('/admin/login') && !adminLoginRedirectPending) {
|
|
adminLoginRedirectPending = true;
|
|
window.location.href = '/admin/login';
|
|
}
|
|
} else {
|
|
// For gallery routes, check if the error is from a gallery API call
|
|
const galleryMatch = error.config?.url?.match(/\/gallery\/([^\/]+)/);
|
|
|
|
// Check if this is an image request (photo or thumbnail)
|
|
const isImageRequest = error.config?.url?.match(/\/(photo|thumbnail)\/\d+$/);
|
|
|
|
// Don't redirect if we're on any gallery page (to avoid redirect loops during login)
|
|
if (currentPath.startsWith('/gallery/')) {
|
|
// Don't clear tokens for image requests - they might just need a retry
|
|
if (!isImageRequest && galleryMatch && galleryMatch[1]) {
|
|
const gallerySlug = galleryMatch[1];
|
|
sessionStorage.removeItem(`gallery_event_${gallerySlug}`);
|
|
}
|
|
// Don't redirect - let the component handle the auth state
|
|
} else if (galleryMatch) {
|
|
// We're not on a gallery page but got a 401 from a gallery API
|
|
// This shouldn't happen in normal flow, but if it does, redirect to homepage
|
|
window.location.href = '/';
|
|
}
|
|
}
|
|
}
|
|
|
|
return Promise.reject(error);
|
|
}
|
|
);
|