Skip to content

more finetuning and modifications for aws integration #166

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
Feb 24, 2025
Merged

more finetuning and modifications for aws integration #166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
955e992
more finetuning and modifications for aws integration
Feb 24, 2025
29e388a
update example
Feb 24, 2025
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
22 changes: 22 additions & 0 deletions pkg/merger/merger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,28 @@ func MergeConfigFiles(
}
}

if extraConfig.Integrations.AWS != nil {
if config.Integrations.AWS == nil {
config.Integrations.AWS = extraConfig.Integrations.AWS
} else {
config.Integrations.AWS.Enable = extraConfig.Integrations.AWS.Enable

config.Integrations.AWS.RoleNameToAssume = extraConfig.Integrations.AWS.RoleNameToAssume
config.Integrations.AWS.PrimaryAccountID = extraConfig.Integrations.AWS.PrimaryAccountID
config.Integrations.AWS.PrimaryRegion = extraConfig.Integrations.AWS.PrimaryRegion

if extraConfig.Integrations.AWS.PrimaryRegion != "" {
config.Integrations.AWS.PrimaryRegion = extraConfig.Integrations.AWS.PrimaryRegion
}
if extraConfig.Integrations.AWS.TargetRegions != nil {
config.Integrations.AWS.TargetRegions = extraConfig.Integrations.AWS.TargetRegions
}
if extraConfig.Integrations.AWS.TargetAccounts != nil {
config.Integrations.AWS.TargetAccounts = extraConfig.Integrations.AWS.TargetAccounts
}
}
}

if len(extraConfig.IgnoreDirs) > 0 {
config.IgnoreDirs = extraConfig.IgnoreDirs
}
Expand Down
46 changes: 32 additions & 14 deletions pkg/merger/merger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ func TestMergeConfigFiles(t *testing.T) {
SeverityThreshold: models.SeverityHigh,
PriorityThreshold: models.PriorityImportant,
},
AWS: &models.AWS{
Enable: true,
RoleNameToAssume: "nullify-role",
PrimaryAccountID: "123456789012",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-2", "us-east-2"},
TargetAccounts: &[]string{"123456789012", "123456789013"},
},
},
},
expected: &models.Configuration{
Expand Down Expand Up @@ -140,6 +148,14 @@ func TestMergeConfigFiles(t *testing.T) {
SeverityThreshold: models.SeverityHigh,
PriorityThreshold: models.PriorityImportant,
},
AWS: &models.AWS{
Enable: true,
RoleNameToAssume: "nullify-role",
PrimaryAccountID: "123456789012",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-2", "us-east-2"},
TargetAccounts: &[]string{"123456789012", "123456789013"},
},
},
},
},
Expand Down Expand Up @@ -204,6 +220,14 @@ func TestMergeConfigFiles(t *testing.T) {
Low: "low",
},
},
AWS: &models.AWS{
Enable: true,
RoleNameToAssume: "nullify-role",
PrimaryAccountID: "123456789012",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-2", "us-east-2"},
TargetAccounts: &[]string{"123456789012", "123456789013"},
},
},
},
repoConfig: nil,
Expand Down Expand Up @@ -269,6 +293,14 @@ func TestMergeConfigFiles(t *testing.T) {
Low: "low",
},
},
AWS: &models.AWS{
Enable: true,
RoleNameToAssume: "nullify-role",
PrimaryAccountID: "123456789012",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-2", "us-east-2"},
TargetAccounts: &[]string{"123456789012", "123456789013"},
},
},
},
},
Expand Down Expand Up @@ -423,13 +455,6 @@ func TestMergeConfigFiles(t *testing.T) {
globalConfig: &models.Configuration{
AttackSurface: &models.AttackSurface{
Enable: true,
AWSIntegration: &models.AWSIntegration{
Enable: true,
PrimaryAccountID: "111111111111",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-1", "us-east-2"},
TargetAccounts: &[]string{"222222222222", "333333333333"},
},
},
},
repoConfig: nil,
Expand All @@ -440,13 +465,6 @@ func TestMergeConfigFiles(t *testing.T) {
PriorityThreshold: parser.DefaultPriorityThreshold,
AttackSurface: &models.AttackSurface{
Enable: true,
AWSIntegration: &models.AWSIntegration{
Enable: true,
PrimaryAccountID: "111111111111",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-1", "us-east-2"},
TargetAccounts: &[]string{"222222222222", "333333333333"},
},
},
},
},
Expand Down
10 changes: 0 additions & 10 deletions pkg/models/attack_surface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,11 @@ type AttackSurface struct {
// global only
Enable bool `yaml:"enable"`
EnableDNSEnumeration bool `yaml:"enable_dns_enumeration"`
AWSIntegration *AWSIntegration `yaml:"aws_integration"`
Hosts []string `yaml:"hosts,omitempty"`
IncludeOnly []AttackSurfaceIncludeOnly `yaml:"include_only,omitempty"`
Ignore []AttackSurfaceIgnore `yaml:"ignore,omitempty"`
}

