Merge pull request #7076 from nextcloud/s3-valid-bucket-name

Better error message for invalid bucket names
nextcloud · Nov 6, 2017 · 5ed0521 · 5ed0521
2 parents 5411d60 + 8b763ea
commit 5ed0521
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -90,8 +90,8 @@ protected function getConnection() {
 		}
 		$this->connection = new S3Client($options);
 
-		if (!S3Client::isBucketDnsCompatible($this->bucket)) {
-			throw new \Exception("The configured bucket name is invalid.");
+		if (!$this->connection->isBucketDnsCompatible($this->bucket)) {
+			throw new \Exception("The configured bucket name is invalid: " . $this->bucket);
 		}
 
 		if (!$this->connection->doesBucketExist($this->bucket)) {