Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(route53resolver): FirewallDomainList throws with wildcard domains #16538

Merged
merged 3 commits into from
Sep 21, 2021
Merged

fix(route53resolver): FirewallDomainList throws with wildcard domains #16538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0533f01
fix(rout53resolver): FireWallDomainList throws with wildcard domains
jogold Sep 18, 2021
c82dcf3
Merge branch 'master' into route53resolver-wildcard-domain
jogold Sep 21, 2021
04cc299
Merge branch 'master' into route53resolver-wildcard-domain
mergify[bot] Sep 21, 2021
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
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-route53resolver/lib/firewall-domain-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export abstract class FirewallDomains {
*/
public static fromList(list: string[]): FirewallDomains {
for (const domain of list) {
if (!/^[\w-.]+$/.test(domain)) {
throw new Error(`Invalid domain: ${domain}. Valid characters: A-Z, a-z, 0-9, _, -, .`);
if (!/^([\w-.]{1,255}|\*[\w-.]{1,254})$/.test(domain)) {
throw new Error(`Invalid domain: ${domain}. Domain can optionally start with *. Max length of 255. Valid characters: A-Z, a-z, 0-9, _, -, .`);
}
}

Expand Down
7 changes: 6 additions & 1 deletion packages/@aws-cdk/aws-route53resolver/test/firewall-domain-list.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ beforeEach(() => {
test('domain list from strings', () => {
// WHEN
new FirewallDomainList(stack, 'List', {
domains: FirewallDomains.fromList(['first-domain.com', 'second-domain.net']),
domains: FirewallDomains.fromList([
'first-domain.com',
'second-domain.net',
'*.wildcard.com',
]),
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::Route53Resolver::FirewallDomainList', {
Domains: [
'first-domain.com',
'second-domain.net',
'*.wildcard.com',
],
});
});
Expand Down