mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct bucket key headers 

Signed-off-by: Bernd.Rederlechner@t-systems.com <bernd.rederlechner@t-systems.com>
This commit is contained in:
Bernd.Rederlechner@t-systems.com 2021-05-27 14:11:12 +00:00
parent 5809f7a7ac
commit 2805536f7d
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/private/Files/ObjectStore/S3ConnectionTrait.php
View File

@ -38,6 +38,7 @@ use GuzzleHttp\Promise;
use GuzzleHttp\Promise\RejectedPromise; use GuzzleHttp\Promise\RejectedPromise;
use OCP\ILogger; use OCP\ILogger;
trait S3ConnectionTrait { trait S3ConnectionTrait {
/** @var array */ /** @var array */
protected $params; protected $params;
@ -60,8 +61,8 @@ trait S3ConnectionTrait {
/** @var string */ /** @var string */
protected $sseKmsKeyId; protected $sseKmsKeyId;
/** @var string */ /** @var bool */
protected $sseKmsBucketKeyId; protected $sseUseBucketKey;
protected $test; protected $test;
@ -70,25 +71,24 @@ trait S3ConnectionTrait {
throw new \Exception('Bucket has to be configured.'); throw new \Exception('Bucket has to be configured.');
} }
$this->id = 'amazon::'.$params['bucket']; $this->id = 'amazon::' . $params['bucket'];
$this->test = isset($params['test']); $this->test = isset($params['test']);
$this->bucket = $params['bucket']; $this->bucket = $params['bucket'];
$this->timeout = !isset($params['timeout']) ? 15 : $params['timeout']; $this->timeout = !isset($params['timeout']) ? 15 : $params['timeout'];
$this->uploadPartSize = !isset($params['uploadPartSize']) ? 524288000 : $params['uploadPartSize']; $this->uploadPartSize = !isset($params['uploadPartSize']) ? 524288000 : $params['uploadPartSize'];
$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region']; $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
$params['hostname'] = empty($params['hostname']) ? 's3.'.$params['region'].'.amazonaws.com' : $params['hostname']; $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
if (!isset($params['port']) || $params['port'] === '') { if (!isset($params['port']) || $params['port'] === '') {
$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443; $params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
} }
$params['autocreate'] = !isset($params['autocreate']) ? false : $params['autocreate']; $params['autocreate'] = !isset($params['autocreate']) ? false : $params['autocreate'];
// this avoid at least the hash lookups for each read/weite operation // this avoid at least the hash lookups for each read/weite operation
if (isset($params['ssekmsbucketkeyid'])) { if (isset($params['ssekmskeyid'])) {
$this->sseKmsBucketKeyId = $params['ssekmsbucketkeyid'];
} elseif (isset($params['ssekmskeyid'])) {
$this->sseKmsKeyId = $params['ssekmskeyid']; $this->sseKmsKeyId = $params['ssekmskeyid'];
} }
$this->sseUseBucketKey = (isset($params['sseusebucketkey'])) ? $params['sseusebucketkey'] : false;
$this->params = $params; $this->params = $params;
} }
@ -105,7 +105,7 @@ trait S3ConnectionTrait {
* @return array with encryption parameters * @return array with encryption parameters
*/ */
public function getSseKmsPutParameters(): array { public function getSseKmsPutParameters(): array {
if (!empty($this->sseKmsBucketKeyId)) { if ($this->sseUseBucketKey) {
return [ return [
'ServerSideEncryption' => 'aws:kms', 'ServerSideEncryption' => 'aws:kms',
'BucketKeyEnabled' => true, 'BucketKeyEnabled' => true,
@ -129,8 +129,7 @@ trait S3ConnectionTrait {
* @return array with encryption parameters * @return array with encryption parameters
*/ */
public function getSseKmsGetParameters(): array { public function getSseKmsGetParameters(): array {
if (!empty($this->sseKmsBucketKeyId) || if (($this->sseUseBucketKey) || !empty($this->sseKmsKeyId)) {
!empty($this->sseKmsKeyId)) {
return [ return [
'ServerSideEncryption' => 'aws:kms', 'ServerSideEncryption' => 'aws:kms',
]; ];
@ -139,7 +138,6 @@ trait S3ConnectionTrait {
} }
} }
/** /**
* Create the required bucket * Create the required bucket
* *
@ -182,18 +180,17 @@ trait S3ConnectionTrait {
$encrypt_state = $this->connection->getBucketEncryption([ $encrypt_state = $this->connection->getBucketEncryption([
'Bucket' => $this->bucket, 'Bucket' => $this->bucket,
]); ]);
return;
} catch (S3Exception $e) { } catch (S3Exception $e) {
try { try {
$logger->info('Bucket key for "'.$this->bucket.'" is not set - adding it.', ['app' => 'objectstore']); $logger->info('Bucket key for "'.$this->bucket.'" is not set - adding it.', ['app' => 'objectstore']);
$this->connection->putBucketEncryption([ $this->connection->putBucketEncryption([
'Bucket' => $this->bucket , 'Bucket' => $this->bucket,
'ServerSideEncryptionConfiguration' => [ 'ServerSideEncryptionConfiguration' => [
'Rules' => [ 'Rules' => [
[ [
'ApplyServerSideEncryptionByDefault' => [ 'ApplyServerSideEncryptionByDefault' => [
'KMSMasterKeyID' => $this->sseKmsBucketKeyId,
'SSEAlgorithm' => 'aws:kms', 'SSEAlgorithm' => 'aws:kms',
'KMSMasterKeyID' => $this->sseKmsKeyId,
], ],
'BucketKeyEnabled' => true, 'BucketKeyEnabled' => true,
], ],
@ -249,6 +246,7 @@ trait S3ConnectionTrait {
'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false, 'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false,
'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()), 'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
'csm' => false, 'csm' => false,
'debug' => true,
]; ];
if (isset($this->params['proxy'])) { if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']]; $options['request.options'] = ['proxy' => $this->params['proxy']];
@ -260,7 +258,7 @@ trait S3ConnectionTrait {
if (!$this->connection::isBucketDnsCompatible($this->bucket)) { if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
$logger = \OC::$server->getLogger(); $logger = \OC::$server->getLogger();
$logger->debug('Bucket "'.$this->bucket.'" This bucket name is not dns compatible, it may contain invalid characters.', $logger->debug('Bucket "' . $this->bucket.'" This bucket name is not dns compatible, it may contain invalid characters.',
['app' => 'objectstore']); ['app' => 'objectstore']);
} }
@ -268,7 +266,7 @@ trait S3ConnectionTrait {
$this->createNewBucket(); $this->createNewBucket();
} }
if ($this->params['autocreate'] && isset($this->params['ssekmsbucketkeyid'])) { if ($this->params['autocreate'] && $this->sseUseBucketKey) {
$this->checkOrPutBucketKey(); $this->checkOrPutBucketKey();
} }