summaryrefslogtreecommitdiffstats
path: root/lib/private/Files/ObjectStore
diff options
context:
space:
mode:
authorFlorent <florent@coppint.com>2020-10-08 10:56:35 +0200
committerMorris Jobke <hey@morrisjobke.de>2021-05-20 12:21:15 +0200
commitd4444f247234fe026e591ec93a38c30ce3219ed9 (patch)
treedbac1cb36285834efb26cbfe9415abc035d036cd /lib/private/Files/ObjectStore
parent7ffee26aa8768736593c77dcb12d17978a6e06b2 (diff)
downloadnextcloud-server-d4444f247234fe026e591ec93a38c30ce3219ed9.tar.gz
nextcloud-server-d4444f247234fe026e591ec93a38c30ce3219ed9.zip
Avoid reading ~/.aws/config when using S3 provider
When using S3 storage, we sometimes have open_basedir errors due to aws-sdk-php trying to read ~/.aws/config which is out of open_basedir restrictions. Christoph Wurst already added csm=false config in #21406 but it wasn't enough, we also need to set use_arn_region=false, added in this commit. Signed-off-by: Florent <florent@coppint.com>
Diffstat (limited to 'lib/private/Files/ObjectStore')
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index d88ef0ac8e7..9e0b12ec177 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -121,6 +121,7 @@ trait S3ConnectionTrait {
'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()),
'csm' => false,
+ 'use_arn_region' => false,
];
if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']];