upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

fix: Allow to disable ssl verification for object storage

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2024-08-14 15:13:05 +02:00 committed by Julius Knorr
parent bd8348f5c1
commit 375ef4c062
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/Files/ObjectStore/S3ConnectionTrait.php
View file

@ -51,6 +51,7 @@ trait S3ConnectionTrait {
$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
}
$params['verify_bucket_exists'] = $params['verify_bucket_exists'] ?? true;
$params['ssl_verify'] = $params['ssl_verify'] ?? true;
if ($params['s3-accelerate']) {
$params['verify_bucket_exists'] = false;
@ -100,7 +101,7 @@ trait S3ConnectionTrait {
'csm' => false,
'use_arn_region' => false,
'http' => [
'verify' => $this->getCertificateBundlePath(),
'verify' => $this->params['ssl_verify'] ? $this->getCertificateBundlePath() : false,
// Timeout for the connection to S3 server, not for the request.
'connect_timeout' => 5
],

7
lib/private/Files/ObjectStore/S3ObjectTrait.php
View file

@ -54,7 +54,8 @@ trait S3ObjectTrait {
'http' => [
'protocol_version' => $request->getProtocolVersion(),
'header' => $headers,
]
],
'ssl' => [],
];
$bundle = $this->getCertificateBundlePath();
if ($bundle) {
@ -63,6 +64,10 @@ trait S3ObjectTrait {
];
}
if ($this->params['ssl_verify'] === false) {
$opts['ssl']['verify_peer'] = false;
}
if ($this->getProxy()) {
$opts['http']['proxy'] = $this->getProxy();
$opts['http']['request_fulluri'] = true;