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

Jump to bottom

fix(federation): Use sharing.federation.allowSelfSignedCertificates config for all OCM requests #40864

Merged
merged 2 commits into from Oct 12, 2023
Merged

fix(federation): Use sharing.federation.allowSelfSignedCertificates config for all OCM requests #40864

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ebbe8
fix(federation): Use `sharing.federation.allowSelfSignedCertificates`…
nickvergessen Oct 11, 2023
cd659b7
Fix unit tests
nickvergessen Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 9 additions & 18 deletions apps/files_sharing/lib/Controller/ExternalSharesController.php
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\IRequest;

/**
Expand All @@ -37,25 +38,14 @@
* @package OCA\Files_Sharing\Controller
*/
class ExternalSharesController extends Controller {

/** @var \OCA\Files_Sharing\External\Manager */
private $externalManager;
/** @var IClientService */
private $clientService;

/**
* @param string $appName
* @param IRequest $request
* @param \OCA\Files_Sharing\External\Manager $externalManager
* @param IClientService $clientService
*/
public function __construct($appName,
IRequest $request,
\OCA\Files_Sharing\External\Manager $externalManager,
IClientService $clientService) {
public function __construct(
string $appName,
IRequest $request,
mejo- marked this conversation as resolved.
Show resolved Hide resolved
private \OCA\Files_Sharing\External\Manager $externalManager,
private IClientService $clientService,
private IConfig $config,
) {
parent::__construct($appName, $request);
$this->externalManager = $externalManager;
$this->clientService = $clientService;
}

/**
Expand Down Expand Up @@ -107,6 +97,7 @@ protected function testUrl($remote, $checkVersion = false) {
[
'timeout' => 3,
'connect_timeout' => 3,
'verify' => !$this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates', false),
]
)->getBody());

Expand Down
4 changes: 4 additions & 0 deletions apps/files_sharing/lib/External/Storage.php
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@
use OCP\Http\Client\IClientService;
use OCP\Http\Client\LocalServerException;
use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\OCM\Exceptions\OCMArgumentException;
use OCP\OCM\Exceptions\OCMProviderException;
use OCP\OCM\IOCMDiscoveryService;
Expand All @@ -67,6 +68,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage,
private IClientService $httpClient;
private bool $updateChecked = false;
private ExternalShareManager $manager;
private IConfig $config;

/**
* @param array{HttpClientService: IClientService, manager: ExternalShareManager, cloudId: ICloudId, mountpoint: string, token: string, password: ?string}|array $options
Expand All @@ -78,6 +80,7 @@ public function __construct($options) {
$this->cloudId = $options['cloudId'];
$this->logger = Server::get(LoggerInterface::class);
$discoveryService = Server::get(IOCMDiscoveryService::class);
$this->config = Server::get(IConfig::class);

// use default path to webdav if not found on discovery
try {
Expand Down Expand Up @@ -290,6 +293,7 @@ private function testRemoteUrl(string $url): bool {
$result = $client->get($url, [
'timeout' => 10,
'connect_timeout' => 10,
'verify' => !$this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates', false),
])->getBody();
$data = json_decode($result);
$returnValue = (is_object($data) && !empty($data->version));
Expand Down