diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-12-21 11:58:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 11:58:52 +0100 |
| commit | 1acfbd0b061a26f9e466448d756296296e356fc2 (patch) | |
| tree | 799037ce225350878f2b8c19b23af3a6de8fc252 /lib/private | |
| parent | d73fe0ccd984d8cf37c4b7b9b3d5622e1ade4ba9 (diff) | |
| parent | 4a6a2c2b482e2b34d25d03c9e859078570717a39 (diff) | |
| download | nextcloud-server-1acfbd0b061a26f9e466448d756296296e356fc2.tar.gz nextcloud-server-1acfbd0b061a26f9e466448d756296296e356fc2.zip | |
Merge pull request #27493 from cuppett/cuppett/simplify-aws-credential-provider
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index c99ebdbcd5c..6d6d8684153 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -109,15 +109,11 @@ trait S3ConnectionTrait { $base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/'; // Adding explicit credential provider to the beginning chain. - // Including environment variables and IAM instance profiles. + // Including default credential provider (skipping AWS shared config files). $provider = CredentialProvider::memoize( CredentialProvider::chain( $this->paramCredentialProvider(), - CredentialProvider::env(), - CredentialProvider::assumeRoleWithWebIdentityCredentialProvider(), - !empty(getenv(EcsCredentialProvider::ENV_URI)) - ? CredentialProvider::ecsCredentials() - : CredentialProvider::instanceProfile() + CredentialProvider::defaultProvider(['use_aws_shared_config_files' => false]) ) ); |