cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-27 18:09:10 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: resolve path to public assets in cloud

Browse Source
This commit is contained in:
Carlos Valente
2026-03-27 21:20:09 +01:00
committed by Carlos Valente
parent cc48ac8fd3
commit 23298bbe85
5 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/index.html
+5 -5
View File
@@ -3,14 +3,14 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<base href="/" /> <base href="/" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#101010" /> <meta name="theme-color" content="#101010" />
<meta name="ontime" content="ontime - time keeping for live events" /> <meta name="ontime" content="ontime - time keeping for live events" />
<link rel="apple-touch-icon" href="/ontime-logo.png" /> <link rel="apple-touch-icon" href="ontime-logo.png" />
<link rel="icon" type="image/png" href="/ontime-logo.png" /> <link rel="icon" type="image/png" href="ontime-logo.png" />
<link rel="manifest" href="/site.webmanifest" /> <link rel="manifest" href="site.webmanifest" />
<link rel="manifest" href="/manifest.json" /> <link rel="manifest" href="manifest.json" />
<meta name="robots" content="noindex" /> <meta name="robots" content="noindex" />
<title>ontime</title> <title>ontime</title>
</head> </head>
apps/client/public/manifest.json
+2 -2
View File
@@ -11,8 +11,8 @@
"type": "image/png" "type": "image/png"
} }
], ],
"scope": "/", "scope": "./",
"start_url": "/", "start_url": "./",
"display": "", "display": "",
"theme_color": "#121212", "theme_color": "#121212",
"background_color": "#ffffff" "background_color": "#ffffff"
apps/client/public/site.webmanifest
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "", "name": "",
"short_name": "", "short_name": "",
"icons": [{ "src": "/ontime-logo.png", "sizes": "295x295", "type": "image/png" }], "icons": [{ "src": "ontime-logo.png", "sizes": "295x295", "type": "image/png" }],
"theme_color": "#2B5ABC", "theme_color": "#2B5ABC",
"background_color": "#101010", "background_color": "#101010",
"display": "standalone" "display": "standalone"
apps/server/src/middleware/__tests__/authenticate.test.ts
+20
View File
@@ -0,0 +1,20 @@
import { describe, expect, it } from 'vitest';
import { isPublicAssetRequest } from '../authenticate.js';
describe('isPublicAssetRequest()', () => {
it('allows root public assets without a prefix', () => {
expect(isPublicAssetRequest('/site.webmanifest', '')).toBe(true);
expect(isPublicAssetRequest('/manifest.json', '')).toBe(true);
});
it('allows prefixed public assets in cloud deployments', () => {
expect(isPublicAssetRequest('/stage-hash/site.webmanifest', '/stage-hash')).toBe(true);
expect(isPublicAssetRequest('/stage-hash/ontime-logo.png?cache=1', '/stage-hash')).toBe(true);
});
it('keeps non-public paths protected', () => {
expect(isPublicAssetRequest('/stage-hash/data', '/stage-hash')).toBe(false);
expect(isPublicAssetRequest('/backstage', '')).toBe(false);
});
});
apps/server/src/middleware/authenticate.ts
+15 -1
View File
@@ -21,6 +21,20 @@ const publicAssets = new Set([
'/site.webmanifest', '/site.webmanifest',
]); ]);
export function isPublicAssetRequest(originalUrl: string, prefix: string): boolean {
const pathname = originalUrl.split('?')[0];
if (publicAssets.has(pathname)) {
return true;
}
if (prefix && pathname.startsWith(prefix)) {
return publicAssets.has(pathname.slice(prefix.length) || '/');
}
return false;
}
/** /**
* Creates a login router with the provided prefix * Creates a login router with the provided prefix
* @param {string} prefix - Prefix is used for the client hashes in Ontime Cloud * @param {string} prefix - Prefix is used for the client hashes in Ontime Cloud
@@ -81,7 +95,7 @@ export function makeAuthenticateMiddleware(prefix: string) {
function authenticateAndRedirect(req: Request, res: Response, next: NextFunction) { function authenticateAndRedirect(req: Request, res: Response, next: NextFunction) {
// Allow access to specific public assets without authentication // Allow access to specific public assets without authentication
if (publicAssets.has(req.originalUrl)) { if (isPublicAssetRequest(req.originalUrl, prefix)) {
return next(); return next();
} }