Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Weyne <jasperweyne@gmail.com>2022-06-07 14:39:14 +0300
committerGitHub <noreply@github.com>2022-06-07 14:39:14 +0300
commit0633a1d9f5a7ef06d577ae6556d09db9e94f5684 (patch)
treeee51fb9d52b05a8f614c6e66e0d83a71b4da33a2 /lib/private/Files
parent92d64617e64a27538439eca97dfcafca54b640e2 (diff)
Disable ~/.aws/config access by S3ConnectionTrait
This commit sets the 'use_aws_shared_config_files' option to false, in order to disable configuration loading from ~/.aws/config by the AWS SDK, specifically the S3Client. It is a continuation of #27040, as that PR only changed the behaviour of the CredentialsProvider; this change affects the ConfigurationProvider as well. Signed-off-by: Jasper Weyne <jasperweyne@gmail.com>
Diffstat (limited to 'lib/private/Files')
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index c3836749c6d..e00e3332b82 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -11,6 +11,7 @@
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author S. Cat <33800996+sparrowjack63@users.noreply.github.com>
* @author Stephen Cuppett <steve@cuppett.com>
+ * @author Jasper Weyne <jasperweyne@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
@@ -140,6 +141,7 @@ trait S3ConnectionTrait {
'csm' => false,
'use_arn_region' => false,
'http' => ['verify' => $certPath],
+ 'use_aws_shared_config_files' => false,
];
if ($this->getProxy()) {
$options['http']['proxy'] = $this->getProxy();