Revert "fix: check bucket owner permission"

This reverts commit 51d06a1.
aws · Jan 14, 2025 · b53164d · b53164d
1 parent 530a1f8
commit b53164d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 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
diff --git a/auth/kerberos/src/krb.cpp b/auth/kerberos/src/krb.cpp
@@ -631,4 +631,4 @@ std::vector<std::string> delete_krb_tickets( std::string krb_files_dir, std::str
         return delete_krb_ticket_paths;
     }
     return delete_krb_ticket_paths;
-}
+}
diff --git a/common/daemon.h b/common/daemon.h
@@ -257,6 +257,7 @@ std::string generate_lease_id();
 
 void clearString( std::string& str );
 
+
 #if AMAZON_LINUX_DISTRO
 
 std::string retrieve_credspec_from_s3( std::string s3_arn, std::string region,
-Original file line number
+Diff line change
@@ Expand Up @@
             return delete_krb_ticket_paths;
         }
         return delete_krb_ticket_paths;
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -257,6 +257,7 @@ std::string generate_lease_id();

		void clearString( std::string& str );


		#if AMAZON_LINUX_DISTRO

		std::string retrieve_credspec_from_s3( std::string s3_arn, std::string region,
Expand Down