Skip to content

Revert use the nextcloud certificate bundle for s3 #32942

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

Closed
kesselb wants to merge 2 commits into from
Closed

Revert use the nextcloud certificate bundle for s3 #32942

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0d88cb
Revert "don't try to get custom certs for s3 primary storage"
kesselb Jun 20, 2022
22a74c2
Revert "use the nextcloud certificate bundle for s3"
kesselb Jun 20, 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
Prev Previous commit
Revert "use the nextcloud certificate bundle for s3" 
This reverts commit 194a21f.

Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb committed Jun 20, 2022
commit 22a74c2de1f6d5224739c1f5e3d3fabd9094fefa
7 changes: 1 addition & 6 deletions lib/private/Files/ObjectStore/S3ConnectionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
use Aws\S3\S3Client;
use GuzzleHttp\Promise;
use GuzzleHttp\Promise\RejectedPromise;
use OCP\ICertificateManager;
use Psr\Log\LoggerInterface;

trait S3ConnectionTrait {
Expand Down Expand Up @@ -121,9 +120,6 @@ public function getConnection() {
)
);

/** @var ICertificateManager $certManager */
$certManager = \OC::$server->get(ICertificateManager::class);

$options = [
'version' => isset($this->params['version']) ? $this->params['version'] : 'latest',
'credentials' => $provider,
Expand All @@ -133,10 +129,9 @@ public function getConnection() {
'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
'csm' => false,
'use_arn_region' => false,
'http' => ['verify' => $certManager->getAbsoluteBundlePath()],
];
if ($this->getProxy()) {
$options['http']['proxy'] = $this->getProxy();
$options['http'] = ['proxy' => $this->getProxy()];
}
if (isset($this->params['legacy_auth']) && $this->params['legacy_auth']) {
$options['signature_version'] = 'v2';
Expand Down