CDK cross-span vuln fix (WIP) #1436
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ Object { | |
| "GuEc2App", | ||
| "GuCertificate", | ||
| "GuInstanceRole", | ||
| "GuSsmSshPolicy", | ||
| "GuDescribeEC2Policy", | ||
| "GuLoggingStreamNameParameter", | ||
| "GuLogShippingPolicy", | ||
|
|
@@ -134,6 +135,11 @@ Object { | |
| }, | ||
| }, | ||
| "MaxSize": "6", | ||
| "MetricsCollection": Array [ | ||
| Object { | ||
| "Granularity": "1Minute", | ||
| }, | ||
| ], | ||
| "MinSize": "3", | ||
| "Tags": Array [ | ||
| Object { | ||
|
|
@@ -1805,20 +1811,6 @@ Object { | |
| ], | ||
| "Version": "2012-10-17", | ||
| }, | ||
| "Path": "/", | ||
| "Tags": Array [ | ||
| Object { | ||
|
|
@@ -1921,6 +1913,7 @@ Object { | |
| }, | ||
| "Port": 443, | ||
| "Protocol": "HTTPS", | ||
| "SslPolicy": "ELBSecurityPolicy-TLS13-1-2-2021-06", | ||
|
There was a problem hiding this comment. As long as fastly user TLS v1.2 or later this should be fine (https://docs.aws.amazon.com/elasticloadbalancing/latest/application/describe-ssl-policies.html) |
||
| }, | ||
| "Type": "AWS::ElasticLoadBalancingV2::Listener", | ||
| }, | ||
|
|
@@ -1931,6 +1924,14 @@ Object { | |
| "Key": "deletion_protection.enabled", | ||
| "Value": "true", | ||
| }, | ||
| Object { | ||
| "Key": "routing.http.x_amzn_tls_version_and_cipher_suite.enabled", | ||
| "Value": "true", | ||
| }, | ||
| Object { | ||
| "Key": "routing.http.drop_invalid_header_fields.enabled", | ||
| "Value": "true", | ||
| }, | ||
|
Comment on lines
+1931
to
+1934
There was a problem hiding this comment. We're not sure what constitutes an invalid header, but this sounds sensible. |
||
| ], | ||
| "Scheme": "internet-facing", | ||
| "SecurityGroups": Array [ | ||
|
|
@@ -2231,6 +2232,42 @@ Object { | |
| }, | ||
| "Type": "AWS::IAM::Policy", | ||
| }, | ||
| "SsmSshPolicy4CFC977E": Object { | ||
| "Properties": Object { | ||
| "PolicyDocument": Object { | ||
| "Statement": Array [ | ||
| Object { | ||
| "Action": Array [ | ||
| "ec2messages:AcknowledgeMessage", | ||
| "ec2messages:DeleteMessage", | ||
| "ec2messages:FailMessage", | ||
| "ec2messages:GetEndpoint", | ||
| "ec2messages:GetMessages", | ||
| "ec2messages:SendReply", | ||
| "ssm:UpdateInstanceInformation", | ||
| "ssm:ListInstanceAssociations", | ||
| "ssm:DescribeInstanceProperties", | ||
| "ssm:DescribeDocumentParameters", | ||
| "ssmmessages:CreateControlChannel", | ||
| "ssmmessages:CreateDataChannel", | ||
| "ssmmessages:OpenControlChannel", | ||
| "ssmmessages:OpenDataChannel", | ||
|
Comment on lines
+2241
to
+2254
There was a problem hiding this comment. These match the current permissions needed according to https://github.com/guardian/ssm-scala?tab=readme-ov-file#in-aws |
||
| ], | ||
| "Effect": "Allow", | ||
| "Resource": "*", | ||
| }, | ||
| ], | ||
| "Version": "2012-10-17", | ||
| }, | ||
| "PolicyName": "ssm-ssh-policy", | ||
| "Roles": Array [ | ||
| Object { | ||
| "Ref": "InstanceRoleManagefrontendC8EBF20D", | ||
| }, | ||
| ], | ||
| }, | ||
| "Type": "AWS::IAM::Policy", | ||
| }, | ||
| "TargetGroupManagefrontend7AE2B787": Object { | ||
| "Properties": Object { | ||
| "HealthCheckIntervalSeconds": 10, | ||
|
|
@@ -2345,6 +2382,9 @@ Object { | |
| "Type": "AWS::EC2::SecurityGroupIngress", | ||
| }, | ||
| "supportPRODmanagefrontend8911518E": Object { | ||
| "DependsOn": Array [ | ||
| "InstanceRoleManagefrontendC8EBF20D", | ||
| ], | ||
| "Properties": Object { | ||
| "LaunchTemplateData": Object { | ||
| "IamInstanceProfile": Object { | ||
|
|
@@ -2359,6 +2399,9 @@ Object { | |
| "Ref": "AMIManagefrontend", | ||
| }, | ||
| "InstanceType": "t4g.small", | ||
| "MetadataOptions": Object { | ||
| "InstanceMetadataTags": "enabled", | ||
| }, | ||
|
Comment on lines
+2402
to
+2404
There was a problem hiding this comment. this is to allow access to https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-tags-in-IMDS.html |
||
| "SecurityGroupIds": Array [ | ||
| Object { | ||
| "Fn::GetAtt": Array [ | ||
|
|
@@ -2377,6 +2420,10 @@ Object { | |
| Object { | ||
| "ResourceType": "instance", | ||
| "Tags": Array [ | ||
| Object { | ||
| "Key": "App", | ||
| "Value": "manage-frontend", | ||
| }, | ||
| Object { | ||
| "Key": "gu:cdk:version", | ||
| "Value": "TEST", | ||
|
|
@@ -2402,6 +2449,10 @@ Object { | |
| Object { | ||
| "ResourceType": "volume", | ||
| "Tags": Array [ | ||
| Object { | ||
| "Key": "App", | ||
| "Value": "manage-frontend", | ||
| }, | ||
| Object { | ||
| "Key": "gu:cdk:version", | ||
| "Value": "TEST", | ||
|
|
@@ -2482,6 +2533,10 @@ systemctl start manage-frontend | |
| Object { | ||
| "ResourceType": "launch-template", | ||
| "Tags": Array [ | ||
| Object { | ||
| "Key": "App", | ||
| "Value": "manage-frontend", | ||
| }, | ||
| Object { | ||
| "Key": "gu:cdk:version", | ||
| "Value": "TEST", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We think this replaces the old AmazonSSMManagedInstanceCore policy below to ssh into the ec2 instance.
TODO: test in code to make sure we can still ssh into the instance