fix(media): bypass stale service worker auth

This commit is contained in:
7w1 committed 2026-07-30 16:00:54 -05:00
1 parent 38c95e7b20
commit 2f013c1ade
4 files changed
+67 -12

No files matched your search

+40 -6
View File
@@ -6,15 +6,17 @@ const platform = vi.hoisted(() => ({
vi.mock('$utils/platform', () => platform);
function stubServiceWorker(controller: unknown): void {
function stubServiceWorker(controller: unknown) {
const serviceWorker = {
controller,
addEventListener: vi.fn<(...args: unknown[]) => void>(),
removeEventListener: vi.fn<(...args: unknown[]) => void>(),
};
Object.defineProperty(navigator, 'serviceWorker', {
configurable: true,
value: {
controller,
addEventListener: vi.fn<(...args: unknown[]) => void>(),
removeEventListener: vi.fn<(...args: unknown[]) => void>(),
},
value: serviceWorker,
});
return serviceWorker;
}
describe('swMediaAuth', () => {
@@ -24,6 +26,7 @@ describe('swMediaAuth', () => {
});
afterEach(() => {
vi.useRealTimers();
vi.restoreAllMocks();
});
@@ -93,6 +96,37 @@ describe('swMediaAuth', () => {
expect(postMessage).toHaveBeenCalledTimes(2);
}, 10_000);
it('notifies unsupported while a replacement controller probe is unresolved', async () => {
platform.hasServiceWorker.mockReturnValue(true);
const firstController = {
postMessage: vi.fn<(...args: unknown[]) => void>((...args: unknown[]) => {
const [port] = args[1] as MessagePort[];
port?.postMessage({ type: 'swMediaAuth', supported: true, version: 1 });
}),
};
const serviceWorker = stubServiceWorker(firstController);
const mod = await import('./swMediaAuth');
const listener = vi.fn<(supported: boolean) => void>();
mod.subscribeSWMediaAuthSupport(listener);
await expect(mod.probeSWMediaAuthSupport()).resolves.toBe(true);
listener.mockClear();
vi.useFakeTimers();
serviceWorker.controller = { postMessage: vi.fn<() => void>() };
const controllerChange = serviceWorker.addEventListener.mock.calls.find(
([type]) => type === 'controllerchange'
)?.[1] as (() => void) | undefined;
controllerChange?.();
expect(controllerChange).toBeTypeOf('function');
expect(listener).toHaveBeenCalledWith(false);
expect(mod.getCachedSWMediaAuthSupport()).toBeUndefined();
await vi.advanceTimersByTimeAsync(1500);
expect(mod.getCachedSWMediaAuthSupport()).toBeUndefined();
});
it('resolves false when posting the probe throws', async () => {
platform.hasServiceWorker.mockReturnValue(true);
stubServiceWorker({
+4 -5
View File
@@ -108,14 +108,13 @@ export function probeSWMediaAuthSupport(): Promise<boolean> {
if (typeof window !== 'undefined' && typeof navigator !== 'undefined' && hasServiceWorker()) {
navigator.serviceWorker.addEventListener('controllerchange', () => {
cachedSupport = undefined;
const { controller } = navigator.serviceWorker;
cachedSupport = controller ? undefined : false;
inflightProbe = undefined;
probedController = undefined;
if (navigator.serviceWorker.controller) {
notify(false);
if (controller) {
void probeSWMediaAuthSupport();
} else {
cachedSupport = false;
notify(false);
}
});
}
+19 -1
View File
@@ -12,13 +12,15 @@ type SwTestHooks = typeof swTestHooksHelper;
describe('service worker media auth recovery', () => {
let swTestHooks: SwTestHooks;
let clients: Map<string, Client>;
let addEventListener: ReturnType<typeof vi.fn>;
beforeEach(async () => {
vi.resetModules();
clients = new Map();
addEventListener = vi.fn();
vi.stubGlobal('self', {
__WB_MANIFEST: [],
addEventListener: vi.fn(),
addEventListener,
caches: {
open: vi.fn(async () => ({
delete: vi.fn(async () => true),
@@ -37,6 +39,22 @@ describe('service worker media auth recovery', () => {
swTestHooks = (await import('./sw')).swTestHooks;
});
it('does not intercept media requests that already carry authorization', () => {
const fetchHandler = addEventListener.mock.calls.find(([type]) => type === 'fetch')?.[1] as
| ((event: FetchEvent) => void)
| undefined;
const respondWith = vi.fn();
const request = new Request(
'https://matrix.example.org/_matrix/client/v1/media/download/example.org/media-id',
{ headers: { Authorization: 'Bearer direct-token' } }
);
fetchHandler?.({ request, respondWith, clientId: 'client-a' } as unknown as FetchEvent);
expect(fetchHandler).toBeTypeOf('function');
expect(respondWith).not.toHaveBeenCalled();
});
it('shares recovery and preserves each Range header on retry', async () => {
const client = {
id: 'client-a',
+4
View File
@@ -889,6 +889,10 @@ self.addEventListener('fetch', (event: FetchEvent) => {
if (!mediaPath(url)) return;
// Direct-auth fallback requests already carry the page's token. Let the
// browser send them unchanged instead of routing them back through SW auth.
if (event.request.headers.has('Authorization')) return;
const { clientId } = event;
// For browser sub-resource loads (images, video, audio, etc.), 'follow' is