summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-06-15 09:12:42 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2020-06-17 09:00:28 +0000
commit60a3bf8572127c752c00d601581a970928f67608 (patch)
tree02d2a42ae5bc2f3d8b4ab868117805be2861932a /lib
parent8b2a76216d604e74805f7e08a8c47030e40878c7 (diff)
downloadnextcloud-server-60a3bf8572127c752c00d601581a970928f67608.tar.gz
nextcloud-server-60a3bf8572127c752c00d601581a970928f67608.zip
Disable Client-Side Monitoring on AWS storage
The S3 client enables this by default and then tries to read `.aws/config`. This causes `open_basedir` restriction related error for some setups. So this patch disables the CSM because it's most likely unused anyway. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index 0208df1908a..16a48ee82a0 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -47,7 +47,7 @@ trait S3ConnectionTrait {
/** @var int */
protected $timeout;
-
+
/** @var int */
protected $uploadPartSize;
@@ -99,7 +99,8 @@ trait S3ConnectionTrait {
'endpoint' => $base_url,
'region' => $this->params['region'],
'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,
];
if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']];