gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-26 02:24:23 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fix(config): update corsResourcePolicy type to string, typecheck did not like previous method

Browse Source
This commit is contained in:
lzinga 2025-11-22 15:54:21 -08:00
parent 0bcc02dfab
commit 8cc4d08eae
2 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/server/src/app.ts
View File

@ -56,12 +56,18 @@ export default async function buildApp() {
app.use(compression()); // HTTP compression app.use(compression()); // HTTP compression
} }
let resourcePolicy = config["Network"]["corsResourcePolicy"] as 'same-origin' | 'same-site' | 'cross-origin' | undefined;
if(resourcePolicy !== 'same-origin' && resourcePolicy !== 'same-site' && resourcePolicy !== 'cross-origin') {
log.error(`Invalid CORS Resource Policy value: '${resourcePolicy}', defaulting to 'same-origin'`);
resourcePolicy = 'same-origin';
}
app.use( app.use(
helmet({ helmet({
hidePoweredBy: false, // errors out in electron hidePoweredBy: false, // errors out in electron
contentSecurityPolicy: false, contentSecurityPolicy: false,
crossOriginResourcePolicy: { crossOriginResourcePolicy: {
policy: config["Network"]["corsResourcePolicy"] || 'same-origin' policy: resourcePolicy
}, },
crossOriginEmbedderPolicy: false crossOriginEmbedderPolicy: false
}) })

4
apps/server/src/services/config.ts
View File

@ -98,7 +98,7 @@ export interface TriliumConfig {
/** CORS allowed headers (comma-separated header names) */ /** CORS allowed headers (comma-separated header names) */
corsAllowHeaders: string; corsAllowHeaders: string;
/** CORS Resource Policy ('same-origin', 'same-site', 'cross-origin') */ /** CORS Resource Policy ('same-origin', 'same-site', 'cross-origin') */
corsResourcePolicy: 'same-origin' | 'same-site' | 'cross-origin' | undefined; corsResourcePolicy: string;
}; };
/** Session management configuration */ /** Session management configuration */
Session: { Session: {
@ -369,7 +369,7 @@ const configMapping = {
standardEnvVar: 'TRILIUM_NETWORK_CORSRESOURCEPOLICY', standardEnvVar: 'TRILIUM_NETWORK_CORSRESOURCEPOLICY',
aliasEnvVars: ['TRILIUM_NETWORK_CORS_RESOURCE_POLICY'], aliasEnvVars: ['TRILIUM_NETWORK_CORS_RESOURCE_POLICY'],
iniGetter: () => getIniSection("Network")?.corsResourcePolicy, iniGetter: () => getIniSection("Network")?.corsResourcePolicy,
defaultValue: 'same-origin' defaultValue: 'same-origin' as 'same-origin' | 'same-site' | 'cross-origin'
} }
}, },
Session: { Session: {