Chapril/paste.chapril.org-privatebin
Chapril/paste.chapril.org-privatebin
25
1
Fork 0
Code Issues Releases Wiki Activity

Use credentials array only if values passed via conf.php

Browse Source
This commit is contained in:
Felipe Nakandakari 2023-02-27 12:58:18 +11:00
parent 643832b2b8
commit e3abc042a8
No known key found for this signature in database
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/Data/S3Storage.php
View File

@ -82,31 +82,32 @@ class S3Storage extends AbstractData
*/ */
public function __construct(array $options) public function __construct(array $options)
{ {
$this->_options['credentials'] = array(); if (is_array($options)) {
// AWS SDK will try to load credentials from environment if credentials are not passed via configuration
if (is_array($options) && array_key_exists('region', $options)) { // ref: https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/guide_credentials.html#default-credential-chain
$this->_options['region'] = $options['region']; if (isset($options['accesskey']) && isset($options['secretkey'])) {
} $this->_options['credentials'] = array();
if (is_array($options) && array_key_exists('version', $options)) { $this->_options['credentials']['key'] = $options['accesskey'];
$this->_options['version'] = $options['version']; $this->_options['credentials']['secret'] = $options['secretkey'];
} }
if (is_array($options) && array_key_exists('endpoint', $options)) { if (array_key_exists('region', $options)) {
$this->_options['endpoint'] = $options['endpoint']; $this->_options['region'] = $options['region'];
} }
if (is_array($options) && array_key_exists('accesskey', $options)) { if (array_key_exists('version', $options)) {
$this->_options['credentials']['key'] = $options['accesskey']; $this->_options['version'] = $options['version'];
} }
if (is_array($options) && array_key_exists('secretkey', $options)) { if (array_key_exists('endpoint', $options)) {
$this->_options['credentials']['secret'] = $options['secretkey']; $this->_options['endpoint'] = $options['endpoint'];
} }
if (is_array($options) && array_key_exists('use_path_style_endpoint', $options)) { if (array_key_exists('use_path_style_endpoint', $options)) {
$this->_options['use_path_style_endpoint'] = filter_var($options['use_path_style_endpoint'], FILTER_VALIDATE_BOOLEAN); $this->_options['use_path_style_endpoint'] = filter_var($options['use_path_style_endpoint'], FILTER_VALIDATE_BOOLEAN);
} }
if (is_array($options) && array_key_exists('bucket', $options)) { if (array_key_exists('bucket', $options)) {
$this->_bucket = $options['bucket']; $this->_bucket = $options['bucket'];
} }
if (is_array($options) && array_key_exists('prefix', $options)) { if (array_key_exists('prefix', $options)) {
$this->_prefix = $options['prefix']; $this->_prefix = $options['prefix'];
}
} }
$this->_client = new S3Client($this->_options); $this->_client = new S3Client($this->_options);