diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-03-26 15:47:14 +0100 |
|---|---|---|
| committer | Josh <josh.t.richards@gmail.com> | 2024-05-10 10:03:40 -0400 |
| commit | 2f0b200665f47d49005ee043a74685dec5594c18 (patch) | |
| tree | 7ef42644b0eb23751e0b37f45d1a78e30514bf1e /lib/private/Files | |
| parent | efb03b726d27907f161a0c011a6ebc3cc3bfcd2b (diff) | |
| download | nextcloud-server-2f0b200665f47d49005ee043a74685dec5594c18.tar.gz nextcloud-server-2f0b200665f47d49005ee043a74685dec5594c18.zip | |
feat: add option to enable s3 acceleration
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index a1edfa1eb99..7aa4189bbde 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -95,11 +95,17 @@ trait S3ConnectionTrait { $this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000; $this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true); $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region']; + $params['s3-accelerate'] = $params['hostname'] == 's3-accelerate.amazonaws.com' || $params['hostname'] == 's3-accelerate.dualstack.amazonaws.com'; $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname']; if (!isset($params['port']) || $params['port'] === '') { $params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443; } $params['verify_bucket_exists'] = $params['verify_bucket_exists'] ?? true; + + if ($params['s3-accelerate']) { + $params['verify_bucket_exists'] = false; + } + $this->params = $params; } @@ -146,6 +152,13 @@ trait S3ConnectionTrait { 'http' => ['verify' => $this->getCertificateBundlePath()], 'use_aws_shared_config_files' => false, ]; + + if ($this->params['s3-accelerate']) { + $options['use_accelerate_endpoint'] = true; + } else { + $options['endpoint'] = $base_url; + } + if ($this->getProxy()) { $options['http']['proxy'] = $this->getProxy(); } @@ -174,7 +187,9 @@ trait S3ConnectionTrait { 'exception' => $e, 'app' => 'objectstore', ]); - throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage()); + if ($e->getAwsErrorCode() !== "BucketAlreadyOwnedByYou") { + throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage()); + } } } |