Skip to content

Commit 42f3740

Browse files
authored
chore(cloudfront): check size of Origin Request headers and prevent forbidden values (#13410)
This PR checks the size of Origin Request headers and prevents forbidden values (`Authorization` or `Accept-Encoding`). Closes #13408 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 5d57777 commit 42f3740

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

packages/@aws-cdk/aws-cloudfront/lib/origin-request-policy.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class OriginRequestPolicy extends Resource implements IOriginRequestPolic
121121
}
122122

123123
/**
124-
* Ddetermines whether any cookies in viewer requests (and if so, which cookies)
124+
* Determines whether any cookies in viewer requests (and if so, which cookies)
125125
* are included in requests that CloudFront sends to the origin.
126126
*/
127127
export class OriginRequestCookieBehavior {
@@ -184,6 +184,12 @@ export class OriginRequestHeaderBehavior {
184184
if (headers.length === 0) {
185185
throw new Error('At least one header to allow must be provided');
186186
}
187+
if (headers.length > 10) {
188+
throw new Error(`Maximum allowed headers in Origin Request Policy is 10; got ${headers.length}.`);
189+
}
190+
if (/Authorization/i.test(headers.join('|')) || /Accept-Encoding/i.test(headers.join('|'))) {
191+
throw new Error('you cannot pass `Authorization` or `Accept-Encoding` as header values; use a CachePolicy to forward these headers instead');
192+
}
187193
return new OriginRequestHeaderBehavior('whitelist', headers);
188194
}
189195

packages/@aws-cdk/aws-cloudfront/test/origin-request-policy.test.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,29 @@ describe('OriginRequestPolicy', () => {
7777
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy6', { originRequestPolicyName: 'My_Policy' })).not.toThrow();
7878
});
7979

80+
test('throws if prohibited headers are being passed', () => {
81+
const errorMessage = /you cannot pass `Authorization` or `Accept-Encoding` as header values/;
82+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy1', { headerBehavior: OriginRequestHeaderBehavior.allowList('Authorization') })).toThrow(errorMessage);
83+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy2', { headerBehavior: OriginRequestHeaderBehavior.allowList('Accept-Encoding') })).toThrow(errorMessage);
84+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy3', { headerBehavior: OriginRequestHeaderBehavior.allowList('authorization') })).toThrow(errorMessage);
85+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy4', { headerBehavior: OriginRequestHeaderBehavior.allowList('accept-encoding') })).toThrow(errorMessage);
86+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy5', { headerBehavior: OriginRequestHeaderBehavior.allowList('Foo', 'Authorization', 'Bar') })).toThrow(errorMessage);
87+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy6', { headerBehavior: OriginRequestHeaderBehavior.allowList('Foo', 'Accept-Encoding', 'Bar') })).toThrow(errorMessage);
88+
89+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy7', { headerBehavior: OriginRequestHeaderBehavior.allowList('Foo', 'Bar') })).not.toThrow();
90+
});
91+
92+
test('throws if more than 10 OriginRequestHeaderBehavior headers are being passed', () => {
93+
const errorMessage = /Maximum allowed headers in Origin Request Policy is 10; got (.*?)/;
94+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy1', {
95+
headerBehavior: OriginRequestHeaderBehavior.allowList('Lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipiscing', 'elit', 'sed', 'do', 'eiusmod'),
96+
})).toThrow(errorMessage);
97+
98+
expect(() => new OriginRequestPolicy(stack, 'OriginRequestPolicy2', {
99+
headerBehavior: OriginRequestHeaderBehavior.allowList('Lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipiscing', 'elit', 'sed', 'do'),
100+
})).not.toThrow();
101+
});
102+
80103
test('does not throw if originRequestPolicyName is a token', () => {
81104
expect(() => new OriginRequestPolicy(stack, 'CachePolicy', {
82105
originRequestPolicyName: Aws.STACK_NAME,

0 commit comments

Comments
 (0)