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

fix(security): make stricter rules for AWS instance policy #31

Merged
merged 4 commits into from
May 10, 2024
Merged

fix(security): make stricter rules for AWS instance policy #31

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e71c9a5
fix(security): make stricter rules for AWS instance policy
89luca89 May 10, 2024
68912d2
fix(security): move AMI search to create, allow stricter instance pro…
89luca89 May 10, 2024
79d87b6
fix(security): detect if we're in EC2 instance, perform actions only …
89luca89 May 10, 2024
0c9f12c
fix(security): enforce IMDSv2
89luca89 May 10, 2024
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
81 changes: 49 additions & 32 deletions pkg/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/base64"
"fmt"
"net/http"
"regexp"
"sort"
"strings"
Expand All @@ -21,6 +22,22 @@ import (
"github.com/pkg/errors"
)

// detect if we're in an ec2 instance
func isEC2Instance() bool {
client := &http.Client{}
req, err := http.NewRequest("GET", "http://instance-data.ec2.internal", nil)
if err != nil {
return false
}
resp, err := client.Do(req)
if err != nil {
return false
}
defer resp.Body.Close()

return true
}

func NewProvider(ctx context.Context, logs log.Logger) (*AwsProvider, error) {
config, err := options.FromEnv(false)
if err != nil {
Expand All @@ -32,7 +49,9 @@ func NewProvider(ctx context.Context, logs log.Logger) (*AwsProvider, error) {
return nil, err
}

if config.DiskImage == "" {
isEC2 := isEC2Instance()

if config.DiskImage == "" && !isEC2 {
image, err := GetDefaultAMI(ctx, cfg, config.MachineType)
if err != nil {
return nil, err
Expand All @@ -41,7 +60,7 @@ func NewProvider(ctx context.Context, logs log.Logger) (*AwsProvider, error) {
config.DiskImage = image
}

if config.RootDevice == "" {
if config.RootDevice == "" && !isEC2 {
device, err := GetAMIRootDevice(ctx, cfg, config.DiskImage)
if err != nil {
return nil, err
Expand Down Expand Up @@ -288,17 +307,30 @@ func CreateDevpodInstanceProfile(ctx context.Context, provider *AwsProvider) (st

policyInput := &iam.PutRolePolicyInput{
PolicyDocument: aws.String(`{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "VisualEditor0",
"Effect": "Allow",
"Action": [
"ec2:StopInstances",
],
"Resource": "*"
"Version": "2012-10-17",
"Statement": [
{
"Sid": "Describe",
"Action": [
"ec2:DescribeInstances"
],
"Effect": "Allow",
"Resource": "*"
},
{
"Sid": "Stop",
"Action": [
"ec2:StopInstances"
],
"Effect": "Allow",
"Resource": "arn:aws:ec2:*:*:instance/*",
"Condition": {
"StringLike": {
"aws:userid": "*:${ec2:InstanceID}"
}
]
}
}
]
}`),
PolicyName: aws.String("devpod-ec2-policy"),
RoleName: aws.String("devpod-ec2-role"),
Expand All @@ -309,26 +341,6 @@ func CreateDevpodInstanceProfile(ctx context.Context, provider *AwsProvider) (st
return "", err
}

policyInput = &iam.PutRolePolicyInput{
PolicyDocument: aws.String(`{
"Version": "2012-10-17",
"Statement": [
{
"Action": "ec2:*",
"Effect": "Allow",
"Resource": "*"
}
]
}`),
PolicyName: aws.String("EC2Access"),
RoleName: aws.String("devpod-ec2-role"),
}

_, err = svc.PutRolePolicy(ctx, policyInput)
if err != nil {
return "", err
}

instanceProfile := &iam.CreateInstanceProfileInput{
InstanceProfileName: aws.String("devpod-ec2-role"),
}
Expand Down Expand Up @@ -650,6 +662,11 @@ func Create(
MinCount: aws.Int32(1),
MaxCount: aws.Int32(1),
SecurityGroupIds: devpodSG,
MetadataOptions: &types.InstanceMetadataOptionsRequest{
HttpEndpoint: types.InstanceMetadataEndpointStateEnabled,
HttpTokens: types.HttpTokensStateRequired,
HttpPutResponseHopLimit: aws.Int32(1),
},
BlockDeviceMappings: []types.BlockDeviceMapping{
{
DeviceName: aws.String(providerAws.Config.RootDevice),
Expand Down