Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix open_basedir issues by AWS SDK #32740

Merged
merged 2 commits into from
Sep 19, 2022
Merged

Fix open_basedir issues by AWS SDK #32740

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0633a1d
Disable ~/.aws/config access by S3ConnectionTrait
jasperweyne Jun 7, 2022
44f6c93
Merge branch 'master' into patch-2
jasperweyne Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/private/Files/ObjectStore/S3ConnectionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* @author Roeland Jago Douma <[email protected]>
* @author S. Cat <[email protected]>
* @author Stephen Cuppett <[email protected]>
* @author Jasper Weyne <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
Expand Down Expand Up @@ -140,6 +141,7 @@ public function getConnection() {
'csm' => false,
'use_arn_region' => false,
'http' => ['verify' => $certPath],
'use_aws_shared_config_files' => false,
];
if ($this->getProxy()) {
$options['http']['proxy'] = $this->getProxy();
Expand Down