type AWSIntegration struct {
Enable bool `yaml:"enable"`
RoleNameToAssume string `yaml:"role_name_to_assume"`
PrimaryAccountID string `yaml:"primary_account_id,omitempty"`
PrimaryRegion string `yaml:"primary_region,omitempty"`
TargetRegions *[]string `yaml:"target_regions,omitempty"`
TargetAccounts *[]string `yaml:"target_accounts,omitempty"`
}

type AttackSurfaceIncludeOnly struct {
Hosts []string `yaml:"hosts,omitempty"`
HTTP *HTTPAttackSurfaceIncludeOnly `yaml:"http,omitempty"`
Expand Down
10 changes: 10 additions & 0 deletions pkg/models/integrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package models

type Integrations struct {
Jira *Jira `yaml:"jira,omitempty"`
AWS *AWS `yaml:"aws,omitempty"`
}

type Jira struct {
Expand Down Expand Up @@ -31,3 +32,12 @@ type Assignee struct {
Name string `yaml:"name,omitempty"`
ID string `yaml:"id,omitempty"`
}

type AWS struct {
Enable bool `yaml:"enable"`
RoleNameToAssume string `yaml:"role_name_to_assume"`
PrimaryAccountID string `yaml:"primary_account_id"`
PrimaryRegion string `yaml:"primary_region"`
TargetRegions *[]string `yaml:"target_regions,omitempty"`
TargetAccounts *[]string `yaml:"target_accounts,omitempty"`
}
16 changes: 8 additions & 8 deletions tests/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ func TestIntegration(t *testing.T) {
PriorityThreshold: models.PriorityImportant,
OnFixTransition: "Done",
},
AWS: &models.AWS{
Enable: true,
RoleNameToAssume: "nullify-role",
PrimaryAccountID: "123456789012",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-2", "us-east-2"},
TargetAccounts: &[]string{"123456789012", "123456789013"},
},
},
AttackSurface: &models.AttackSurface{
Enable: true,
Expand Down Expand Up @@ -188,14 +196,6 @@ func TestIntegration(t *testing.T) {
},
},
},
AWSIntegration: &models.AWSIntegration{
Enable: true,
PrimaryAccountID: "123456789012",
PrimaryRegion: "ap-southeast-2",
TargetRegions: &[]string{"ap-southeast-2", "us-east-2"},
TargetAccounts: &[]string{"123456789012", "123456789013"},
RoleNameToAssume: "nullify-role",
},
},
}

Expand Down
15 changes: 8 additions & 7 deletions tests/nullify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ integrations:
severity_threshold: HIGH
priority_threshold: IMPORTANT
on_fix_transition: Done
aws:
enable: true
role_name_to_assume: nullify-role
primary_account_id: 123456789012
primary_region: ap-southeast-2
target_regions: [ap-southeast-2, us-east-2]
target_accounts: [123456789012, 123456789013]
attack_surface:
enable: true
enable_dns_enumeration: true
Expand All @@ -114,10 +121,4 @@ attack_surface:
http:
paths: [/auth]
methods: [POST]
aws_integration:
enable: true
role_name_to_assume: nullify-role
primary_account_id: 123456789012
primary_region: ap-southeast-2
target_regions: [ap-southeast-2, us-east-2]
target_accounts: [123456789012, 123456789013]

Loading