]> source.dussan.org Git - nextcloud-server.git/commitdiff
Disable Client-Side Monitoring on AWS storage 21406/head
authorChristoph Wurst <christoph@winzerhof-wurst.at>
Mon, 15 Jun 2020 07:12:42 +0000 (09:12 +0200)
committerChristoph Wurst <christoph@winzerhof-wurst.at>
Mon, 15 Jun 2020 07:13:08 +0000 (09:13 +0200)
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>
lib/private/Files/ObjectStore/S3ConnectionTrait.php

index 0208df1908a92f9140d5ef40e7756f01e094cd8b..16a48ee82a02ae5b35f2300c569b5aeeb3720015 100644 (file)
@@ -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']];