Merge pull request #66 from BishopFox/seth-dev

Seth dev

README.md

@@ -14,8 +14,12 @@ CloudFox helps you gain situational awareness in unfamiliar cloud environments.
 
 ## Demos, Examples, Walkthroughs
 * [Blog - Introducing: CloudFox](https://bishopfox.com/blog/introducing-cloudfox)
+* [Video - Penetration Testing with CloudFox](https://www.youtube.com/watch?v=Ljt_JUp5HbM)
 * [Video - CloudFox Intro Demos](https://www.youtube.com/watch?v=ReWoUgpUuiQ)
-* [Video - Tool Talk: CloudFox AWS sub-command walkthroughs](https://youtu.be/KKsYfL5uVU4?t=360) 
+* [Video - Tool Talk: CloudFox AWS sub-command walkthroughs](https://youtu.be/KKsYfL5uVU4?t=360)
+
+## Intentionally Vulnerable Playground 
+* [CloudFoxable - A Gamified Cloud Hacking Sandbox](https://cloudfoxable.bishopfox.com/)
 
 ## Quick Start
 CloudFox is modular (you can run one command at a time), but there is an `aws all-checks` command that will run the other aws commands for you with sane defaults: 

aws/access-keys.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
 	"github.com/BishopFox/cloudfox/internal"
@@ -18,9 +19,10 @@ type AccessKeysModule struct {
 	IAMClient      sdk.AWSIAMClientInterface
 	Caller         sts.GetCallerIdentityOutput
 	AWSProfile     string
-	OutputFormat   string
 	Goroutines     int
 	WrapTable      bool
+	AWSOutputType  string
+	AWSTableCols   string
 	CommandCounter internal.CommandCounter
 
 	// Main module data
@@ -36,7 +38,7 @@ type UserKeys struct {
 	Key      string
 }
 
-func (m *AccessKeysModule) PrintAccessKeys(filter string, outputFormat string, outputDirectory string, verbosity int) {
+func (m *AccessKeysModule) PrintAccessKeys(filter string, outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -55,6 +57,7 @@ func (m *AccessKeysModule) PrintAccessKeys(filter string, outputFormat string, o
 
 	// Variables used to draw table output
 	m.output.Headers = []string{
+		"Account",
 		"User Name",
 		"Access Key ID",
 	}
@@ -65,6 +68,7 @@ func (m *AccessKeysModule) PrintAccessKeys(filter string, outputFormat string, o
 			m.output.Body = append(
 				m.output.Body,
 				[]string{
+					aws.ToString(m.Caller.Account),
 					key.Username,
 					key.Key,
 				},
@@ -79,9 +83,6 @@ func (m *AccessKeysModule) PrintAccessKeys(filter string, outputFormat string, o
 		//fmt.Printf("[%s][%s] Preparing output.\n\n")
 
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -89,10 +90,37 @@ func (m *AccessKeysModule) PrintAccessKeys(filter string, outputFormat string, o
 				Wrap: m.WrapTable,
 			},
 		}
+
+		// If the user specified table columns, use those.
+		// If the user specified -o wide, use the wide default cols for this module.
+		// Otherwise, use the hardcoded default cols for this module.
+		var tableCols []string
+		// If the user specified table columns, use those.
+		if m.AWSTableCols != "" {
+			// remove any spaces between any commas and the first letter after the commas
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+			tableCols = strings.Split(m.AWSTableCols, ",")
+			// If the user specified wide as the output format, use these columns.
+		} else if m.AWSOutputType == "wide" {
+			tableCols = []string{
+				"Account",
+				"User Name",
+				"Access Key ID",
+			}
+			// Otherwise, use the default columns.
+		} else {
+			tableCols = []string{
+				"User Name",
+				"Access Key ID",
+			}
+		}
+
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/buckets.go

@@ -20,24 +20,26 @@ import (
 type BucketsModule struct {
 	// General configuration data
 	//BucketsS3Client CloudFoxS3Client
-	S3Client   sdk.AWSS3ClientInterface
-	AWSRegions []string
-	AWSProfile string
-	Caller     sts.GetCallerIdentityOutput
+	CheckBucketPolicies bool
+	S3Client            sdk.AWSS3ClientInterface
+	AWSRegions          []string
+	AWSProfile          string
+	Caller              sts.GetCallerIdentityOutput
+	AWSTableCols        string
+	AWSOutputType       string
 
-	OutputFormat string
-	Goroutines   int
-	WrapTable    bool
+	Goroutines int
+	WrapTable  bool
 
 	// Main module data
-	Buckets        []Bucket
+	Buckets        []BucketRow
 	CommandCounter internal.CommandCounter
 	// Used to store output data for pretty printing
 	output internal.OutputData2
 	modLog *logrus.Entry
 }
 
-type Bucket struct {
+type BucketRow struct {
 	Arn                   string
 	AWSService            string
 	Region                string
@@ -53,7 +55,7 @@ type Bucket struct {
 	ResourcePolicySummary string
 }
 
-func (m *BucketsModule) PrintBuckets(outputFormat string, outputDirectory string, verbosity int) {
+func (m *BucketsModule) PrintBuckets(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -78,7 +80,7 @@ func (m *BucketsModule) PrintBuckets(outputFormat string, outputDirectory string
 	go internal.SpinUntil(m.output.CallingModule, &m.CommandCounter, spinnerDone, "tasks")
 
 	//create a channel to receive the objects
-	dataReceiver := make(chan Bucket)
+	dataReceiver := make(chan BucketRow)
 
 	// Create a channel to signal to stop
 	receiverDone := make(chan bool)
@@ -100,6 +102,7 @@ func (m *BucketsModule) PrintBuckets(outputFormat string, outputDirectory string
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
+		"Account",
 		"Name",
 		"Region",
 		"Public?",
@@ -111,17 +114,16 @@ func (m *BucketsModule) PrintBuckets(outputFormat string, outputDirectory string
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Buckets[i].Name,
 				m.Buckets[i].Region,
 				m.Buckets[i].IsPublic,
 				m.Buckets[i].ResourcePolicySummary,
 			},
 		)
-
 	}
+
 	if len(m.output.Body) > 0 {
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -129,10 +131,47 @@ func (m *BucketsModule) PrintBuckets(outputFormat string, outputDirectory string
 				Wrap: m.WrapTable,
 			},
 		}
+
+		// If the user specified table columns, use those.
+		// If the user specified -o wide, use the wide default cols for this module.
+		// Otherwise, use the hardcoded default cols for this module.
+		var tableCols []string
+		// If the user specified table columns, use those.
+		if m.AWSTableCols != "" {
+			// remove any spaces between any commas and the first letter after the commas
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+			tableCols = strings.Split(m.AWSTableCols, ",")
+			// If the user specified wide as the output format, use these columns.
+		} else if m.AWSOutputType == "wide" {
+			tableCols = []string{
+				"Account",
+				"Name",
+				"Region",
+				"Public?",
+				"Resource Policy Summary",
+			}
+			// Otherwise, use the default columns for this module (brief)
+		} else {
+			tableCols = []string{
+				"Name",
+				"Region",
+				"Public?",
+				"Resource Policy Summary",
+			}
+		}
+
+		// Remove the Public? and Resource Policy Summary columns if the user did not specify CheckBucketPolicies
+		if !m.CheckBucketPolicies {
+			tableCols = removeStringFromSlice(tableCols, "Public?")
+			tableCols = removeStringFromSlice(tableCols, "Resource Policy Summary")
+		}
+
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			TableCols: tableCols,
+			Body:      m.output.Body,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -148,7 +187,7 @@ func (m *BucketsModule) PrintBuckets(outputFormat string, outputDirectory string
 	fmt.Printf("[%s][%s] For context and next steps: https://github.com/BishopFox/cloudfox/wiki/AWS-Commands#%s\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), m.output.CallingModule)
 }
 
-func (m *BucketsModule) Receiver(receiver chan Bucket, receiverDone chan bool) {
+func (m *BucketsModule) Receiver(receiver chan BucketRow, receiverDone chan bool) {
 	defer close(receiverDone)
 	for {
 		select {
@@ -161,7 +200,7 @@ func (m *BucketsModule) Receiver(receiver chan Bucket, receiverDone chan bool) {
 	}
 }
 
-func (m *BucketsModule) executeChecks(wg *sync.WaitGroup, semaphore chan struct{}, dataReceiver chan Bucket) {
+func (m *BucketsModule) executeChecks(wg *sync.WaitGroup, semaphore chan struct{}, dataReceiver chan BucketRow) {
 	defer wg.Done()
 
 	m.CommandCounter.Total++
@@ -215,7 +254,7 @@ func (m *BucketsModule) writeLoot(outputDirectory string, verbosity int, profile
 
 }
 
-func (m *BucketsModule) createBucketsRows(verbosity int, wg *sync.WaitGroup, semaphore chan struct{}, dataReceiver chan Bucket) {
+func (m *BucketsModule) createBucketsRows(verbosity int, wg *sync.WaitGroup, semaphore chan struct{}, dataReceiver chan BucketRow) {
 	defer func() {
 		m.CommandCounter.Executing--
 		m.CommandCounter.Complete++
@@ -237,42 +276,49 @@ func (m *BucketsModule) createBucketsRows(verbosity int, wg *sync.WaitGroup, sem
 	}
 
 	for _, b := range ListBuckets {
-		bucket := &Bucket{
+		bucket := &BucketRow{
 			Name:       aws.ToString(b.Name),
 			AWSService: "S3",
 		}
 		region, err = sdk.CachedGetBucketLocation(m.S3Client, aws.ToString(m.Caller.Account), aws.ToString(b.Name))
 		if err != nil {
 			m.modLog.Error(err.Error())
+			region = "Unknown"
+
 		}
 		bucket.Region = region
 
-		policyJSON, err := sdk.CachedGetBucketPolicy(m.S3Client, aws.ToString(m.Caller.Account), region, aws.ToString(b.Name))
-		if err != nil {
-			m.modLog.Error(err.Error())
-		} else {
-			bucket.PolicyJSON = policyJSON
-		}
+		if m.CheckBucketPolicies {
 
-		policy, err := policy.ParseJSONPolicy([]byte(policyJSON))
-		if err != nil {
-			m.modLog.Error(fmt.Sprintf("parsing bucket access policy (%s) as JSON: %s", name, err))
-		} else {
-			bucket.Policy = policy
-		}
+			policyJSON, err := sdk.CachedGetBucketPolicy(m.S3Client, aws.ToString(m.Caller.Account), region, aws.ToString(b.Name))
+			if err != nil {
+				m.modLog.Error(err.Error())
+			} else {
+				bucket.PolicyJSON = policyJSON
+			}
 
-		bucket.IsPublic = "No"
-		if !bucket.Policy.IsEmpty() {
-			m.analyseBucketPolicy(bucket, dataReceiver)
+			policy, err := policy.ParseJSONPolicy([]byte(policyJSON))
+			if err != nil {
+				m.modLog.Error(fmt.Sprintf("parsing bucket access policy (%s) as JSON: %s", name, err))
+			} else {
+				bucket.Policy = policy
+			}
+
+			bucket.IsPublic = "No"
+			if !bucket.Policy.IsEmpty() {
+				m.analyseBucketPolicy(bucket, dataReceiver)
+			} else {
+				bucket.Access = "No resource policy"
+				dataReceiver <- *bucket
+			}
 		} else {
-			bucket.Access = "No resource policy"
+
+			// Send Bucket object through the channel to the receiver
+			bucket.Access = "Skipped"
+			bucket.IsPublic = "Skipped"
 			dataReceiver <- *bucket
 		}
-
-		// Send Bucket object through the channel to the receiver
-
 	}
-
 }
 
 func (m *BucketsModule) isPublicAccessBlocked(bucketName string, r string) bool {
@@ -284,7 +330,7 @@ func (m *BucketsModule) isPublicAccessBlocked(bucketName string, r string) bool
 
 }
 
-func (m *BucketsModule) analyseBucketPolicy(bucket *Bucket, dataReceiver chan Bucket) {
+func (m *BucketsModule) analyseBucketPolicy(bucket *BucketRow, dataReceiver chan BucketRow) {
 	m.storeAccessPolicy(bucket)
 
 	if bucket.Policy.IsPublic() && !bucket.Policy.IsConditionallyPublic() && !m.isPublicAccessBlocked(bucket.Name, bucket.Region) {
@@ -299,14 +345,14 @@ func (m *BucketsModule) analyseBucketPolicy(bucket *Bucket, dataReceiver chan Bu
 		} else {
 			bucket.ResourcePolicySummary = statement.GetStatementSummaryInEnglish(*m.Caller.Account)
 		}
-		bucket.ResourcePolicySummary = strings.TrimSuffix(bucket.ResourcePolicySummary, "\n")
+		//bucket.ResourcePolicySummary = strings.TrimSuffix(bucket.ResourcePolicySummary, "\n")
 
 	}
 	dataReceiver <- *bucket
 
 }
 
-func (m *BucketsModule) storeAccessPolicy(bucket *Bucket) {
+func (m *BucketsModule) storeAccessPolicy(bucket *BucketRow) {
 	f := filepath.Join(m.getLootDir(), fmt.Sprintf("%s.json", bucket.Name))
 
 	if err := m.storeFile(f, bucket.PolicyJSON); err != nil {

aws/buckets_test.go

@@ -81,9 +81,11 @@ func TestListBuckets(t *testing.T) {
 			Arn:     aws.String("arn:aws:iam::123456789012:user/cloudfox_unit_tests"),
 			Account: aws.String("123456789012"),
 		},
-		AWSRegions: []string{"us-east-1", "us-west-1", "us-west-2"},
-		AWSProfile: "unittesting",
-		Goroutines: 3,
+		AWSRegions:          []string{"us-east-1", "us-west-1", "us-west-2"},
+		AWSProfile:          "unittesting",
+		AWSOutputType:       "",
+		CheckBucketPolicies: true,
+		Goroutines:          3,
 	}
 
 	subtests := []struct {
@@ -91,14 +93,14 @@ func TestListBuckets(t *testing.T) {
 		outputDirectory string
 		verbosity       int
 		testModule      BucketsModule
-		expectedResult  []Bucket
+		expectedResult  []BucketRow
 	}{
 		{
 			name:            "test1",
 			outputDirectory: ".",
 			verbosity:       2,
 			testModule:      m,
-			expectedResult: []Bucket{{
+			expectedResult: []BucketRow{{
 				Name: "mockBucket123",
 			}},
 		},
@@ -110,7 +112,7 @@ func TestListBuckets(t *testing.T) {
 
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.PrintBuckets(subtest.testModule.OutputFormat, subtest.outputDirectory, subtest.verbosity)
+			subtest.testModule.PrintBuckets(subtest.outputDirectory, subtest.verbosity)
 			for index, expectedBucket := range subtest.expectedResult {
 				resultsFilePath := filepath.Join(tmpDir, "cloudfox-output/aws/unittesting-123456789012/table/buckets.txt")
 				resultsFile, err := afero.ReadFile(fs, resultsFilePath)

aws/client-initializers.go

@@ -7,9 +7,11 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ecr"
 	"github.com/aws/aws-sdk-go-v2/service/efs"
 	"github.com/aws/aws-sdk-go-v2/service/fsx"
+	"github.com/aws/aws-sdk-go-v2/service/glue"
 	"github.com/aws/aws-sdk-go-v2/service/lambda"
 	"github.com/aws/aws-sdk-go-v2/service/organizations"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	"github.com/aws/aws-sdk-go-v2/service/sns"
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
@@ -28,13 +30,13 @@ func initIAMSimClient(iamSimPPClient sdk.AWSIAMClientInterface, caller sts.GetCa
 
 }
 
-func InitCloudFoxSNSClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSWrapTable bool) SNSModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitCloudFoxSNSClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSWrapTable bool, AWSMFAToken string) SNSModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	cloudFoxSNSClient := SNSModule{
 		SNSClient:  sns.NewFromConfig(AWSConfig),
 		Caller:     caller,
 		AWSProfile: AWSProfile,
-		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 		Goroutines: Goroutines,
 		WrapTable:  AWSWrapTable,
 	}
@@ -42,25 +44,25 @@ func InitCloudFoxSNSClient(caller sts.GetCallerIdentityOutput, AWSProfile string
 
 }
 
-func initCloudFoxS3Client(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string) BucketsModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func initCloudFoxS3Client(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, AWSMFAToken string) BucketsModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	cloudFoxS3Client := BucketsModule{
 		S3Client:   s3.NewFromConfig(AWSConfig),
 		Caller:     caller,
 		AWSProfile: AWSProfile,
-		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 	}
 	return cloudFoxS3Client
 
 }
 
-func InitSQSClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int) SQSModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitSQSClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) SQSModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	sqsClient := SQSModule{
 		SQSClient: sqs.NewFromConfig(AWSConfig),
 
 		Caller:     caller,
-		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 		AWSProfile: AWSProfile,
 		Goroutines: Goroutines,
 	}
@@ -69,58 +71,68 @@ func InitSQSClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVers
 
 }
 
-func InitLambdaClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int) LambdasModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitLambdaClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) LambdasModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	lambdaClient := LambdasModule{
 		LambdaClient: lambda.NewFromConfig(AWSConfig),
 		Caller:       caller,
 		AWSProfile:   AWSProfile,
-		AWSRegions:   internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions:   internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 	}
 	return lambdaClient
 }
 
-func InitCodeBuildClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int) CodeBuildModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitCodeBuildClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) CodeBuildModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	codeBuildClient := CodeBuildModule{
 		CodeBuildClient: codebuild.NewFromConfig(AWSConfig),
 		Caller:          caller,
 		AWSProfile:      AWSProfile,
-		AWSRegions:      internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions:      internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 	}
 	return codeBuildClient
 }
 
-func InitECRClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int) ECRModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitECRClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) ECRModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	ecrClient := ECRModule{
 		ECRClient:  ecr.NewFromConfig(AWSConfig),
 		Caller:     caller,
 		AWSProfile: AWSProfile,
-		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 	}
 	return ecrClient
 }
 
-func InitFileSystemsClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int) FilesystemsModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitFileSystemsClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) FilesystemsModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	fileSystemsClient := FilesystemsModule{
 		EFSClient:  efs.NewFromConfig(AWSConfig),
 		FSxClient:  fsx.NewFromConfig(AWSConfig),
 		Caller:     caller,
 		AWSProfile: AWSProfile,
-		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions: internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 	}
 	return fileSystemsClient
 }
 
-func InitOrgClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int) OrgModule {
-	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion)
+func InitOrgClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) OrgModule {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
 	orgClient := OrgModule{
 		OrganizationsClient: organizations.NewFromConfig(AWSConfig),
 		Caller:              caller,
 		AWSProfile:          AWSProfile,
-		AWSRegions:          internal.GetEnabledRegions(AWSProfile, cfVersion),
+		AWSRegions:          internal.GetEnabledRegions(AWSProfile, cfVersion, AWSMFAToken),
 	}
 	return orgClient
 }
+
+func InitSecretsManagerClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) *secretsmanager.Client {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
+	return secretsmanager.NewFromConfig(AWSConfig)
+}
+
+func InitGlueClient(caller sts.GetCallerIdentityOutput, AWSProfile string, cfVersion string, Goroutines int, AWSMFAToken string) *glue.Client {
+	var AWSConfig = internal.AWSConfigFileLoader(AWSProfile, cfVersion, AWSMFAToken)
+	return glue.NewFromConfig(AWSConfig)
+}

aws/cloudformation.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -20,12 +21,13 @@ type CloudformationModule struct {
 	// General configuration data
 	CloudFormationClient sdk.CloudFormationClientInterface
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	Goroutines    int
+	AWSProfile    string
+	WrapTable     bool
+	AWSOutputType string
+	AWSTableCols  string
 
 	// Main module data
 	CFStacks       []CFStack
@@ -45,7 +47,7 @@ type CFStack struct {
 	Template   string
 }
 
-func (m *CloudformationModule) PrintCloudformationStacks(outputFormat string, outputDirectory string, verbosity int) {
+func (m *CloudformationModule) PrintCloudformationStacks(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -93,48 +95,45 @@ func (m *CloudformationModule) PrintCloudformationStacks(outputFormat string, ou
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Name",
 		"Role",
-		// "Parameters",
-		// "Outputs",
+		"Parameters",
+		"Outputs",
 	}
 
 	// Table rows
 	for i := range m.CFStacks {
-		// var isParameters string
-		// var isOutputs string
-		// if m.CFStacks[i].Parameters != nil {
-		// 	isParameters = "Y"
-		// } else {
-		// 	isParameters = "N"
-		// }
-		// if m.CFStacks[i].Outputs != nil {
-		// 	isOutputs = "Y"
-		// } else {
-		// 	isOutputs = "N"
-		// }
+		var hasParameters string
+		var hasOutputs string
+		if m.CFStacks[i].Parameters != nil {
+			hasParameters = "Y"
+		} else {
+			hasParameters = "N"
+		}
+		if m.CFStacks[i].Outputs != nil {
+			hasOutputs = "Y"
+		} else {
+			hasOutputs = "N"
+		}
 
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.CFStacks[i].AWSService,
 				m.CFStacks[i].Region,
 				m.CFStacks[i].Name,
 				m.CFStacks[i].Role,
-				// isParameters,
-				// isOutputs,
+				hasParameters,
+				hasOutputs,
 			},
 		)
 
 	}
 	if len(m.output.Body) > 0 {
-		//	m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", aws.ToString(m.Caller.Account),m.AWSProfile))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -142,10 +141,43 @@ func (m *CloudformationModule) PrintCloudformationStacks(outputFormat string, ou
 				Wrap: m.WrapTable,
 			},
 		}
+
+		// If the user specified table columns, use those.
+		// If the user specified -o wide, use the wide default cols for this module.
+		// Otherwise, use the hardcoded default cols for this module.
+		var tableCols []string
+		// If the user specified table columns, use those.
+		if m.AWSTableCols != "" {
+			// remove any spaces between any commas and the first letter after the commas
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+			tableCols = strings.Split(m.AWSTableCols, ",")
+			// If the user specified wide as the output format, use these columns.
+		} else if m.AWSOutputType == "wide" {
+			tableCols = []string{
+				"Account",
+				"Service",
+				"Region",
+				"Name",
+				"Role",
+				"Parameters",
+				"Outputs",
+			}
+			// Otherwise, use the default columns.
+		} else {
+			tableCols = []string{
+				"Service",
+				"Region",
+				"Name",
+				"Role",
+			}
+		}
+
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/cloudformation_test.go

@@ -25,7 +25,6 @@ func TestCloudFormation(t *testing.T) {
 			testModule: CloudformationModule{
 				CloudFormationClient: &sdk.MockedCloudformationClient{},
 				Caller:               sts.GetCallerIdentityOutput{Arn: aws.String("test")},
-				OutputFormat:         "table",
 				AWSProfile:           "test",
 				Goroutines:           30,
 				AWSRegions:           AWSRegions,
@@ -39,7 +38,7 @@ func TestCloudFormation(t *testing.T) {
 	internal.MockFileSystem(true)
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.PrintCloudformationStacks(subtest.testModule.OutputFormat, subtest.outputDirectory, subtest.verbosity)
+			subtest.testModule.PrintCloudformationStacks(subtest.outputDirectory, subtest.verbosity)
 			for index, expectedStack := range subtest.expectedResult {
 				if expectedStack.Name != subtest.testModule.CFStacks[index].Name {
 					log.Fatal("Stack name does not match expected name")

aws/codebuild.go

@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -18,9 +19,11 @@ type CodeBuildModule struct {
 	CodeBuildClient sdk.CodeBuildClientInterface
 	IAMClient       sdk.AWSIAMClientInterface
 
-	Caller         sts.GetCallerIdentityOutput
-	AWSRegions     []string
-	OutputFormat   string
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	Goroutines     int
 	AWSProfile     string
 	SkipAdminCheck bool
@@ -46,7 +49,7 @@ type Project struct {
 	CanPrivEsc string
 }
 
-func (m *CodeBuildModule) PrintCodeBuildProjects(outputFormat string, outputDirectory string, verbosity int) {
+func (m *CodeBuildModule) PrintCodeBuildProjects(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -107,50 +110,66 @@ func (m *CodeBuildModule) PrintCodeBuildProjects(outputFormat string, outputDire
 	}
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
-	if m.pmapperError == nil {
-		m.output.Headers = []string{
+	m.output.Headers = []string{
+		"Account",
+		"Region",
+		"Name",
+		"Role",
+		"IsAdminRole?",
+		"CanPrivEscToAdmin?",
+	}
+
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
 			"Region",
 			"Name",
 			"Role",
 			"IsAdminRole?",
 			"CanPrivEscToAdmin?",
 		}
+		// Otherwise, use the default columns.
 	} else {
-		m.output.Headers = []string{
+		tableCols = []string{
 			"Region",
 			"Name",
 			"Role",
 			"IsAdminRole?",
-			//"CanPrivEscToAdmin?",
+			"CanPrivEscToAdmin?",
 		}
 	}
 
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
+	}
+
 	// Table rows
 
 	for i := range m.Projects {
-		if m.pmapperError == nil {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					m.Projects[i].Region,
-					m.Projects[i].Name,
-					m.Projects[i].Role,
-					m.Projects[i].Admin,
-					m.Projects[i].CanPrivEsc,
-				},
-			)
-		} else {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					m.Projects[i].Region,
-					m.Projects[i].Name,
-					m.Projects[i].Role,
-					m.Projects[i].Admin,
-				},
-			)
-
-		}
+		m.output.Body = append(
+			m.output.Body,
+			[]string{
+				aws.ToString(m.Caller.Account),
+				m.Projects[i].Region,
+				m.Projects[i].Name,
+				m.Projects[i].Role,
+				m.Projects[i].Admin,
+				m.Projects[i].CanPrivEsc,
+			},
+		)
 	}
 
 	var seen []string
@@ -162,11 +181,6 @@ func (m *CodeBuildModule) PrintCodeBuildProjects(outputFormat string, outputDire
 
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
-		//fmt.Printf("[%s][%s] %d projects with a total of %d node groups found.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), len(seen), len(m.output.Body))
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -175,9 +189,10 @@ func (m *CodeBuildModule) PrintCodeBuildProjects(outputFormat string, outputDire
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/codebuild_test.go

@@ -124,7 +124,7 @@ func TestCodeBuildProjects(t *testing.T) {
 	tmpDir := "."
 
 	// execute the module with verbosity set to 2
-	m.PrintCodeBuildProjects("table", tmpDir, 2)
+	m.PrintCodeBuildProjects(tmpDir, 2)
 
 	resultsFilePath := filepath.Join(tmpDir, "cloudfox-output/aws/unittesting-123456789012/table/codebuild.txt")
 	resultsFile, err := afero.ReadFile(fs, resultsFilePath)

aws/databases.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -23,12 +24,14 @@ type DatabasesModule struct {
 	DynamoDBClient sdk.DynamoDBClientInterface
 	DocDBClient    sdk.DocDBClientInterface
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	Databases      []Database
 	CommandCounter internal.CommandCounter
@@ -52,7 +55,7 @@ type Database struct {
 	Size       string
 }
 
-func (m *DatabasesModule) PrintDatabases(outputFormat string, outputDirectory string, verbosity int) {
+func (m *DatabasesModule) PrintDatabases(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -101,6 +104,7 @@ func (m *DatabasesModule) PrintDatabases(outputFormat string, outputDirectory st
 	})
 
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Engine",
 		"Region",
@@ -114,11 +118,47 @@ func (m *DatabasesModule) PrintDatabases(outputFormat string, outputDirectory st
 
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Engine",
+			"Region",
+			"Name",
+			"Size",
+			"UserName",
+			"Endpoint",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Service",
+			"Engine",
+			"Region",
+			"Name",
+			"Size",
+			"UserName",
+			"Endpoint",
+		}
+	}
+
 	// Table rows
 	for i := range m.Databases {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Databases[i].AWSService,
 				m.Databases[i].Engine,
 				m.Databases[i].Region,
@@ -135,10 +175,7 @@ func (m *DatabasesModule) PrintDatabases(outputFormat string, outputDirectory st
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -147,9 +184,10 @@ func (m *DatabasesModule) PrintDatabases(outputFormat string, outputDirectory st
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -287,7 +325,7 @@ func (m *DatabasesModule) getRdsClustersPerRegion(r string, wg *sync.WaitGroup,
 			endpoint := aws.ToString(instance.Endpoint.Address)
 			engine := aws.ToString(instance.Engine)
 
-			if instance.PubliclyAccessible {
+			if aws.ToBool(instance.PubliclyAccessible) {
 				public = "True"
 			} else {
 				public = "False"
@@ -300,7 +338,7 @@ func (m *DatabasesModule) getRdsClustersPerRegion(r string, wg *sync.WaitGroup,
 				Engine:     engine,
 				Endpoint:   endpoint,
 				UserName:   aws.ToString(instance.MasterUsername),
-				Port:       port,
+				Port:       aws.ToInt32(port),
 				Protocol:   aws.ToString(instance.Engine),
 				Public:     public,
 			}
@@ -344,7 +382,7 @@ func (m *DatabasesModule) getRedshiftDatabasesPerRegion(r string, wg *sync.WaitG
 		//id := workspace.Id
 		endpoint := aws.ToString(cluster.Endpoint.Address)
 
-		if cluster.PubliclyAccessible {
+		if aws.ToBool(cluster.PubliclyAccessible) {
 			public = "True"
 		} else {
 			public = "False"
@@ -355,7 +393,7 @@ func (m *DatabasesModule) getRedshiftDatabasesPerRegion(r string, wg *sync.WaitG
 			Region:     r,
 			Name:       name,
 			Endpoint:   endpoint,
-			Port:       port,
+			Port:       aws.ToInt32(port),
 			Protocol:   protocol,
 			Public:     public,
 		}

aws/ecr.go

@@ -21,13 +21,15 @@ import (
 
 type ECRModule struct {
 	// General configuration data
-	ECRClient    sdk.AWSECRClientInterface
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	ECRClient     sdk.AWSECRClientInterface
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	Repositories   []Repository
@@ -49,7 +51,7 @@ type Repository struct {
 	PolicyJSON string
 }
 
-func (m *ECRModule) PrintECR(outputFormat string, outputDirectory string, verbosity int) {
+func (m *ECRModule) PrintECR(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -95,8 +97,9 @@ func (m *ECRModule) PrintECR(outputFormat string, outputDirectory string, verbos
 	receiverDone <- true
 	<-receiverDone
 
-	// add - if struct is not empty do this. otherwise, dont write anything.
+	// This is the complete list of potential table columns
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Name",
@@ -106,11 +109,53 @@ func (m *ECRModule) PrintECR(outputFormat string, outputDirectory string, verbos
 		"ImageSize",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Region",
+			"Name",
+			"URI",
+			"PushedAt",
+			"ImageTags",
+			"ImageSize",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Name",
+			"URI",
+			"PushedAt",
+			"ImageTags",
+			"ImageSize",
+		}
+	}
+
+	// sort the table by Name
+	sort.Slice(m.Repositories, func(i, j int) bool {
+		return m.Repositories[i].Name < m.Repositories[j].Name
+	})
+
 	// Table rows
 	for i := range m.Repositories {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Repositories[i].AWSService,
 				m.Repositories[i].Region,
 				m.Repositories[i].Name,
@@ -124,10 +169,7 @@ func (m *ECRModule) PrintECR(outputFormat string, outputDirectory string, verbos
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -136,9 +178,10 @@ func (m *ECRModule) PrintECR(outputFormat string, outputDirectory string, verbos
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -239,92 +282,89 @@ func (m *ECRModule) getECRRecordsPerRegion(r string, wg *sync.WaitGroup, semapho
 		<-semaphore
 	}()
 
-	var allImages []types.ImageDetail
-	var repoURI string
-	var repoName string
-
-	DescribeRepositories, err := m.describeRepositories(r)
+	Repositories, err := sdk.CachedECRDescribeRepositories(m.ECRClient, aws.ToString(m.Caller.Account), r)
 	if err != nil {
 		m.modLog.Error(err.Error())
 		m.CommandCounter.Error++
 		return
 	}
 
-	for _, repo := range DescribeRepositories {
-		repoName = aws.ToString(repo.RepositoryName)
-		repoURI = aws.ToString(repo.RepositoryUri)
+	for _, repo := range Repositories {
+		repoName := aws.ToString(repo.RepositoryName)
+		repoURI := aws.ToString(repo.RepositoryUri)
 		//created := *repo.CreatedAt
 		//fmt.Printf("%s, %s, %s", repoName, repoURI, created)
-
-		images, err := m.describeImages(r, repoName)
+		images, err := sdk.CachedECRDescribeImages(m.ECRClient, aws.ToString(m.Caller.Account), r, repoName)
 		if err != nil {
 			m.modLog.Error(err.Error())
 			m.CommandCounter.Error++
-			return
+			continue
 		}
-		allImages = append(allImages, images...)
-	}
 
-	sort.Slice(allImages, func(i, j int) bool {
-		return allImages[i].ImagePushedAt.Format("2006-01-02 15:04:05") < allImages[j].ImagePushedAt.Format("2006-01-02 15:04:05")
-	})
+		sort.Slice(images, func(i, j int) bool {
+			return images[i].ImagePushedAt.Format("2006-01-02 15:04:05") < images[j].ImagePushedAt.Format("2006-01-02 15:04:05")
+		})
 
-	var image types.ImageDetail
-	var imageTags string
+		var image types.ImageDetail
+		var imageTags string
 
-	if len(allImages) > 1 {
-		image = allImages[len(allImages)-1]
-	} else if len(allImages) == 1 {
-		image = allImages[0]
-	} else {
-		return
-	}
+		if len(images) > 1 {
+			image = images[len(images)-1]
+		} else if len(images) == 1 {
+			image = images[0]
+		} else {
+			continue
+		}
 
-	if len(image.ImageTags) > 0 {
-		imageTags = image.ImageTags[0]
-	}
-	//imageTags := image.ImageTags[0]
-	pushedAt := image.ImagePushedAt.Format("2006-01-02 15:04:05")
-	imageSize := aws.ToInt64(image.ImageSizeInBytes)
-	pullURI := fmt.Sprintf("%s:%s", repoURI, imageTags)
+		if len(image.ImageTags) > 0 {
+			imageTags = image.ImageTags[0]
+		} else {
+			imageTags = "No tags"
+		}
 
-	dataReceiver <- Repository{
-		AWSService: "ECR",
-		Name:       repoName,
-		Region:     r,
-		URI:        pullURI,
-		PushedAt:   pushedAt,
-		ImageTags:  imageTags,
-		ImageSize:  imageSize,
+		//imageTags := image.ImageTags[0]
+		pushedAt := image.ImagePushedAt.Format("2006-01-02 15:04:05")
+		imageSize := aws.ToInt64(image.ImageSizeInBytes)
+		pullURI := fmt.Sprintf("%s:%s", repoURI, imageTags)
+
+		dataReceiver <- Repository{
+			AWSService: "ECR",
+			Name:       repoName,
+			Region:     r,
+			URI:        pullURI,
+			PushedAt:   pushedAt,
+			ImageTags:  imageTags,
+			ImageSize:  imageSize,
+		}
 	}
 
 }
 
-func (m *ECRModule) describeRepositories(r string) ([]types.Repository, error) {
+// func (m *ECRModule) describeRepositories(r string) ([]types.Repository, error) {
 
-	var repositories []types.Repository
-	Repositories, err := sdk.CachedECRDescribeRepositories(m.ECRClient, aws.ToString(m.Caller.Account), r)
-	if err != nil {
-		m.CommandCounter.Error++
-		return nil, err
-	}
+// 	var repositories []types.Repository
+// 	Repositories, err := sdk.CachedECRDescribeRepositories(m.ECRClient, aws.ToString(m.Caller.Account), r)
+// 	if err != nil {
+// 		m.CommandCounter.Error++
+// 		return nil, err
+// 	}
 
-	repositories = append(repositories, Repositories...)
+// 	repositories = append(repositories, Repositories...)
 
-	return repositories, nil
-}
+// 	return repositories, nil
+// }
 
-func (m *ECRModule) describeImages(r string, repoName string) ([]types.ImageDetail, error) {
-	var images []types.ImageDetail
+// func (m *ECRModule) describeImages(r string, repoName string) ([]types.ImageDetail, error) {
+// 	var images []types.ImageDetail
 
-	ImageDetails, err := sdk.CachedECRDescribeImages(m.ECRClient, aws.ToString(m.Caller.Account), r, repoName)
-	if err != nil {
-		m.CommandCounter.Error++
-		return nil, err
-	}
-	images = append(images, ImageDetails...)
-	return images, nil
-}
+// 	ImageDetails, err := sdk.CachedECRDescribeImages(m.ECRClient, aws.ToString(m.Caller.Account), r, repoName)
+// 	if err != nil {
+// 		m.CommandCounter.Error++
+// 		return nil, err
+// 	}
+// 	images = append(images, ImageDetails...)
+// 	return images, nil
+// }
 
 func (m *ECRModule) getECRRepositoryPolicy(r string, repository string) (policy.Policy, error) {
 	var repoPolicy policy.Policy

aws/ecr_test.go

@@ -1,52 +1,15 @@
 package aws
 
 import (
-	"context"
 	"log"
 	"testing"
-	"time"
 
+	"github.com/BishopFox/cloudfox/aws/sdk"
 	"github.com/BishopFox/cloudfox/internal"
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/ecr"
-	"github.com/aws/aws-sdk-go-v2/service/ecr/types"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 )
 
-var AWSRegions = []string{"us-east-1", "us-east-2", "us-west-1", "us-west-2", "af-south-1", "ap-east-1", "ap-south-1", "ap-northeast-3", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-south-1", "eu-west-3", "eu-north-1", "me-south-1", "sa-east-1"}
-
-type MockedECRClient struct {
-}
-
-func (m *MockedECRClient) DescribeRepositories(ctx context.Context, params *ecr.DescribeRepositoriesInput, optFns ...func(*ecr.Options)) (*ecr.DescribeRepositoriesOutput, error) {
-	return &ecr.DescribeRepositoriesOutput{
-		Repositories: []types.Repository{
-			{
-				RepositoryName: aws.String("test1"),
-				RepositoryUri:  aws.String("testURI"),
-			},
-		},
-	}, nil
-}
-
-func (m *MockedECRClient) DescribeImages(context.Context, *ecr.DescribeImagesInput, ...func(*ecr.Options)) (*ecr.DescribeImagesOutput, error) {
-	return &ecr.DescribeImagesOutput{
-		ImageDetails: []types.ImageDetail{
-			{
-				ImagePushedAt:    aws.Time(time.Now()),
-				ImageSizeInBytes: aws.Int64(123456),
-				ImageTags:        []string{"latest"},
-			},
-		},
-	}, nil
-}
-
-func (m *MockedECRClient) GetRepositoryPolicy(context.Context, *ecr.GetRepositoryPolicyInput, ...func(*ecr.Options)) (*ecr.GetRepositoryPolicyOutput, error) {
-	return &ecr.GetRepositoryPolicyOutput{
-		PolicyText: aws.String("policyText"),
-	}, nil
-}
-
 func TestDescribeRepos(t *testing.T) {
 
 	subtests := []struct {
@@ -61,29 +24,37 @@ func TestDescribeRepos(t *testing.T) {
 			outputDirectory: ".",
 			verbosity:       2,
 			testModule: ECRModule{
-				ECRClient: &MockedECRClient{},
+				ECRClient: &sdk.MockedECRClient{},
 				Caller: sts.GetCallerIdentityOutput{
 					Arn:     aws.String("arn:aws:iam::123456789012:user/cloudfox_unit_tests"),
 					Account: aws.String("123456789012"),
 				},
-				OutputFormat: "table",
-				AWSProfile:   "test",
-				Goroutines:   30,
-				AWSRegions:   AWSRegions,
+				AWSProfile: "test",
+				Goroutines: 30,
+				AWSRegions: []string{"us-east-1"},
 			},
-			expectedResult: []Repository{{
-				Name:      "test1",
-				URI:       "testURI:latest",
-				PushedAt:  "2022-10-25 15:14:06",
-				ImageTags: "latest",
-				ImageSize: 123456,
-			}},
+			expectedResult: []Repository{
+				{
+					Name:      "repo1",
+					URI:       "11111111111111.dkr.ecr.us-east-1.amazonaws.com/repo1",
+					PushedAt:  "2022-10-25 15:14:00",
+					ImageTags: "customtag, tag2",
+					ImageSize: 123456,
+				},
+				{
+					Name:      "repo2",
+					URI:       "11111111111111.dkr.ecr.us-east-1.amazonaws.com/repo2",
+					PushedAt:  "2021-10-15 11:14:00",
+					ImageTags: "latest",
+					ImageSize: 2222222,
+				}},
 		},
 	}
+
 	internal.MockFileSystem(true)
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.PrintECR(subtest.testModule.OutputFormat, subtest.outputDirectory, subtest.verbosity)
+			subtest.testModule.PrintECR(subtest.outputDirectory, subtest.verbosity)
 			for index, expectedRepo := range subtest.expectedResult {
 				if expectedRepo.Name != subtest.testModule.Repositories[index].Name {
 					log.Fatal("Repo name does not match expected name")

aws/ecs-tasks.go

@@ -25,9 +25,11 @@ type ECSTasksModule struct {
 	EC2Client sdk.AWSEC2ClientInterface
 	IAMClient sdk.AWSIAMClientInterface
 
-	Caller         sts.GetCallerIdentityOutput
-	AWSRegions     []string
-	OutputFormat   string
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	AWSProfile     string
 	Goroutines     int
 	SkipAdminCheck bool
@@ -56,7 +58,7 @@ type MappedECSTask struct {
 	CanPrivEsc            string
 }
 
-func (m *ECSTasksModule) ECSTasks(outputFormat string, outputDirectory string, verbosity int) {
+func (m *ECSTasksModule) ECSTasks(outputDirectory string, verbosity int) {
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
 	m.output.CallingModule = "ecs-tasks"
@@ -119,7 +121,7 @@ func (m *ECSTasksModule) ECSTasks(outputFormat string, outputDirectory string, v
 	receiverDone <- true
 	<-receiverDone
 
-	m.printECSTaskData(outputFormat, outputDirectory, dataReceiver, verbosity)
+	m.printECSTaskData(outputDirectory, dataReceiver, verbosity)
 
 }
 
@@ -136,9 +138,36 @@ func (m *ECSTasksModule) Receiver(receiver chan MappedECSTask, receiverDone chan
 	}
 }
 
-func (m *ECSTasksModule) printECSTaskData(outputFormat string, outputDirectory string, dataReceiver chan MappedECSTask, verbosity int) {
-	if m.pmapperError == nil {
-		m.output.Headers = []string{
+func (m *ECSTasksModule) printECSTaskData(outputDirectory string, dataReceiver chan MappedECSTask, verbosity int) {
+	// This is the complete list of potential table columns
+	m.output.Headers = []string{
+		"Account",
+		"Cluster",
+		"TaskDefinition",
+		"LaunchType",
+		"ID",
+		"External IP",
+		"Internal IP",
+		"RoleArn",
+		"IsAdminRole?",
+		"CanPrivEscToAdmin?",
+	}
+
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
 			"Cluster",
 			"TaskDefinition",
 			"LaunchType",
@@ -149,61 +178,46 @@ func (m *ECSTasksModule) printECSTaskData(outputFormat string, outputDirectory s
 			"IsAdminRole?",
 			"CanPrivEscToAdmin?",
 		}
+		// Otherwise, use the default columns.
 	} else {
-		m.output.Headers = []string{
+		tableCols = []string{
 			"Cluster",
 			"TaskDefinition",
 			"LaunchType",
-			"ID",
 			"External IP",
 			"Internal IP",
 			"RoleArn",
 			"IsAdminRole?",
-			//"CanPrivEscToAdmin?",
+			"CanPrivEscToAdmin?",
 		}
 	}
 
-	if m.pmapperError == nil {
-		for _, ecsTask := range m.MappedECSTasks {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					ecsTask.Cluster,
-					ecsTask.TaskDefinitionName,
-					ecsTask.LaunchType,
-					ecsTask.ID,
-					ecsTask.ExternalIP,
-					ecsTask.PrivateIP,
-					ecsTask.Role,
-					ecsTask.Admin,
-					ecsTask.CanPrivEsc,
-				},
-			)
-		}
-	} else {
-		for _, ecsTask := range m.MappedECSTasks {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					ecsTask.Cluster,
-					ecsTask.TaskDefinitionName,
-					ecsTask.LaunchType,
-					ecsTask.ID,
-					ecsTask.ExternalIP,
-					ecsTask.PrivateIP,
-					ecsTask.Role,
-					ecsTask.Admin,
-					//ecsTask.CanPrivEsc,
-				},
-			)
-		}
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
+	}
+
+	for _, ecsTask := range m.MappedECSTasks {
+		m.output.Body = append(
+			m.output.Body,
+			[]string{
+				aws.ToString(m.Caller.Account),
+				ecsTask.Cluster,
+				ecsTask.TaskDefinitionName,
+				ecsTask.LaunchType,
+				ecsTask.ID,
+				ecsTask.ExternalIP,
+				ecsTask.PrivateIP,
+				ecsTask.Role,
+				ecsTask.Admin,
+				ecsTask.CanPrivEsc,
+			},
+		)
 	}
 
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -212,9 +226,10 @@ func (m *ECSTasksModule) printECSTaskData(outputFormat string, outputDirectory s
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/ecs-tasks_test.go

@@ -43,7 +43,7 @@ func TestECSTasks(t *testing.T) {
 	internal.MockFileSystem(true)
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.ECSTasks(subtest.testModule.OutputFormat, subtest.outputDirectory, subtest.verbosity)
+			subtest.testModule.ECSTasks(subtest.outputDirectory, subtest.verbosity)
 			for index, expectedTask := range subtest.expectedResult {
 				if expectedTask.Cluster != subtest.testModule.MappedECSTasks[index].Cluster {
 					log.Fatal("Cluster name does not match expected value")

aws/eks.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -21,9 +22,11 @@ type EKSModule struct {
 	EKSClient sdk.EKSClientInterface
 	IAMClient sdk.AWSIAMClientInterface
 
-	Caller         sts.GetCallerIdentityOutput
-	AWSRegions     []string
-	OutputFormat   string
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	Goroutines     int
 	AWSProfile     string
 	SkipAdminCheck bool
@@ -52,7 +55,7 @@ type Cluster struct {
 	CanPrivEsc string
 }
 
-func (m *EKSModule) EKS(outputFormat string, outputDirectory string, verbosity int) {
+func (m *EKSModule) EKS(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -122,10 +125,48 @@ func (m *EKSModule) EKS(outputFormat string, outputDirectory string, verbosity i
 		}
 	}
 
-	// add - if struct is not empty do this. otherwise, dont write anything.
-	if m.pmapperError == nil {
-		m.output.Headers = []string{
-			"Service",
+	// This is the complete list of potential table columns
+	m.output.Headers = []string{
+		"Account",
+		"Region",
+		"Name",
+		//"Endpoint",
+		"Public",
+		//"OIDC",
+		"NodeGroup",
+		"Role",
+		"IsAdminRole?",
+		"CanPrivEscToAdmin?",
+	}
+
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Region",
+			"Name",
+			"Endpoint",
+			"Public",
+			"OIDC",
+			"NodeGroup",
+			"Role",
+			"IsAdminRole?",
+			"CanPrivEscToAdmin?",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
 			"Region",
 			"Name",
 			//"Endpoint",
@@ -136,58 +177,32 @@ func (m *EKSModule) EKS(outputFormat string, outputDirectory string, verbosity i
 			"IsAdminRole?",
 			"CanPrivEscToAdmin?",
 		}
-	} else {
-		m.output.Headers = []string{
-			"Service",
-			"Region",
-			"Name",
-			//"Endpoint",
-			"Public",
-			//"OIDC",
-			"NodeGroup",
-			"Role",
-			"IsAdminRole?",
-			//"CanPrivEscToAdmin?",
-		}
+	}
+
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
 	}
 
 	// Table rows
 
 	for i := range m.Clusters {
-		if m.pmapperError == nil {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					m.Clusters[i].AWSService,
-					m.Clusters[i].Region,
-					m.Clusters[i].Name,
-					//m.Clusters[i].Endpoint,
-					m.Clusters[i].Public,
-					//m.Clusters[i].OIDC,
-					m.Clusters[i].NodeGroup,
-					m.Clusters[i].Role,
-					m.Clusters[i].Admin,
-					m.Clusters[i].CanPrivEsc,
-				},
-			)
-		} else {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					m.Clusters[i].AWSService,
-					m.Clusters[i].Region,
-					m.Clusters[i].Name,
-					//m.Clusters[i].Endpoint,
-					m.Clusters[i].Public,
-					//m.Clusters[i].OIDC,
-					m.Clusters[i].NodeGroup,
-					m.Clusters[i].Role,
-					m.Clusters[i].Admin,
-					//m.Clusters[i].CanPrivEsc,
-				},
-			)
-
-		}
+		m.output.Body = append(
+			m.output.Body,
+			[]string{
+				aws.ToString(m.Caller.Account),
+				m.Clusters[i].Region,
+				m.Clusters[i].Name,
+				//m.Clusters[i].Endpoint,
+				m.Clusters[i].Public,
+				//m.Clusters[i].OIDC,
+				m.Clusters[i].NodeGroup,
+				m.Clusters[i].Role,
+				m.Clusters[i].Admin,
+				m.Clusters[i].CanPrivEsc,
+			},
+		)
 	}
 
 	var seen []string
@@ -199,10 +214,6 @@ func (m *EKSModule) EKS(outputFormat string, outputDirectory string, verbosity i
 
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -211,9 +222,10 @@ func (m *EKSModule) EKS(outputFormat string, outputDirectory string, verbosity i
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/eks_test.go

@@ -86,7 +86,6 @@ func TestEks(t *testing.T) {
 				EKSClient: &MockedEKSClientInterface{},
 				//IAMSimulatePrincipalPolicyClient:    iam.SimulatePrincipalPolicyAPIClient,
 				Caller:         sts.GetCallerIdentityOutput{Arn: aws.String("test")},
-				OutputFormat:   "table",
 				AWSProfile:     "test",
 				Goroutines:     30,
 				AWSRegions:     AWSRegions,
@@ -104,7 +103,7 @@ func TestEks(t *testing.T) {
 	internal.MockFileSystem(true)
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.EKS(subtest.testModule.OutputFormat, subtest.outputDirectory, subtest.verbosity)
+			subtest.testModule.EKS(subtest.outputDirectory, subtest.verbosity)
 			for index, expectedCluster := range subtest.expectedResult {
 				if expectedCluster.Name != subtest.testModule.Clusters[index].Name {
 					log.Fatal("Cluster name does not match expected value")

aws/elastic-network-interfaces.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -19,11 +20,13 @@ import (
 type ElasticNetworkInterfacesModule struct {
 	EC2Client sdk.AWSEC2ClientInterface
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	AWSProfile string
+	WrapTable  bool
 
 	MappedENIs     []MappedENI
 	CommandCounter internal.CommandCounter
@@ -42,7 +45,7 @@ type MappedENI struct {
 	Description      string
 }
 
-func (m *ElasticNetworkInterfacesModule) ElasticNetworkInterfaces(outputFormat string, outputDirectory string, verbosity int) {
+func (m *ElasticNetworkInterfacesModule) ElasticNetworkInterfaces(outputDirectory string, verbosity int) {
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
 	m.output.CallingModule = "elastic-network-interfaces"
@@ -82,7 +85,7 @@ func (m *ElasticNetworkInterfacesModule) ElasticNetworkInterfaces(outputFormat s
 	receiverDone <- true
 	<-receiverDone
 
-	m.printENIsData(outputFormat, outputDirectory, dataReceiver, verbosity)
+	m.printENIsData(outputDirectory, dataReceiver, verbosity)
 
 }
 
@@ -99,8 +102,9 @@ func (m *ElasticNetworkInterfacesModule) Receiver(receiver chan MappedENI, recei
 	}
 }
 
-func (m *ElasticNetworkInterfacesModule) printENIsData(outputFormat string, outputDirectory string, dataReceiver chan MappedENI, verbosity int) {
+func (m *ElasticNetworkInterfacesModule) printENIsData(outputDirectory string, dataReceiver chan MappedENI, verbosity int) {
 	m.output.Headers = []string{
+		"Account",
 		"ID",
 		"Type",
 		"External IP",
@@ -109,10 +113,48 @@ func (m *ElasticNetworkInterfacesModule) printENIsData(outputFormat string, outp
 		"Attached Instance",
 		"Description",
 	}
+
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"ID",
+			"Type",
+			"External IP",
+			"Internal IP",
+			"VPC ID",
+			"Attached Instance",
+			"Description",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"ID",
+			"Type",
+			"External IP",
+			"Internal IP",
+			"VPC ID",
+			"Attached Instance",
+			"Description",
+		}
+	}
+
 	for _, eni := range m.MappedENIs {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				eni.ID,
 				eni.Type,
 				eni.ExternalIP,
@@ -125,10 +167,7 @@ func (m *ElasticNetworkInterfacesModule) printENIsData(outputFormat string, outp
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 
-		//m.writeLoot(m.output.FilePath)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -137,9 +176,10 @@ func (m *ElasticNetworkInterfacesModule) printENIsData(outputFormat string, outp
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/elastic-network-interfaces_test.go

@@ -44,7 +44,7 @@ func TestElasticNetworkInterfaces(t *testing.T) {
 	internal.MockFileSystem(true)
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.ElasticNetworkInterfaces("table", ".", 3)
+			subtest.testModule.ElasticNetworkInterfaces(".", 3)
 			for index, expectedTask := range subtest.expectedResult {
 				if expectedTask.ExternalIP != subtest.testModule.MappedENIs[index].ExternalIP {
 					t.Errorf("expected %s, got %s", expectedTask.ExternalIP, subtest.testModule.MappedENIs[index].ExternalIP)

aws/endpoints.go

@@ -55,12 +55,14 @@ type EndpointsModule struct {
 	AppRunnerClient    *apprunner.Client
 	LightsailClient    *lightsail.Client
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	Endpoints      []Endpoint
@@ -83,7 +85,7 @@ type Endpoint struct {
 
 var oe *smithy.OperationError
 
-func (m *EndpointsModule) PrintEndpoints(outputFormat string, outputDirectory string, verbosity int) {
+func (m *EndpointsModule) PrintEndpoints(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -147,6 +149,7 @@ func (m *EndpointsModule) PrintEndpoints(outputFormat string, outputDirectory st
 	})
 
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Name",
@@ -156,11 +159,48 @@ func (m *EndpointsModule) PrintEndpoints(outputFormat string, outputDirectory st
 		"Public",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Region",
+			"Name",
+			"Endpoint",
+			"Port",
+			"Protocol",
+			"Public",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Name",
+			"Endpoint",
+			"Port",
+			"Protocol",
+			"Public",
+		}
+	}
+
 	// Table rows
 	for i := range m.Endpoints {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Endpoints[i].AWSService,
 				m.Endpoints[i].Region,
 				m.Endpoints[i].Name,
@@ -174,10 +214,6 @@ func (m *EndpointsModule) PrintEndpoints(outputFormat string, outputDirectory st
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -186,9 +222,10 @@ func (m *EndpointsModule) PrintEndpoints(outputFormat string, outputDirectory st
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -545,7 +582,7 @@ func (m *EndpointsModule) getMqBrokersPerRegion(r string, wg *sync.WaitGroup, se
 			m.CommandCounter.Error++
 			continue
 		}
-		if BrokerDetails.PubliclyAccessible {
+		if aws.ToBool(BrokerDetails.PubliclyAccessible) {
 			public = "True"
 		} else {
 			public = "False"
@@ -1386,7 +1423,7 @@ func (m *EndpointsModule) getRdsClustersPerRegion(r string, wg *sync.WaitGroup,
 			endpoint := aws.ToString(instance.Endpoint.Address)
 			awsService := "RDS"
 
-			if instance.PubliclyAccessible {
+			if aws.ToBool(instance.PubliclyAccessible) {
 				public = "True"
 			} else {
 				public = "False"
@@ -1397,7 +1434,7 @@ func (m *EndpointsModule) getRdsClustersPerRegion(r string, wg *sync.WaitGroup,
 				Region:     r,
 				Name:       name,
 				Endpoint:   endpoint,
-				Port:       port,
+				Port:       aws.ToInt32(port),
 				Protocol:   aws.ToString(instance.Engine),
 				Public:     public,
 			}
@@ -1442,7 +1479,7 @@ func (m *EndpointsModule) getRedshiftEndPointsPerRegion(r string, wg *sync.WaitG
 		//id := workspace.Id
 		endpoint := aws.ToString(cluster.Endpoint.Address)
 
-		if cluster.PubliclyAccessible {
+		if aws.ToBool(cluster.PubliclyAccessible) {
 			public = "True"
 		} else {
 			public = "False"
@@ -1455,7 +1492,7 @@ func (m *EndpointsModule) getRedshiftEndPointsPerRegion(r string, wg *sync.WaitG
 			Region:     r,
 			Name:       name,
 			Endpoint:   endpoint,
-			Port:       port,
+			Port:       aws.ToInt32(port),
 			Protocol:   protocol,
 			Public:     public,
 		}

aws/env-vars.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -34,12 +35,14 @@ import (
 
 type EnvsModule struct {
 	// General configuration data
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	AWSProfile   string
-	OutputFormat string
-	Goroutines   int
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSProfile    string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	WrapTable  bool
 
 	// Service Clients
 	ECSClient       *ecs.Client
@@ -65,7 +68,7 @@ type EnvironmentVariable struct {
 	environmentVarValue string
 }
 
-func (m *EnvsModule) PrintEnvs(outputFormat string, outputDirectory string, verbosity int) {
+func (m *EnvsModule) PrintEnvs(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -119,6 +122,7 @@ func (m *EnvsModule) PrintEnvs(outputFormat string, outputDirectory string, verb
 
 	// Table headers
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Name",
@@ -126,10 +130,42 @@ func (m *EnvsModule) PrintEnvs(outputFormat string, outputDirectory string, verb
 		"Value",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Region",
+			"Name",
+			"Key",
+			"Value",
+		}
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Name",
+			"Key",
+			"Value",
+		}
+	}
+
 	//Table rows
 	for _, envVar := range m.EnvironmentVariables {
 		m.output.Body = append(
 			m.output.Body, []string{
+				aws.ToString(m.Caller.Account),
 				envVar.service,
 				envVar.region,
 				envVar.name,
@@ -141,9 +177,7 @@ func (m *EnvsModule) PrintEnvs(outputFormat string, outputDirectory string, verb
 	if len(m.output.Body) > 0 {
 
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -152,9 +186,10 @@ func (m *EnvsModule) PrintEnvs(outputFormat string, outputDirectory string, verb
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/filesystems.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -27,12 +28,14 @@ type FilesystemsModule struct {
 	EFSClient *efs.Client
 	FSxClient *fsx.Client
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	Filesystems []FilesystemObject
@@ -55,7 +58,7 @@ type FilesystemObject struct {
 	Permissions string
 }
 
-func (m *FilesystemsModule) PrintFilesystems(outputFormat string, outputDirectory string, verbosity int) {
+func (m *FilesystemsModule) PrintFilesystems(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -107,7 +110,7 @@ func (m *FilesystemsModule) PrintFilesystems(outputFormat string, outputDirector
 	})
 
 	m.output.Headers = []string{
-		"Service",
+		"Account",
 		"Region",
 		"Name",
 		"DNS Name",
@@ -117,12 +120,48 @@ func (m *FilesystemsModule) PrintFilesystems(outputFormat string, outputDirector
 		"Permissions",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Region",
+			"Name",
+			"DNS Name",
+			//"IP",
+			"Mount Target",
+			"Policy",
+			"Permissions",
+		}
+	} else {
+		tableCols = []string{
+			"Region",
+			"Name",
+			"DNS Name",
+			//"IP",
+			"Mount Target",
+			"Policy",
+			"Permissions",
+		}
+
+	}
+
 	// Table rows
 	for i := range m.Filesystems {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.Filesystems[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.Filesystems[i].Region,
 				m.Filesystems[i].Name,
 				m.Filesystems[i].DnsName,
@@ -137,10 +176,7 @@ func (m *FilesystemsModule) PrintFilesystems(outputFormat string, outputDirector
 	if len(m.output.Body) > 0 {
 
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -149,9 +185,10 @@ func (m *FilesystemsModule) PrintFilesystems(outputFormat string, outputDirector
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/iam-simulator.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -20,13 +21,15 @@ import (
 
 type IamSimulatorModule struct {
 	// General configuration data
-	IAMClient    sdk.AWSIAMClientInterface
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	IAMClient     sdk.AWSIAMClientInterface
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	SimulatorResults []SimulatorResult
@@ -64,7 +67,7 @@ var (
 	TxtLogger = internal.TxtLogger()
 )
 
-func (m *IamSimulatorModule) PrintIamSimulator(principal string, action string, resource string, outputFormat string, outputDirectory string, verbosity int) {
+func (m *IamSimulatorModule) PrintIamSimulator(principal string, action string, resource string, outputDirectory string, verbosity int) {
 
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
@@ -149,11 +152,36 @@ func (m *IamSimulatorModule) PrintIamSimulator(principal string, action string,
 
 	// Regardless of what options were selected, for now at least, we will always print the data using the output module (table/csv mode)
 	m.output.Headers = []string{
-		"Service",
+		"Account",
 		"Principal",
 		"Query",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Principal",
+			"Query",
+		}
+	} else {
+		tableCols = []string{
+			"Principal",
+			"Query",
+		}
+	}
+
 	sort.Slice(m.SimulatorResults, func(i, j int) bool {
 		return m.SimulatorResults[i].Query < m.SimulatorResults[j].Query
 	})
@@ -163,7 +191,7 @@ func (m *IamSimulatorModule) PrintIamSimulator(principal string, action string,
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.SimulatorResults[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.SimulatorResults[i].Principal,
 				m.SimulatorResults[i].Query,
 			},
@@ -172,8 +200,7 @@ func (m *IamSimulatorModule) PrintIamSimulator(principal string, action string,
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule, m.WrapTable, m.AWSProfile)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -182,9 +209,10 @@ func (m *IamSimulatorModule) PrintIamSimulator(principal string, action string,
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/instances.go

@@ -13,7 +13,6 @@ import (
 	"github.com/BishopFox/cloudfox/aws/sdk"
 	"github.com/BishopFox/cloudfox/internal"
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	iamTypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
@@ -24,11 +23,13 @@ import (
 
 type InstancesModule struct {
 	// General configuration data
-	EC2Client                 *ec2.Client
-	IAMClient                 sdk.AWSIAMClientInterface
-	Caller                    sts.GetCallerIdentityOutput
-	AWSRegions                []string
-	OutputFormat              string
+	EC2Client     sdk.AWSEC2ClientInterface
+	IAMClient     sdk.AWSIAMClientInterface
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	Goroutines                int
 	UserDataAttributesOnly    bool
 	AWSProfile                string
@@ -63,7 +64,7 @@ type MappedInstance struct {
 	CanPrivEsc       string
 }
 
-func (m *InstancesModule) Instances(filter string, outputFormat string, outputDirectory string, verbosity int) {
+func (m *InstancesModule) Instances(filter string, outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -147,9 +148,9 @@ func (m *InstancesModule) Instances(filter string, outputFormat string, outputDi
 	// This conditional block will either dump the userData attribute content or the general instances data, depending on what you select via command line.
 	//fmt.Printf("\n[*] Preparing output...\n\n")
 	if m.UserDataAttributesOnly {
-		m.printInstancesUserDataAttributesOnly(outputFormat, outputDirectory, dataReceiver)
+		m.printInstancesUserDataAttributesOnly(outputDirectory, dataReceiver)
 	} else {
-		m.printGeneralInstanceData(outputFormat, outputDirectory, dataReceiver, verbosity)
+		m.printGeneralInstanceData(outputDirectory, dataReceiver, verbosity)
 	}
 
 }
@@ -167,7 +168,7 @@ func (m *InstancesModule) Receiver(receiver chan MappedInstance, receiverDone ch
 	}
 }
 
-func (m *InstancesModule) printInstancesUserDataAttributesOnly(outputFormat string, outputDirectory string, dataReceiver chan MappedInstance) {
+func (m *InstancesModule) printInstancesUserDataAttributesOnly(outputDirectory string, dataReceiver chan MappedInstance) {
 	defer func() {
 		m.output.CallingModule = "instances"
 	}()
@@ -217,12 +218,39 @@ func (m *InstancesModule) printInstancesUserDataAttributesOnly(outputFormat stri
 	}
 }
 
-func (m *InstancesModule) printGeneralInstanceData(outputFormat string, outputDirectory string, dataReceiver chan MappedInstance, verbosity int) {
+func (m *InstancesModule) printGeneralInstanceData(outputDirectory string, dataReceiver chan MappedInstance, verbosity int) {
 	// Prepare Table headers
 	//m.output.Headers = table.Row{
-	if m.pmapperError == nil {
+	m.output.Headers = []string{
+		"Account",
+		//"ID",
+		"Name",
+		//"Arn",
+		"ID",
+		"Zone",
+		"State",
+		"External IP",
+		"Internal IP",
+		"Role",
+		"IsAdminRole?",
+		"CanPrivEscToAdmin?",
+	}
 
-		m.output.Headers = []string{
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
 			//"ID",
 			"Name",
 			//"Arn",
@@ -235,8 +263,9 @@ func (m *InstancesModule) printGeneralInstanceData(outputFormat string, outputDi
 			"IsAdminRole?",
 			"CanPrivEscToAdmin?",
 		}
+		// Otherwise, use the default columns.
 	} else {
-		m.output.Headers = []string{
+		tableCols = []string{
 			//"ID",
 			"Name",
 			//"Arn",
@@ -247,59 +276,40 @@ func (m *InstancesModule) printGeneralInstanceData(outputFormat string, outputDi
 			"Internal IP",
 			"Role",
 			"IsAdminRole?",
-			//"CanPrivEscToAdmin?",
+			"CanPrivEscToAdmin?",
 		}
 	}
 
-	//Table rows
-	if m.pmapperError == nil {
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
+	}
 
-		for _, instance := range m.MappedInstances {
-			m.output.Body = append(
-				m.output.Body,
-				//table.Row{
-				[]string{
-					//instance.ID,
-					instance.Name,
-					//instance.Arn,
-					instance.ID,
-					instance.AvailabilityZone,
-					instance.State,
-					instance.ExternalIP,
-					instance.PrivateIP,
-					instance.Role,
-					instance.Admin,
-					instance.CanPrivEsc,
-				},
-			)
-		}
-	} else {
-		for _, instance := range m.MappedInstances {
-			m.output.Body = append(
-				m.output.Body,
-				//table.Row{
-				[]string{
-					//instance.ID,
-					instance.Name,
-					//instance.Arn,
-					instance.ID,
-					instance.AvailabilityZone,
-					instance.State,
-					instance.ExternalIP,
-					instance.PrivateIP,
-					instance.Role,
-					instance.Admin,
-					//instance.CanPrivEsc,
-				},
-			)
-		}
+	//Table rows
+	for _, instance := range m.MappedInstances {
+		m.output.Body = append(
+			m.output.Body,
+			//table.Row{
+			[]string{
+				aws.ToString(m.Caller.Account),
+				//instance.ID,
+				instance.Name,
+				//instance.Arn,
+				instance.ID,
+				instance.AvailabilityZone,
+				instance.State,
+				instance.ExternalIP,
+				instance.PrivateIP,
+				instance.Role,
+				instance.Admin,
+				instance.CanPrivEsc,
+			},
+		)
 	}
 
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		////m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 
 		//m.writeLoot(m.output.FilePath)
 		o := internal.OutputClient{
@@ -310,9 +320,10 @@ func (m *InstancesModule) printGeneralInstanceData(outputFormat string, outputDi
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -440,27 +451,17 @@ func (m *InstancesModule) executeChecks(instancesToSearch []string, r string, wg
 }
 
 func (m *InstancesModule) getInstanceUserDataAttribute(instanceID *string, region string) (userData *string, err error) {
-
-	Attributes, err := m.EC2Client.DescribeInstanceAttribute(
-		context.TODO(),
-		&ec2.DescribeInstanceAttributeInput{
-			InstanceId: instanceID,
-			Attribute:  types.InstanceAttributeName("userData"),
-		},
-		func(o *ec2.Options) {
-			o.Region = region
-		},
-	)
+	UserData, err := sdk.CachedEC2DescribeInstanceAttributeUserData(m.EC2Client, aws.ToString(m.Caller.Account), region, aws.ToString(instanceID))
 
 	if err != nil {
 		m.modLog.Error(err.Error())
 		m.CommandCounter.Error++
 		return nil, err
 	} else {
-		if Attributes.UserData.Value == nil {
+		if UserData == "" {
 			return aws.String("NoUserData"), nil
 		} else {
-			data, _ := base64.StdEncoding.DecodeString(*Attributes.UserData.Value)
+			data, _ := base64.StdEncoding.DecodeString(UserData)
 			return aws.String(string(data)), nil
 		}
 	}
@@ -470,47 +471,22 @@ func (m *InstancesModule) getInstanceUserDataAttribute(instanceID *string, regio
 func (m *InstancesModule) getDescribeInstances(instancesToSearch []string, region string, dataReceiver chan MappedInstance) {
 
 	// The "PaginationControl" value is nil when there's no more data to return.
-	var PaginationControl *string
-	for {
 
-		DescribeInstances, err := m.EC2Client.DescribeInstances(
-			context.TODO(),
-			&(ec2.DescribeInstancesInput{
-				NextToken: PaginationControl,
-			}),
-			func(o *ec2.Options) {
-				o.Region = region
-			},
-		)
-		if err != nil {
-			m.modLog.Error(err.Error())
-			m.CommandCounter.Error++
-			break
+	Instances, err := sdk.CachedEC2DescribeInstances(m.EC2Client, aws.ToString(m.Caller.Account), region)
+	if err != nil {
+		m.modLog.Error(err.Error())
+		m.CommandCounter.Error++
+		return
+	}
+
+	for _, instance := range Instances {
+		if instancesToSearch[0] == "all" || internal.Contains(aws.ToString(instance.InstanceId), instancesToSearch) {
+			m.loadInstanceData(instance, region, dataReceiver)
 		}
-
-		for _, reservation := range DescribeInstances.Reservations {
-			accountId := reservation.OwnerId
-
-			for _, instance := range reservation.Instances {
-
-				if instancesToSearch[0] == "all" || internal.Contains(aws.ToString(instance.InstanceId), instancesToSearch) {
-					m.loadInstanceData(instance, region, accountId, dataReceiver)
-				}
-			}
-		}
-
-		// The "NextToken" value is nil when there's no more data to return.
-		if DescribeInstances.NextToken != nil {
-			PaginationControl = DescribeInstances.NextToken
-		} else {
-			PaginationControl = nil
-			break
-		}
-
 	}
 }
 
-func (m *InstancesModule) loadInstanceData(instance types.Instance, region string, accountId *string, dataReceiver chan MappedInstance) {
+func (m *InstancesModule) loadInstanceData(instance types.Instance, region string, dataReceiver chan MappedInstance) {
 
 	var profile string
 	var externalIP string
@@ -552,7 +528,7 @@ func (m *InstancesModule) loadInstanceData(instance types.Instance, region strin
 	dataReceiver <- MappedInstance{
 		ID:               aws.ToString(instance.InstanceId),
 		Name:             aws.ToString(&name),
-		Arn:              fmt.Sprintf("arn:aws:ec2:%s:%s:instance/%s", region, aws.ToString(accountId), aws.ToString(instance.InstanceId)),
+		Arn:              fmt.Sprintf("arn:aws:ec2:%s:%s:instance/%s", region, aws.ToString(m.Caller.Account), aws.ToString(instance.InstanceId)),
 		AvailabilityZone: aws.ToString(instance.Placement.AvailabilityZone),
 		State:            string(instance.State.Name),
 		ExternalIP:       externalIP,

aws/inventory.go

@@ -15,6 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/apigatewayv2"
 	"github.com/aws/aws-sdk-go-v2/service/apprunner"
 	"github.com/aws/aws-sdk-go-v2/service/athena"
+	"github.com/aws/aws-sdk-go-v2/service/cloud9"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation"
 	"github.com/aws/aws-sdk-go-v2/service/cloudfront"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
@@ -45,6 +46,7 @@ type Inventory2Module struct {
 	APIGatewayv2Client     *apigatewayv2.Client
 	AppRunnerClient        *apprunner.Client
 	AthenaClient           *athena.Client
+	Cloud9Client           *cloud9.Client
 	CloudFormationClient   *cloudformation.Client
 	CloudfrontClient       *cloudfront.Client
 	CodeArtifactClient     sdk.AWSCodeArtifactClientInterface
@@ -80,12 +82,14 @@ type Inventory2Module struct {
 	SecretsManagerClient   *secretsmanager.Client
 	StepFunctionClient     sdk.StepFunctionsClientInterface
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	RegionResourceCount  int
@@ -109,7 +113,7 @@ type GlobalResourceCount2 struct {
 	count        int
 }
 
-func (m *Inventory2Module) PrintInventoryPerRegion(outputFormat string, outputDirectory string, verbosity int) {
+func (m *Inventory2Module) PrintInventoryPerRegion(outputDirectory string, verbosity int) {
 
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
@@ -127,6 +131,7 @@ func (m *Inventory2Module) PrintInventoryPerRegion(outputFormat string, outputDi
 		"Athena Databases",
 		//"Athena Data Catalogs",
 		"AppRunner Services",
+		"Cloud9 Environments",
 		"CloudFormation Stacks",
 		"Cloudfront Distributions",
 		"CodeArtifact Repositories",
@@ -341,10 +346,6 @@ func (m *Inventory2Module) PrintInventoryPerRegion(outputFormat string, outputDi
 	// }
 	if len(m.output.Body) > 0 {
 
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -360,18 +361,11 @@ func (m *Inventory2Module) PrintInventoryPerRegion(outputFormat string, outputDi
 
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		// var header []string
-		// var body [][]string
-		// header, body = m.PrintGlobalResources(outputFormat, outputDirectory, verbosity, dataReceiver)
-		// o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-		// 	Header: header,
-		// 	Body:   body,
-		// 	Name:   "inventory-global",
-		// })
+
 		o.WriteFullOutput(o.Table.TableFiles, nil)
 		m.writeLoot(o.Table.DirectoryName, verbosity)
 
-		m.PrintTotalResources(outputFormat)
+		m.PrintTotalResources(m.AWSOutputType)
 		//m.writeLoot(m.output.FilePath, verbosity)
 	} else {
 		fmt.Printf("[%s][%s] No resources identified, skipping the creation of an output file.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile))
@@ -464,6 +458,16 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
 		// go m.getAthenaDataCatalogsPerRegion(r, wg, semaphore)
 	}
 
+	res, err = servicemap.IsServiceInRegion("cloud9", r)
+	if err != nil {
+		m.modLog.Error(err)
+	}
+	if res {
+		m.CommandCounter.Total++
+		wg.Add(1)
+		go m.getCloud9EnvironmentsPerRegion(r, wg, semaphore)
+	}
+
 	res, err = servicemap.IsServiceInRegion("cloudformation", r)
 	if err != nil {
 		m.modLog.Error(err)
@@ -786,7 +790,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
 
 }
 
-func (m *Inventory2Module) PrintTotalResources(outputFormat string) {
+func (m *Inventory2Module) PrintTotalResources(AWSOutputType string) {
 	var totalResources int
 	for _, r := range m.AWSRegions {
 		if m.totalRegionCounts[r] != 0 {
@@ -2856,6 +2860,48 @@ func (m *Inventory2Module) getStepFunctionsPerRegion(r string, wg *sync.WaitGrou
 	m.mu.Unlock()
 }
 
+func (m *Inventory2Module) getCloud9EnvironmentsPerRegion(r string, wg *sync.WaitGroup, semaphore chan struct{}) {
+	defer func() {
+		wg.Done()
+		m.CommandCounter.Executing--
+	}()
+	semaphore <- struct{}{}
+	defer func() {
+		<-semaphore
+	}()
+	m.CommandCounter.Total++
+	m.CommandCounter.Pending--
+	m.CommandCounter.Executing++
+	var totalCountThisServiceThisRegion = 0
+	var service = "Cloud9 Environments"
+	var resourceNames []string
+
+	Environments, err := sdk.CachedCloud9ListEnvironments(m.Cloud9Client, aws.ToString(m.Caller.Account), r)
+
+	if err != nil {
+		m.modLog.Error(err.Error())
+		m.CommandCounter.Error++
+		return
+
+	}
+
+	// Add this page of resources to the total count
+	totalCountThisServiceThisRegion = totalCountThisServiceThisRegion + len(Environments)
+
+	// Add this page of resources to the module's resource list
+	for _, env := range Environments {
+		arn := "arn:aws:cloud9:" + r + ":" + aws.ToString(m.Caller.Account) + ":environment:" + env
+		resourceNames = append(resourceNames, arn)
+	}
+
+	// No more pages, update the module's service map
+	m.mu.Lock()
+	m.resources = append(m.resources, resourceNames...)
+	m.serviceMap[service][r] = totalCountThisServiceThisRegion
+
+	m.mu.Unlock()
+}
+
 // Global Resources
 
 func (m *Inventory2Module) getBuckets(verbosity int, dataReceiver chan GlobalResourceCount2) {

aws/lambda.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -25,9 +26,11 @@ type LambdasModule struct {
 	LambdaClient *lambda.Client
 	IAMClient    sdk.AWSIAMClientInterface
 
-	Caller         sts.GetCallerIdentityOutput
-	AWSRegions     []string
-	OutputFormat   string
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	Goroutines     int
 	AWSProfile     string
 	SkipAdminCheck bool
@@ -49,13 +52,14 @@ type Lambda struct {
 	Region     string
 	Type       string
 	Name       string
+	Arn        string
 	Role       string
 	Admin      string
 	CanPrivEsc string
 	Public     string
 }
 
-func (m *LambdasModule) PrintLambdas(outputFormat string, outputDirectory string, verbosity int) {
+func (m *LambdasModule) PrintLambdas(outputDirectory string, verbosity int) {
 
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
@@ -123,24 +127,52 @@ func (m *LambdasModule) PrintLambdas(outputFormat string, outputDirectory string
 	<-receiverDone
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
-	if m.pmapperError == nil {
-		m.output.Headers = []string{
-			"Service",
+	m.output.Headers = []string{
+		"Account",
+		"Region",
+		"Name",
+		"Arn",
+		"Role",
+		"IsAdminRole?",
+		"CanPrivEscToAdmin?",
+	}
+
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
 			"Region",
-			"Resource",
+			"Arn",
 			"Role",
 			"IsAdminRole?",
 			"CanPrivEscToAdmin?",
 		}
+		// Otherwise, use the default columns.
 	} else {
-		m.output.Headers = []string{
+		tableCols = []string{
 			"Service",
 			"Region",
-			"Resource",
+			"Name",
 			"Role",
 			"IsAdminRole?",
+			"CanPrivEscToAdmin?",
 		}
 	}
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
+	}
 
 	sort.Slice(m.Lambdas, func(i, j int) bool {
 		return m.Lambdas[i].AWSService < m.Lambdas[j].AWSService
@@ -149,41 +181,24 @@ func (m *LambdasModule) PrintLambdas(outputFormat string, outputDirectory string
 	// Table rows
 	for i := range m.Lambdas {
 
-		if m.pmapperError == nil {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					m.Lambdas[i].AWSService,
-					m.Lambdas[i].Region,
-					//m.Lambdas[i].Type,
-					m.Lambdas[i].Name,
-					m.Lambdas[i].Role,
-					m.Lambdas[i].Admin,
-					m.Lambdas[i].CanPrivEsc,
-					//m.Lambdas[i].Public,
-				},
-			)
-		} else {
-			m.output.Body = append(
-				m.output.Body,
-				[]string{
-					m.Lambdas[i].AWSService,
-					m.Lambdas[i].Region,
-					//m.Lambdas[i].Type,
-					m.Lambdas[i].Name,
-					m.Lambdas[i].Role,
-					m.Lambdas[i].Admin,
-					//m.Lambdas[i].CanPrivEsc,
-					//m.Lambdas[i].Public,
-				},
-			)
-		}
+		m.output.Body = append(
+			m.output.Body,
+			[]string{
+				aws.ToString(m.Caller.Account),
+				m.Lambdas[i].Region,
+				//m.Lambdas[i].Type,
+				m.Lambdas[i].Name,
+				m.Lambdas[i].Arn,
+				m.Lambdas[i].Role,
+				m.Lambdas[i].Admin,
+				m.Lambdas[i].CanPrivEsc,
+				//m.Lambdas[i].Public,
+			},
+		)
 
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -192,9 +207,10 @@ func (m *LambdasModule) PrintLambdas(outputFormat string, outputDirectory string
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -300,13 +316,14 @@ func (m *LambdasModule) getLambdasPerRegion(r string, wg *sync.WaitGroup, semaph
 	}
 
 	for _, function := range functions {
-		//arn := aws.ToString(function.FunctionArn)
+		arn := aws.ToString(function.FunctionArn)
 		name := aws.ToString(function.FunctionName)
 		role := aws.ToString(function.Role)
 
 		dataReceiver <- Lambda{
 			AWSService: "Lambda",
 			Name:       name,
+			Arn:        arn,
 			Region:     r,
 			Type:       "",
 			Role:       role,

aws/network-ports.go

@@ -65,13 +65,15 @@ type NetworkPortsModule struct {
 	LightsailClient   *lightsail.Client
 	RDSClient         *rds.Client
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
-	Verbosity    int
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
+	Verbosity  int
 
 	// Main module data
 	IPv4_Private   []NetworkService
@@ -136,7 +138,7 @@ var naclToSG = map[string]string{
 
 var validSecurityGroupProtocols = []string{"-1", "tcp", "udp"}
 
-func (m *NetworkPortsModule) PrintNetworkPorts(outputFormat string, outputDirectory string) {
+func (m *NetworkPortsModule) PrintNetworkPorts(outputDirectory string) {
 	// These struct values are used by the output module
 	m.output.Verbosity = m.Verbosity
 	m.output.Directory = outputDirectory
@@ -184,6 +186,7 @@ func (m *NetworkPortsModule) PrintNetworkPorts(outputFormat string, outputDirect
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Protocol",
@@ -191,6 +194,36 @@ func (m *NetworkPortsModule) PrintNetworkPorts(outputFormat string, outputDirect
 		"Ports",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Region",
+			"Protocol",
+			"Host",
+			"Ports",
+		}
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Protocol",
+			"Host",
+			"Ports",
+		}
+	}
+
 	// Table rows
 	for _, arr := range [][]NetworkService{m.IPv4_Private, m.IPv4_Public, m.IPv6} {
 		for _, i := range arr {
@@ -198,6 +231,7 @@ func (m *NetworkPortsModule) PrintNetworkPorts(outputFormat string, outputDirect
 				m.output.Body = append(
 					m.output.Body,
 					[]string{
+						aws.ToString(m.Caller.Account),
 						i.AWSService,
 						i.Region,
 						i.Protocol,
@@ -211,9 +245,6 @@ func (m *NetworkPortsModule) PrintNetworkPorts(outputFormat string, outputDirect
 
 	if len(m.IPv4_Private) > 0 || len(m.IPv4_Public) > 0 || len(m.IPv6) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//internal.OutputSelector(m.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath)
 		o := internal.OutputClient{
 			Verbosity:     m.Verbosity,
 			CallingModule: m.output.CallingModule,
@@ -222,9 +253,10 @@ func (m *NetworkPortsModule) PrintNetworkPorts(outputFormat string, outputDirect
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -742,7 +774,7 @@ func (m *NetworkPortsModule) getElastiCacheNetworkPortsPerRegion(r string, dataR
 		// Memcached
 		if cluster.ConfigurationEndpoint != nil {
 			ipv4_private = addHost(ipv4_private, aws.ToString(cluster.ConfigurationEndpoint.Address))
-			tcpPortsInts = addPort(tcpPortsInts, cluster.ConfigurationEndpoint.Port)
+			tcpPortsInts = addPort(tcpPortsInts, aws.ToInt32(cluster.ConfigurationEndpoint.Port))
 		} else {
 			replicationGroupId := aws.ToString(cluster.ReplicationGroupId)
 			for _, group := range nodes {
@@ -751,7 +783,7 @@ func (m *NetworkPortsModule) getElastiCacheNetworkPortsPerRegion(r string, dataR
 						// Primary
 						if g.PrimaryEndpoint != nil && !strContains(reportedClusters, aws.ToString(g.PrimaryEndpoint.Address)) {
 							ipv4_private = addHost(ipv4_private, aws.ToString(g.PrimaryEndpoint.Address))
-							tcpPortsInts = addPort(tcpPortsInts, g.PrimaryEndpoint.Port)
+							tcpPortsInts = addPort(tcpPortsInts, aws.ToInt32(g.PrimaryEndpoint.Port))
 
 							reportedClusters = addHost(reportedClusters, aws.ToString(g.PrimaryEndpoint.Address))
 						}
@@ -759,7 +791,7 @@ func (m *NetworkPortsModule) getElastiCacheNetworkPortsPerRegion(r string, dataR
 						// Reader
 						if g.ReaderEndpoint != nil && !strContains(reportedClusters, aws.ToString(g.ReaderEndpoint.Address)) {
 							ipv4_private = addHost(ipv4_private, aws.ToString(g.ReaderEndpoint.Address))
-							tcpPortsInts = addPort(tcpPortsInts, g.ReaderEndpoint.Port)
+							tcpPortsInts = addPort(tcpPortsInts, aws.ToInt32(g.ReaderEndpoint.Port))
 
 							reportedClusters = addHost(reportedClusters, aws.ToString(g.ReaderEndpoint.Address))
 						}
@@ -769,7 +801,7 @@ func (m *NetworkPortsModule) getElastiCacheNetworkPortsPerRegion(r string, dataR
 							if aws.ToString(m.CacheClusterId) == aws.ToString(cluster.CacheClusterId) {
 								if m.ReadEndpoint != nil {
 									ipv4_private = addHost(ipv4_private, aws.ToString(m.ReadEndpoint.Address))
-									tcpPortsInts = addPort(tcpPortsInts, m.ReadEndpoint.Port)
+									tcpPortsInts = addPort(tcpPortsInts, aws.ToInt32(m.ReadEndpoint.Port))
 								}
 							}
 						}
@@ -1047,7 +1079,7 @@ func (m *NetworkPortsModule) getRdsNetworkPortsPerRegion(r string, dataReceiver
 	for _, instance := range DBInstances {
 		if aws.ToString(instance.DBInstanceStatus) == "available" {
 			host := []string{aws.ToString(instance.Endpoint.Address)}
-			var port int32 = instance.Endpoint.Port
+			var port int32 = aws.ToInt32(instance.Endpoint.Port)
 
 			var groups []SecurityGroup
 			for _, group := range instance.VpcSecurityGroups {

aws/org.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
@@ -19,12 +20,14 @@ type OrgModule struct {
 	OrganizationsClient sdk.OrganizationsClientInterface
 	Caller              sts.GetCallerIdentityOutput
 	AWSRegions          []string
-	OutputFormat        string
-	Goroutines          int
-	AWSProfile          string
-	SkipAdminCheck      bool
-	WrapTable           bool
-	DescribeOrgOutput   *types.Organization
+	AWSOutputType       string
+	AWSTableCols        string
+
+	Goroutines        int
+	AWSProfile        string
+	SkipAdminCheck    bool
+	WrapTable         bool
+	DescribeOrgOutput *types.Organization
 
 	// Main module data
 	Accounts       []Account
@@ -52,7 +55,7 @@ type Account struct {
 	OrgId               string
 }
 
-func (m *OrgModule) PrintOrgAccounts(outputFormat string, outputDirectory string, verbosity int) {
+func (m *OrgModule) PrintOrgAccounts(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	var err error
 	m.output.Verbosity = verbosity
@@ -85,6 +88,7 @@ func (m *OrgModule) PrintOrgAccounts(outputFormat string, outputDirectory string
 		}
 
 		m.output.Headers = []string{
+			"Account",
 			"Name",
 			"ID",
 			"isManagementAccount?",
@@ -92,12 +96,44 @@ func (m *OrgModule) PrintOrgAccounts(outputFormat string, outputDirectory string
 			"Email",
 		}
 
+		// If the user specified table columns, use those.
+		// If the user specified -o wide, use the wide default cols for this module.
+		// Otherwise, use the hardcoded default cols for this module.
+		var tableCols []string
+		// If the user specified table columns, use those.
+		if m.AWSTableCols != "" {
+			// If the user specified wide as the output format, use these columns.
+			// remove any spaces between any commas and the first letter after the commas
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+			m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+			tableCols = strings.Split(m.AWSTableCols, ",")
+		} else if m.AWSOutputType == "wide" {
+			tableCols = []string{
+				"Account",
+				"Name",
+				"ID",
+				"isManagementAccount?",
+				"Status",
+				"Email",
+			}
+			// Otherwise, use the default columns.
+		} else {
+			tableCols = []string{
+				"Name",
+				"ID",
+				"isManagementAccount?",
+				"Status",
+				"Email",
+			}
+		}
+
 		// Table rows
 
 		for i := range m.Accounts {
 			m.output.Body = append(
 				m.output.Body,
 				[]string{
+					aws.ToString(m.Caller.Account),
 					m.Accounts[i].Name,
 					m.Accounts[i].Id,
 					strconv.FormatBool(m.Accounts[i].isManagementAccount),
@@ -109,8 +145,6 @@ func (m *OrgModule) PrintOrgAccounts(outputFormat string, outputDirectory string
 
 		if len(m.output.Body) > 0 {
 			m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-			//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-			//m.writeLoot(m.output.FilePath, verbosity)
 			o := internal.OutputClient{
 				Verbosity:     verbosity,
 				CallingModule: m.output.CallingModule,
@@ -119,9 +153,10 @@ func (m *OrgModule) PrintOrgAccounts(outputFormat string, outputDirectory string
 				},
 			}
 			o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-				Header: m.output.Headers,
-				Body:   m.output.Body,
-				Name:   m.output.CallingModule,
+				Header:    m.output.Headers,
+				Body:      m.output.Body,
+				TableCols: tableCols,
+				Name:      m.output.CallingModule,
 			})
 			o.PrefixIdentifier = m.AWSProfile
 			o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/outbound-assumed-roles.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -22,12 +23,14 @@ type OutboundAssumedRolesModule struct {
 	// General configuration data
 	CloudTrailClient *cloudtrail.Client
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	OutboundAssumeRoleEntries []OutboundAssumeRoleEntry
@@ -114,7 +117,7 @@ type CloudTrailEvent struct {
 	} `json:"tlsDetails"`
 }
 
-func (m *OutboundAssumedRolesModule) PrintOutboundRoleTrusts(days int, outputFormat string, outputDirectory string, verbosity int) {
+func (m *OutboundAssumedRolesModule) PrintOutboundRoleTrusts(days int, outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -161,7 +164,7 @@ func (m *OutboundAssumedRolesModule) PrintOutboundRoleTrusts(days int, outputFor
 	<-receiverDone
 
 	m.output.Headers = []string{
-		"Service",
+		"Account",
 		"Region",
 		"Type",
 		//"Source Account",
@@ -171,12 +174,48 @@ func (m *OutboundAssumedRolesModule) PrintOutboundRoleTrusts(days int, outputFor
 		"Log Entry Timestamp",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Region",
+			"Type",
+			//"Source Account",
+			"Source Principal",
+			//"Destination Account",
+			"Destination Principal",
+			"Log Entry Timestamp",
+		}
+		// Otherwise, use the default columns.
+	} else {
+
+		tableCols = []string{
+			"Region",
+			"Type",
+			//"Source Account",
+			"Source Principal",
+			//"Destination Account",
+			"Destination Principal",
+			"Log Entry Timestamp",
+		}
+	}
+
 	// Table rows
 	for i := range m.OutboundAssumeRoleEntries {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.OutboundAssumeRoleEntries[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.OutboundAssumeRoleEntries[i].Region,
 				m.OutboundAssumeRoleEntries[i].Type,
 				//m.OutboundAssumeRoleEntries[i].SourceAccount,
@@ -191,9 +230,6 @@ func (m *OutboundAssumedRolesModule) PrintOutboundRoleTrusts(days int, outputFor
 	if len(m.output.Body) > 0 {
 
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -202,9 +238,10 @@ func (m *OutboundAssumedRolesModule) PrintOutboundRoleTrusts(days int, outputFor
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/permissions.go

@@ -21,12 +21,14 @@ type IamPermissionsModule struct {
 	// General configuration data
 	IAMClient sdk.AWSIAMClientInterface
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 
@@ -76,13 +78,14 @@ type PermissionsRow struct {
 	Arn        string
 	PolicyType string
 	PolicyName string
+	PolicyArn  string
 	Effect     string
 	Action     string
 	Resource   string
 	Condition  string
 }
 
-func (m *IamPermissionsModule) PrintIamPermissions(outputFormat string, outputDirectory string, verbosity int, principal string) {
+func (m *IamPermissionsModule) PrintIamPermissions(outputDirectory string, verbosity int, principal string) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -105,12 +108,13 @@ func (m *IamPermissionsModule) PrintIamPermissions(outputFormat string, outputDi
 	m.parsePermissions(principal)
 
 	m.output.Headers = []string{
-		//"Service",
+		"Account",
 		"Type",
 		"Name",
-		//"Arn",
+		"Arn",
 		"Policy",
 		"Policy Name",
+		"Policy Arn",
 		"Effect",
 		"Action",
 		"Resource",
@@ -122,12 +126,13 @@ func (m *IamPermissionsModule) PrintIamPermissions(outputFormat string, outputDi
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				//m.Rows[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.Rows[i].Type,
 				m.Rows[i].Name,
-				//m.Rows[i].Arn,
+				m.Rows[i].Arn,
 				m.Rows[i].PolicyType,
 				m.Rows[i].PolicyName,
+				m.Rows[i].PolicyArn,
 				m.Rows[i].Effect,
 				m.Rows[i].Action,
 				m.Rows[i].Resource,
@@ -139,9 +144,6 @@ func (m *IamPermissionsModule) PrintIamPermissions(outputFormat string, outputDi
 
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector3(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -149,10 +151,48 @@ func (m *IamPermissionsModule) PrintIamPermissions(outputFormat string, outputDi
 				Wrap: m.WrapTable,
 			},
 		}
+
+		// If the user specified table columns, use those.
+		// If the user specified -o wide, use the wide default cols for this module.
+		// Otherwise, use the hardcoded default cols for this module.
+		var tableCols []string
+		// If the user specified table columns, use those.
+		if m.AWSTableCols != "" {
+			tableCols = strings.Split(m.AWSTableCols, ",")
+			// If the user specified wide as the output format, use these columns.
+		} else if m.AWSOutputType == "wide" {
+			tableCols = []string{
+				"Account",
+				"Type",
+				//"Name",
+				"Arn",
+				"Policy",
+				"Policy Name",
+				"Policy Arn",
+				"Effect",
+				"Action",
+				"Resource",
+				"Condition"}
+			// Otherwise, use the default columns for this module (brief)
+		} else {
+			tableCols = []string{
+				"Type",
+				"Name",
+				//"Arn",
+				"Policy",
+				"Policy Name",
+				"Effect",
+				"Action",
+				"Resource",
+				"Condition",
+			}
+		}
+
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			TableCols: tableCols,
+			Body:      m.output.Body,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -402,6 +442,7 @@ func (m *IamPermissionsModule) getPermissionsFromAttachedPolicy(arn string, atta
 											Type:       IAMtype,
 											PolicyType: "Managed",
 											PolicyName: p.Name,
+											PolicyArn:  p.Arn,
 											Effect:     effect,
 											Action:     action,
 											Resource:   resource,
@@ -428,6 +469,7 @@ func (m *IamPermissionsModule) getPermissionsFromAttachedPolicy(arn string, atta
 											Type:       IAMtype,
 											PolicyType: "Managed",
 											PolicyName: p.Name,
+											PolicyArn:  p.Arn,
 											Effect:     effect,
 											Action:     "[NotAction] " + action,
 											Resource:   resource,
@@ -473,6 +515,7 @@ func (m *IamPermissionsModule) getPermissionsFromInlinePolicy(arn string, inline
 							Type:       IAMtype,
 							PolicyType: "Inline",
 							PolicyName: aws.ToString(inlinePolicy.PolicyName),
+							PolicyArn:  aws.ToString(inlinePolicy.PolicyName),
 							Effect:     effect,
 							Action:     action,
 							Resource:   resource,
@@ -498,6 +541,7 @@ func (m *IamPermissionsModule) getPermissionsFromInlinePolicy(arn string, inline
 							Type:       IAMtype,
 							PolicyType: "Inline",
 							PolicyName: aws.ToString(inlinePolicy.PolicyName),
+							PolicyArn:  aws.ToString(inlinePolicy.PolicyName),
 							Effect:     effect,
 							Action:     "[NotAction] " + action,
 							Resource:   resource,

aws/pmapper.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/BishopFox/cloudfox/internal"
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -17,12 +18,14 @@ import (
 
 type PmapperModule struct {
 	// General configuration data
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	pmapperGraph   graph.Graph[string, string]
@@ -136,7 +139,7 @@ func (m *PmapperModule) DoesPrincipalHaveAdmin(principal string) bool {
 	return false
 }
 
-func (m *PmapperModule) PrintPmapperData(outputFormat string, outputDirectory string, verbosity int) {
+func (m *PmapperModule) PrintPmapperData(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -163,11 +166,39 @@ func (m *PmapperModule) PrintPmapperData(outputFormat string, outputDirectory st
 	}
 
 	m.output.Headers = []string{
+		"Account",
 		"Principal Arn",
 		"IsAdmin?",
 		"CanPrivEscToAdmin?",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Principal Arn",
+			"IsAdmin?",
+			"CanPrivEscToAdmin?",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Principal Arn",
+			"IsAdmin?",
+			"CanPrivEscToAdmin?",
+		}
+	}
+
 	//Table rows
 	var isAdmin, pathToAdmin string
 	for i := range m.Nodes {
@@ -186,6 +217,7 @@ func (m *PmapperModule) PrintPmapperData(outputFormat string, outputDirectory st
 			m.output.Body = append(
 				m.output.Body,
 				[]string{
+					aws.ToString(m.Caller.Account),
 					m.Nodes[i].Arn,
 					isAdmin,
 					pathToAdmin,
@@ -196,8 +228,6 @@ func (m *PmapperModule) PrintPmapperData(outputFormat string, outputDirectory st
 
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -206,9 +236,10 @@ func (m *PmapperModule) PrintPmapperData(outputFormat string, outputDirectory st
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/principals.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
 	"github.com/BishopFox/cloudfox/internal"
@@ -16,12 +17,14 @@ type IamPrincipalsModule struct {
 	// General configuration data
 	IAMClient sdk.AWSIAMClientInterface
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	Users          []User
@@ -61,7 +64,7 @@ type Role struct {
 	InlinePolicies   []string
 }
 
-func (m *IamPrincipalsModule) PrintIamPrincipals(outputFormat string, outputDirectory string, verbosity int) {
+func (m *IamPrincipalsModule) PrintIamPrincipals(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -92,13 +95,44 @@ func (m *IamPrincipalsModule) PrintIamPrincipals(outputFormat string, outputDire
 	//fmt.Printf("\nAnalyzed Resources by Region\n\n")
 
 	m.output.Headers = []string{
-		"Service",
+		"Account",
 		"Type",
 		"Name",
 		"Arn",
+		"AttachedPolicies",
+		"InlinePolicies",
+	}
 
-		// "AttachedPolicies",
-		// "InlinePolicies",
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Type",
+			"Name",
+			"Arn",
+			//"AttachedPolicies",
+			//"InlinePolicies",
+		}
+
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Type",
+			"Name",
+			"Arn",
+			// "AttachedPolicies",
+			// "InlinePolicies",
+		}
 	}
 
 	//Table rows
@@ -106,13 +140,12 @@ func (m *IamPrincipalsModule) PrintIamPrincipals(outputFormat string, outputDire
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.Users[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.Users[i].Type,
 				m.Users[i].Name,
 				m.Users[i].Arn,
-
-				// m.Users[i].AttachedPolicies,
-				// m.Users[i].InlinePolicies,
+				strings.Join(m.Users[i].AttachedPolicies, " , "),
+				strings.Join(m.Users[i].InlinePolicies, " , "),
 			},
 		)
 
@@ -122,22 +155,19 @@ func (m *IamPrincipalsModule) PrintIamPrincipals(outputFormat string, outputDire
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.Roles[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.Roles[i].Type,
 				m.Roles[i].Name,
 				m.Roles[i].Arn,
-
-				// m.Roles[i].AttachedPolicies,
-				// m.Roles[i].InlinePolicies,
+				strings.Join(m.Roles[i].AttachedPolicies, " , "),
+				strings.Join(m.Roles[i].InlinePolicies, " , "),
 			},
 		)
 
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -146,9 +176,10 @@ func (m *IamPrincipalsModule) PrintIamPrincipals(outputFormat string, outputDire
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/ram.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/internal"
@@ -20,12 +21,14 @@ type RAMModule struct {
 	// General configuration data
 	RAMClient *ram.Client
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	Resources      []Resource
@@ -44,7 +47,7 @@ type Resource struct {
 	ShareType  string
 }
 
-func (m *RAMModule) PrintRAM(outputFormat string, outputDirectory string, verbosity int) {
+func (m *RAMModule) PrintRAM(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -91,7 +94,7 @@ func (m *RAMModule) PrintRAM(outputFormat string, outputDirectory string, verbos
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
-		"Service",
+		"Account",
 		"Region",
 		"Share Name",
 		"Type",
@@ -99,12 +102,44 @@ func (m *RAMModule) PrintRAM(outputFormat string, outputDirectory string, verbos
 		"Share Type",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Region",
+			"Share Name",
+			"Type",
+			"Owner",
+			"Share Type",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Share Name",
+			"Type",
+			"Owner",
+			"Share Type",
+		}
+	}
+
 	// Table rows
 	for i := range m.Resources {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.Resources[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.Resources[i].Region,
 				m.Resources[i].Name,
 				m.Resources[i].Type,
@@ -116,9 +151,7 @@ func (m *RAMModule) PrintRAM(outputFormat string, outputDirectory string, verbos
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -127,9 +160,10 @@ func (m *RAMModule) PrintRAM(outputFormat string, outputDirectory string, verbos
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/resource-trusts.go

@@ -20,10 +20,14 @@ import (
 
 type ResourceTrustsModule struct {
 	// General configuration data
-	Caller          sts.GetCallerIdentityOutput
-	AWSRegions      []string
-	Goroutines      int
-	WrapTable       bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	Goroutines    int
+	WrapTable     bool
+	AWSOutputType string
+	AWSTableCols  string
+	AWSMFAToken   string
+
 	AWSProfile      string
 	CloudFoxVersion string
 
@@ -44,9 +48,13 @@ type Resource2 struct {
 	ResourcePolicySummary string
 	Public                string
 	Interesting           string
+	TrustedPrincipals     string
+	TrustsCrossAccount    string
+	TrustsAllAccounts     string
+	HasConditions         string
 }
 
-func (m *ResourceTrustsModule) PrintResources(outputFormat string, outputDirectory string, verbosity int) {
+func (m *ResourceTrustsModule) PrintResources(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -60,7 +68,7 @@ func (m *ResourceTrustsModule) PrintResources(outputFormat string, outputDirecto
 	}
 
 	fmt.Printf("[%s][%s] Enumerating Resources with resource policies for account %s.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), aws.ToString(m.Caller.Account))
-	fmt.Printf("[%s][%s] Supported Services: CodeBuild, ECR, EFS, Lambda, S3, SNS, SQS\n", cyan(m.output.CallingModule), cyan(m.AWSProfile))
+	fmt.Printf("[%s][%s] Supported Services: CodeBuild, ECR, EFS, Glue, Lambda, SecretsManager, S3, SNS, SQS\n", cyan(m.output.CallingModule), cyan(m.AWSProfile))
 	wg := new(sync.WaitGroup)
 	semaphore := make(chan struct{}, m.Goroutines)
 
@@ -95,13 +103,42 @@ func (m *ResourceTrustsModule) PrintResources(outputFormat string, outputDirecto
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
-		//"Account ID",
+		"Account",
 		"ARN",
 		"Public",
 		"Interesting",
 		"Resource Policy Summary",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"ARN",
+			"Public",
+			"Interesting",
+			"Resource Policy Summary",
+		}
+	} else {
+		tableCols = []string{
+			//"Account ID",
+			"ARN",
+			"Public",
+			"Interesting",
+			"Resource Policy Summary",
+		}
+	}
+
 	// sort the table roles by Interesting
 	sort.Slice(m.Resources2, func(i, j int) bool {
 		return m.Resources2[j].Interesting > m.Resources2[i].Interesting
@@ -112,7 +149,7 @@ func (m *ResourceTrustsModule) PrintResources(outputFormat string, outputDirecto
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				//m.Resources2[i].AccountID,
+				aws.ToString(m.Caller.Account),
 				m.Resources2[i].ARN,
 				m.Resources2[i].Public,
 				m.Resources2[i].Interesting,
@@ -122,8 +159,6 @@ func (m *ResourceTrustsModule) PrintResources(outputFormat string, outputDirecto
 
 	}
 	if len(m.output.Body) > 0 {
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity, m.AWSProfile)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -132,9 +167,10 @@ func (m *ResourceTrustsModule) PrintResources(outputFormat string, outputDirecto
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -212,6 +248,24 @@ func (m *ResourceTrustsModule) executeChecks(r string, wg *sync.WaitGroup, semap
 		wg.Add(1)
 		m.getEFSfilesystemPoliciesPerRegion(r, wg, semaphore, dataReceiver)
 	}
+	res, err = servicemap.IsServiceInRegion("secretsmanager", r)
+	if err != nil {
+		m.modLog.Error(err)
+	}
+	if res {
+		m.CommandCounter.Total++
+		wg.Add(1)
+		m.getSecretsManagerSecretsPoliciesPerRegion(r, wg, semaphore, dataReceiver)
+	}
+	res, err = servicemap.IsServiceInRegion("glue", r)
+	if err != nil {
+		m.modLog.Error(err)
+	}
+	if res {
+		m.CommandCounter.Total++
+		wg.Add(1)
+		m.getGlueResourcePoliciesPerRegion(r, wg, semaphore, dataReceiver)
+	}
 
 }
 
@@ -238,7 +292,7 @@ func (m *ResourceTrustsModule) getSNSTopicsPerRegion(r string, wg *sync.WaitGrou
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxSNSClient := InitCloudFoxSNSClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.WrapTable)
+	cloudFoxSNSClient := InitCloudFoxSNSClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.WrapTable, m.AWSMFAToken)
 
 	ListTopics, err := cloudFoxSNSClient.listTopics(r)
 	if err != nil {
@@ -314,7 +368,7 @@ func (m *ResourceTrustsModule) getS3Buckets(wg *sync.WaitGroup, semaphore chan s
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxS3Client := initCloudFoxS3Client(m.Caller, m.AWSProfile, m.CloudFoxVersion)
+	cloudFoxS3Client := initCloudFoxS3Client(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.AWSMFAToken)
 
 	ListBuckets, err := sdk.CachedListBuckets(cloudFoxS3Client.S3Client, aws.ToString(m.Caller.Account))
 	if err != nil {
@@ -325,7 +379,7 @@ func (m *ResourceTrustsModule) getS3Buckets(wg *sync.WaitGroup, semaphore chan s
 	for _, b := range ListBuckets {
 		var statementSummaryInEnglish string
 		var isInteresting string = "No"
-		bucket := &Bucket{
+		bucket := &BucketRow{
 			Arn: fmt.Sprintf("arn:aws:s3:::%s", aws.ToString(b.Name)),
 		}
 		name := aws.ToString(b.Name)
@@ -397,7 +451,7 @@ func (m *ResourceTrustsModule) getSQSQueuesPerRegion(r string, wg *sync.WaitGrou
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxSQSClient := InitSQSClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines)
+	cloudFoxSQSClient := InitSQSClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
 
 	ListQueues, err := cloudFoxSQSClient.listQueues(r)
 	if err != nil {
@@ -459,9 +513,9 @@ func (m *ResourceTrustsModule) getECRRecordsPerRegion(r string, wg *sync.WaitGro
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxECRClient := InitECRClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines)
+	cloudFoxECRClient := InitECRClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
 
-	DescribeRepositories, err := cloudFoxECRClient.describeRepositories(r)
+	DescribeRepositories, err := sdk.CachedECRDescribeRepositories(cloudFoxECRClient.ECRClient, aws.ToString(m.Caller.Account), r)
 	if err != nil {
 		m.modLog.Error(err.Error())
 		return
@@ -523,7 +577,7 @@ func (m *ResourceTrustsModule) getCodeBuildResourcePoliciesPerRegion(r string, w
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxCodeBuildClient := InitCodeBuildClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines)
+	cloudFoxCodeBuildClient := InitCodeBuildClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
 
 	ListProjects, err := sdk.CachedCodeBuildListProjects(cloudFoxCodeBuildClient.CodeBuildClient, aws.ToString(cloudFoxCodeBuildClient.Caller.Account), r)
 	if err != nil {
@@ -597,7 +651,7 @@ func (m *ResourceTrustsModule) getLambdaPolicyPerRegion(r string, wg *sync.WaitG
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxLambdaClient := InitLambdaClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines)
+	cloudFoxLambdaClient := InitLambdaClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
 
 	ListFunctions, err := cloudFoxLambdaClient.listFunctions(r)
 	if err != nil {
@@ -662,7 +716,7 @@ func (m *ResourceTrustsModule) getEFSfilesystemPoliciesPerRegion(r string, wg *s
 	semaphore <- struct{}{}
 	defer func() { <-semaphore }()
 
-	cloudFoxEFSClient := InitFileSystemsClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines)
+	cloudFoxEFSClient := InitFileSystemsClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
 
 	ListFileSystems, err := sdk.CachedDescribeFileSystems(cloudFoxEFSClient.EFSClient, aws.ToString(m.Caller.Account), r)
 	if err != nil {
@@ -718,6 +772,134 @@ func (m *ResourceTrustsModule) getEFSfilesystemPoliciesPerRegion(r string, wg *s
 	}
 }
 
+// getSecretsManagerSecretsPoliciesPerRegion retrieves the resource policies for all Secrets Manager secrets in the specified region.
+// It sends the resulting Resource2 objects to the dataReceiver channel.
+// It uses a semaphore to limit the number of concurrent requests and a WaitGroup to wait for all requests to complete.
+// It takes the region to search in, the WaitGroup to use, the semaphore to use, and the dataReceiver channel to send results to.
+func (m *ResourceTrustsModule) getSecretsManagerSecretsPoliciesPerRegion(r string, wg *sync.WaitGroup, semaphore chan struct{}, dataReceiver chan Resource2) {
+	defer func() {
+		m.CommandCounter.Executing--
+		m.CommandCounter.Complete++
+		wg.Done()
+
+	}()
+	semaphore <- struct{}{}
+	defer func() { <-semaphore }()
+
+	cloudFoxSecretsManagerClient := InitSecretsManagerClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
+
+	ListSecrets, err := sdk.CachedSecretsManagerListSecrets(cloudFoxSecretsManagerClient, aws.ToString(m.Caller.Account), r)
+	if err != nil {
+		sharedLogger.Error(err.Error())
+		return
+	}
+
+	for _, s := range ListSecrets {
+		var isPublic string
+		var statementSummaryInEnglish string
+		var isInteresting string = "No"
+		secretPolicy, err := sdk.CachedSecretsManagerGetResourcePolicy(cloudFoxSecretsManagerClient, aws.ToString(s.ARN), r, aws.ToString(m.Caller.Account))
+		if err != nil {
+			sharedLogger.Error(err.Error())
+			m.CommandCounter.Error++
+			continue
+		}
+
+		if secretPolicy.IsPublic() {
+			isPublic = magenta("Yes")
+			isInteresting = magenta("Yes")
+
+		} else {
+			isPublic = "No"
+		}
+
+		if !secretPolicy.IsEmpty() {
+			for i, statement := range secretPolicy.Statement {
+				prefix := ""
+				if len(secretPolicy.Statement) > 1 {
+					prefix = fmt.Sprintf("Statement %d says: ", i)
+					statementSummaryInEnglish = prefix + statement.GetStatementSummaryInEnglish(*m.Caller.Account) + "\n"
+				} else {
+					statementSummaryInEnglish = statement.GetStatementSummaryInEnglish(*m.Caller.Account)
+				}
+				statementSummaryInEnglish = strings.TrimSuffix(statementSummaryInEnglish, "\n")
+				if isResourcePolicyInteresting(statementSummaryInEnglish) {
+					//magenta(statementSummaryInEnglish)
+					isInteresting = magenta("Yes")
+				}
+
+				dataReceiver <- Resource2{
+					AccountID:             aws.ToString(m.Caller.Account),
+					ARN:                   aws.ToString(s.ARN),
+					ResourcePolicySummary: statementSummaryInEnglish,
+					Public:                isPublic,
+					Name:                  aws.ToString(s.Name),
+					Region:                r,
+					Interesting:           isInteresting,
+				}
+			}
+		}
+	}
+}
+
+func (m *ResourceTrustsModule) getGlueResourcePoliciesPerRegion(r string, wg *sync.WaitGroup, semaphore chan struct{}, dataReceiver chan Resource2) {
+	defer func() {
+		m.CommandCounter.Executing--
+		m.CommandCounter.Complete++
+		wg.Done()
+
+	}()
+	semaphore <- struct{}{}
+	defer func() { <-semaphore }()
+
+	cloudFoxGlueClient := InitGlueClient(m.Caller, m.AWSProfile, m.CloudFoxVersion, m.Goroutines, m.AWSMFAToken)
+
+	ResourcePolicies, err := sdk.CachedGlueGetResourcePolicies(cloudFoxGlueClient, aws.ToString(m.Caller.Account), r)
+	if err != nil {
+		sharedLogger.Error(err.Error())
+		return
+	}
+
+	for _, resourcePolicy := range ResourcePolicies {
+		var isPublic string
+		var statementSummaryInEnglish string
+		var isInteresting string = "No"
+
+		if resourcePolicy.IsPublic() {
+			isPublic = magenta("Yes")
+			isInteresting = magenta("Yes")
+
+		} else {
+			isPublic = "No"
+		}
+
+		if !resourcePolicy.IsEmpty() {
+			for _, statement := range resourcePolicy.Statement {
+				statementSummaryInEnglish = statement.GetStatementSummaryInEnglish(*m.Caller.Account)
+				resources := statement.Resource
+				for _, resource := range resources {
+
+					statementSummaryInEnglish = strings.TrimSuffix(statementSummaryInEnglish, "\n")
+					if isResourcePolicyInteresting(statementSummaryInEnglish) {
+						//magenta(statementSummaryInEnglish)
+						isInteresting = magenta("Yes")
+					}
+
+					dataReceiver <- Resource2{
+						AccountID:             aws.ToString(m.Caller.Account),
+						ARN:                   resource,
+						ResourcePolicySummary: statementSummaryInEnglish,
+						Public:                isPublic,
+						Name:                  resource,
+						Region:                r,
+						Interesting:           isInteresting,
+					}
+				}
+			}
+		}
+	}
+}
+
 func isResourcePolicyInteresting(statementSummaryInEnglish string) bool {
 	// check if the statement has any of the following items, but make sure the check is case insensitive
 	// if it does, then return true

aws/resource-trusts_test.go

@@ -0,0 +1,43 @@
+package aws
+
+import (
+	"testing"
+)
+
+func TestIsResourcePolicyInteresting(t *testing.T) {
+	testCases := []struct {
+		name     string
+		input    string
+		expected bool
+	}{
+		{
+			name:     "test1",
+			input:    "Everyone can sqs:SendMessage & can sqs:ReceiveMessage",
+			expected: true,
+		},
+		{
+			name:     "PrincipalOrgPaths",
+			input:    "aws:PrincipalOrgPaths",
+			expected: true,
+		},
+		{
+			name:     "Empty",
+			input:    "",
+			expected: false,
+		},
+		{
+			name:     "NotInteresting",
+			input:    "sns.amazonaws.com can lambda:InvokeFunction",
+			expected: false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			actual := isResourcePolicyInteresting(tc.input)
+			if actual != tc.expected {
+				t.Errorf("Expected %v but got %v for input %s", tc.expected, actual, tc.input)
+			}
+		})
+	}
+}

aws/role-trusts.go

@@ -31,12 +31,16 @@ type RoleTrustsModule struct {
 	CommandCounter internal.CommandCounter
 	SkipAdminCheck bool
 	WrapTable      bool
-	pmapperMod     PmapperModule
-	pmapperError   error
-	iamSimClient   IamSimulatorModule
+	AWSOutputType  string
+	AWSTableCols   string
+
+	pmapperMod   PmapperModule
+	pmapperError error
+	iamSimClient IamSimulatorModule
 
 	// Main module data
-	AnalyzedRoles []AnalyzedRole
+	AnalyzedRoles  []AnalyzedRole
+	RoleTrustTable []RoleTrustRow
 
 	// Used to store output data for pretty printing
 	output internal.OutputData2
@@ -44,6 +48,18 @@ type RoleTrustsModule struct {
 	modLog *logrus.Entry
 }
 
+type RoleTrustRow struct {
+	RoleARN                  string
+	RoleName                 string
+	TrustedPrincipal         string
+	TrustedService           string
+	TrustedFederatedProvider string
+	TrustedFederatedSubject  string
+	ExternalID               string
+	IsAdmin                  string
+	CanPrivEsc               string
+}
+
 type AnalyzedRole struct {
 	roleARN   *string
 	trustsDoc trustPolicyDocument
@@ -86,7 +102,7 @@ type RoleTrustStatementEntry struct {
 	} `json:"Condition"`
 }
 
-func (m *RoleTrustsModule) PrintRoleTrusts(outputFormat string, outputDirectory string, verbosity int) {
+func (m *RoleTrustsModule) PrintRoleTrusts(outputDirectory string, verbosity int) {
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
 	m.output.CallingModule = "role-trusts"
@@ -129,25 +145,28 @@ func (m *RoleTrustsModule) PrintRoleTrusts(outputFormat string, outputDirectory
 	o.PrefixIdentifier = m.AWSProfile
 	o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
 
-	principalsHeader, principalsBody := m.printPrincipalTrusts(outputFormat, outputDirectory)
+	principalsHeader, principalsBody, principalTableCols := m.printPrincipalTrusts(outputDirectory)
 	o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-		Header: principalsHeader,
-		Body:   principalsBody,
-		Name:   "role-trusts-principals",
+		Header:    principalsHeader,
+		Body:      principalsBody,
+		TableCols: principalTableCols,
+		Name:      "role-trusts-principals",
 	})
 
-	servicesHeader, servicesBody := m.printServiceTrusts(outputFormat, outputDirectory)
+	servicesHeader, servicesBody, serviceTableCols := m.printServiceTrusts(outputDirectory)
 	o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-		Header: servicesHeader,
-		Body:   servicesBody,
-		Name:   "role-trusts-services",
+		Header:    servicesHeader,
+		Body:      servicesBody,
+		TableCols: serviceTableCols,
+		Name:      "role-trusts-services",
 	})
 
-	federatedHeader, federatedBody := m.printFederatedTrusts(outputFormat, outputDirectory)
+	federatedHeader, federatedBody, federatedTableCols := m.printFederatedTrusts(outputDirectory)
 	o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-		Header: federatedHeader,
-		Body:   federatedBody,
-		Name:   "role-trusts-federated",
+		Header:    federatedHeader,
+		Body:      federatedBody,
+		TableCols: federatedTableCols,
+		Name:      "role-trusts-federated",
 	})
 
 	o.WriteFullOutput(o.Table.TableFiles, nil)
@@ -169,196 +188,203 @@ func (m *RoleTrustsModule) PrintRoleTrusts(outputFormat string, outputDirectory
 
 }
 
-func (m *RoleTrustsModule) printPrincipalTrusts(outputFormat string, outputDirectory string) ([]string, [][]string) {
+func (m *RoleTrustsModule) printPrincipalTrusts(outputDirectory string) ([]string, [][]string, []string) {
 	var header []string
 	var body [][]string
 	m.output.FullFilename = ""
 	m.output.Body = nil
 	m.output.CallingModule = "role-trusts"
 	m.output.FullFilename = "role-trusts-principals"
-	var column1 string
-	if m.pmapperError == nil {
-		header = []string{
-			"Role",
-			"Trusted Principal",
-			"ExternalID",
-			"IsAdmin?",
-			"CanPrivEscToAdmin?",
-		}
-	} else {
-		header = []string{
-			"Role",
-			"Trusted Principal",
-			"ExternalID",
-			"IsAdmin?",
-			//"CanPrivEscToAdmin?",
-		}
+	header = []string{
+		"Account",
+		"Role Arn",
+		"Role Name",
+		"Trusted Principal",
+		"ExternalID",
+		"IsAdmin?",
+		"CanPrivEscToAdmin?",
+	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{"Account", "Role Arn", "Trusted Principal", "ExternalID", "IsAdmin?", "CanPrivEscToAdmin?"}
+		// Otherwise, use the default columns for this module (brief)
+	} else {
+		tableCols = []string{"Role Name", "Trusted Principal", "ExternalID", "IsAdmin?", "CanPrivEscToAdmin?"}
+	}
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
 	}
 
 	for _, role := range m.AnalyzedRoles {
 		for _, statement := range role.trustsDoc.Statement {
 			for _, principal := range statement.Principal.AWS {
-				if outputFormat == "wide" {
-					column1 = aws.ToString(role.roleARN)
-				} else {
-					column1 = GetResourceNameFromArn(aws.ToString(role.roleARN))
-				}
-				column2 := principal
-				column3 := statement.Condition.StringEquals.StsExternalID
-				column4 := role.Admin
-				column5 := role.CanPrivEsc
-				if m.pmapperError == nil {
-					body = append(body, []string{column1, column2, column3, column4, column5})
-				} else {
-					body = append(body, []string{column1, column2, column3, column4})
-				}
 
+				RoleTrustRow := RoleTrustRow{
+					RoleARN:          aws.ToString(role.roleARN),
+					RoleName:         GetResourceNameFromArn(aws.ToString(role.roleARN)),
+					TrustedPrincipal: principal,
+					ExternalID:       statement.Condition.StringEquals.StsExternalID,
+					IsAdmin:          role.Admin,
+					CanPrivEsc:       role.CanPrivEsc,
+				}
+				body = append(body, []string{
+					aws.ToString(m.Caller.Account),
+					RoleTrustRow.RoleARN,
+					RoleTrustRow.RoleName,
+					RoleTrustRow.TrustedPrincipal,
+					RoleTrustRow.ExternalID,
+					RoleTrustRow.IsAdmin,
+					RoleTrustRow.CanPrivEsc})
 			}
 		}
 	}
-	m.sortTrustsTablePerTrustedPrincipal()
-	return header, body
-	// if len(m.output.Body) > 0 {
-	// 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", aws.ToString(m.Caller.Account),m.AWSProfile))
-	// 	////m.output.OutputSelector(outputFormat)
-	// 	//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule)
-	// 	//internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-	// 	fmt.Printf("[%s][%s] %s role trusts found.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), strconv.Itoa(len(m.output.Body)))
 
-	// } else {
-	// 	fmt.Printf("[%s][%s] No role trusts found, skipping the creation of an output file.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile))
-	// }
-	// fmt.Printf("[%s][%s] For context and next steps: https://github.com/BishopFox/cloudfox/wiki/AWS-Commands#%s\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), m.output.CallingModule)
+	m.sortTrustsTablePerTrustedPrincipal()
+	return header, body, tableCols
+
 }
 
-func (m *RoleTrustsModule) printServiceTrusts(outputFormat string, outputDirectory string) ([]string, [][]string) {
+func (m *RoleTrustsModule) printServiceTrusts(outputDirectory string) ([]string, [][]string, []string) {
 	var header []string
 	var body [][]string
 	m.output.FullFilename = ""
 	m.output.Body = nil
 	m.output.CallingModule = "role-trusts"
 	m.output.FullFilename = "role-trusts-services"
-	var column1 string
-	if m.pmapperError == nil {
-		header = []string{
-			"Role",
-			"Trusted Service",
-			"ExternalID",
-			"IsAdmin?",
-			"CanPrivEscToAdmin?",
-		}
+	header = []string{
+		"Account",
+		"Role Arn",
+		"Role Name",
+		"Trusted Service",
+		"IsAdmin?",
+		"CanPrivEscToAdmin?",
+	}
+
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{"Role Arn", "Trusted Service", "IsAdmin?", "CanPrivEscToAdmin?"}
+		// Otherwise, use the default columns for this module (brief)
 	} else {
-		header = []string{
-			"Role",
-			"Trusted Service",
-			"ExternalID",
-			"IsAdmin?",
-			//"CanPrivEscToAdmin?",
-		}
+		tableCols = []string{"Role Name", "Trusted Service", "IsAdmin?", "CanPrivEscToAdmin?"}
+	}
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
 	}
 
 	for _, role := range m.AnalyzedRoles {
 		for _, statement := range role.trustsDoc.Statement {
 			for _, service := range statement.Principal.Service {
-				if outputFormat == "wide" {
-					column1 = aws.ToString(role.roleARN)
-				} else {
-					column1 = GetResourceNameFromArn(aws.ToString(role.roleARN))
-				}
-				column2 := service
-				column3 := statement.Condition.StringEquals.StsExternalID
-				column4 := role.Admin
-				column5 := role.CanPrivEsc
-				if m.pmapperError == nil {
-					body = append(body, []string{column1, column2, column3, column4, column5})
-				} else {
-					body = append(body, []string{column1, column2, column3, column4})
+				RoleTrustRow := RoleTrustRow{
+					RoleARN:        aws.ToString(role.roleARN),
+					RoleName:       GetResourceNameFromArn(aws.ToString(role.roleARN)),
+					TrustedService: service,
+					IsAdmin:        role.Admin,
+					CanPrivEsc:     role.CanPrivEsc,
 				}
+				body = append(body, []string{
+					aws.ToString(m.Caller.Account),
+					RoleTrustRow.RoleARN,
+					RoleTrustRow.RoleName,
+					RoleTrustRow.TrustedService,
+					RoleTrustRow.IsAdmin,
+					RoleTrustRow.CanPrivEsc})
+
 			}
 		}
 	}
 
 	// sort the rows based on column 2 (service)
 	sort.SliceStable(body, func(i, j int) bool {
-		return body[i][1] < body[j][1]
+		return body[i][3] < body[j][3]
 	})
 
-	//m.sortTrustsTablePerTrustedPrincipal()
-	return header, body
+	return header, body, tableCols
 
-	// if len(m.output.Body) > 0 {
-	// 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", aws.ToString(m.Caller.Account),m.AWSProfile))
-	// 	//m.output.OutputSelector(outputFormat)
-	// 	//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule)
-	// 	internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-	// 	fmt.Printf("[%s][%s] %s role trusts found.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), strconv.Itoa(len(m.output.Body)))
-
-	// } else {
-	// 	fmt.Printf("[%s][%s] No role trusts found, skipping the creation of an output file.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile))
-	// }
 }
 
-func (m *RoleTrustsModule) printFederatedTrusts(outputFormat string, outputDirectory string) ([]string, [][]string) {
+func (m *RoleTrustsModule) printFederatedTrusts(outputDirectory string) ([]string, [][]string, []string) {
 	var header []string
 	var body [][]string
 	m.output.FullFilename = ""
 	m.output.Body = nil
 	m.output.CallingModule = "role-trusts"
 	m.output.FullFilename = "role-trusts-federated"
-	var column1, column3, column2 string
-	if m.pmapperError == nil {
-
-		header = []string{
-			"Role",
-			"Trusted Provider",
-			"Trusted Subject",
-			"IsAdmin?",
-			"CanPrivEscToAdmin?",
-		}
-	} else {
-		header = []string{
-			"Role",
-			"Trusted Provider",
-			"Trusted Subject",
-			"IsAdmin?",
-			//"CanPrivEscToAdmin?",
-		}
+	header = []string{
+		"Account",
+		"Role Arn",
+		"Role Name",
+		"Trusted Provider",
+		"Trusted Subject",
+		"IsAdmin?",
+		"CanPrivEscToAdmin?",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		tableCols = strings.Split(m.AWSTableCols, ",")
+		// If the user specified wide as the output format, use these columns.
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{"Role Arn", "Trusted Provider", "Trusted Subject", "IsAdmin?", "CanPrivEscToAdmin?"}
+		// Otherwise, use the default columns for this module (brief)
+	} else {
+		tableCols = []string{"Role Name", "Trusted Provider", "Trusted Subject", "IsAdmin?", "CanPrivEscToAdmin?"}
+	}
+	// Remove the pmapper row if there is no pmapper data
+	if m.pmapperError != nil {
+		sharedLogger.Errorf("%s - %s - No pmapper data found for this account. Skipping the pmapper column in the output table.", m.output.CallingModule, m.AWSProfile)
+		tableCols = removeStringFromSlice(tableCols, "CanPrivEscToAdmin?")
+	}
 	for _, role := range m.AnalyzedRoles {
-		if outputFormat == "wide" {
-			column1 = aws.ToString(role.roleARN)
-		} else {
-			column1 = GetResourceNameFromArn(aws.ToString(role.roleARN))
-		}
 		for _, statement := range role.trustsDoc.Statement {
 			if len(statement.Principal.Federated) > 0 {
-				column2, column3 = parseFederatedTrustPolicy(statement)
-				column4 := role.Admin
-				column5 := role.CanPrivEsc
-				if m.pmapperError == nil {
-					body = append(body, []string{column1, column2, column3, column4, column5})
-				} else {
-					body = append(body, []string{column1, column2, column3, column4})
+				provider, subject := parseFederatedTrustPolicy(statement)
+				RoleTrustRow := RoleTrustRow{
+					RoleARN:                  aws.ToString(role.roleARN),
+					RoleName:                 GetResourceNameFromArn(aws.ToString(role.roleARN)),
+					TrustedFederatedProvider: provider,
+					TrustedFederatedSubject:  subject,
+					IsAdmin:                  role.Admin,
+					CanPrivEsc:               role.CanPrivEsc,
 				}
+				body = append(body, []string{
+					aws.ToString(m.Caller.Account),
+					RoleTrustRow.RoleARN,
+					RoleTrustRow.RoleName,
+					RoleTrustRow.TrustedFederatedProvider,
+					RoleTrustRow.TrustedFederatedSubject,
+					RoleTrustRow.IsAdmin,
+					RoleTrustRow.CanPrivEsc})
 			}
+
 		}
 	}
 
 	m.sortTrustsTablePerTrustedPrincipal()
-	return header, body
+	return header, body, tableCols
 
-	// if len(m.output.Body) > 0 {
-	// 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", aws.ToString(m.Caller.Account),m.AWSProfile))
-	// 	//m.output.OutputSelector(outputFormat)
-	// 	//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule)
-	// 	internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.FullFilename, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-	// 	fmt.Printf("[%s][%s] %s role trusts found.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile), strconv.Itoa(len(m.output.Body)))
-
-	// } else {
-	// 	fmt.Printf("[%s][%s] No role trusts found, skipping the creation of an output file.\n", cyan(m.output.CallingModule), cyan(m.AWSProfile))
-	// }
 }
 
 func parseFederatedTrustPolicy(statement RoleTrustStatementEntry) (string, string) {
@@ -435,6 +461,7 @@ func (m *RoleTrustsModule) getAllRoleTrusts() {
 				Admin:      "",
 				CanPrivEsc: "",
 			})
+
 		}
 
 	}

aws/route53.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/BishopFox/cloudfox/aws/sdk"
 	"github.com/BishopFox/cloudfox/internal"
@@ -17,9 +18,11 @@ type Route53Module struct {
 	// General configuration data
 	Route53Client sdk.AWSRoute53ClientInterface
 
-	Caller         sts.GetCallerIdentityOutput
-	AWSRegions     []string
-	OutputFormat   string
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	Goroutines     int
 	AWSProfile     string
 	WrapTable      bool
@@ -41,7 +44,7 @@ type Record struct {
 	PrivateZone string
 }
 
-func (m *Route53Module) PrintRoute53(outputFormat string, outputDirectory string, verbosity int) {
+func (m *Route53Module) PrintRoute53(outputDirectory string, verbosity int) {
 
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
@@ -59,19 +62,48 @@ func (m *Route53Module) PrintRoute53(outputFormat string, outputDirectory string
 	m.getRoute53Records()
 
 	m.output.Headers = []string{
-		"Service",
+		"Account",
 		"Name",
 		"Type",
 		"Value",
 		"PrivateZone",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Name",
+			"Type",
+			"Value",
+			"PrivateZone",
+		}
+
+	} else {
+		tableCols = []string{
+			"Name",
+			"Type",
+			"Value",
+			"PrivateZone",
+		}
+	}
+
 	// Table rows
 	for i := range m.Records {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
-				m.Records[i].AWSService,
+				aws.ToString(m.Caller.Account),
 				m.Records[i].Name,
 				m.Records[i].Type,
 				m.Records[i].Value,
@@ -83,10 +115,7 @@ func (m *Route53Module) PrintRoute53(outputFormat string, outputDirectory string
 	if len(m.output.Body) > 0 {
 
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -95,9 +124,10 @@ func (m *Route53Module) PrintRoute53(outputFormat string, outputDirectory string
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/sdk/cloud9.go

@@ -0,0 +1,86 @@
+package sdk
+
+import (
+	"context"
+	"encoding/gob"
+
+	"github.com/BishopFox/cloudfox/internal"
+	"github.com/aws/aws-sdk-go-v2/service/cloud9"
+	cloud9Types "github.com/aws/aws-sdk-go-v2/service/cloud9/types"
+	"github.com/patrickmn/go-cache"
+)
+
+type AWSCloud9ClientInterface interface {
+	ListEnvironments(context.Context, *cloud9.ListEnvironmentsInput, ...func(*cloud9.Options)) (*cloud9.ListEnvironmentsOutput, error)
+	DescribeEnvironments(context.Context, *cloud9.DescribeEnvironmentsInput, ...func(*cloud9.Options)) (*cloud9.DescribeEnvironmentsOutput, error)
+}
+
+func init() {
+	gob.Register([]string{})
+}
+
+func CachedCloud9ListEnvironments(client AWSCloud9ClientInterface, accountID string, region string) ([]string, error) {
+	var PaginationControl *string
+	var environments []string
+	cacheKey := "cloud9-ListEnvironments-" + accountID + "-" + region
+	cached, found := internal.Cache.Get(cacheKey)
+	if found {
+		return cached.([]string), nil
+	}
+	for {
+		ListEnvironments, err := client.ListEnvironments(
+			context.TODO(),
+			&cloud9.ListEnvironmentsInput{
+				NextToken: PaginationControl,
+			},
+			func(o *cloud9.Options) {
+				o.Region = region
+			},
+		)
+
+		if err != nil {
+			return environments, err
+		}
+
+		environments = append(environments, ListEnvironments.EnvironmentIds...)
+
+		//pagination
+		if ListEnvironments.NextToken == nil {
+			break
+		}
+		PaginationControl = ListEnvironments.NextToken
+	}
+
+	internal.Cache.Set(cacheKey, environments, cache.DefaultExpiration)
+	return environments, nil
+}
+
+func CachedCloud9DescribeEnvironments(client AWSCloud9ClientInterface, accountID string, region string, environmentIDs []string) ([]cloud9Types.Environment, error) {
+	var environments []cloud9Types.Environment
+	cacheKey := "cloud9-DescribeEnvironments-" + accountID + "-" + region
+	cached, found := internal.Cache.Get(cacheKey)
+	if found {
+		return cached.([]cloud9Types.Environment), nil
+	}
+	for _, environmentID := range environmentIDs {
+		DescribeEnvironments, err := client.DescribeEnvironments(
+			context.TODO(),
+			&cloud9.DescribeEnvironmentsInput{
+				EnvironmentIds: []string{environmentID},
+			},
+			func(o *cloud9.Options) {
+				o.Region = region
+			},
+		)
+
+		if err != nil {
+			return environments, err
+		}
+
+		environments = append(environments, DescribeEnvironments.Environments...)
+
+	}
+
+	internal.Cache.Set(cacheKey, environments, cache.DefaultExpiration)
+	return environments, nil
+}

aws/sdk/cloud9_mocks.go

@@ -0,0 +1,36 @@
+package sdk
+
+import (
+	"context"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/cloud9"
+	"github.com/aws/aws-sdk-go-v2/service/cloud9/types"
+)
+
+type MockedAWSCloud9Client struct {
+}
+
+func (m *MockedAWSCloud9Client) ListEnvironments(ctx context.Context, input *cloud9.ListEnvironmentsInput, options ...func(*cloud9.Options)) (*cloud9.ListEnvironmentsOutput, error) {
+	return &cloud9.ListEnvironmentsOutput{
+		EnvironmentIds: []string{
+			"env1",
+			"env2",
+		},
+	}, nil
+}
+
+func (m *MockedAWSCloud9Client) DescribeEnvironments(ctx context.Context, input *cloud9.DescribeEnvironmentsInput, options ...func(*cloud9.Options)) (*cloud9.DescribeEnvironmentsOutput, error) {
+	return &cloud9.DescribeEnvironmentsOutput{
+		Environments: []types.Environment{
+			{
+				Name: aws.String("env1"),
+				Arn:  aws.String("arn:aws:cloud9:us-east-1:123456789012:environment/env1"),
+			},
+			{
+				Name: aws.String("env2"),
+				Arn:  aws.String("arn:aws:cloud9:us-east-1:123456789012:environment/env2"),
+			},
+		},
+	}, nil
+}

aws/sdk/codebuild_mocks.go

@@ -3,6 +3,7 @@ package sdk
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/codebuild"
 )
 
@@ -17,3 +18,22 @@ func (m *MockedCodeBuildClient) ListProjects(ctx context.Context, input *codebui
 		},
 	}, nil
 }
+
+func (m *MockedCodeBuildClient) GetResourcePolicy(ctx context.Context, input *codebuild.GetResourcePolicyInput, options ...func(*codebuild.Options)) (*codebuild.GetResourcePolicyOutput, error) {
+	return &codebuild.GetResourcePolicyOutput{
+		Policy: aws.String(`{
+			"Version": "2012-10-17",
+			"Statement": [
+			  {
+				"Effect": "Allow",
+				"Action": "codebuild:BatchGetProjects",
+				"Resource": "*",
+				"Principal": {
+					"AWS": "arn:aws:iam::123456789012:root"
+				},
+			  }
+			]
+		  }
+		`),
+	}, nil
+}

aws/sdk/ec2.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/BishopFox/cloudfox/internal"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/patrickmn/go-cache"
@@ -17,6 +18,7 @@ type AWSEC2ClientInterface interface {
 	DescribeSnapshots(context.Context, *ec2.DescribeSnapshotsInput, ...func(*ec2.Options)) (*ec2.DescribeSnapshotsOutput, error)
 	DescribeVolumes(context.Context, *ec2.DescribeVolumesInput, ...func(*ec2.Options)) (*ec2.DescribeVolumesOutput, error)
 	DescribeImages(context.Context, *ec2.DescribeImagesInput, ...func(*ec2.Options)) (*ec2.DescribeImagesOutput, error)
+	DescribeInstanceAttribute(context.Context, *ec2.DescribeInstanceAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceAttributeOutput, error)
 }
 
 func init() {
@@ -66,6 +68,30 @@ func CachedEC2DescribeInstances(client AWSEC2ClientInterface, accountID string,
 	return instances, nil
 }
 
+func CachedEC2DescribeInstanceAttributeUserData(client AWSEC2ClientInterface, accountID string, region string, instanceID string) (string, error) {
+	cacheKey := fmt.Sprintf("%s-ec2-DescribeInstanceAttributeUserData-%s-%s", accountID, region, instanceID)
+	cached, found := internal.Cache.Get(cacheKey)
+	if found {
+		return cached.(string), nil
+	}
+	DescribeInstanceAttribute, err := client.DescribeInstanceAttribute(
+		context.TODO(),
+		&ec2.DescribeInstanceAttributeInput{
+			Attribute:  ec2Types.InstanceAttributeNameUserData,
+			InstanceId: &instanceID,
+		},
+		func(o *ec2.Options) {
+			o.Region = region
+		},
+	)
+	if err != nil {
+		return "", err
+	}
+	internal.Cache.Set(cacheKey, aws.ToString(DescribeInstanceAttribute.UserData.Value), cache.DefaultExpiration)
+
+	return aws.ToString(DescribeInstanceAttribute.UserData.Value), nil
+}
+
 func CachedEC2DescribeNetworkInterfaces(client AWSEC2ClientInterface, accountID string, region string) ([]ec2Types.NetworkInterface, error) {
 	var PaginationControl *string
 	var NetworkInterfaces []ec2Types.NetworkInterface
@@ -87,9 +113,8 @@ func CachedEC2DescribeNetworkInterfaces(client AWSEC2ClientInterface, accountID
 		if err != nil {
 			return NetworkInterfaces, err
 		}
-		for _, networkInterface := range DescribeNetworkInterfaces.NetworkInterfaces {
-			NetworkInterfaces = append(NetworkInterfaces, networkInterface)
-		}
+		NetworkInterfaces = append(NetworkInterfaces, DescribeNetworkInterfaces.NetworkInterfaces...)
+
 		if DescribeNetworkInterfaces.NextToken == nil {
 			break
 		}
@@ -122,9 +147,8 @@ func CachedEC2DescribeSnapshots(client AWSEC2ClientInterface, accountID string,
 		if err != nil {
 			return Snapshots, err
 		}
-		for _, snapshot := range DescribeSnapshots.Snapshots {
-			Snapshots = append(Snapshots, snapshot)
-		}
+		Snapshots = append(Snapshots, DescribeSnapshots.Snapshots...)
+
 		if DescribeSnapshots.NextToken == nil {
 			break
 		}
@@ -156,9 +180,8 @@ func CachedEC2DescribeVolumes(client AWSEC2ClientInterface, accountID string, re
 		if err != nil {
 			return Volumes, err
 		}
-		for _, volume := range DescribeVolumes.Volumes {
-			Volumes = append(Volumes, volume)
-		}
+		Volumes = append(Volumes, DescribeVolumes.Volumes...)
+
 		if DescribeVolumes.NextToken == nil {
 			break
 		}
@@ -191,9 +214,8 @@ func CachedEC2DescribeImages(client AWSEC2ClientInterface, accountID string, reg
 		if err != nil {
 			return Images, err
 		}
-		for _, image := range DescribeImages.Images {
-			Images = append(Images, image)
-		}
+		Images = append(Images, DescribeImages.Images...)
+
 		if DescribeImages.NextToken == nil {
 			break
 		}

aws/sdk/ec2_mocks.go

@@ -265,6 +265,12 @@ type DescribeVolumes struct {
 	} `json:"Volumes"`
 }
 
+// DescribeInstanceAttribute is a struct for the DescribeInstanceAttribute function - include userdata
+type DescribeInstanceAttribute struct {
+	UserData   string `json:"UserData"`
+	InstanceID string `json:"InstanceId"`
+}
+
 func (c *MockedEC2Client2) DescribeNetworkInterfaces(ctx context.Context, input *ec2.DescribeNetworkInterfacesInput, f ...func(o *ec2.Options)) (*ec2.DescribeNetworkInterfacesOutput, error) {
 	var nics []ec2types.NetworkInterface
 	err := json.Unmarshal(readTestFile(DESCRIBE_NETWORK_INTEFACES_TEST_FILE), &c.describeNetworkInterfaces)
@@ -372,3 +378,11 @@ func (c *MockedEC2Client2) DescribeImages(ctx context.Context, input *ec2.Descri
 	}
 	return &ec2.DescribeImagesOutput{Images: images}, nil
 }
+
+func (c *MockedEC2Client2) DescribeInstanceAttribute(ctx context.Context, input *ec2.DescribeInstanceAttributeInput, f ...func(o *ec2.Options)) (*ec2.DescribeInstanceAttributeOutput, error) {
+	return &ec2.DescribeInstanceAttributeOutput{
+		UserData: &ec2types.AttributeValue{
+			Value: aws.String("userdata"),
+		},
+	}, nil
+}

aws/sdk/ecr.go

@@ -70,7 +70,7 @@ func CachedECRDescribeRepositories(ECRClient AWSECRClientInterface, accountID st
 func CachedECRDescribeImages(ECRClient AWSECRClientInterface, accountID string, region string, repositoryName string) ([]ecrTypes.ImageDetail, error) {
 	var PaginationControl *string
 	var images []ecrTypes.ImageDetail
-	cacheKey := fmt.Sprintf("%s-efs-DescribImages-%s-%s", accountID, region, strings.ReplaceAll(repositoryName, "/", "-"))
+	cacheKey := fmt.Sprintf("%s-ecr-DescribeImages-%s-%s", accountID, region, strings.ReplaceAll(repositoryName, "/", "-"))
 	cached, found := internal.Cache.Get(cacheKey)
 	if found {
 		sharedLogger.Debug("Using cached Images data")

aws/sdk/ecr_mocks.go

@@ -2,6 +2,7 @@ package sdk
 
 import (
 	"context"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ecr"
@@ -16,29 +17,64 @@ func (m *MockedECRClient) DescribeRepositories(ctx context.Context, input *ecr.D
 		Repositories: []ecrTypes.Repository{
 			{
 				RepositoryName: aws.String("repo1"),
+				RepositoryUri:  aws.String("11111111111111.dkr.ecr.us-east-1.amazonaws.com/repo1"),
 			},
 			{
 				RepositoryName: aws.String("repo2"),
+				RepositoryUri:  aws.String("11111111111111.dkr.ecr.us-east-1.amazonaws.com/repo2"),
 			},
 		},
 	}, nil
 }
 
 func (m *MockedECRClient) DescribeImages(ctx context.Context, input *ecr.DescribeImagesInput, options ...func(*ecr.Options)) (*ecr.DescribeImagesOutput, error) {
-	return &ecr.DescribeImagesOutput{
-		ImageDetails: []ecrTypes.ImageDetail{
-			{
-				ImageTags: []string{
-					"tag1",
-					"tag2",
+	if aws.ToString(input.RepositoryName) == "repo1" {
+		return &ecr.DescribeImagesOutput{
+			ImageDetails: []ecrTypes.ImageDetail{
+				{
+					ImageTags: []string{
+						"customtag",
+						"tag2",
+					},
+					ImagePushedAt:    aws.Time(time.Date(2022, 10, 25, 15, 14, 0, 0, time.UTC)),
+					ImageSizeInBytes: aws.Int64(123456),
 				},
 			},
-			{
-				ImageTags: []string{
-					"tag3", "tag4", "tag5", "tag6"},
+		}, nil
+	} else if aws.ToString(input.RepositoryName) == "repo2" {
+		return &ecr.DescribeImagesOutput{
+			ImageDetails: []ecrTypes.ImageDetail{
+				{
+					ImageTags: []string{
+						"latest",
+					},
+					ImagePushedAt:    aws.Time(time.Date(2021, 10, 15, 11, 14, 0, 0, time.UTC)),
+					ImageSizeInBytes: aws.Int64(2222222),
+				},
 			},
-		},
-	}, nil
+		}, nil
+	} else {
+		return &ecr.DescribeImagesOutput{
+			ImageDetails: []ecrTypes.ImageDetail{
+				{
+					ImageTags: []string{
+						"customtag",
+						"tag2",
+					},
+					ImagePushedAt:    aws.Time(time.Date(2022, 10, 25, 15, 14, 0, 0, time.UTC)),
+					ImageSizeInBytes: aws.Int64(111),
+				},
+				{
+					ImageTags: []string{
+						"latest",
+					},
+					ImagePushedAt:    aws.Time(time.Date(2021, 10, 15, 11, 14, 0, 0, time.UTC)),
+					ImageSizeInBytes: aws.Int64(333),
+				},
+			},
+		}, nil
+	}
+
 }
 
 func (m *MockedECRClient) GetRepositoryPolicy(ctx context.Context, input *ecr.GetRepositoryPolicyInput, options ...func(*ecr.Options)) (*ecr.GetRepositoryPolicyOutput, error) {

aws/sdk/ecs.go

@@ -23,6 +23,7 @@ type AWSECSClientInterface interface {
 func init() {
 	gob.Register([]string{})
 	gob.Register(ecsTypes.Task{})
+	gob.Register([]ecsTypes.Task{})
 	gob.Register(ecsTypes.TaskDefinition{})
 
 }
@@ -113,7 +114,10 @@ func CachedECSListTasks(ECSClient AWSECSClientInterface, accountID string, regio
 
 func CachedECSDescribeTasks(ECSClient AWSECSClientInterface, accountID string, region string, cluster string, tasks []string) ([]ecsTypes.Task, error) {
 	var taskDetails []ecsTypes.Task
-	cacheKey := fmt.Sprintf("%s-ecs-DescribeTasks-%s-%s", accountID, region, cluster)
+	//replace semi-colons with underscores in task definition name
+	clusterFileSystemSafe := strings.ReplaceAll(cluster, ":", "_")
+	clusterFileSystemSafe = strings.ReplaceAll(clusterFileSystemSafe, "/", "_")
+	cacheKey := fmt.Sprintf("%s-ecs-DescribeTasks-%s-%s", accountID, region, clusterFileSystemSafe)
 	cached, found := internal.Cache.Get(cacheKey)
 	if found {
 		sharedLogger.Debug("Using cached ECS task details data")
@@ -143,7 +147,10 @@ func CachedECSDescribeTasks(ECSClient AWSECSClientInterface, accountID string, r
 
 func CachedECSDescribeTaskDefinition(ECSClient AWSECSClientInterface, accountID string, region string, taskDefinition string) (ecsTypes.TaskDefinition, error) {
 	var taskDefinitionDetails ecsTypes.TaskDefinition
-	cacheKey := fmt.Sprintf("%s-ecs-DescribeTaskDefinition-%s-%s", accountID, region, taskDefinition)
+	//replace semi-colons with underscores in task definition name
+	taskDefinitionFileSystemSafe := strings.ReplaceAll(taskDefinition, ":", "_")
+	taskDefinitionFileSystemSafe = strings.ReplaceAll(taskDefinitionFileSystemSafe, "/", "_")
+	cacheKey := fmt.Sprintf("%s-ecs-DescribeTaskDefinition-%s-%s", accountID, region, taskDefinitionFileSystemSafe)
 	cached, found := internal.Cache.Get(cacheKey)
 	if found {
 		sharedLogger.Debug("Using cached ECS task definition details data")

aws/sdk/eks.go

@@ -126,7 +126,7 @@ func CachedEKSListNodeGroups(client EKSClientInterface, accountID string, region
 
 func CachedEKSDescribeNodeGroup(client EKSClientInterface, accountID string, region string, clusterName string, nodeGroupName string) (eksTypes.Nodegroup, error) {
 	var nodeGroup eksTypes.Nodegroup
-	cacheKey := fmt.Sprintf("%s-eks-DescribeNodeGroup-%s-%s-%s", accountID, region, nodeGroupName)
+	cacheKey := fmt.Sprintf("%s-eks-DescribeNodeGroup-%s-%s-%s", accountID, region, clusterName, nodeGroupName)
 	cached, found := internal.Cache.Get(cacheKey)
 	if found {
 		return cached.(eksTypes.Nodegroup), nil

aws/sdk/elasticache_mocks.go

@@ -32,7 +32,7 @@ func (m *MockedElasticacheClient) DescribeCacheClusters(ctx context.Context, inp
 					},
 				},
 
-				AutoMinorVersionUpgrade:    true,
+				AutoMinorVersionUpgrade:    aws.Bool(true),
 				PreferredMaintenanceWindow: aws.String("sun:05:00-sun:06:00"),
 			},
 		},

aws/sdk/glue.go

@@ -3,8 +3,10 @@ package sdk
 import (
 	"context"
 	"encoding/gob"
+	"errors"
 
 	"github.com/BishopFox/cloudfox/internal"
+	"github.com/BishopFox/cloudfox/internal/aws/policy"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/glue"
 	glueTypes "github.com/aws/aws-sdk-go-v2/service/glue/types"
@@ -16,6 +18,7 @@ type AWSGlueClientInterface interface {
 	ListJobs(ctx context.Context, params *glue.ListJobsInput, optFns ...func(*glue.Options)) (*glue.ListJobsOutput, error)
 	GetTables(ctx context.Context, params *glue.GetTablesInput, optFns ...func(*glue.Options)) (*glue.GetTablesOutput, error)
 	GetDatabases(ctx context.Context, params *glue.GetDatabasesInput, optFns ...func(*glue.Options)) (*glue.GetDatabasesOutput, error)
+	GetResourcePolicies(ctx context.Context, params *glue.GetResourcePoliciesInput, optFns ...func(*glue.Options)) (*glue.GetResourcePoliciesOutput, error)
 }
 
 func init() {
@@ -24,6 +27,7 @@ func init() {
 	gob.Register(glueTypes.Job{})
 	gob.Register([]glueTypes.Table{})
 	gob.Register([]glueTypes.Database{})
+	gob.Register([]policy.Policy{})
 }
 
 func CachedGlueListDevEndpoints(GlueClient AWSGlueClientInterface, accountID string, region string) ([]string, error) {
@@ -190,3 +194,55 @@ func CachedGlueGetDatabases(GlueClient AWSGlueClientInterface, accountID string,
 
 	return databases, nil
 }
+
+func CachedGlueGetResourcePolicies(GlueClient AWSGlueClientInterface, accountID string, region string) ([]policy.Policy, error) {
+	var PaginationControl *string
+	var GluePolicy policy.Policy
+	var policies []policy.Policy
+	var policyJSON string
+	cacheKey := "glue-GetResourcePolicies-" + accountID + "-" + region
+	cached, found := internal.Cache.Get(cacheKey)
+	if found {
+		sharedLogger.Debug("Using cached Glue resource policies data")
+		return cached.([]policy.Policy), nil
+	}
+
+	for {
+		GetResourcePolicies, err := GlueClient.GetResourcePolicies(
+			context.TODO(),
+			&glue.GetResourcePoliciesInput{
+				NextToken: PaginationControl,
+			},
+			func(o *glue.Options) {
+				o.Region = region
+			},
+		)
+		if err != nil {
+			sharedLogger.Error(err.Error())
+			break
+		}
+
+		for _, policyPointer := range GetResourcePolicies.GetResourcePoliciesResponseList {
+			policyJSON = aws.ToString(policyPointer.PolicyInJson)
+			GluePolicy, err = policy.ParseJSONPolicy([]byte(policyJSON))
+			if err != nil {
+				return policies, errors.New("error parsing Glue policy")
+			}
+			policies = append(policies, GluePolicy)
+		}
+
+		// Pagination control.
+		if GetResourcePolicies.NextToken != nil {
+			PaginationControl = GetResourcePolicies.NextToken
+		} else {
+			PaginationControl = nil
+			break
+		}
+	}
+
+	internal.Cache.Set(cacheKey, policies, cache.DefaultExpiration)
+
+	return policies, nil
+}
+
+// in the resource trust command, need to parse the actual resource policies to determine the resources for the cloudfox table. crazy pants

aws/sdk/redshift_mocks.go

@@ -20,7 +20,7 @@ func (m *MockedRedshiftClient) DescribeClusters(ctx context.Context, input *reds
 				DBName:              aws.String("db1"),
 				Endpoint: &redshiftTypes.Endpoint{
 					Address: aws.String("cluster1.us-east-1.redshift.amazonaws.com"),
-					Port:    5439,
+					Port:    aws.Int32(5439),
 				},
 			},
 			{
@@ -29,7 +29,7 @@ func (m *MockedRedshiftClient) DescribeClusters(ctx context.Context, input *reds
 				DBName:              aws.String("db2"),
 				Endpoint: &redshiftTypes.Endpoint{
 					Address: aws.String("cluster2.us-east-1.redshift.amazonaws.com"),
-					Port:    5439,
+					Port:    aws.Int32(5439),
 				},
 			},
 		},

aws/sdk/s3.go

@@ -90,6 +90,7 @@ func CachedGetBucketPolicy(S3Client AWSS3ClientInterface, accountID string, r st
 		},
 	)
 	if err != nil {
+		internal.Cache.Set(cacheKey, "", cache.DefaultExpiration)
 		return "", err
 	}
 

aws/sdk/secretsmanager.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 
 	"github.com/BishopFox/cloudfox/internal"
+	"github.com/BishopFox/cloudfox/internal/aws/policy"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	secretsmanagerTypes "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types"
 	"github.com/patrickmn/go-cache"
@@ -13,10 +15,13 @@ import (
 
 type SecretsManagerClientInterface interface {
 	ListSecrets(context.Context, *secretsmanager.ListSecretsInput, ...func(*secretsmanager.Options)) (*secretsmanager.ListSecretsOutput, error)
+	GetResourcePolicy(context.Context, *secretsmanager.GetResourcePolicyInput, ...func(*secretsmanager.Options)) (*secretsmanager.GetResourcePolicyOutput, error)
 }
 
 func init() {
 	gob.Register([]secretsmanagerTypes.SecretListEntry{})
+	gob.Register(policy.Policy{})
+
 }
 
 func CachedSecretsManagerListSecrets(client SecretsManagerClientInterface, accountID string, region string) ([]secretsmanagerTypes.SecretListEntry, error) {
@@ -54,3 +59,33 @@ func CachedSecretsManagerListSecrets(client SecretsManagerClientInterface, accou
 	internal.Cache.Set(cacheKey, secrets, cache.DefaultExpiration)
 	return secrets, nil
 }
+
+func CachedSecretsManagerGetResourcePolicy(client SecretsManagerClientInterface, secretId string, region string, accountID string) (policy.Policy, error) {
+	var secretPolicy policy.Policy
+	var policyJSON string
+	cacheKey := fmt.Sprintf("%s-secretsmanager-GetResourcePolicy-%s-%s", accountID, region, secretId)
+	cached, found := internal.Cache.Get(cacheKey)
+	if found {
+		return cached.(policy.Policy), nil
+	}
+	GetResourcePolicy, err := client.GetResourcePolicy(
+		context.TODO(),
+		&secretsmanager.GetResourcePolicyInput{
+			SecretId: &secretId,
+		},
+		func(o *secretsmanager.Options) {
+			o.Region = region
+		},
+	)
+	if err != nil {
+		return secretPolicy, err
+	}
+
+	policyJSON = aws.ToString(GetResourcePolicy.ResourcePolicy)
+	secretPolicy, err = policy.ParseJSONPolicy([]byte(policyJSON))
+	if err != nil {
+		return secretPolicy, fmt.Errorf("parsing policy (%s) as JSON: %s", secretId, err)
+	}
+	internal.Cache.Set(cacheKey, secretPolicy, cache.DefaultExpiration)
+	return secretPolicy, nil
+}

aws/sdk/secretsmanager_mocks.go

@@ -23,3 +23,38 @@ func (m *MockedSecretsManagerClient) ListSecrets(ctx context.Context, input *sec
 		},
 	}, nil
 }
+
+func (m *MockedSecretsManagerClient) GetResourcePolicy(ctx context.Context, input *secretsmanager.GetResourcePolicyInput, options ...func(*secretsmanager.Options)) (*secretsmanager.GetResourcePolicyOutput, error) {
+	return &secretsmanager.GetResourcePolicyOutput{
+		ResourcePolicy: aws.String(`{
+			"Version": "2012-10-17",
+			"Statement": [
+				{
+					"Sid": "RetrieveSecret",
+					"Effect": "Allow",
+					"Principal": {
+						"AWS": "arn:aws:iam::123456789012:root"
+					},
+					"Action": [
+						"secretsmanager:GetSecretValue",
+						"secretsmanager:DescribeSecret",
+						"secretsmanager:ListSecretVersionIds"
+					],
+					"Resource": "*"
+				},
+				{
+					"Sid": "RetrieveSecret",
+					"Effect": "Allow",
+					"Principal": {
+						"AWS": "arn:aws:iam::123456789012:root"
+					},
+					"Action": [
+						"secretsmanager:GetSecretValue",
+						"secretsmanager:DescribeSecret",
+					],
+					"Resource": "*"
+				}
+			]
+		}`),
+	}, nil
+}

aws/secrets.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/BishopFox/cloudfox/internal"
@@ -22,11 +23,13 @@ type SecretsModule struct {
 	SecretsManagerClient *secretsmanager.Client
 	SSMClient            *ssm.Client
 
-	Caller     sts.GetCallerIdentityOutput
-	AWSRegions []string
-	AWSProfile string
-	Goroutines int
-	WrapTable  bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSProfile    string
+	Goroutines    int
+	WrapTable     bool
+	AWSOutputType string
+	AWSTableCols  string
 
 	// Main module data
 	Secrets []Secret
@@ -45,7 +48,7 @@ type Secret struct {
 	Description string
 }
 
-func (m *SecretsModule) PrintSecrets(outputFormat string, outputDirectory string, verbosity int) {
+func (m *SecretsModule) PrintSecrets(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -94,17 +97,48 @@ func (m *SecretsModule) PrintSecrets(outputFormat string, outputDirectory string
 	//	fmt.Printf("\nAnalyzed Resources by Region\n\n")
 
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Name",
 		"Description",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Region",
+			"Name",
+			"Description",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Name",
+			"Description",
+		}
+	}
+
 	// Table rows
 	for i := range m.Secrets {
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Secrets[i].AWSService,
 				m.Secrets[i].Region,
 				m.Secrets[i].Name,
@@ -116,11 +150,7 @@ func (m *SecretsModule) PrintSecrets(outputFormat string, outputDirectory string
 	if len(m.output.Body) > 0 {
 
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//m.output.OutputSelector(outputFormat)
-		//utils.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(m.output.Verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
 
-		//m.writeLoot(m.output.FilePath, verbosity)
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -129,9 +159,10 @@ func (m *SecretsModule) PrintSecrets(outputFormat string, outputDirectory string
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/shared.go

@@ -18,9 +18,8 @@ var red = color.New(color.FgRed).SprintFunc()
 var yellow = color.New(color.FgRed).SprintFunc()
 var blue = color.New(color.FgBlue).SprintFunc()
 var magenta = color.New(color.FgMagenta).SprintFunc()
-
 var green = color.New(color.FgGreen).SprintFunc()
-
+var AWSRegions = []string{"us-east-1", "us-east-2", "us-west-1", "us-west-2", "af-south-1", "ap-east-1", "ap-south-1", "ap-northeast-3", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-south-1", "eu-west-3", "eu-north-1", "me-south-1", "sa-east-1"}
 var sharedLogger = internal.TxtLogger()
 
 func GetIamSimResult(SkipAdminCheck bool, roleArnPtr *string, iamSimulatorMod IamSimulatorModule, localAdminMap map[string]bool) (string, string) {
@@ -178,3 +177,12 @@ func GetResourceNameFromArn(arn string) string {
 
 	return resourceName
 }
+
+func removeStringFromSlice(slice []string, element string) []string {
+	for i, v := range slice {
+		if v == element {
+			return append(slice[:i], slice[i+1:]...)
+		}
+	}
+	return slice
+}

aws/sns.go

@@ -29,9 +29,11 @@ type SNSModule struct {
 	AWSProfile    string
 	Caller        sts.GetCallerIdentityOutput
 	StorePolicies bool
-	OutputFormat  string
-	Goroutines    int
-	WrapTable     bool
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	WrapTable  bool
 
 	// Main module data
 	Topics         []SNSTopic
@@ -61,7 +63,7 @@ type SNSTopic struct {
 	ResourcePolicySummary string
 }
 
-func (m *SNSModule) PrintSNS(outputFormat string, outputDirectory string, verbosity int) {
+func (m *SNSModule) PrintSNS(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -108,12 +110,40 @@ func (m *SNSModule) PrintSNS(outputFormat string, outputDirectory string, verbos
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
-
+		"Account",
 		"ARN",
 		"Public?",
 		"Resource Policy Summary",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"ARN",
+			"Public?",
+			"Resource Policy Summary",
+		}
+
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"ARN",
+			"Public?",
+			"Resource Policy Summary",
+		}
+	}
+
 	sort.SliceStable(m.Topics, func(i, j int) bool {
 		return m.Topics[i].ARN < m.Topics[j].ARN
 	})
@@ -123,6 +153,7 @@ func (m *SNSModule) PrintSNS(outputFormat string, outputDirectory string, verbos
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Topics[i].ARN,
 				m.Topics[i].IsPublic,
 				m.Topics[i].ResourcePolicySummary,
@@ -131,9 +162,7 @@ func (m *SNSModule) PrintSNS(outputFormat string, outputDirectory string, verbos
 
 	}
 	if len(m.output.Body) > 0 {
-		//m.output.OutputSelector(outputFormat)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity, m.AWSProfile)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -142,9 +171,10 @@ func (m *SNSModule) PrintSNS(outputFormat string, outputDirectory string, verbos
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/sns_test.go

@@ -42,7 +42,7 @@ func TestSNSQueues(t *testing.T) {
 	tmpDir := "."
 
 	// execute the module with verbosity = 2
-	m.PrintSNS("table", tmpDir, 2)
+	m.PrintSNS(tmpDir, 2)
 
 	resultsFilePath := filepath.Join(tmpDir, "cloudfox-output/aws/unittesting-123456789012/table/sns.txt")
 	resultsFile, err := afero.ReadFile(fs, resultsFilePath)

aws/sqs.go

@@ -28,12 +28,14 @@ type SQSModule struct {
 
 	StorePolicies bool
 
-	Caller       sts.GetCallerIdentityOutput
-	AWSRegions   []string
-	OutputFormat string
-	Goroutines   int
-	AWSProfile   string
-	WrapTable    bool
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
+	Goroutines int
+	AWSProfile string
+	WrapTable  bool
 
 	// Main module data
 	Queues         []Queue
@@ -64,7 +66,7 @@ type Queue struct {
 	ResourcePolicySummary string
 }
 
-func (m *SQSModule) PrintSQS(outputFormat string, outputDirectory string, verbosity int) {
+func (m *SQSModule) PrintSQS(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -111,11 +113,40 @@ func (m *SQSModule) PrintSQS(outputFormat string, outputDirectory string, verbos
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
+		"Account",
 		"Arn",
 		"Public?",
 		"Resource Policy Summary",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Arn",
+			"Public?",
+			"Resource Policy Summary",
+		}
+
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Arn",
+			"Public?",
+			"Resource Policy Summary",
+		}
+	}
+
 	sort.SliceStable(m.Queues, func(i, j int) bool {
 		return m.Queues[i].URL < m.Queues[j].URL
 	})
@@ -125,6 +156,7 @@ func (m *SQSModule) PrintSQS(outputFormat string, outputDirectory string, verbos
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Queues[i].Arn,
 				m.Queues[i].IsPublic,
 				m.Queues[i].ResourcePolicySummary,
@@ -133,9 +165,7 @@ func (m *SQSModule) PrintSQS(outputFormat string, outputDirectory string, verbos
 
 	}
 	if len(m.output.Body) > 0 {
-		//m.output.OutputSelector(outputFormat)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity, m.AWSProfile)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -144,9 +174,10 @@ func (m *SQSModule) PrintSQS(outputFormat string, outputDirectory string, verbos
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
@@ -390,7 +421,7 @@ func (m *SQSModule) analyseQueuePolicy(queue *Queue, dataReceiver chan Queue) {
 		} else {
 			queue.ResourcePolicySummary = statement.GetStatementSummaryInEnglish(*m.Caller.Account)
 		}
-		queue.ResourcePolicySummary = strings.TrimSuffix(queue.ResourcePolicySummary, "\n")
+		//queue.ResourcePolicySummary = strings.TrimSuffix(queue.ResourcePolicySummary, "\n")
 
 	}
 	dataReceiver <- *queue

aws/sqs_test.go

@@ -48,7 +48,7 @@ func TestSQSQueues(t *testing.T) {
 	tmpDir := "."
 
 	// execute the module with verbosity set to 2
-	m.PrintSQS("table", tmpDir, 2)
+	m.PrintSQS(tmpDir, 2)
 
 	resultsFilePath := filepath.Join(tmpDir, "cloudfox-output/aws/unittesting-123456789012/table/sqs.txt")
 	resultsFile, err := afero.ReadFile(fs, resultsFilePath)

aws/tags.go

@@ -26,9 +26,11 @@ type TagsModule struct {
 	// General configuration data
 	ResourceGroupsTaggingApiInterface TagsGetResourcesAPI
 
-	Caller                sts.GetCallerIdentityOutput
-	AWSRegions            []string
-	OutputFormat          string
+	Caller        sts.GetCallerIdentityOutput
+	AWSRegions    []string
+	AWSOutputType string
+	AWSTableCols  string
+
 	Goroutines            int
 	AWSProfile            string
 	WrapTable             bool
@@ -54,7 +56,7 @@ type Tag struct {
 	Value      string
 }
 
-func (m *TagsModule) PrintTags(outputFormat string, outputDirectory string, verbosity int) {
+func (m *TagsModule) PrintTags(outputDirectory string, verbosity int) {
 	// These struct values are used by the output module
 	m.output.Verbosity = verbosity
 	m.output.Directory = outputDirectory
@@ -102,6 +104,7 @@ func (m *TagsModule) PrintTags(outputFormat string, outputDirectory string, verb
 
 	// add - if struct is not empty do this. otherwise, dont write anything.
 	m.output.Headers = []string{
+		"Account",
 		"Service",
 		"Region",
 		"Type",
@@ -111,6 +114,41 @@ func (m *TagsModule) PrintTags(outputFormat string, outputDirectory string, verb
 		"Value",
 	}
 
+	// If the user specified table columns, use those.
+	// If the user specified -o wide, use the wide default cols for this module.
+	// Otherwise, use the hardcoded default cols for this module.
+	var tableCols []string
+	// If the user specified table columns, use those.
+	if m.AWSTableCols != "" {
+		// If the user specified wide as the output format, use these columns.
+		// remove any spaces between any commas and the first letter after the commas
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ", ", ",")
+		m.AWSTableCols = strings.ReplaceAll(m.AWSTableCols, ",  ", ",")
+		tableCols = strings.Split(m.AWSTableCols, ",")
+	} else if m.AWSOutputType == "wide" {
+		tableCols = []string{
+			"Account",
+			"Service",
+			"Region",
+			"Type",
+			//"Name",
+			//"Resource Arn",
+			"Key",
+			"Value",
+		}
+		// Otherwise, use the default columns.
+	} else {
+		tableCols = []string{
+			"Service",
+			"Region",
+			"Type",
+			//"Name",
+			//"Resource Arn",
+			"Key",
+			"Value",
+		}
+	}
+
 	sort.Slice(m.Tags, func(i, j int) bool {
 		return m.Tags[i].AWSService < m.Tags[j].AWSService
 	})
@@ -121,6 +159,7 @@ func (m *TagsModule) PrintTags(outputFormat string, outputDirectory string, verb
 		m.output.Body = append(
 			m.output.Body,
 			[]string{
+				aws.ToString(m.Caller.Account),
 				m.Tags[i].AWSService,
 				m.Tags[i].Region,
 				m.Tags[i].Type,
@@ -134,9 +173,7 @@ func (m *TagsModule) PrintTags(outputFormat string, outputDirectory string, verb
 	}
 	if len(m.output.Body) > 0 {
 		m.output.FilePath = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))
-		//utils.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule)
-		//internal.OutputSelector(verbosity, outputFormat, m.output.Headers, m.output.Body, m.output.FilePath, m.output.CallingModule, m.output.CallingModule, m.WrapTable, m.AWSProfile)
-		//m.writeLoot(m.output.FilePath, verbosity)
+
 		o := internal.OutputClient{
 			Verbosity:     verbosity,
 			CallingModule: m.output.CallingModule,
@@ -145,9 +182,10 @@ func (m *TagsModule) PrintTags(outputFormat string, outputDirectory string, verb
 			},
 		}
 		o.Table.TableFiles = append(o.Table.TableFiles, internal.TableFile{
-			Header: m.output.Headers,
-			Body:   m.output.Body,
-			Name:   m.output.CallingModule,
+			Header:    m.output.Headers,
+			Body:      m.output.Body,
+			TableCols: tableCols,
+			Name:      m.output.CallingModule,
 		})
 		o.PrefixIdentifier = m.AWSProfile
 		o.Table.DirectoryName = filepath.Join(outputDirectory, "cloudfox-output", "aws", fmt.Sprintf("%s-%s", m.AWSProfile, aws.ToString(m.Caller.Account)))

aws/tags_test.go

@@ -53,7 +53,6 @@ func TestTags(t *testing.T) {
 					UserId:  aws.String("AIDAJDPLRKLG7UEXAMPLE"),
 				},
 				AWSRegions:            []string{"us-east-1"},
-				OutputFormat:          "table",
 				Goroutines:            10,
 				AWSProfile:            "test",
 				WrapTable:             false,
@@ -73,7 +72,7 @@ func TestTags(t *testing.T) {
 	internal.MockFileSystem(true)
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
-			subtest.testModule.PrintTags(subtest.testModule.OutputFormat, subtest.outputDirectory, subtest.verbosity)
+			subtest.testModule.PrintTags(subtest.outputDirectory, subtest.verbosity)
 			if len(subtest.testModule.Tags) != len(subtest.expectedResult) {
 				t.Errorf("Expected %d results, got %d", len(subtest.expectedResult), len(subtest.testModule.Tags))
 			}

go.mod

@@ -4,52 +4,53 @@ go 1.20
 
 require (
 	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
 	github.com/Azure/go-autorest/autorest v0.11.29
 	github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
 	github.com/aquasecurity/table v1.8.0
-	github.com/aws/aws-sdk-go-v2 v1.19.0
-	github.com/aws/aws-sdk-go-v2/config v1.18.28
-	github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.14
-	github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.14
-	github.com/aws/aws-sdk-go-v2/service/apprunner v1.17.12
-	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.30.1
-	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.26.9
-	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.27.2
-	github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.16
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.105.0
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.18.14
-	github.com/aws/aws-sdk-go-v2/service/ecs v1.28.1
-	github.com/aws/aws-sdk-go-v2/service/efs v1.20.4
-	github.com/aws/aws-sdk-go-v2/service/eks v1.27.15
-	github.com/aws/aws-sdk-go-v2/service/elasticache v1.27.3
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.13
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.14
-	github.com/aws/aws-sdk-go-v2/service/fsx v1.30.0
-	github.com/aws/aws-sdk-go-v2/service/glue v1.55.0
-	github.com/aws/aws-sdk-go-v2/service/grafana v1.13.4
-	github.com/aws/aws-sdk-go-v2/service/iam v1.21.1
-	github.com/aws/aws-sdk-go-v2/service/lambda v1.37.1
-	github.com/aws/aws-sdk-go-v2/service/lightsail v1.27.2
-	github.com/aws/aws-sdk-go-v2/service/mq v1.15.1
-	github.com/aws/aws-sdk-go-v2/service/opensearch v1.18.3
-	github.com/aws/aws-sdk-go-v2/service/organizations v1.19.9
-	github.com/aws/aws-sdk-go-v2/service/ram v1.18.5
-	github.com/aws/aws-sdk-go-v2/service/rds v1.46.2
-	github.com/aws/aws-sdk-go-v2/service/redshift v1.28.1
-	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.14.15
-	github.com/aws/aws-sdk-go-v2/service/route53 v1.28.4
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0
-	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.92.0
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.11
-	github.com/aws/aws-sdk-go-v2/service/sns v1.20.14
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.23.3
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.36.8
-	github.com/aws/aws-sdk-go-v2/service/sts v1.19.3
-	github.com/aws/smithy-go v1.13.5
+	github.com/aws/aws-sdk-go-v2 v1.21.2
+	github.com/aws/aws-sdk-go-v2/config v1.19.1
+	github.com/aws/aws-sdk-go-v2/service/apigateway v1.18.2
+	github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.15.0
+	github.com/aws/aws-sdk-go-v2/service/apprunner v1.21.2
+	github.com/aws/aws-sdk-go-v2/service/cloud9 v1.18.11
+	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.36.0
+	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.28.7
+	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.29.2
+	github.com/aws/aws-sdk-go-v2/service/codebuild v1.22.2
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.127.0
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2
+	github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4
+	github.com/aws/aws-sdk-go-v2/service/efs v1.21.9
+	github.com/aws/aws-sdk-go-v2/service/eks v1.30.0
+	github.com/aws/aws-sdk-go-v2/service/elasticache v1.30.0
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.18.0
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.22.0
+	github.com/aws/aws-sdk-go-v2/service/fsx v1.34.0
+	github.com/aws/aws-sdk-go-v2/service/glue v1.64.0
+	github.com/aws/aws-sdk-go-v2/service/grafana v1.15.7
+	github.com/aws/aws-sdk-go-v2/service/iam v1.23.0
+	github.com/aws/aws-sdk-go-v2/service/lambda v1.41.0
+	github.com/aws/aws-sdk-go-v2/service/lightsail v1.29.0
+	github.com/aws/aws-sdk-go-v2/service/mq v1.17.0
+	github.com/aws/aws-sdk-go-v2/service/opensearch v1.22.0
+	github.com/aws/aws-sdk-go-v2/service/organizations v1.20.8
+	github.com/aws/aws-sdk-go-v2/service/ram v1.20.7
+	github.com/aws/aws-sdk-go-v2/service/rds v1.58.0
+	github.com/aws/aws-sdk-go-v2/service/redshift v1.31.0
+	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.16.2
+	github.com/aws/aws-sdk-go-v2/service/route53 v1.31.0
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.40.2
+	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.112.0
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.6
+	github.com/aws/aws-sdk-go-v2/service/sns v1.22.2
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.24.7
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.40.0
+	github.com/aws/aws-sdk-go-v2/service/sts v1.23.2
+	github.com/aws/smithy-go v1.15.0
 	github.com/bishopfox/awsservicemap v1.0.2
 	github.com/dominikbraun/graph v0.23.0
 	github.com/fatih/color v1.15.0
@@ -57,14 +58,16 @@ require (
 	github.com/kyokomi/emoji v2.2.4+incompatible
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/afero v1.9.5
+	github.com/spf13/afero v1.10.0
 	github.com/spf13/cobra v1.7.0
-	golang.org/x/crypto v0.11.0
+	golang.org/x/crypto v0.14.0
 )
 
+require github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
+
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.4.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
 	github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
@@ -73,52 +76,52 @@ require (
 	github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.27 // indirect
-	github.com/aws/aws-sdk-go-v2/service/athena v1.30.4
-	github.com/aws/aws-sdk-go-v2/service/codeartifact v1.18.8
-	github.com/aws/aws-sdk-go-v2/service/codecommit v1.14.15
-	github.com/aws/aws-sdk-go-v2/service/codedeploy v1.16.14
-	github.com/aws/aws-sdk-go-v2/service/datapipeline v1.14.13
-	github.com/aws/aws-sdk-go-v2/service/docdb v1.22.0
-	github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.13
-	github.com/aws/aws-sdk-go-v2/service/emr v1.27.1
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.30 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.29 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.15
-	github.com/aws/aws-sdk-go-v2/service/sfn v1.18.1
-	github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.14 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/athena v1.32.0
+	github.com/aws/aws-sdk-go-v2/service/codeartifact v1.20.2
+	github.com/aws/aws-sdk-go-v2/service/codecommit v1.16.4
+	github.com/aws/aws-sdk-go-v2/service/codedeploy v1.18.3
+	github.com/aws/aws-sdk-go-v2/service/datapipeline v1.16.2
+	github.com/aws/aws-sdk-go-v2/service/docdb v1.24.0
+	github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.17.2
+	github.com/aws/aws-sdk-go-v2/service/emr v1.29.0
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.38 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kinesis v1.20.0
+	github.com/aws/aws-sdk-go-v2/service/sfn v1.19.8
+	github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
 	github.com/go-openapi/errors v0.20.4 // indirect
 	github.com/go-openapi/strfmt v0.21.7 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.mongodb.org/mongo-driver v1.12.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	go.mongodb.org/mongo-driver v1.12.1 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 )

go.sum

@@ -38,19 +38,19 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
 github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.4.0 h1:TuEMD+E+1aTjjLICGQOW6vLe8UWES7kopac9mUXL56Y=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.4.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1/go.mod h1:c/wcGeGx5FUPbM/JltUYHZcKmigwyVLJlDq+4HdtXaw=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 h1:Ma67P/GGprNwsslzEH6+Kb8nybI8jpDTm4Wmzu2ReK8=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0 h1:nVocQV40OQne5613EeLayJiRAJuKlBGy+m22qWG+WRg=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0/go.mod h1:7QJP7dr2wznCMeqIrhMgWGf7XpAQnVrJqDm9nvV3Cu4=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0/go.mod h1:+6KLcKIVgxoBDMqMO/Nvy7bZ9a0nbU3I1DtFQK3YvB4=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.24/go.mod h1:G6kyRlFnTuSbEYkQGawPfsCswgme4iYf6rfSKUDzbCc=
@@ -78,142 +78,144 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z
 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 h1:hVeq+yCyUi+MsoO/CU95yqCIcdzra5ovzk8Q2BBpV2M=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/aquasecurity/table v1.8.0 h1:9ntpSwrUfjrM6/YviArlx/ZBGd6ix8W+MtojQcM7tv0=
 github.com/aquasecurity/table v1.8.0/go.mod h1:eqOmvjjB7AhXFgFqpJUEE/ietg7RrMSJZXyTN8E/wZw=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/aws/aws-sdk-go-v2 v1.19.0 h1:klAT+y3pGFBU/qVf1uzwttpBbiuozJYWzNLHioyDJ+k=
-github.com/aws/aws-sdk-go-v2 v1.19.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno=
-github.com/aws/aws-sdk-go-v2/config v1.18.28 h1:TINEaKyh1Td64tqFvn09iYpKiWjmHYrG1fa91q2gnqw=
-github.com/aws/aws-sdk-go-v2/config v1.18.28/go.mod h1:nIL+4/8JdAuNHEjn/gPEXqtnS02Q3NXB/9Z7o5xE4+A=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.27 h1:dz0yr/yR1jweAnsCx+BmjerUILVPQ6FS5AwF/OyG1kA=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.27/go.mod h1:syOqAek45ZXZp29HlnRS/BNgMIW6uiRmeuQsz4Qh2UE=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 h1:kP3Me6Fy3vdi+9uHd7YLr6ewPxRL+PU6y15urfTaamU=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5/go.mod h1:Gj7tm95r+QsDoN2Fhuz/3npQvcZbkEf5mL70n3Xfluc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35 h1:hMUCiE3Zi5AHrRNGf5j985u0WyqI6r2NULhUfo0N/No=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35/go.mod h1:ipR5PvpSPqIqL5Mi82BxLnfMkHVbmco8kUwO2xrCi0M=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29 h1:yOpYx+FTBdpk/g+sBU6Cb1H0U/TLEcYYp66mYqsPpcc=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29/go.mod h1:M/eUABlDbw2uVrdAn+UsI6M727qp2fxkp8K0ejcBDUY=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36 h1:8r5m1BoAWkn0TDC34lUculryf7nUF25EgIMdjvGCkgo=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36/go.mod h1:Rmw2M1hMVTwiUhjwMoIBFWFJMhvJbct06sSidxInkhY=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.27 h1:cZG7psLfqpkB6H+fIrgUDWmlzM474St1LP0jcz272yI=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.27/go.mod h1:ZdjYvJpDlefgh8/hWelJhqgqJeodxu4SmbVsSdBlL7E=
-github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.14 h1:mXf/MQX2zcKpWTfI4YgHrD4UYBh6AzyBCRfVdsxExaU=
-github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.14/go.mod h1:KJyzRVA5DkFaU4hVgKDoHiSrCobfmYP8UpRXlybTuTU=
-github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.14 h1:2jRKwxT+e40l1vepcIIenlrZBXrCWnx1Z2JkoUUqWrU=
-github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.14/go.mod h1:lg/1D90DDo2//C84mvygysHF4JRo+Vf/W5YbkHoeUk8=
-github.com/aws/aws-sdk-go-v2/service/apprunner v1.17.12 h1:N+D3pKbf4KsQZqyjkp6wxHmOoDspMg1NwZ5yamU2m1s=
-github.com/aws/aws-sdk-go-v2/service/apprunner v1.17.12/go.mod h1:M7bk3j8yRkWkLSWoDEAi0g/4sMESF833RyaNvXv1dY4=
-github.com/aws/aws-sdk-go-v2/service/athena v1.30.4 h1:x6pNnhCWXrkGX43gkJkcdCtlYSFx3tzqJKnm2QBqz6k=
-github.com/aws/aws-sdk-go-v2/service/athena v1.30.4/go.mod h1:XyrQmcmWx6BNhu1K5la/Zub8gX29MqiIMQ9silULHjk=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.30.1 h1:MHKSdt+ECxOWD98MYj/Ocy4GS8GgAjgEDSPaiTaXP6U=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.30.1/go.mod h1:laKFhtn8EH6gcPl7KEQ4kcuSYcQF1tqUm82ENxMwlMk=
-github.com/aws/aws-sdk-go-v2/service/cloudfront v1.26.9 h1:4O/O22aiQnseomkhDKmLmxbu/cvuh3h04TIkIt3y52g=
-github.com/aws/aws-sdk-go-v2/service/cloudfront v1.26.9/go.mod h1:NmocATyq+MjavfhK3WQwXpsVosmwkaV5fq4dSco8xtA=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.27.2 h1:GFzRU2A1lQQRtdwVlnUaP7ZUMbqDY8wJ8PmIy8CRK4A=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.27.2/go.mod h1:KVIJ9sAGIzNEL5mdHa/AImzRKeu8hl9aeXefbZ1J6a8=
-github.com/aws/aws-sdk-go-v2/service/codeartifact v1.18.8 h1:cWssbdIoAQpXqaVvdlXkGMvoBtMQnyCj2YAnLCsRClo=
-github.com/aws/aws-sdk-go-v2/service/codeartifact v1.18.8/go.mod h1:Zdiq2FAX/UUo8sxidJFSHnvfnj3ZWNkVXW9tshdzQhE=
-github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.16 h1:fNS2i46UC2lcenFPn0BUR6BQsNjT3gdH7XB5772Rku4=
-github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.16/go.mod h1:eM+6ViLu4JRJLd6ZkQ/wDCh1KlOkhZ812kPLENq0t4k=
-github.com/aws/aws-sdk-go-v2/service/codecommit v1.14.15 h1:TEwSIgYLucLnjeKHR6zGp157gW4sLzlwdVAQ2x7u6ZE=
-github.com/aws/aws-sdk-go-v2/service/codecommit v1.14.15/go.mod h1:JBOP8ous+Xpzr2FcXLauTA4xa7Ybrji0dsW2tUuVLvs=
-github.com/aws/aws-sdk-go-v2/service/codedeploy v1.16.14 h1:EVKDqeD08oM5ixpnV06StrPmRVB7uuM/o9Sl4rHVeR0=
-github.com/aws/aws-sdk-go-v2/service/codedeploy v1.16.14/go.mod h1:J/+zzr7xwnR7NBecD5KSWcc/TCa1F6MHV76A1iZnO/o=
-github.com/aws/aws-sdk-go-v2/service/datapipeline v1.14.13 h1:ecYKjPdg4cypyt6WbHUp/Fjd0UeQNO0sXgDdWUuS+W0=
-github.com/aws/aws-sdk-go-v2/service/datapipeline v1.14.13/go.mod h1:mesCNwh+iqOeg228D7bYNgW/AHQveoC/0fkFDlSJ5RY=
-github.com/aws/aws-sdk-go-v2/service/docdb v1.22.0 h1:pj/zAKhHzoPQkR2GW1pA3qg9L7bIf+A6zSoV0FXCqfw=
-github.com/aws/aws-sdk-go-v2/service/docdb v1.22.0/go.mod h1:XwDAgHepy8Zz8Tt+CDvbyJ8ahGkzhFF2QNALcMjst+o=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1 h1:gknY3OHEGXaLamootb1VaJSohtHwcIMGvm23VnZVIzE=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1/go.mod h1:iA/evsHrPWhDyMj6cuMa6qlFTqSqYXoKs8LSvIFauTA=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.105.0 h1:8lYKOgr+FTjPFk6fHRDuZ4e96p3ULA+ZCKzB2nIwif8=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.105.0/go.mod h1:/0btVmMZJ0sn9JQ2N96XszlQNeRCJhhXOS/sPZgDeew=
-github.com/aws/aws-sdk-go-v2/service/ecr v1.18.14 h1:dcbDHH0NqKqalrVVwuEcvMvKBBY4AHcI8+JTiytJKDw=
-github.com/aws/aws-sdk-go-v2/service/ecr v1.18.14/go.mod h1:ALDmr/JM6zozlNH9a/SBdXIDFdwKfSl//1Eg5YE+jww=
-github.com/aws/aws-sdk-go-v2/service/ecs v1.28.1 h1:PxWgrtfQvct60NjxSrFsSWG/Yg1HATRKP4IeUPiLlrE=
-github.com/aws/aws-sdk-go-v2/service/ecs v1.28.1/go.mod h1:eZBCsRjzc+ZX8x3h0beHOu+uxRWRwnEHzzvDgKy9v0E=
-github.com/aws/aws-sdk-go-v2/service/efs v1.20.4 h1:Ji42n3FRxDb+ATocYrNsFeXVlxIX7SCvM7P2p9HUwNE=
-github.com/aws/aws-sdk-go-v2/service/efs v1.20.4/go.mod h1:gcYTldik9KddkXidRaSjVXc+56+lpVT9C0aABQBQ7vE=
-github.com/aws/aws-sdk-go-v2/service/eks v1.27.15 h1:Q48ivwZJ136hfkk8Dua1fMM7m1e1s/0rBRyRX/J9XAY=
-github.com/aws/aws-sdk-go-v2/service/eks v1.27.15/go.mod h1:9mqDBj08MtFxKFQWUEMm4iFnIdM9gFpnSJvHUEIfsiU=
-github.com/aws/aws-sdk-go-v2/service/elasticache v1.27.3 h1:6bmDGXMc8y/M8khlDxtDWvUPCUEpwei8pUQ30f6mVBU=
-github.com/aws/aws-sdk-go-v2/service/elasticache v1.27.3/go.mod h1:ZPycHtrD86labux1w15bbSWw4acVxgh+UTVZZ5iCoE8=
-github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.13 h1:cUFujjKLQ17m6aEvNRnmZP1XmLJlAsDa8LZ6x2eguOk=
-github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.13/go.mod h1:GtN44WU1jWBvpbqnWS1TIX466t1DzJ2GiFPc1sDRVHE=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.13 h1:iGBC7Z41yj6NvDreXhFtxtyjPuxS+l4qAtP4sWb5j2M=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.13/go.mod h1:P8vJCgR0ZIIliJ/13O0nIyQf32ZFUe5IrcDeNEvzHGE=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.14 h1:ekfFZUYzAqzBYhh1bwIen4SNLIn4KiMNDWyRmfbp62I=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.14/go.mod h1:0eT2aeVd4MnWmyT935I2MTwP5xT7cFVteV02BgJ/F+E=
-github.com/aws/aws-sdk-go-v2/service/emr v1.27.1 h1:DKtcRNy5Ax+la1EB3zom38xp6CO/SQyhBhcLY68UVPA=
-github.com/aws/aws-sdk-go-v2/service/emr v1.27.1/go.mod h1:zctGR4lbmEwybnWFh3jZNJe5mSWDMh0wWYEc9u3AvN0=
-github.com/aws/aws-sdk-go-v2/service/fsx v1.30.0 h1:mOJHvtiMYG+pyo4wuA63FCO/ZaawIiySEe+Gy5DrwtI=
-github.com/aws/aws-sdk-go-v2/service/fsx v1.30.0/go.mod h1:Xyl3hExYEINtN3PSM2j4x/fyUGQCICH+uQS33WTgjWE=
-github.com/aws/aws-sdk-go-v2/service/glue v1.55.0 h1:tdqCJ2VXVKBgab3Ugzdet+/PCftkyNnYSxjaZFqeQYs=
-github.com/aws/aws-sdk-go-v2/service/glue v1.55.0/go.mod h1:Q9zH4k9LjOE7V1NqIsRHXc2M7WF3hi02v5TgFtqVErc=
-github.com/aws/aws-sdk-go-v2/service/grafana v1.13.4 h1:InFGzy71oXUzTMBzhclha3j8mgWnTvDN7FCVDXrXyHE=
-github.com/aws/aws-sdk-go-v2/service/grafana v1.13.4/go.mod h1:5K62PcnljmwuUv6qE2RhGBjAWxFyo57VTLjeYMW76Ak=
-github.com/aws/aws-sdk-go-v2/service/iam v1.21.1 h1:VTCWgsrromZqnlRgfziqqWWcW7LFkQLwJVYgf/5zgWA=
-github.com/aws/aws-sdk-go-v2/service/iam v1.21.1/go.mod h1:LBsjrFczXiQLASO6FtDGTeHuZh6oHuIH6VKaOozFghg=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.30 h1:Bje8Xkh2OWpjBdNfXLrnn8eZg569dUQmhgtydxAYyP0=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.30/go.mod h1:qQtIBl5OVMfmeQkz8HaVyh5DzFmmFXyvK27UgIgOr4c=
-github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.29 h1:gajv/wALzb2KgK9YKq1jW+y2ZgL5o4A+UZmFfZi8lSY=
-github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.29/go.mod h1:SYEgYIjFeLoPSOCIqdFr44QiBwGlnsUIHqMD5OZnsgg=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29 h1:IiDolu/eLmuB18DRZibj77n1hHQT7z12jnGO7Ze3pLc=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29/go.mod h1:fDbkK4o7fpPXWn8YAPmTieAMuB9mk/VgvW64uaUqxd4=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.4 h1:hx4WksB0NRQ9utR+2c3gEGzl6uKj3eM6PMQ6tN3lgXs=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.4/go.mod h1:JniVpqvw90sVjNqanGLufrVapWySL28fhBlYgl96Q/w=
-github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.15 h1:ntCXWPydulxVCe1/Jzw/CpffNI5Rz04+4ALDbxLvzjM=
-github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.15/go.mod h1:Vtt7mN35Ev7fC7NHpSXmprMUP7DkEBTRMNHK0gQojeM=
-github.com/aws/aws-sdk-go-v2/service/lambda v1.37.1 h1:BRdW2JcxZSsen77Y0WoWIWY4+H9EXT55uEPWZKIcDHY=
-github.com/aws/aws-sdk-go-v2/service/lambda v1.37.1/go.mod h1:zmdE2b9ZX8milexhZc3SeC3LwJRJpJ0k0fsuMBOSCEI=
-github.com/aws/aws-sdk-go-v2/service/lightsail v1.27.2 h1:PwNeYoonBzmTdCztKiiutws3U24KrnDBuabzRfIlZY4=
-github.com/aws/aws-sdk-go-v2/service/lightsail v1.27.2/go.mod h1:gQhLZrTEath4zik5ixIe6axvgY5jJrgSBDJ360Fxnco=
-github.com/aws/aws-sdk-go-v2/service/mq v1.15.1 h1:TW18FUzhvAFZpGhvSiJYw/1z3sq+2pZl61YwLP7Ukzg=
-github.com/aws/aws-sdk-go-v2/service/mq v1.15.1/go.mod h1:98Ia1qM4KLiezDJ001VFhzTgFU2XpBtiFveZ5CcoZ1c=
-github.com/aws/aws-sdk-go-v2/service/opensearch v1.18.3 h1:NCFBj/m5ga7XZsMmrwkb/BKlLr7NqxgWTtRoFTdfIhc=
-github.com/aws/aws-sdk-go-v2/service/opensearch v1.18.3/go.mod h1:zZ5INI6l4mLcOO/rfXTgm/M4r7u5wMNu1MfLdhDdYac=
-github.com/aws/aws-sdk-go-v2/service/organizations v1.19.9 h1:zGbv0aBHnx6LAZeClqK9fpO1C8IIGyToP0u62pEQiBA=
-github.com/aws/aws-sdk-go-v2/service/organizations v1.19.9/go.mod h1:OvoCgJ4TLrd6ADYbUcWMc58RfeY6SM/2V1l5WqTkQUs=
-github.com/aws/aws-sdk-go-v2/service/ram v1.18.5 h1:NaXBILMGYxTny+NliB9xePKQW2zytcCpsNCW9xWtC2A=
-github.com/aws/aws-sdk-go-v2/service/ram v1.18.5/go.mod h1:0Kw6acC8zS+XHVfyatwG2sJ0bPtT3kRipUH8i48KcxM=
-github.com/aws/aws-sdk-go-v2/service/rds v1.46.2 h1:y3bLlmitL3ASnYNFZJ+ySl2ONEPWJt/GQ9N9OE/auLA=
-github.com/aws/aws-sdk-go-v2/service/rds v1.46.2/go.mod h1:+T+8IxRb5KRF52F8xfWanPDfUCGFL3j1yRl/VVF0q+M=
-github.com/aws/aws-sdk-go-v2/service/redshift v1.28.1 h1:ZuQTY/P127S/Gyv5HZ6gGC0kqFLyTZMlyPduRvyPy/w=
-github.com/aws/aws-sdk-go-v2/service/redshift v1.28.1/go.mod h1:ihY8HhdhtqDaAvlUEd2iU3IfNboMiDVE6qicbacH0w4=
-github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.14.15 h1:5I9Yi2Ls1q8/VTpRmlLOGilFCtJNsEms+64BhYybm7Y=
-github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.14.15/go.mod h1:86l8OObGPcaNgQ2pVaRRdaHTepispGs2UYLp8niWkSM=
-github.com/aws/aws-sdk-go-v2/service/route53 v1.28.4 h1:p4mTxJfCAyiTT4Wp6p/mOPa6j5MqCSRGot8qZwFs+Z0=
-github.com/aws/aws-sdk-go-v2/service/route53 v1.28.4/go.mod h1:VBLWpaHvhQNeu7N9rMEf00SWeOONb/HvaDUxe/7b44k=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0 h1:PalLOEGZ/4XfQxpGZFTLaoJSmPoybnqJYotaIZEf/Rg=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0/go.mod h1:PwyKKVL0cNkC37QwLcrhyeCrAk+5bY8O2ou7USyAS2A=
-github.com/aws/aws-sdk-go-v2/service/sagemaker v1.92.0 h1:MJ/Ras3Ea9eUEnQs/T59lil3EMt6OVUj4zjkOlK/8/Q=
-github.com/aws/aws-sdk-go-v2/service/sagemaker v1.92.0/go.mod h1:r5UufmVymEbTga9pVC6VkIF6pnNyCMowP0sD5Rf1Z0E=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.11 h1:g2uwGxEXNsjd2OJHIW1KrP4q/BAUcyn6440LQ9gR+nQ=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.11/go.mod h1:ywwMMBG8ioLfw1LccY05t/egwONbtwDkoUVuXNgDZjs=
-github.com/aws/aws-sdk-go-v2/service/sfn v1.18.1 h1:2lBYdhSTuqep5O54NNnyncuaI/xwABFRmRhNkfTIu1I=
-github.com/aws/aws-sdk-go-v2/service/sfn v1.18.1/go.mod h1:Ar9VDauywKQCtfEVZ2AiXBMwHtsDaqngdt4/aUbqtUc=
-github.com/aws/aws-sdk-go-v2/service/sns v1.20.14 h1:zl5JH5C7gE9bnvelqK7AKrmwp3lZRMh1281HoJ4qRj0=
-github.com/aws/aws-sdk-go-v2/service/sns v1.20.14/go.mod h1:bhIXgiDmP5qREwaPNFMyflXgjtd8USRrISXYQygSDi0=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.23.3 h1:yA25gnP6qmggck6ypwNFxurfXnyx4XJexwJVDko/UH0=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.23.3/go.mod h1:FcXJKz137Ousb8wFnHyYI/qjUB7nUUFqKZvWaBe7Fy0=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.36.8 h1:Z9bclrIuHR0/yd8yGikJAbYS4iIDySF+Fo7lwBuDWfo=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.36.8/go.mod h1:Uwh2QwiXNf2+WCU3z5K13HE6f2bLCu9WpioFRkWjUVk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 h1:sWDv7cMITPcZ21QdreULwxOOAmE05JjEsT6fCDtDA9k=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.13/go.mod h1:DfX0sWuT46KpcqbMhJ9QWtxAIP1VozkDWf8VAkByjYY=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 h1:BFubHS/xN5bjl818QaroN6mQdjneYQ+AOx44KNXlyH4=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13/go.mod h1:BzqsVVFduubEmzrVtUFQQIQdFqvUItF8XUq2EnS8Wog=
-github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 h1:e5mnydVdCVWxP+5rPAGi2PYxC7u2OZgH1ypC114H04U=
-github.com/aws/aws-sdk-go-v2/service/sts v1.19.3/go.mod h1:yVGZA1CPkmUhBdA039jXNJJG7/6t+G+EBWmFq23xqnY=
-github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
-github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
+github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA=
+github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.14 h1:Sc82v7tDQ/vdU1WtuSyzZ1I7y/68j//HJ6uozND1IDs=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.14/go.mod h1:9NCTOURS8OpxvoAVHq79LK81/zC78hfRWFn+aL0SPcY=
+github.com/aws/aws-sdk-go-v2/config v1.19.1 h1:oe3vqcGftyk40icfLymhhhNysAwk0NfiwkDi2GTPMXs=
+github.com/aws/aws-sdk-go-v2/config v1.19.1/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.6 h1:wmGLw2i8ZTlHLw7a9ULGfQbuccw8uIiNr6sol5bFzc8=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.6/go.mod h1:Q0Hq2X/NuL7z8b1Dww8rmOFl+jzusKEcyvkKspwdpyc=
+github.com/aws/aws-sdk-go-v2/service/apigateway v1.18.2 h1:d1T1J5oR9zHMHbXMs22nxR6YCBQEf0rAHyaZvv34XEM=
+github.com/aws/aws-sdk-go-v2/service/apigateway v1.18.2/go.mod h1:hfIgsvZ+nvnfBqu6T1H1YTeFkkPr0I/+UTyekLl054E=
+github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.15.0 h1:q6PifcrJdhfbpARjoMRxVDzOJWBzkM0aBtewbAHYpMI=
+github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.15.0/go.mod h1:MfSzpqLwryvxfGpwi9w2Re7DqkLG4qv+qzGu9a+GKJ0=
+github.com/aws/aws-sdk-go-v2/service/apprunner v1.21.2 h1:n2SWTOTKAlh5Wi78ypl8dy3iW0kFe3OATPDrf2pjkhE=
+github.com/aws/aws-sdk-go-v2/service/apprunner v1.21.2/go.mod h1:GvCOU2jyq+MgUD5v99Lw/jjjC0NKKCq7LVDeebOpGj4=
+github.com/aws/aws-sdk-go-v2/service/athena v1.32.0 h1:n4ui9xL0VbmOVNi2+hiWIrVLVhew/1/4BdzjJY3Px58=
+github.com/aws/aws-sdk-go-v2/service/athena v1.32.0/go.mod h1:vKT/ZbLHt0S5hlmf0T5OzcPhs4LJoEmqlr49JP+9Hy8=
+github.com/aws/aws-sdk-go-v2/service/cloud9 v1.18.11 h1:stATlP32EI69+sNDOKw30IbEhgXAu6bxwM/NvQcA1SU=
+github.com/aws/aws-sdk-go-v2/service/cloud9 v1.18.11/go.mod h1:e1xHnjdRt/ZaqrtO6gUwpbtPF8PtkRVyN1zCmz1IbNI=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.36.0 h1:9ls+8DHLhF0E4/xtZDNF3iYY9Ibqh+fG1y2ueKFDeEo=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.36.0/go.mod h1:EV06EPuSb3m40bD1suX/QSj3o161aG/6Wwbodk2vqzA=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.28.7 h1:rbzZROs9b8Fpo0jtdPy2Qfxh8SRAAXx6sEMX4yxqF6g=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.28.7/go.mod h1:0rod2DMcm5wuAlNJn99o/dtwuQKul9asVbcUn4nBIZs=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.29.2 h1:S9sfsAGkT/5e0bzqLMK7k3DkoZEz0EioL336dT+sCIM=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.29.2/go.mod h1:N6mA9PPSL2C2drFl+Yx8oEUiuSGhOiplOixRGWc2OYM=
+github.com/aws/aws-sdk-go-v2/service/codeartifact v1.20.2 h1:iOcHl9tgrHxvPVOW1cRHwIj9T7/FrkPE6bM0aDKOxE8=
+github.com/aws/aws-sdk-go-v2/service/codeartifact v1.20.2/go.mod h1:dZQurYLoNZG5Px5uhyf64g2th0tYkGihn+0pXOmMA0Y=
+github.com/aws/aws-sdk-go-v2/service/codebuild v1.22.2 h1:Xg0xMsQYw/8g+A6RQs6w9HtwQ5SgDojYjYbnKFmnp0Y=
+github.com/aws/aws-sdk-go-v2/service/codebuild v1.22.2/go.mod h1:WeDpKFqkjJU6RVUXL0M4MjLjNKQ5ZUWKmn1VOtbVplc=
+github.com/aws/aws-sdk-go-v2/service/codecommit v1.16.4 h1:xfkjR+oSH2FWuBqIuatV+ALSIjlX/0ro8JF3X5MzsXo=
+github.com/aws/aws-sdk-go-v2/service/codecommit v1.16.4/go.mod h1:WGVkzcLWQmGahUjgZDieFVFt07OSmaNMCW5pp+DLZYw=
+github.com/aws/aws-sdk-go-v2/service/codedeploy v1.18.3 h1:QpPAopwlgH0ODSxpVabR+TmR/32NcD/KMEvhE5ohGsw=
+github.com/aws/aws-sdk-go-v2/service/codedeploy v1.18.3/go.mod h1:XS0bHX1J7EFeoYPTXdg+GipSRP20erPm6WxTGj/xPoU=
+github.com/aws/aws-sdk-go-v2/service/datapipeline v1.16.2 h1:c5+t2S4JCTBzj3/y9Z15TagZTK0vJFYvdNUYvk9UeAo=
+github.com/aws/aws-sdk-go-v2/service/datapipeline v1.16.2/go.mod h1:RggMwt9IKmOq49+9okMMIGzoy/ZyEMZ23XmG8hq6oHs=
+github.com/aws/aws-sdk-go-v2/service/docdb v1.24.0 h1:Oto0KebWdPEtGUA7IB2pizLWCeQ82NasO2mv/UcrwSk=
+github.com/aws/aws-sdk-go-v2/service/docdb v1.24.0/go.mod h1:A7PqVcedUBaK/y89wiWysaEw+WqFPjgkcrxIZTOy/Yo=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 h1:xmSAn14nM6IdHyuWO/bsrAagOQtnqzuUCLxdVmj9nhg=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0/go.mod h1:1HkLh8vaL4obF95fne7ZOu7sxomS/+vkBt3/+gqqwE4=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.127.0 h1:4xtATQuR0qIvX+QTWHlgTUnwlDPNzHcvMsB+qkRSPRo=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.127.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 h1:y6LX9GUoEA3mO0qpFl1ZQHj1rFyPWVphlzebiSt2tKE=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2/go.mod h1:Q0LcmaN/Qr8+4aSBrdrXXePqoX0eOuYpJLbYpilmWnA=
+github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0=
+github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g=
+github.com/aws/aws-sdk-go-v2/service/efs v1.21.9 h1:mlF3jj8aWvnd/o/KEJqzFUQEGqw2a7UOm1S4gzqWe/o=
+github.com/aws/aws-sdk-go-v2/service/efs v1.21.9/go.mod h1:yXsn9Nd+xBewfLNGxu2HBjP8amz3/L6lGIsPZP1fhfc=
+github.com/aws/aws-sdk-go-v2/service/eks v1.30.0 h1:d6WbsOHHsEMryKLc9oYCmvu4lrV9z9QLSQ5S44KSn0o=
+github.com/aws/aws-sdk-go-v2/service/eks v1.30.0/go.mod h1:Nt5l6Vn68Hv0JWJ6dcQDKuBAKAfHUZSC9Ln8X/1fUMY=
+github.com/aws/aws-sdk-go-v2/service/elasticache v1.30.0 h1:isOi+s5w3lUupgMUnBd/Y1oZ04T7NG835vkQg75hnpo=
+github.com/aws/aws-sdk-go-v2/service/elasticache v1.30.0/go.mod h1:9fw8OlW99pw/i4qUkO7bNYYqznIPPuH/tsCHwa1ZYHc=
+github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.17.2 h1:a5T0ZZARvpJBSF3NTMG1Oh7MVrFqjaJrbTE7/Ro1iDM=
+github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.17.2/go.mod h1:RWRjHldUoeUDce3D6OIjCcIC1dJ5DeOHs0Y0inI2Xt8=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.18.0 h1:rw3OZB7wAdl0OA0w0dAy2kdsUSjUe4wSxNbu3rwi8zU=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.18.0/go.mod h1:T7I3S3o4CWa9sSV2DIK+5ZmuMXarrcrE8RYKGDaQ1I4=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.22.0 h1:DEdgH+R4MCPiuYW0G11pzU4U6kn+1WprM8N7gx1wnko=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.22.0/go.mod h1:/ZlJt5r04rRWDg/7K6cQ6Tq0ZUnUMVR2FRg0GGTy/e0=
+github.com/aws/aws-sdk-go-v2/service/emr v1.29.0 h1:a+70mGT17GMYDek7hU4bDN8BE5zhd7JE5Dzth+0BR00=
+github.com/aws/aws-sdk-go-v2/service/emr v1.29.0/go.mod h1:TUlGxOXunqrsVPdN98ergwcW9ZeR1+Fg0/qsQTho1ww=
+github.com/aws/aws-sdk-go-v2/service/fsx v1.34.0 h1:P9vHaltsJyddWNcD8zl3ixyGxQjlY9PdfKtHunV5LQE=
+github.com/aws/aws-sdk-go-v2/service/fsx v1.34.0/go.mod h1:EjIvHf1MOUWLXk5Gv2ot6BwlEyPHM4kceJ8IJv7KMME=
+github.com/aws/aws-sdk-go-v2/service/glue v1.64.0 h1:fwarWmCqZ40V+CU/EsZ9r+f1RMVxqz3BVnwJtz9OUN0=
+github.com/aws/aws-sdk-go-v2/service/glue v1.64.0/go.mod h1:U6H3cQ/25CnRt1rEsQ+Tk2q5Dnl3IXJZFHoRwc2WNE8=
+github.com/aws/aws-sdk-go-v2/service/grafana v1.15.7 h1:6JIuHCZ1aBYbwqypQ1omjx0+cJh6iDVVY0lHnGdr3no=
+github.com/aws/aws-sdk-go-v2/service/grafana v1.15.7/go.mod h1:L1GGWtZRULrM/5b4dtyakgcoPzIOMuxyNLSYcHA8SdU=
+github.com/aws/aws-sdk-go-v2/service/iam v1.23.0 h1:rHRl/C8gMedaF3XEZ9SgXkdgEgd3ir9t6upZqSZ1F+8=
+github.com/aws/aws-sdk-go-v2/service/iam v1.23.0/go.mod h1:d4c7P+mola/qBIgxgtVHK/w77vn+BlCsC/tbJ3m8m4Y=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.38 h1:skaFGzv+3kA+v2BPKhuekeb1Hbb105+44r8ASC+q5SE=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.38/go.mod h1:epIZoRSSbRIwLPJU5F+OldHhwZPBdpDeQkRdCeY3+00=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 h1:4LoizcvPT9A0tiAFhepxn0bGZXkzvN0pG0epydY3Pno=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37/go.mod h1:7xBUZyP6LeLc+5Ym9PG7atqw4sR28sBtYcHETik+bPE=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.6 h1:9ulSU5ClouoPIYhDQdg9tpl83d5Yb91PXTKK+17q+ow=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.6/go.mod h1:lnc2taBsR9nTlz9meD+lhFZZ9EWY712QHrRflWpTcOA=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.20.0 h1:OCYjSomi2Q8ttimk0DB4nNSAvoVOXfpSAwB0ZM4g1K0=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.20.0/go.mod h1:IKAdoalibJPPhb+riPJyKh9z/6V8n4J2X1yUto/W90Q=
+github.com/aws/aws-sdk-go-v2/service/lambda v1.41.0 h1:AQK0v7JA0stOOi1cNOq4n9N3X1a3N3A2Ezt3UEyHL9o=
+github.com/aws/aws-sdk-go-v2/service/lambda v1.41.0/go.mod h1:kFs07FNyTowZkz+dGBR33xJbzGs2mkC5Kfm6/lyR5CA=
+github.com/aws/aws-sdk-go-v2/service/lightsail v1.29.0 h1:Io+ezo97hWDmcg3tSMJbMoL1zd5zJ8BxK8Y8yB2Chfs=
+github.com/aws/aws-sdk-go-v2/service/lightsail v1.29.0/go.mod h1:u2yl3D9ygNXthorLQOj2wmMPSxWBGZ+XTlkVbsK2Bh8=
+github.com/aws/aws-sdk-go-v2/service/mq v1.17.0 h1:SseTkq+6TtZv05ez/rBfQJQDueAa9DQosluNGF5ZHzo=
+github.com/aws/aws-sdk-go-v2/service/mq v1.17.0/go.mod h1:GrFG5/W01G5Z2OXb+Qe40PjSzHQsXJTWSCNmvqAq6Rw=
+github.com/aws/aws-sdk-go-v2/service/opensearch v1.22.0 h1:ATE++PFLW5V2CAujoI846MVD8MIFtrpSvCXdeXloY84=
+github.com/aws/aws-sdk-go-v2/service/opensearch v1.22.0/go.mod h1:LPkOrJqBDqIzzNpnToYR79f5JQD/udkxyC9nECuHA3s=
+github.com/aws/aws-sdk-go-v2/service/organizations v1.20.8 h1:FUd2lRsLCF+hKf7Ve9I10in/N0f+EVqZEXB/VZm8BZI=
+github.com/aws/aws-sdk-go-v2/service/organizations v1.20.8/go.mod h1:0zR2FnFXmQBI+aHBNr6iQ9WuzssOkl7deBA+1c004Gk=
+github.com/aws/aws-sdk-go-v2/service/ram v1.20.7 h1:afbEGsuDyeU+svV28+V3wozbHRoRNn5GSGxgXaUUjqU=
+github.com/aws/aws-sdk-go-v2/service/ram v1.20.7/go.mod h1:hxfoKaeAQq9ybg0ZX+FK16nepP3+Ck7GmYrfBgPKcQE=
+github.com/aws/aws-sdk-go-v2/service/rds v1.58.0 h1:ErFOugr4ORe+d6OGNk3Csr5ItF9DRcHJMFZnuh4isUM=
+github.com/aws/aws-sdk-go-v2/service/rds v1.58.0/go.mod h1:NNx09yR8B7z4I5xTt2rUq+5h2lmA9T9bbm7NME/74Ac=
+github.com/aws/aws-sdk-go-v2/service/redshift v1.31.0 h1:61PxIJHRpNVHypYy4+8WNx7q9izeMvw7C3+OLM4dZ4c=
+github.com/aws/aws-sdk-go-v2/service/redshift v1.31.0/go.mod h1:WOT17e05/tPt7VV0Thz/sqtA1wE/C4iuxb2wsXyc5Qc=
+github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.16.2 h1:03EH0RIXqyhwLZFjyJBG4hMTBw4rHMUtIESEwizxkg8=
+github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.16.2/go.mod h1:qqGaDe21Tbh/b9vRv61ykdn/JM/xQr78SL4nYfRzh4E=
+github.com/aws/aws-sdk-go-v2/service/route53 v1.31.0 h1:2u6uM0+E/bowkcCBe6KXhAFc5++tHuCZqJC3br1sI1c=
+github.com/aws/aws-sdk-go-v2/service/route53 v1.31.0/go.mod h1:TQZBt/WaQy+zTHoW++rnl8JBrmZ0VO6EUbVua1+foCA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.40.2 h1:Ll5/YVCOzRB+gxPqs2uD0R7/MyATC0w85626glSKmp4=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.40.2/go.mod h1:Zjfqt7KhQK+PO1bbOsFNzKgaq7TcxzmEoDWN8lM0qzQ=
+github.com/aws/aws-sdk-go-v2/service/sagemaker v1.112.0 h1:ZN0GhpC0JEhWemCyXpUDEhpYaANwgs1Rr/Xot6mjHGo=
+github.com/aws/aws-sdk-go-v2/service/sagemaker v1.112.0/go.mod h1:gbX8YRNFupoP6GuDH609e+QXejEPyQKrf/chjLTHYTk=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.6 h1:y3n83jEM6EuawrD5HZCh3eMj9RsfxniVLcXlyFMNITM=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.6/go.mod h1:A108ijf0IFtqhYApU+Gia80aPSAUfi9dItm+h5fWGJE=
+github.com/aws/aws-sdk-go-v2/service/sfn v1.19.8 h1:qyewIfqnYEIvYx4SwH/0ObX6PpJ9SEEUUHmUQ3CNois=
+github.com/aws/aws-sdk-go-v2/service/sfn v1.19.8/go.mod h1:rxuLnlLghUuQWgzHnqq2lXEwYmPnEFkX+RxC4QflXXs=
+github.com/aws/aws-sdk-go-v2/service/sns v1.22.2 h1:zU+iUkj72bZFuIgUTCcAyVXs7Le1uX2LopHMnvZfn04=
+github.com/aws/aws-sdk-go-v2/service/sns v1.22.2/go.mod h1:gLVePJ104BrkWKr4aU3CURZYZnZN7BQGDsB668Uh3ZY=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.24.7 h1:NZhGz9eHNTLPK9Bhq3wrRSUIu9BqcjWzC8UNK6MwUfI=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.24.7/go.mod h1:iWb2iGUERRXX3kEyKVtkjuMOW2YkDBcuhKCp5y37ys0=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.40.0 h1:DHZFzwbFXlfw15I0ERlTVB/YH9iHNr2C1axjRpB7/Gg=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.40.0/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY=
+github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k=
+github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg=
+github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU=
+github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ=
+github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8=
+github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/bishopfox/awsservicemap v1.0.2 h1:+NnuInVcQkja6y6h6eGseneU3m5Nzp9O++gR1s+FiyM=
 github.com/bishopfox/awsservicemap v1.0.2/go.mod h1:oy9Fyqh6AozQjShSx+zRNouTlp7k3z3YEMoFkN8rquc=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -253,6 +255,8 @@ github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
+github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -307,8 +311,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
@@ -340,10 +344,10 @@ github.com/kyokomi/emoji v2.2.4+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2px
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
-github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -368,8 +372,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -384,8 +388,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
@@ -395,8 +399,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE=
-go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=
+go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE=
+go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -414,8 +418,8 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -484,8 +488,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -548,13 +552,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
-golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -565,8 +569,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

internal/aws.go

@@ -12,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/aws/retry"
 	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials/stscreds"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	"github.com/aws/smithy-go/ptr"
@@ -25,32 +26,69 @@ var (
 	TxtLoggerName = "root"
 	TxtLog        = TxtLogger()
 	UtilsFs       = afero.NewOsFs()
+	credsMap      = map[string]aws.Credentials{}
+	ConfigMap     = map[string]aws.Config{}
 )
 
-func AWSConfigFileLoader(AWSProfile string, version string) aws.Config {
-	// Ensures the profile in the aws config file meets all requirements (valid keys and a region defined). I noticed some calls fail without a default region.
-	cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithSharedConfigProfile(AWSProfile), config.WithDefaultRegion("us-east-1"), config.WithRetryer(
-		func() aws.Retryer {
-			return retry.AddWithMaxAttempts(retry.NewStandard(), 3)
-		}))
-	if err != nil {
-		fmt.Println(err)
-		TxtLog.Println(err)
-	}
+func AWSConfigFileLoader(AWSProfile string, version string, AwsMfaToken string) aws.Config {
+	// Loads the AWS config file and returns a config object
 
-	_, err = cfg.Credentials.Retrieve(context.TODO())
-	if err != nil {
-		fmt.Printf("[%s][%s] Error retrieving credentials from environment variables, or the instance metadata service.\n", cyan(emoji.Sprintf(":fox:cloudfox v%s :fox:", version)), cyan(AWSProfile))
-		TxtLog.Printf("Could not retrieve the specified profile name %s", err)
+	var cfg aws.Config
+	var err error
+	// Check if the profile is already in the config map. If not, load it and retrieve the credentials. If it is, return the cached config object
+	// The AssumeRoleOptions below are used to pass the MFA token to the AssumeRole call (when applicable)
+	if _, ok := ConfigMap[AWSProfile]; !ok {
+		// Ensures the profile in the aws config file meets all requirements (valid keys and a region defined). I noticed some calls fail without a default region.
+		if AwsMfaToken != "" {
+			cfg, err = config.LoadDefaultConfig(context.TODO(), config.WithSharedConfigProfile(AWSProfile), config.WithDefaultRegion("us-east-1"), config.WithRetryer(
+				func() aws.Retryer {
+					return retry.AddWithMaxAttempts(retry.NewStandard(), 3)
+				}), config.WithAssumeRoleCredentialOptions(func(options *stscreds.AssumeRoleOptions) {
+				options.TokenProvider = func() (string, error) {
+					return AwsMfaToken, nil
+				}
+			}),
+			)
+		} else {
+			cfg, err = config.LoadDefaultConfig(context.TODO(), config.WithSharedConfigProfile(AWSProfile), config.WithDefaultRegion("us-east-1"), config.WithRetryer(
+				func() aws.Retryer {
+					return retry.AddWithMaxAttempts(retry.NewStandard(), 3)
+				}), config.WithAssumeRoleCredentialOptions(func(options *stscreds.AssumeRoleOptions) {
+				options.TokenProvider = stscreds.StdinTokenProvider
+			}),
+			)
+		}
 
+		if err != nil {
+			fmt.Println(err)
+			TxtLog.Println(err)
+		}
+
+		_, err := cfg.Credentials.Retrieve(context.TODO())
+
+		if err != nil {
+			fmt.Printf("[%s][%s] Error retrieving credentials from environment variables, or the instance metadata service.\n", cyan(emoji.Sprintf(":fox:cloudfox v%s :fox:", version)), cyan(AWSProfile))
+			TxtLog.Printf("Could not retrieve the specified profile name %s", err)
+
+		} else {
+			// update the config map with the new config for future lookups
+			ConfigMap[AWSProfile] = cfg
+			//return the config object for this first iteration
+			return cfg
+
+		}
+	} else {
+		//fmt.Println("Using cached config")
+		cfg = ConfigMap[AWSProfile]
+		return cfg
 	}
 	return cfg
 }
 
-func AWSWhoami(awsProfile string, version string) (*sts.GetCallerIdentityOutput, error) {
+func AWSWhoami(awsProfile string, version string, AwsMfaToken string) (*sts.GetCallerIdentityOutput, error) {
 	// Connects to STS and checks caller identity. Same as running "aws sts get-caller-identity"
 	//fmt.Printf("[%s] Retrieving caller's identity\n", cyan(emoji.Sprintf(":fox:cloudfox v%s :fox:", version)))
-	STSService := sts.NewFromConfig(AWSConfigFileLoader(awsProfile, version))
+	STSService := sts.NewFromConfig(AWSConfigFileLoader(awsProfile, version, AwsMfaToken))
 	CallerIdentity, err := STSService.GetCallerIdentity(context.TODO(), &sts.GetCallerIdentityInput{})
 	if err != nil {
 		fmt.Printf("[%s][%s] Could not get caller's identity\n\nError: %s\n\n", cyan(emoji.Sprintf(":fox:cloudfox v%s :fox:", version)), cyan(awsProfile), err)
@@ -61,9 +99,9 @@ func AWSWhoami(awsProfile string, version string) (*sts.GetCallerIdentityOutput,
 	return CallerIdentity, err
 }
 
-func GetEnabledRegions(awsProfile string, version string) []string {
+func GetEnabledRegions(awsProfile string, version string, AwsMfaToken string) []string {
 	var enabledRegions []string
-	ec2Client := ec2.NewFromConfig(AWSConfigFileLoader(awsProfile, version))
+	ec2Client := ec2.NewFromConfig(ConfigMap[awsProfile])
 	regions, err := ec2Client.DescribeRegions(
 		context.TODO(),
 		&ec2.DescribeRegionsInput{

internal/aws/policy/principal.go

@@ -3,6 +3,7 @@ package policy
 import (
 	"encoding/json"
 	"errors"
+	"strings"
 )
 
 type PolicyStatementPrincipal struct {
@@ -92,3 +93,16 @@ func (ls *ListOrString) UnmarshalJSON(b []byte) error {
 
 	return errors.New("not a string or list of strings")
 }
+
+// create a method on *PolicyStatementPrincipalObject that will determine if trusted principal is from the same account as the resource or a different account
+func (pspo *PolicyStatementPrincipalObject) IsTrustedPrincipalSameAccount(accountID string) bool {
+	for _, principal := range pspo.CanonicalUser {
+		if strings.Contains(principal, ":") {
+			principalAccount := strings.Split(principal, ":")[4]
+			if principalAccount == accountID {
+				return true
+			}
+		}
+	}
+	return false
+}

internal/aws/policy/statement.go

@@ -54,18 +54,6 @@ func (ps *PolicyStatement) GetAllActionsAsString() string {
 
 func (ps *PolicyStatement) GetAllPrincipalsAsString() string {
 	principals := ""
-	// if len(ps.Principal.O.GetListOfPrincipals()) < 3 {
-	// 	for _, principal := range ps.Principal.O.GetListOfPrincipals() {
-	// 		principals = fmt.Sprintf("%s%s & ", principals, principal)
-	// 	}
-	// } else {
-	// 	principals = fmt.Sprintf("%s%d principals", principals, len(ps.Principal.O.GetListOfPrincipals()))
-	// }
-	// principals = strings.TrimSuffix(principals, " & ")
-	// principals = principals + "\n"
-
-	// return principals
-
 	for _, principal := range ps.Principal.O.GetListOfPrincipals() {
 		if len(ps.Principal.O.GetListOfPrincipals()) > 1 {
 			principals = fmt.Sprintf("%s%s \n& ", principals, principal)
@@ -133,3 +121,8 @@ func (ps *PolicyStatement) GetStatementSummaryInEnglish(caller string) string {
 
 	return statementSummary
 }
+
+// GetResources as list of strings
+func (ps *PolicyStatement) GetResources() []string {
+	return ps.Resource
+}

internal/cache.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -37,7 +36,7 @@ func SaveCacheToFiles(directory string, accountID string) error {
 			}
 
 			filename := filepath.Join(directory, key+".json")
-			err = ioutil.WriteFile(filename, jsonData, 0644)
+			err = os.WriteFile(filename, jsonData, 0644)
 			if err != nil {
 				return err
 			}
@@ -55,7 +54,7 @@ func LoadCacheFromFiles(directory string) error {
 		return err
 	}
 
-	files, err := ioutil.ReadDir(directory)
+	files, err := os.ReadDir(directory)
 	if err != nil {
 		return err
 	}
@@ -66,7 +65,7 @@ func LoadCacheFromFiles(directory string) error {
 		}
 
 		filename := filepath.Join(directory, file.Name())
-		jsonData, err := ioutil.ReadFile(filename)
+		jsonData, err := os.ReadFile(filename)
 		if err != nil {
 			return err
 		}
@@ -133,7 +132,8 @@ func LoadCacheFromGobFiles(directory string) error {
 		return err
 	}
 
-	files, err := ioutil.ReadDir(directory)
+	files, err := os.ReadDir(directory)
+
 	if err != nil {
 		return err
 	}
@@ -142,6 +142,10 @@ func LoadCacheFromGobFiles(directory string) error {
 		if file.IsDir() {
 			continue
 		}
+		// if the filetype is json, skip it
+		if filepath.Ext(file.Name()) == ".json" {
+			continue
+		}
 
 		filename := filepath.Join(directory, file.Name())
 		file, err := os.Open(filename)
@@ -155,7 +159,7 @@ func LoadCacheFromGobFiles(directory string) error {
 		err = decoder.Decode(&entry)
 		if err != nil {
 			sharedLogger.Errorf("Could not decode the following file: %s", filename)
-			return err
+			continue
 		}
 
 		// the key should remove the directory and the .json suffix from the filename and also trim the first slash

internal/output2.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path"
 	"regexp"
+	"strings"
 
 	"github.com/aquasecurity/table"
 	"github.com/fatih/color"
@@ -41,6 +42,7 @@ type TableFile struct {
 	TableFilePointer afero.File
 	CSVFilePointer   afero.File
 	JSONFilePointer  afero.File
+	TableCols        []string
 	Header           []string
 	Body             [][]string
 }
@@ -179,20 +181,10 @@ func (l *LootClient) writeLootFiles() []string {
 
 func (b *TableClient) printTablesToScreen(tableFiles []TableFile) {
 	for _, tf := range tableFiles {
+		tf.Body, tf.Header = adjustBodyForTable(tf.TableCols, tf.Header, tf.Body)
 		standardColumnWidth := 1000
 		t := table.New(os.Stdout)
 
-		// if b.Wrap {
-		// 	terminalWidth, _, err := terminal.GetSize(int(os.Stdout.Fd()))
-		// 	if err != nil {
-		// 		fmt.Printf("error getting terminal size: %s, please set the --wrap flag to false\n", err)
-		// 		return
-		// 	}
-		// 	columnCount := len(tf.Header)
-		// 	// The offset value was defined by trial and error to get the best wrapping
-		// 	trialAndErrorOffset := 1
-		// 	standardColumnWidth = terminalWidth / (columnCount + trialAndErrorOffset)
-		// }
 		if !b.Wrap {
 			t.SetColumnMaxWidth(standardColumnWidth)
 		}
@@ -245,6 +237,7 @@ func (b *TableClient) writeTableFiles(files []TableFile) []string {
 	var fullFilePaths []string
 
 	for _, file := range b.TableFiles {
+		file.Body, file.Header = adjustBodyForTable(file.TableCols, file.Header, file.Body)
 		standardColumnWidth := 1000
 		t := table.New(file.TableFilePointer)
 
@@ -305,6 +298,8 @@ func (b *TableClient) writeCSVFiles() []string {
 		csvWriter.Write(file.Header)
 		for _, row := range file.Body {
 			row = removeColorCodesFromSlice(row)
+			//row = removeNewLinesFromSlice(row)
+
 			csvWriter.Write(row)
 		}
 		csvWriter.Flush()
@@ -316,6 +311,39 @@ func (b *TableClient) writeCSVFiles() []string {
 	return fullFilePaths
 }
 
+// replace newlines in row to make them csv and json safe
+func removeNewLinesFromNestedSlice(input [][]string) [][]string {
+	// Regular expression to match new lines
+	newLineRegExp := regexp.MustCompile(`\n`)
+
+	// Create a new slice to store the slices with new lines removed
+	noNewLineNestedSlice := make([][]string, len(input))
+
+	for i, strSlice := range input {
+		noNewLineNestedSlice[i] = make([]string, len(strSlice))
+		for j, str := range strSlice {
+			noNewLineNestedSlice[i][j] = newLineRegExp.ReplaceAllString(str, "")
+		}
+	}
+
+	return noNewLineNestedSlice
+}
+
+// replace newlines in slice of strings to make them render as newlines in csv and json when opened in excel
+func removeNewLinesFromSlice(input []string) []string {
+	// Regular expression to match new lines
+	newLineRegExp := regexp.MustCompile(`\n`)
+
+	// Create a new slice to store the strings with new lines removed
+	noNewLineSlice := make([]string, len(input))
+
+	for i, str := range input {
+		noNewLineSlice[i] = newLineRegExp.ReplaceAllString(str, " \\n")
+	}
+
+	return noNewLineSlice
+}
+
 func (b *TableClient) createJSONFiles() {
 	for i, file := range b.TableFiles {
 		if b.DirectoryName == "" {
@@ -397,3 +425,33 @@ func (b *TableClient) writeJSONFiles() []string {
 
 	return fullFilePaths
 }
+
+func adjustBodyForTable(tableHeaders []string, fullHeaders []string, fullBody [][]string) ([][]string, []string) {
+	if tableHeaders == nil || len(tableHeaders) == 0 {
+		return fullBody, fullHeaders
+	}
+
+	columnIndices := make([]int, 0)
+	selectedHeaders := make([]string, 0)
+
+	for _, tableHeader := range tableHeaders {
+		for j, fullHeader := range fullHeaders {
+			if strings.ToLower(tableHeader) == strings.ToLower(fullHeader) {
+				columnIndices = append(columnIndices, j)
+				selectedHeaders = append(selectedHeaders, fullHeader)
+				break
+			}
+		}
+	}
+
+	adjustedBody := make([][]string, len(fullBody))
+	for i, row := range fullBody {
+		newRow := make([]string, len(columnIndices))
+		for k, index := range columnIndices {
+			newRow[k] = row[index]
+		}
+		adjustedBody[i] = newRow
+	}
+
+	return adjustedBody, selectedHeaders
+}

main.go

@@ -10,7 +10,7 @@ import (
 var (
 	rootCmd = &cobra.Command{
 		Use:     os.Args[0],
-		Version: "1.12.2",
+		Version: "1.12.3",
 	}
 )