diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-11-06 16:16:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 16:16:28 +0100 |
| commit | 5ed05219d7a14aa167ec979bde733865e0777999 (patch) | |
| tree | 0074dfc74fac49360ce515cd449e45199a50bfef /lib | |
| parent | 5411d60b249cc12b429ed8083e7f34d1415d278e (diff) | |
| parent | 8b763ea0f7e87d2b38ff1a1dcd97832ef94c93c5 (diff) | |
| download | nextcloud-server-5ed05219d7a14aa167ec979bde733865e0777999.tar.gz nextcloud-server-5ed05219d7a14aa167ec979bde733865e0777999.zip | |
Merge pull request #7076 from nextcloud/s3-valid-bucket-name
Better error message for invalid bucket names
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index fdda19ff700..927d93689c7 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -90,8 +90,8 @@ trait S3ConnectionTrait { } $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)) { |