Merge pull request #106 from utopia-php/feat-generic-s3

optionally can define endpoint URL
utopia-php · Apr 2, 2024 · 9c89ea2 · 9c89ea2
2 parents 94ab875 + 3ad32bd
commit 9c89ea2
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/Storage/Device/S3.php b/src/Storage/Device/S3.php
@@ -136,7 +136,8 @@ class S3 extends Device
  * @var array
  */
  protected array $headers = [
- 'host' => '', 'date' => '',
+ 'host' => '',
+ 'date' => '',
  'content-md5' => '',
  'content-type' => '',
  ];
@@ -163,7 +164,7 @@ class S3 extends Device
  * @param string $region
  * @param string $acl
  */
- public function __construct(string $root, string $accessKey, string $secretKey, string $bucket, string $region = self::US_EAST_1, string $acl = self::ACL_PRIVATE)
+ public function __construct(string $root, string $accessKey, string $secretKey, string $bucket, string $region = self::US_EAST_1, string $acl = self::ACL_PRIVATE, $endpointUrl = '')
  {
  $this->accessKey = $accessKey;
  $this->secretKey = $secretKey;
@@ -173,10 +174,14 @@ public function __construct(string $root, string $accessKey, string $secretKey,
  $this->acl = $acl;
  $this->amzHeaders = [];
 
- $host = match ($region) {
- self::CN_NORTH_1, self::CN_NORTH_4, self::CN_NORTHWEST_1 => $bucket.'.s3.'.$region.'.amazonaws.cn',
- default => $bucket.'.s3.'.$region.'.amazonaws.com'
- };
+ if (! empty($endpointUrl)) {
+ $host = $bucket.'.'.$endpointUrl;
+ } else {
+ $host = match ($region) {
+ self::CN_NORTH_1, self::CN_NORTH_4, self::CN_NORTHWEST_1 => $bucket.'.s3.'.$region.'.amazonaws.cn',
+ default => $bucket.'.s3.'.$region.'.amazonaws.com'
+ };
+ }
 
  $this->headers['host'] = $host;
  }
@@ -797,8 +802,10 @@ private function getSignatureV4(string $method, string $uri, array $parameters =
 
  // stringToSign
  $stringToSignStr = \implode("\n", [
- $algorithm, $this->amzHeaders['x-amz-date'],
- \implode('/', $credentialScope), \hash('sha256', $amzPayloadStr),
+ $algorithm,
+ $this->amzHeaders['x-amz-date'],
+ \implode('/', $credentialScope),
+ \hash('sha256', $amzPayloadStr),
  ]);
 
  // Make Signature