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

chore: scope down default permissions #5423

Merged
merged 2 commits into from
Oct 31, 2023
Merged

chore: scope down default permissions #5423

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
afe65f6
chore: disallow assuming of tagged roles, TaskRole and InstanceRole
huanjani Oct 27, 2023
0b99b00
Merge branch 'mainline' into sec-ops
mergify[bot] Oct 31, 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
11 changes: 1 addition & 10 deletions internal/pkg/aws/cloudformation/testdata/parse/lb-web-svc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'

DiscoveryService:
Type: AWS::ServiceDiscovery::Service
Metadata:
Expand Down
10 changes: 1 addition & 9 deletions .../pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,21 +209,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: "sts:AssumeRole"
Policies:
- PolicyName: "DenyIAMExceptTaggedRoles"
- PolicyName: "DenyIAM"
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: "Deny"
Action: "iam:*"
Resource: "*"
- Effect: "Allow"
Action: "sts:AssumeRole"
Resource:
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*"
Condition:
StringEquals:
"iam:ResourceTag/copilot-application": !Sub "${AppName}"
"iam:ResourceTag/copilot-environment": !Sub "${EnvName}"
- PolicyName: "ExecuteCommand"
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions .../pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,21 +264,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: "sts:AssumeRole"
Policies:
- PolicyName: "DenyIAMExceptTaggedRoles"
- PolicyName: "DenyIAM"
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: "Deny"
Action: "iam:*"
Resource: "*"
- Effect: "Allow"
Action: "sts:AssumeRole"
Resource:
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*"
Condition:
StringEquals:
"iam:ResourceTag/copilot-application": !Sub "${AppName}"
"iam:ResourceTag/copilot-environment": !Sub "${EnvName}"
- PolicyName: "ExecuteCommand"
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions ...al/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,21 +209,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: "sts:AssumeRole"
Policies:
- PolicyName: "DenyIAMExceptTaggedRoles"
- PolicyName: "DenyIAM"
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: "Deny"
Action: "iam:*"
Resource: "*"
- Effect: "Allow"
Action: "sts:AssumeRole"
Resource:
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*"
Condition:
StringEquals:
"iam:ResourceTag/copilot-application": !Sub "${AppName}"
"iam:ResourceTag/copilot-environment": !Sub "${EnvName}"
- PolicyName: "ExecuteCommand"
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions .../pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'ExecuteCommand'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions ...y/cloudformation/stack/testdata/workloads/backend/simple-template-without-port-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,21 +201,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: "sts:AssumeRole"
Policies:
- PolicyName: "DenyIAMExceptTaggedRoles"
- PolicyName: "DenyIAM"
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: "Deny"
Action: "iam:*"
Resource: "*"
- Effect: "Allow"
Action: "sts:AssumeRole"
Resource:
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*"
Condition:
StringEquals:
"iam:ResourceTag/copilot-application": !Sub "${AppName}"
"iam:ResourceTag/copilot-environment": !Sub "${EnvName}"
- PolicyName: "ExecuteCommand"
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/backend/simple-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,21 +204,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: "sts:AssumeRole"
Policies:
- PolicyName: "DenyIAMExceptTaggedRoles"
- PolicyName: "DenyIAM"
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: "Deny"
Action: "iam:*"
Resource: "*"
- Effect: "Allow"
Action: "sts:AssumeRole"
Resource:
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*"
Condition:
StringEquals:
"iam:ResourceTag/copilot-application": !Sub "${AppName}"
"iam:ResourceTag/copilot-environment": !Sub "${EnvName}"
- PolicyName: "ExecuteCommand"
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/job-test.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,21 +345,13 @@ Resources:
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'GrantAccessCopilotManagedEFS'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/rdws-prod.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,13 @@ Resources:
- tasks.apprunner.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'Publish2SNS'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/rdws-test.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,13 @@ Resources:
- tasks.apprunner.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'AccessCopilotTaggedSecrets'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-grpc-test.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,21 +192,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'Publish2SNS'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-nlb-dev.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,21 +191,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
DiscoveryService:
Metadata:
'aws:copilot:description': 'Service discovery for your services to communicate within the VPC'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-nlb-prod.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,21 +293,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
DiscoveryService:
Metadata:
'aws:copilot:description': 'Service discovery for your services to communicate within the VPC'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-nlb-test.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,21 +186,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
DiscoveryService:
Metadata:
'aws:copilot:description': 'Service discovery for your services to communicate within the VPC'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-prod.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,21 +413,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'Publish2SNS'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-staging.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,21 +194,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'Publish2SNS'
PolicyDocument:
Version: '2012-10-17'
Expand Down
10 changes: 1 addition & 9 deletions internal/pkg/deploy/cloudformation/stack/testdata/workloads/svc-test.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,21 +192,13 @@ Resources: # If a bucket URL is specified, that means the template exists.
Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole'
Policies:
- PolicyName: 'DenyIAMExceptTaggedRoles'
- PolicyName: 'DenyIAM'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: 'Deny'
Action: 'iam:*'
Resource: '*'
- Effect: 'Allow'
Action: 'sts:AssumeRole'
Resource:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/*'
Condition:
StringEquals:
'iam:ResourceTag/copilot-application': !Sub '${AppName}'
'iam:ResourceTag/copilot-environment': !Sub '${EnvName}'
- PolicyName: 'Publish2SNS'
PolicyDocument:
Version: '2012-10-17'
Expand Down
Loading