Skip to content
Open
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: 12 additions & 13 deletions core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,7 @@ describe('OptimizedSsrEngine', () => {
renderingStrategyResolver: '() => ssr_optimization_options_1.RenderingStrategy.ALWAYS_SSR',
logger: 'DefaultExpressServerLogger',
shouldCacheRenderingResult: '({ entry: { err } }) => !err',
renderKeyResolver: 'function getRequestUrl(req) {\\n' +
' return (0, express_request_origin_1.getRequestOrigin)(req) + req.originalUrl;\\n' +
'}',
renderKeyResolver: 'function getDefaultRenderKey(req) {\\n return req.originalUrl;\\n}',
ssrFeatureToggles: { limitCacheByMemory: true }
}
}
Expand Down Expand Up @@ -584,7 +582,7 @@ describe('OptimizedSsrEngine', () => {

describe('renderKeyResolver option', () => {
describe('default key resolver', () => {
it('should be used when the custom one is provided', fakeAsync(() => {
it('should use only the path as the render key', fakeAsync(() => {
const engineRunner = new TestEngineRunner({
timeout: 200,
cache: true,
Expand All @@ -599,10 +597,10 @@ describe('OptimizedSsrEngine', () => {

expect(
engineRunner.optimizedSsrEngine['isConcurrencyLimitExceeded']
).toHaveBeenCalledWith(`https://${host}${route}`);
).toHaveBeenCalledWith(route);
}));

it('should use the X-Forwarded-Host header to resolve the origin', fakeAsync(() => {
it('should not include X-Forwarded-Host header in the render key', fakeAsync(() => {
const engineRunner = new TestEngineRunner({
timeout: 200,
cache: true,
Expand All @@ -623,7 +621,7 @@ describe('OptimizedSsrEngine', () => {

expect(
engineRunner.optimizedSsrEngine['isConcurrencyLimitExceeded']
).toHaveBeenCalledWith(`https://${domain}${route}`);
).toHaveBeenCalledWith(route);
}));
});

Expand Down Expand Up @@ -800,10 +798,12 @@ describe('OptimizedSsrEngine', () => {
});

engineRunner.request('a');
engineRunner.request('a', { httpHeaders: { 'User-Agent': 'bot' } });
engineRunner.request('a', {
httpHeaders: { host, 'User-Agent': 'bot' },
});
tick(200);

expect(engineRunner.responses).toEqual(['', 'a-1']);
expect(engineRunner.responses).toEqual(['', 'a-0']);
}));
});
});
Expand Down Expand Up @@ -1007,8 +1007,7 @@ describe('OptimizedSsrEngine', () => {
const requestUrl = 'a';
const differentUrl = 'b';

const getRenderingKey = (requestUrlStr: string): string =>
`https://${host}${requestUrlStr}`;
const getRenderingKey = (requestUrlStr: string): string => requestUrlStr;
const getRenderCallbacksCount = (
engineRunner: TestEngineRunner,
requestUrlStr: string
Expand Down Expand Up @@ -1448,8 +1447,8 @@ describe('OptimizedSsrEngine', () => {
"forcedSsrTimeout": 60000,
"logger": "MockExpressServerLogger",
"maxRenderTime": 300000,
"renderKeyResolver": "function getRequestUrl(req) {
return (0, express_request_origin_1.getRequestOrigin)(req) + req.originalUrl;
"renderKeyResolver": "function getDefaultRenderKey(req) {
return req.originalUrl;
}",
"renderingStrategyResolver": "(request) => {
if (hasExcludedUrl(request, defaultAlwaysCsrOptions.excludedUrls)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

import { Request } from 'express';
import { getRequestUrl } from '../express-utils/express-request-url';
import { DefaultExpressServerLogger, ExpressServerLogger } from '../logger';
import { DefaultCacheEntrySizeCalculator } from './rendering-cache/default-cache-entry-size-calculator';
import {
Expand Down Expand Up @@ -219,9 +218,14 @@ type DeepRequired<T> = {
};

/**
* Returns the full url for the given SSR Request.
* Returns the request path (with query string) for use as the SSR cache key.
*
* Note: This intentionally excludes the host to prevent cache poisoning
* via attacker-controlled headers like X-Forwarded-Host.
*/
export const getDefaultRenderKey = getRequestUrl;
export function getDefaultRenderKey(req: Request): string {
return req.originalUrl;
}

/**
* The type of `defaultSsrOptimizationOptions` ensures that all properties are set to a default value.
Expand Down
Loading