Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Unify S3 client creation logic (#1657)
Cody Rosea2c0abbfd6bc
diff --git a/pkg/sources/s3/s3.go b/pkg/sources/s3/s3.goindex 44d62572e..c6eef466d 100644--- a/pkg/sources/s3/s3.go+++ b/pkg/sources/s3/s3.go@@ -104,66 +104,44 @@ func (s *Source) setMaxObjectSize(maxObjectSize int64) {}}-func (s *Source) newClient(region string) (*s3.S3, error) {+func (s *Source) newClient(region, roleArn string) (*s3.S3, error) {cfg := aws.NewConfig()cfg.CredentialsChainVerboseErrors = aws.Bool(true)cfg.Region = aws.String(region)- switch cred := s.conn.GetCredential().(type) {- case *sourcespb.S3_SessionToken:- cfg.Credentials = credentials.NewStaticCredentials(cred.SessionToken.Key, cred.SessionToken.Secret, cred.SessionToken.SessionToken)- case *sourcespb.S3_AccessKey:- cfg.Credentials = credentials.NewStaticCredentials(cred.AccessKey.Key, cred.AccessKey.Secret, "")- case *sourcespb.S3_Unauthenticated:- cfg.Credentials = credentials.AnonymousCredentials- case *sourcespb.S3_CloudEnvironment:- // Nothing needs to be done!- default:- return nil, errors.Errorf("invalid configuration given for %s source", s.name)- }-- sess, err := session.NewSessionWithOptions(session.Options{- SharedConfigState: session.SharedConfigEnable,- Config: *cfg,- })- if err != nil {- return nil, err- }-- return s3.New(sess), nil-}--// Separate role assumption functionality into a different newClient function-func (s *Source) newRoleClient(region string, roleArn string) (*s3.S3, error) {-- cfg := aws.NewConfig()- cfg.CredentialsChainVerboseErrors = aws.Bool(true)- cfg.Region = aws.String(region)-- var baseCredentials *credentials.Credentials+ if roleArn == "" {+ switch cred := s.conn.GetCredential().(type) {+ case *sourcespb.S3_SessionToken:+ cfg.Credentials = credentials.NewStaticCredentials(cred.SessionToken.Key, cred.SessionToken.Secret, cred.SessionToken.SessionToken)+ case *sourcespb.S3_AccessKey:+ cfg.Credentials = credentials.NewStaticCredentials(cred.AccessKey.Key, cred.AccessKey.Secret, "")+ case *sourcespb.S3_Unauthenticated:+ cfg.Credentials = credentials.AnonymousCredentials+ case *sourcespb.S3_CloudEnvironment:+ // Nothing needs to be done!+ default:+ return nil, errors.Errorf("invalid configuration given for %s source", s.name)+ }+ } else {+ sess, err := session.NewSession(cfg)+ if err != nil {+ return nil, err+ }- sess, err := session.NewSession(cfg)- if err != nil {- return nil, err+ stsClient := sts.New(sess)+ cfg.Credentials = stscreds.NewCredentialsWithClient(stsClient, roleArn, func(p *stscreds.AssumeRoleProvider) {+ p.RoleSessionName = "trufflehog"+ })}- stsClient := sts.New(sess)- baseCredentials = stscreds.NewCredentialsWithClient(stsClient, roleArn, func(p *stscreds.AssumeRoleProvider) {- p.RoleSessionName = "trufflehog"- })-- cfg.Credentials = baseCredentials-- sess, err = session.NewSessionWithOptions(session.Options{+ sess, err := session.NewSessionWithOptions(session.Options{SharedConfigState: session.SharedConfigEnable,Config: *cfg,})-if err != nil {return nil, err}- // Create and return the S3 client with the final configurationreturn s3.New(sess), nil}@@ -204,13 +182,10 @@ func (s *Source) scanBuckets(ctx context.Context, client *s3.S3, role string, buvar regionalClient *s3.S3if region != defaultAWSRegion {- if role != "" {- regionalClient, err = s.newRoleClient(region, role)- } else {- regionalClient, err = s.newClient(region)- }+ regionalClient, err = s.newClient(region, role)if err != nil {s.log.Error(err, "could not make regional s3 client")+ continue}} else {regionalClient = client@@ -238,24 +213,13 @@ func (s *Source) scanBuckets(ctx context.Context, client *s3.S3, role string, bufunc (s *Source) Chunks(ctx context.Context, chunksChan chan *sources.Chunk) error {const defaultAWSRegion = "us-east-1"- if len(s.conn.Roles) > 0 {- for _, role := range s.conn.Roles {- client, err := s.newRoleClient(defaultAWSRegion, role)- if err != nil {- return errors.WrapPrefix(err, "could not create s3 client", 0)- }-- bucketsToScan, err := s.getBucketsToScan(client)- if err != nil {- return err- }+ roles := s.conn.Roles+ if len(roles) == 0 {+ roles = []string{""}+ }- if err := s.scanBuckets(ctx, client, role, bucketsToScan, chunksChan); err != nil {- return err- }- }- } else {- client, err := s.newClient(defaultAWSRegion)+ for _, role := range roles {+ client, err := s.newClient(defaultAWSRegion, role)if err != nil {return errors.WrapPrefix(err, "could not create s3 client", 0)}@@ -265,7 +229,7 @@ func (s *Source) Chunks(ctx context.Context, chunksChan chan *sources.Chunk) errreturn err}- if err := s.scanBuckets(ctx, client, "", bucketsToScan, chunksChan); err != nil {+ if err := s.scanBuckets(ctx, client, role, bucketsToScan, chunksChan); err != nil {return err}}