Skip to content

Fix SC rule pattern, fix AutoScaling group name regex #141

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

Merged
merged 2 commits into from
Mar 13, 2023
Merged

Fix SC rule pattern, fix AutoScaling group name regex #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a18ce90
Fix auto-remediate rule generator ID pattern for SC
hearde Mar 10, 2023
610e5e0
Fix AutoScaling group name regex
hearde Mar 10, 2023
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
2 changes: 1 addition & 1 deletion source/playbooks/SC/lib/security_controls_playbook-construct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class SecurityControlsPlaybookPrimaryStack extends Stack {
stringValue: `${controlSpec.executes}`,
});
}
const generatorId = `control/${controlSpec.control}`;
const generatorId = `security-control/${controlSpec.control}`;
new Trigger(stack, `${props.securityStandard} ${controlSpec.control}`, {
securityStandard: props.securityStandard,
securityStandardVersion: props.securityStandardVersion,
Expand Down
2 changes: 1 addition & 1 deletion source/playbooks/SC/ssmdocs/SC_AutoScaling.1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class EnableAutoScalingGroupELBHealthCheckDocument extends ControlRunbookDocumen
remediationName: 'EnableAutoScalingGroupELBHealthCheck',
scope: RemediationScope.REGIONAL,
resourceIdName: 'AutoScalingGroupName',
resourceIdRegex: String.raw`^arn:(?:aws|aws-cn|aws-us-gov):autoscaling:(?:[a-z]{2}(?:-gov)?-[a-z]+-\d):\d{12}:autoScalingGroup:(?:[0-9a-fA-F]{11}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}):autoScalingGroupName\/(.*)$`,
resourceIdRegex: String.raw`^arn:(?:aws|aws-cn|aws-us-gov):autoscaling:(?:[a-z]{2}(?:-gov)?-[a-z]+-\d):\d{12}:autoScalingGroup:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}):autoScalingGroupName/(.{1,255})$`,
Copy link
Contributor Author

@hearde hearde Mar 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix we made in v1.5.1 to the other standards but it didn't get merged forward. I reviewed all the CRs between v1.5.0 and v1.5.1 for anything similar and found nothing.

This does bring up the fact that the regexes in SC are not validated against the regex registry. I'll add an item to do that.

updateDescription: HardCodedString.of('ASG health check type updated to ELB'),
});
}
Expand Down
8 changes: 4 additions & 4 deletions source/playbooks/SC/test/__snapshots__/security_controls_stack.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ exports[`admin stack 1`] = `
],
},
"GeneratorId": [
"control/Example.1",
"security-control/Example.1",
],
"RecordState": [
"ACTIVE",
Expand Down Expand Up @@ -143,7 +143,7 @@ exports[`admin stack 1`] = `
],
},
"GeneratorId": [
"control/Example.3",
"security-control/Example.3",
],
"RecordState": [
"ACTIVE",
Expand Down Expand Up @@ -236,7 +236,7 @@ exports[`admin stack 1`] = `
],
},
"GeneratorId": [
"control/Example.5",
"security-control/Example.5",
],
"RecordState": [
"ACTIVE",
Expand Down Expand Up @@ -1137,7 +1137,7 @@ Default: 30 seconds
"expected_control_id": [
"AutoScaling.1",
],
"parse_id_pattern": "^arn:(?:aws|aws-cn|aws-us-gov):autoscaling:(?:[a-z]{2}(?:-gov)?-[a-z]+-\\d):\\d{12}:autoScalingGroup:(?:[0-9a-fA-F]{11}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}):autoScalingGroupName\\/(.*)$",
"parse_id_pattern": "^arn:(?:aws|aws-cn|aws-us-gov):autoscaling:(?:[a-z]{2}(?:-gov)?-[a-z]+-\\d):\\d{12}:autoScalingGroup:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}):autoScalingGroupName/(.{1,255})$",
},
"Runtime": "python3.8",
"Script": "# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down