Dynamically choose between sending canned ACL in the request or not

Author: tomas-sexenian

dotnet/src/dotnetframework/Providers/Storage/GXAmazonS3/ExternalProviderS3.cs

@@ -49,7 +49,9 @@ public class ExternalProviderS3 : ExternalProviderBase, ExternalProvider
 
 		bool forcePathStyle = false;
 		bool customEndpoint = false;
-		
+
+		bool objectOwnershipEnabled;
+
 		public string StorageUri
 		{
 			get {
@@ -104,6 +106,8 @@ private void Initialize() {
 				}
 			}
 
+			objectOwnershipEnabled = !GetPropertyValue(DEFAULT_ACL, DEFAULT_ACL_DEPRECATED, "").Equals("Bucket owner enforced");
+
 #if NETCORE
 			if (credentials != null)
 			{
@@ -227,16 +231,19 @@ public string Upload(string localFile, string objectName, GxFileType fileType)
 			{
 				BucketName = Bucket,
 				Key = objectName,
-				FilePath = localFile,
-				CannedACL = GetCannedACL(fileType)
+				FilePath = localFile
 			};
+			if (objectOwnershipEnabled)
+			{
+				objectRequest.CannedACL = GetCannedACL(fileType);
+			}
 			PutObject(objectRequest);
 			return GetUrlImpl(objectName, fileType);
 		}
 
 		private bool IsPrivateUpload(GxFileType fileType)
 		{
-			return GetCannedACL(fileType) != S3CannedACL.PublicRead;
+			return (GetCannedACL(fileType) != S3CannedACL.PublicRead) && objectOwnershipEnabled;
 		}
 
 		public string Get(string objectName, GxFileType fileType, int urlMinutes = 0)
@@ -327,10 +334,14 @@ public string Copy(string objectName, GxFileType sourceFileType, string newName,
 				SourceKey = objectName,
 				DestinationBucket = Bucket,
 				DestinationKey = newName,
-				CannedACL = GetCannedACL(destFileType),
 				MetadataDirective = S3MetadataDirective.REPLACE
 			};
 
+			if (objectOwnershipEnabled)
+			{
+				request.CannedACL = GetCannedACL(destFileType);
+			}
+
 			if (TryGetContentType(newName, out string mimeType, DEFAULT_CONTENT_TYPE))
 			{
 				request.ContentType = mimeType;
@@ -384,10 +395,14 @@ private string UploadMultipart(string fileName, Stream stream, GxFileType destFi
 				BucketName = Bucket,
 				Key = fileName,				
 				PartSize = MULITIPART_POST_PART_SIZE,
-				InputStream = stream,
-				CannedACL = GetCannedACL(destFileType)
+				InputStream = stream
 			};
 
+			if (objectOwnershipEnabled)
+			{
+				uploadRequest.CannedACL = GetCannedACL(destFileType);
+			}
+
 			if (TryGetContentType(fileName, out string mimeType))
 			{
 				uploadRequest.ContentType = mimeType;
@@ -404,9 +419,14 @@ private string UploadSimple(string fileName, Stream stream, GxFileType destFileT
 			{
 				BucketName = Bucket,
 				Key = fileName,
-				InputStream = stream,
-				CannedACL = GetCannedACL(destFileType)
+				InputStream = stream
 			};
+
+			if (objectOwnershipEnabled)
+			{
+				objectRequest.CannedACL = GetCannedACL(destFileType);
+			}
+
 			if (TryGetContentType(fileName, out string mimeType))
 			{
 				objectRequest.ContentType = mimeType;
@@ -430,10 +450,14 @@ public string Copy(string url, string newName, string tableName, string fieldNam
 				SourceKey = url,
 				DestinationBucket = Bucket,
 				DestinationKey = resourceKey,
-				CannedACL = GetCannedACL(destFileType),
 				MetadataDirective = S3MetadataDirective.REPLACE
 			};
 
+			if (objectOwnershipEnabled)
+			{
+				request.CannedACL = GetCannedACL(destFileType);
+			}
+
 			if (TryGetContentType(newName, out string mimeType, DEFAULT_CONTENT_TYPE))
 			{
 				request.ContentType = mimeType;
@@ -455,9 +479,12 @@ public string Save(Stream fileStream, string fileName, string tableName, string
 				{
 					BucketName = Bucket,
 					Key = resourceKey,
-					InputStream = fileStream,
-					CannedACL = GetCannedACL(destFileType)
+					InputStream = fileStream
 				};
+				if (objectOwnershipEnabled)
+				{
+					objectRequest.CannedACL = GetCannedACL(destFileType);
+				}
 				if (TryGetContentType(fileName, out string mimeType))
 				{
 					objectRequest.ContentType = mimeType;