From f2a2a3588d60f522f0bf8164da9219a4a9c27d41 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Mon, 16 Nov 2026 17:13:54 +0100 Subject: [PATCH 1/3] Send only the public config to the browser in the SSR state The SSR transfer state carried the whole server config, while config.json already had an allowlist. Both now use buildPublicConfig. The allowlist also gets cache.autoSync, which the browser reads, and drops rest.ssrBaseUrl, which it does not. Co-Authored-By: Claude Opus 5.5 --- src/config/config.server.ts | 65 +------------------------- src/config/public-config.spec.ts | 54 +++++++++++++++++++++ src/config/public-config.ts | 60 ++++++++++++++++++++++++ src/modules/app/server-init.service.ts | 13 ++---- 4 files changed, 119 insertions(+), 73 deletions(-) create mode 100644 src/config/public-config.spec.ts create mode 100644 src/config/public-config.ts diff --git a/src/config/config.server.ts b/src/config/config.server.ts index d73462c0c8e..4c1df0a70cb 100644 --- a/src/config/config.server.ts +++ b/src/config/config.server.ts @@ -8,6 +8,7 @@ import { Config } from './config.interface'; import { DefaultAppConfig } from './default-app-config'; import { ServerConfig } from './server-config.interface'; import { mergeConfig } from './config.util'; +import { buildPublicConfig } from './public-config'; import { isNotEmpty } from '../app/shared/empty.util'; const CONFIG_PATH = join(process.cwd(), 'config'); @@ -237,69 +238,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => { buildBaseUrl(appConfig.rest); if (isNotEmpty(destConfigPath)) { - // Create sanitized public config - only expose what frontend actually needs - const publicConfig = { - production: appConfig.production, - // REST API configuration - only public endpoint - ...(appConfig.rest && { - rest: { - baseUrl: appConfig.rest.baseUrl, - nameSpace: appConfig.rest.nameSpace, - ssrBaseUrl: appConfig.rest.ssrBaseUrl, - }, - }), - // UI namespace for routing - ...(appConfig.ui ? { ui: { nameSpace: appConfig.ui.nameSpace } } : {}), - // Auth configuration - only expose client-side settings (idle timeout, token refresh) - auth: { - ui: { - timeUntilIdle: appConfig.auth?.ui?.timeUntilIdle, - idleGracePeriod: appConfig.auth?.ui?.idleGracePeriod, - }, - rest: { - timeLeftBeforeTokenRefresh: appConfig.auth?.rest?.timeLeftBeforeTokenRefresh, - }, - }, - // Cache configuration - frontend needs msToLive, control, and autoSync settings - cache: { - msToLive: appConfig.cache?.msToLive, - control: appConfig.cache?.control, - }, - // Frontend feature configurations - languages: appConfig.languages, - defaultLanguage: appConfig.defaultLanguage, - themes: appConfig.themes, - form: appConfig.form, - notifications: appConfig.notifications, - submission: appConfig.submission, - browseBy: appConfig.browseBy, - communityList: appConfig.communityList, - homePage: appConfig.homePage, - item: appConfig.item, - collection: appConfig.collection, - mediaViewer: appConfig.mediaViewer, - bundle: appConfig.bundle, - info: appConfig.info, - markdown: appConfig.markdown, - vocabularies: appConfig.vocabularies, - comcolSelectionSort: appConfig.comcolSelectionSort, - liveRegion: appConfig.liveRegion, - search: appConfig.search, - accessibility: appConfig.accessibility, - signpostingEnabled: appConfig.signpostingEnabled, - // Matomo analytics - only expose client-side tracking properties - ...(appConfig.matomo && { - matomo: { - enabled: appConfig.matomo.enabled, - hostUrl: appConfig.matomo.hostUrl, - siteId: appConfig.matomo.siteId, - dimensionId: appConfig.matomo.dimensionId, - }, - }), - debug: appConfig.debug, - }; - - writeFileSync(destConfigPath, JSON.stringify(publicConfig, null, 2)); + writeFileSync(destConfigPath, JSON.stringify(buildPublicConfig(appConfig), null, 2)); console.log(`Angular ${bold('config.json')} file generated correctly at ${bold(destConfigPath)} \n`); } diff --git a/src/config/public-config.spec.ts b/src/config/public-config.spec.ts new file mode 100644 index 00000000000..c334c55a370 --- /dev/null +++ b/src/config/public-config.spec.ts @@ -0,0 +1,54 @@ +import { AppConfig } from './app-config.interface'; +import { DefaultAppConfig } from './default-app-config'; +import { buildPublicConfig } from './public-config'; + +describe('buildPublicConfig', () => { + const appConfig: AppConfig = { + ...new DefaultAppConfig(), + ui: { + ssl: false, + host: 'dspace-angular', + port: 4000, + nameSpace: '/', + baseUrl: 'http://dspace-angular:4000/', + rateLimiter: { windowMs: 60000, max: 500 }, + useProxies: true, + }, + rest: { + ssl: true, + host: 'repository.example.org', + port: 443, + nameSpace: '/server', + baseUrl: 'https://repository.example.org/server', + ssrBaseUrl: 'http://dspace:8080/server', + }, + }; + + let publicConfig: any; + + beforeEach(() => { + publicConfig = buildPublicConfig(appConfig); + }); + + it('should not contain the server settings', () => { + expect(Object.keys(publicConfig.ui)).toEqual(['nameSpace']); + expect(Object.keys(publicConfig.rest)).toEqual(['baseUrl', 'nameSpace']); + expect(publicConfig.cache.serverSide).toBeUndefined(); + expect(publicConfig.actuators).toBeUndefined(); + expect(publicConfig.universal).toBeUndefined(); + }); + + it('should contain the settings the browser reads', () => { + expect(publicConfig.rest.baseUrl).toEqual('https://repository.example.org/server'); + expect(publicConfig.ui.nameSpace).toEqual('/'); + expect(publicConfig.cache.msToLive).toEqual(appConfig.cache.msToLive); + expect(publicConfig.cache.control).toEqual(appConfig.cache.control); + expect(publicConfig.cache.autoSync).toEqual(appConfig.cache.autoSync); + expect(publicConfig.auth).toEqual({ + ui: appConfig.auth.ui, + rest: { timeLeftBeforeTokenRefresh: appConfig.auth.rest.timeLeftBeforeTokenRefresh }, + }); + expect(publicConfig.matomo).toEqual(appConfig.matomo); + expect(publicConfig.themes).toEqual(appConfig.themes); + }); +}); diff --git a/src/config/public-config.ts b/src/config/public-config.ts new file mode 100644 index 00000000000..78358457519 --- /dev/null +++ b/src/config/public-config.ts @@ -0,0 +1,60 @@ +import { AppConfig } from './app-config.interface'; + +/** + * Returns only the part of the app config the browser needs. + * It is written to config.json and to the SSR transfer state. + */ +export const buildPublicConfig = (appConfig: AppConfig) => ({ + production: appConfig.production, + ...(appConfig.rest && { + rest: { + baseUrl: appConfig.rest.baseUrl, + nameSpace: appConfig.rest.nameSpace, + }, + }), + ...(appConfig.ui ? { ui: { nameSpace: appConfig.ui.nameSpace } } : {}), + auth: { + ui: { + timeUntilIdle: appConfig.auth?.ui?.timeUntilIdle, + idleGracePeriod: appConfig.auth?.ui?.idleGracePeriod, + }, + rest: { + timeLeftBeforeTokenRefresh: appConfig.auth?.rest?.timeLeftBeforeTokenRefresh, + }, + }, + cache: { + msToLive: appConfig.cache?.msToLive, + control: appConfig.cache?.control, + autoSync: appConfig.cache?.autoSync, + }, + languages: appConfig.languages, + defaultLanguage: appConfig.defaultLanguage, + themes: appConfig.themes, + form: appConfig.form, + notifications: appConfig.notifications, + submission: appConfig.submission, + browseBy: appConfig.browseBy, + communityList: appConfig.communityList, + homePage: appConfig.homePage, + item: appConfig.item, + collection: appConfig.collection, + mediaViewer: appConfig.mediaViewer, + bundle: appConfig.bundle, + info: appConfig.info, + markdown: appConfig.markdown, + vocabularies: appConfig.vocabularies, + comcolSelectionSort: appConfig.comcolSelectionSort, + liveRegion: appConfig.liveRegion, + search: appConfig.search, + accessibility: appConfig.accessibility, + signpostingEnabled: appConfig.signpostingEnabled, + ...(appConfig.matomo && { + matomo: { + enabled: appConfig.matomo.enabled, + hostUrl: appConfig.matomo.hostUrl, + siteId: appConfig.matomo.siteId, + dimensionId: appConfig.matomo.dimensionId, + }, + }), + debug: appConfig.debug, +}); diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts index e0c55211e35..995bfbd76dc 100644 --- a/src/modules/app/server-init.service.ts +++ b/src/modules/app/server-init.service.ts @@ -21,8 +21,9 @@ import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service'; import { ThemeService } from '../../app/shared/theme-support/theme.service'; import { take } from 'rxjs/operators'; import { MenuService } from '../../app/shared/menu/menu.service'; -import { isEmpty, isNotEmpty } from '../../app/shared/empty.util'; +import { isEmpty } from '../../app/shared/empty.util'; import { BuildConfig } from '../../config/build-config.interface'; +import { buildPublicConfig } from '../../config/public-config'; /** * Performs server-side initialization. @@ -95,14 +96,6 @@ export class ServerInitService extends InitService { } private saveAppConfigForCSR(): void { - if (isNotEmpty(environment.rest.ssrBaseUrl) && environment.rest.baseUrl !== environment.rest.ssrBaseUrl) { - // Avoid to transfer ssrBaseUrl in order to prevent security issues - const config: AppConfig = Object.assign({}, environment as AppConfig, { - rest: Object.assign({}, environment.rest, { ssrBaseUrl: '', hasSsrBaseUrl: true }), - }); - this.transferState.set(APP_CONFIG_STATE, config); - } else { - this.transferState.set(APP_CONFIG_STATE, environment as AppConfig); - } + this.transferState.set(APP_CONFIG_STATE, buildPublicConfig(environment as AppConfig) as AppConfig); } } From b3bde082fd243890bf3530c2d932d341c6b83a19 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Mon, 16 Nov 2026 17:21:24 +0100 Subject: [PATCH 2/3] Keep universal.transferState in the public config The browser reads it to decide whether to rehydrate the store from the SSR state. Co-Authored-By: Claude Opus 5.5 --- src/config/public-config.spec.ts | 16 +++++++++++++--- src/config/public-config.ts | 5 +++-- src/modules/app/server-init.service.ts | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/config/public-config.spec.ts b/src/config/public-config.spec.ts index c334c55a370..bca3521365d 100644 --- a/src/config/public-config.spec.ts +++ b/src/config/public-config.spec.ts @@ -1,9 +1,9 @@ -import { AppConfig } from './app-config.interface'; +import { BuildConfig } from './build-config.interface'; import { DefaultAppConfig } from './default-app-config'; import { buildPublicConfig } from './public-config'; describe('buildPublicConfig', () => { - const appConfig: AppConfig = { + const appConfig: BuildConfig = { ...new DefaultAppConfig(), ui: { ssl: false, @@ -22,6 +22,16 @@ describe('buildPublicConfig', () => { baseUrl: 'https://repository.example.org/server', ssrBaseUrl: 'http://dspace:8080/server', }, + universal: { + preboot: true, + async: true, + time: false, + transferState: false, + replaceRestUrl: true, + excludePathPatterns: [{ pattern: '^/search' }], + enableSearchComponent: false, + enableBrowseComponent: false, + }, }; let publicConfig: any; @@ -35,12 +45,12 @@ describe('buildPublicConfig', () => { expect(Object.keys(publicConfig.rest)).toEqual(['baseUrl', 'nameSpace']); expect(publicConfig.cache.serverSide).toBeUndefined(); expect(publicConfig.actuators).toBeUndefined(); - expect(publicConfig.universal).toBeUndefined(); }); it('should contain the settings the browser reads', () => { expect(publicConfig.rest.baseUrl).toEqual('https://repository.example.org/server'); expect(publicConfig.ui.nameSpace).toEqual('/'); + expect(publicConfig.universal).toEqual({ transferState: false }); expect(publicConfig.cache.msToLive).toEqual(appConfig.cache.msToLive); expect(publicConfig.cache.control).toEqual(appConfig.cache.control); expect(publicConfig.cache.autoSync).toEqual(appConfig.cache.autoSync); diff --git a/src/config/public-config.ts b/src/config/public-config.ts index 78358457519..4238e1a7533 100644 --- a/src/config/public-config.ts +++ b/src/config/public-config.ts @@ -1,10 +1,10 @@ -import { AppConfig } from './app-config.interface'; +import { BuildConfig } from './build-config.interface'; /** * Returns only the part of the app config the browser needs. * It is written to config.json and to the SSR transfer state. */ -export const buildPublicConfig = (appConfig: AppConfig) => ({ +export const buildPublicConfig = (appConfig: Partial) => ({ production: appConfig.production, ...(appConfig.rest && { rest: { @@ -13,6 +13,7 @@ export const buildPublicConfig = (appConfig: AppConfig) => ({ }, }), ...(appConfig.ui ? { ui: { nameSpace: appConfig.ui.nameSpace } } : {}), + ...(appConfig.universal && { universal: { transferState: appConfig.universal.transferState } }), auth: { ui: { timeUntilIdle: appConfig.auth?.ui?.timeUntilIdle, diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts index 995bfbd76dc..ce196604133 100644 --- a/src/modules/app/server-init.service.ts +++ b/src/modules/app/server-init.service.ts @@ -96,6 +96,6 @@ export class ServerInitService extends InitService { } private saveAppConfigForCSR(): void { - this.transferState.set(APP_CONFIG_STATE, buildPublicConfig(environment as AppConfig) as AppConfig); + this.transferState.set(APP_CONFIG_STATE, buildPublicConfig(environment) as AppConfig); } } From 2dc0ac8c42370d01838da1f9cb16073a39a7e9a1 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Mon, 16 Nov 2026 17:32:45 +0100 Subject: [PATCH 3/3] Type buildPublicConfig so the SSR state cast compiles Co-Authored-By: Claude Opus 5.5 --- src/config/public-config.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/config/public-config.ts b/src/config/public-config.ts index 4238e1a7533..67425a35231 100644 --- a/src/config/public-config.ts +++ b/src/config/public-config.ts @@ -1,10 +1,12 @@ import { BuildConfig } from './build-config.interface'; +type DeepPartial = T extends object ? { [K in keyof T]?: DeepPartial } : T; + /** * Returns only the part of the app config the browser needs. * It is written to config.json and to the SSR transfer state. */ -export const buildPublicConfig = (appConfig: Partial) => ({ +export const buildPublicConfig = (appConfig: Partial): DeepPartial => ({ production: appConfig.production, ...(appConfig.rest && { rest: {