Revert "Disable certificate verification handling"

This reverts commit 5a59060.
nextcloud · Jun 25, 2020 · 2e38da7 · 2e38da7
1 parent 692ee8e
commit 2e38da7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -114,7 +114,7 @@ public function getSettings() {
 		return new JSONResponse([
 			'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
 			'public_wopi_url' => $this->appConfig->getAppValue('public_wopi_url'),
-			'disable_certificate_verification' => $this->appConfig->getAppValue('disable_certificate_verification', '') !== '',
+			'disable_certificate_verification' => $this->appConfig->getAppValue('disable_certificate_verification'),
 			'edit_groups' => $this->appConfig->getAppValue('edit_groups'),
 			'use_groups' => $this->appConfig->getAppValue('use_groups'),
 			'doc_format' => $this->appConfig->getAppValue('doc_format'),

diff --git a/lib/Preview/Office.php b/lib/Preview/Office.php
@@ -82,7 +82,9 @@ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
 		$client = $this->clientService->newClient();
 		$options = ['timeout' => 10];
 
-		$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
+		if ($this->config->getAppValue('richdocuments', 'disable_certificate_verification') === 'yes') {
+			$options['verify'] = false;
+		}
 
 		$options['multipart'] = [['name' => $path, 'contents' => $stream]];
 

diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
@@ -119,7 +119,9 @@ private function renewCapabilities() {
 		$client = $this->clientService->newClient();
 		$options = ['timeout' => 45, 'nextcloud' => ['allow_local_address' => true]];
 
-		$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
+		if ($this->config->getAppValue('richdocuments', 'disable_certificate_verification') === 'yes') {
+			$options['verify'] = false;
+		}
 
 		try {
 			$response = $client->get($capabilitiesEndpoint, $options);

diff --git a/lib/WOPI/DiscoveryManager.php b/lib/WOPI/DiscoveryManager.php
@@ -98,7 +98,9 @@ public function fetchFromRemote() {
 		$client = $this->clientService->newClient();
 		$options = ['timeout' => 45, 'nextcloud' => ['allow_local_address' => true]];
 
-		$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
+		if ($this->config->getAppValue('richdocuments', 'disable_certificate_verification') === 'yes') {
+			$options['verify'] = false;
+		}
 
 		try {
 			return $client->get($wopiDiscovery, $options);