Merge pull request #159 from bhallasaksham/revert-s3-bucket-ownership…

…-enforce-rule Revert s3 bucket ownership enforce rule
aws · Jan 15, 2025 · b48a386 · b48a386
2 parents 94c6292 + 681bf92
commit b48a386
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/api/src/gmsa_service.cpp b/api/src/gmsa_service.cpp
@@ -2695,27 +2695,13 @@ std::string retrieve_credspec_from_s3( std::string s3_arn, std::string region,
                 std::cerr << objectName;
                 return dummy_credspec;
             }
-
-            // regex for callerId
-            std::regex callerIdRegex( "^\\d{12}$" );
-            std::string callerId = get_caller_id( region, creds );
-            if ( callerId.empty() && !std::regex_match( callerId, callerIdRegex ) )
-            {
-                std::cerr << Util::getCurrentTime() << '\t'
-                          << "ERROR: Unable to get caller information" << std::endl;
-                return std::string( "" );
-            }
-
-            Aws::S3::S3Client s3Client(
-                credentials,
-                Aws::MakeShared<Aws::S3::S3EndpointProvider>( Aws::S3::S3Client::ALLOCATION_TAG ),
-                clientConfig );
+            Aws::S3::S3Client s3Client (credentials,Aws::MakeShared<Aws::S3::S3EndpointProvider>
+                (Aws::S3::S3Client::ALLOCATION_TAG), clientConfig);
             Aws::S3::Model::GetObjectRequest request;
-            request.SetExpectedBucketOwner( callerId );
-            request.SetBucket( s3Bucket );
-            request.SetKey( objectName );
-            Aws::S3::Model::GetObjectOutcome outcome = s3Client.GetObject( request );
-
+            request.SetBucket(s3Bucket);
+            request.SetKey(objectName);
+            Aws::S3::Model::GetObjectOutcome outcome =
+                    s3Client.GetObject(request);
             if ( !outcome.IsSuccess() )
             {
                 const Aws::S3::S3Error& err = outcome.GetError();
@@ -2824,5 +2810,4 @@ retrieve_credspec_from_secrets_manager( std::string sm_arn, std::string region,
     }
     return { "", "", "", "" };
 }
-
 #endif