From 60a3bf8572127c752c00d601581a970928f67608 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 15 Jun 2020 09:12:42 +0200 Subject: [PATCH] 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 --- lib/private/Files/ObjectStore/S3ConnectionTrait.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 0208df1908..16a48ee82a 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']];