Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { APP_CONFIG, AppConfig } from './src/config/app-config.interface';
import { extendEnvironmentWithAppConfig } from './src/config/config.util';
import { logStartupMessage } from './startup-message';
import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model';
import { getSsrCacheKey } from './src/app/shared/ssr-cache-key.util';
import { SsrExcludePatterns } from './src/config/universal-config.interface';


Expand Down Expand Up @@ -385,14 +386,14 @@ function anonymousCacheEnabled(): boolean {

/**
* Check if the currently requested page is in our server-side, in-memory cache.
* Caching is ONLY done for SSR requests. Pages are cached base on their path (e.g. /home or /search?query=test)
* Caching is ONLY done for SSR requests. Pages are cached by path, origin and language (see getSsrCacheKey)
*/
function cacheCheck(req, res, next) {
// Cached copy of page (if found)
let cachedCopy;

// If the bot cache is enabled and this request looks like a bot, check the bot cache for a cached page.
if (botCacheEnabled() && isbot(req.get('user-agent'))) {
// If the bot cache is enabled and this request looks like an anonymous bot, check the bot cache for a cached page.
if (botCacheEnabled() && isbot(req.get('user-agent')) && !isUserAuthenticated(req)) {
cachedCopy = checkCacheForRequest('bot', botCache, req, res);
} else if (anonymousCacheEnabled() && !isUserAuthenticated(req)) {
cachedCopy = checkCacheForRequest('anonymous', anonymousCache, req, res);
Expand Down Expand Up @@ -435,7 +436,7 @@ function cacheCheck(req, res, next) {
*/
function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, res): any {
// Get the cache key for this request
const key = getCacheKey(req);
const key = getSsrCacheKey(req);

// Check if this page is in our cache
let cachedCopy = cache.get(key);
Expand All @@ -459,18 +460,6 @@ function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, r
return cachedCopy;
}

/**
* Create a cache key from the current request.
* The cache key is the URL path (NOTE: this key will also include any querystring params).
* E.g. "/home" or "/search?query=test"
* @param req current request
* @returns cache key to use for this page
*/
function getCacheKey(req): string {
// NOTE: this will return the URL path *without* any baseUrl
return req.url;
}

/**
* Save page to server side cache(s), if enabled. If caching is not enabled or a user is authenticated, this is a noop
* If multiple caches are enabled, the page will be saved to any caches where it does not yet exist (or is expired).
Expand All @@ -483,9 +472,9 @@ function saveToCache(req, page: any) {
// NOTE: It's not safe to save page data to the cache when a user is authenticated. In that situation,
// the page may include sensitive or user-specific materials. As the cache is shared across all users, it can only contain public info.
if (!isUserAuthenticated(req)) {
const key = getCacheKey(req);
const key = getSsrCacheKey(req);
// Avoid caching "/reload/[random]" paths (these are hard refreshes after logout)
if (key.startsWith('/reload')) { return; }
if (req.url.startsWith('/reload')) { return; }
// Avoid caching not successful responses (status code different from 2XX status)
if (hasNotSucceeded(req.res.statusCode)) { return; }

Expand Down
28 changes: 26 additions & 2 deletions src/app/shared/html-content.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { fakeAsync, TestBed, tick } from '@angular/core/testing';
import { PLATFORM_ID, Provider } from '@angular/core';
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { firstValueFrom } from 'rxjs';

import { HtmlContentService } from './html-content.service';
Expand All @@ -19,7 +21,7 @@ describe('HtmlContentService', () => {
let httpMock: HttpTestingController;
let localeService: LocaleServiceStub;

function setup(nameSpace: string): void {
function setup(nameSpace: string, serverProviders: Provider[] = []): void {
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
providers: [
Expand All @@ -28,9 +30,10 @@ describe('HtmlContentService', () => {
{
provide: APP_CONFIG,
useValue: {
ui: { nameSpace },
ui: { nameSpace, baseUrl: `http://localhost:4000${nameSpace}` },
},
},
...serverProviders,
],
});

Expand Down Expand Up @@ -112,6 +115,27 @@ describe('HtmlContentService', () => {
expect(content).toBe('<div>English Content</div>');
}));

it('should fetch static content from the configured UI origin, not the request Host, during SSR', async () => {
setup('/repository', [
{ provide: PLATFORM_ID, useValue: 'server' },
{ provide: REQUEST, useValue: { protocol: 'https', get: () => 'attacker.example' } },
]);

const promise = service.getHmtlContentByPathAndLocale('about');

httpMock.expectOne('http://localhost:4000/repository/static-files/about.html').flush('Trusted content');
expect(await promise).toBe('Trusted content');
});

it('should not request a file name that leaves static-files once decoded', async () => {
setup('/repository');

const promise = service.getHmtlContentByPathAndLocale('..%2Findex');

httpMock.expectNone(() => true);
expect(await promise).toBeUndefined();
});

it('should return empty string from getHtmlContent when request fails', async () => {
setup('/repository');

Expand Down
31 changes: 20 additions & 11 deletions src/app/shared/html-content.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { isPlatformServer } from '@angular/common';
import { Inject, Injectable, Optional, PLATFORM_ID } from '@angular/core';
import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
import { HttpClient, HttpResponse } from '@angular/common/http';
import { catchError } from 'rxjs/operators';
import { firstValueFrom, of as observableOf } from 'rxjs';
import { HTML_SUFFIX, STATIC_FILES_PROJECT_PATH } from '../static-page/static-page-routing-paths';
import { isEmpty } from './empty.util';
import { LocaleService } from '../core/locale/locale.service';
import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
import { REQUEST } from '@nguniversal/express-engine/tokens';

/**
* Service for loading static `.html` files stored in the `/static-files` folder.
Expand All @@ -18,7 +17,6 @@ export class HtmlContentService {
private localeService: LocaleService,
@Inject(APP_CONFIG) protected appConfig?: AppConfig,
@Inject(PLATFORM_ID) private platformId?: object,
@Optional() @Inject(REQUEST) private request?: any,
) {}

private getNamespacePrefix(): string {
Expand All @@ -45,17 +43,12 @@ export class HtmlContentService {
}

private buildRuntimeUrl(path: string): string {
if (!isPlatformServer(this.platformId) || !this.request) {
if (!isPlatformServer(this.platformId)) {
return path;
}

const protocol = this.request.protocol;
const host = this.request.get?.('host');
if (!protocol || !host) {
return path;
}

return `${protocol}://${host}${path}`;
// The request Host header is client-controlled; SSR loads static HTML only from the configured UI origin.
return `${new URL(this.appConfig.ui.baseUrl).origin}${path}`;
}

getHtmlContent(url: string) {
Expand Down Expand Up @@ -91,10 +84,26 @@ export class HtmlContentService {
return undefined;
}

/**
* Whether a file name taken from the URL is still one file name once the server decodes it,
* so it cannot address a file outside `static-files` (e.g. `..%2Findex`). A query part is ignored.
*/
private isPlainFileName(fileName: string): boolean {
try {
return !/[/\\]/.test(decodeURIComponent(fileName.split('?')[0]));
} catch {
// Missing name or malformed percent-encoding: nothing to load.
return false;
}
}

/**
* Get the html file content as a string by the file name and the current locale.
*/
async getHmtlContentByPathAndLocale(fileName: string) {
if (!this.isPlainFileName(fileName)) {
return undefined;
}
let url = '';
// Get current language
let language = this.localeService.getCurrentLanguageCode();
Expand Down
21 changes: 21 additions & 0 deletions src/app/shared/ssr-cache-key.util.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Request } from 'express';

import { getSsrCacheKey } from './ssr-cache-key.util';
import { LANG_COOKIE } from '../core/locale/locale.service';

describe('getSsrCacheKey', () => {
function request(protocol: string, host: string, cookies: Record<string, string> = {}): Request {
return { url: '/static/about', protocol, get: () => host, cookies } as unknown as Request;
}

it('should separate renders for different language cookies', () => {
expect(getSsrCacheKey(request('https', 'repo.example', { [LANG_COOKIE]: 'cs' })))
.not.toEqual(getSsrCacheKey(request('https', 'repo.example', { [LANG_COOKIE]: 'en' })));
});

it('should separate renders for different request origins', () => {
const key = getSsrCacheKey(request('https', 'repo.example'));
expect(getSsrCacheKey(request('https', 'attacker.example'))).not.toEqual(key);
expect(getSsrCacheKey(request('http', 'repo.example'))).not.toEqual(key);
});
});
12 changes: 12 additions & 0 deletions src/app/shared/ssr-cache-key.util.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Request } from 'express';
import { LANG_COOKIE } from '../core/locale/locale.service';

/**
* Key of a server-side rendered page in the SSR page caches (see server.ts).
* Besides path and query, an anonymous render depends on the request origin (protocol and Host header,
* e.g. in `citation_pdf_url`) and on the language cookie, so they are part of the key.
* @param req current request
*/
export function getSsrCacheKey(req: Request): string {
return JSON.stringify([req.protocol, req.get('host'), req.cookies?.[LANG_COOKIE], req.url]);
}
Loading