bugfix: ACL on bucket creation in S3 Streamwrapper

.changes/nextrelease/streamwrapper-acl.json

@@ -0,0 +1,7 @@
+[
+  {
+    "type": "bugfix",
+    "category": "S3",
+    "description": "Removes ACL from bucket creation in S3 Streamwrapper."
+  }
+]

composer.json

@@ -43,7 +43,8 @@
         "paragonie/random_compat": ">= 2",
         "sebastian/comparator": "^1.2.3 || ^4.0",
         "yoast/phpunit-polyfills": "^1.0",
-        "dms/phpunit-arraysubset-asserts": "^0.4.0"
+        "dms/phpunit-arraysubset-asserts": "^0.4.0",
+        "psr/http-message": "<1.1"
     },
     "suggest": {
         "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",

src/S3/StreamWrapper.php

@@ -817,6 +817,7 @@ private function createBucket($path, array $params)
             return $this->triggerError("Bucket already exists: {$path}");
         }
 
+        unset($params['ACL']);
         return $this->boolCall(function () use ($params, $path) {
             $this->getClient()->createBucket($params);
             $this->clearCacheKey($path);

tests/Crypto/RandomByteStream.php

@@ -34,6 +34,9 @@ public function __construct($maxLength)
         });
     }
 
+    /**
+     * @return int|null
+     */
     public function getSize()
     {
         return $this->maxLength;

tests/S3/StreamWrapperPathStyleTest.php

@@ -268,7 +268,7 @@ public function testCreatingAlreadyExistingBucketForKeyRaisesError()
         mkdir('s3://already-existing-bucket/key');
     }
 
-    public function testCreatingBucketsSetsAclBasedOnPermissions()
+    public function testCreatingBucketsDoesNotSetAcl()
     {
         $history = new History();
         $this->client->getHandlerList()->appendSign(Middleware::history($history));
@@ -296,9 +296,9 @@ function ($cmd, $r) { return new S3Exception('404', $cmd); },
         $this->assertSame('PUT', $entries[1]['request']->getMethod());
         $this->assertSame('/bucket/', $entries[1]['request']->getUri()->getPath());
         $this->assertSame('s3.amazonaws.com', $entries[1]['request']->getUri()->getHost());
-        $this->assertSame('public-read', (string) $entries[1]['request']->getHeaderLine('x-amz-acl'));
-        $this->assertSame('authenticated-read', (string) $entries[3]['request']->getHeaderLine('x-amz-acl'));
-        $this->assertSame('private', (string) $entries[5]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[1]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[3]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[5]['request']->getHeaderLine('x-amz-acl'));
     }
 
     public function testCreatesNestedSubfolder()

tests/S3/StreamWrapperTest.php

@@ -381,7 +381,7 @@ public function testCreatingAlreadyExistingBucketForKeyRaisesError()
         mkdir('s3://already-existing-bucket/key');
     }
 
-    public function testCreatingBucketsSetsAclBasedOnPermissions()
+    public function testCreatingBucketsDoesNotSetAcl()
     {
         $history = new History();
         $this->client->getHandlerList()->appendSign(Middleware::history($history));
@@ -409,9 +409,9 @@ function ($cmd, $r) { return new S3Exception('404', $cmd); },
         $this->assertSame('PUT', $entries[1]['request']->getMethod());
         $this->assertSame('/', $entries[1]['request']->getUri()->getPath());
         $this->assertSame('bucket.s3.amazonaws.com', $entries[1]['request']->getUri()->getHost());
-        $this->assertSame('public-read', (string) $entries[1]['request']->getHeaderLine('x-amz-acl'));
-        $this->assertSame('authenticated-read', (string) $entries[3]['request']->getHeaderLine('x-amz-acl'));
-        $this->assertSame('private', (string) $entries[5]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[1]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[3]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[5]['request']->getHeaderLine('x-amz-acl'));
     }
 
     public function testCreatesNestedSubfolder()

tests/S3/StreamWrapperV2ExistenceTest.php

@@ -337,7 +337,7 @@ public function testCreatingAlreadyExistingBucketForKeyRaisesError()
         mkdir('s3://already-existing-bucket/key');
     }
 
-    public function testCreatingBucketsSetsAclBasedOnPermissions()
+    public function testCreatingBucketsDoesNotSetAcl()
     {
         $history = new History();
         $this->client->getHandlerList()->appendSign(Middleware::history($history));
@@ -377,9 +377,9 @@ function ($cmd, $r) {return new S3Exception(
         $this->assertSame('PUT', $entries[1]['request']->getMethod());
         $this->assertSame('/', $entries[1]['request']->getUri()->getPath());
         $this->assertSame('bucket.s3.amazonaws.com', $entries[1]['request']->getUri()->getHost());
-        $this->assertSame('public-read', (string) $entries[1]['request']->getHeaderLine('x-amz-acl'));
-        $this->assertSame('authenticated-read', (string) $entries[3]['request']->getHeaderLine('x-amz-acl'));
-        $this->assertSame('private', (string) $entries[5]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[1]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[3]['request']->getHeaderLine('x-amz-acl'));
+        $this->assertSame('', (string) $entries[5]['request']->getHeaderLine('x-amz-acl'));
     }
 
     public function testCreatesNestedSubfolder()