From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 28 Oct 2016 10:36:44 +0000 (+0200)
Subject: Replace with exception instead of boolean return value
X-Git-Tag: v11.0RC2~332^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e2aee2be6c34ea428f884e61887534f67e0bcbe;p=nextcloud-server.git

Replace with exception instead of boolean return value

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
---

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index ab97859d62a..d3510c51716 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -241,16 +241,13 @@ class Installer {
 	 * @param AppFetcher $appFetcher
 	 * @param IClientService $clientService
 	 * @param ITempManager $tempManager
-	 * @param ILogger $logger
 	 *
-	 * @return bool Whether the installation was successful or not
-	 * @throws \Exception
+	 * @throws \Exception If the installation was not successful
 	 */
 	public function downloadApp($appId,
 								AppFetcher $appFetcher,
 								IClientService $clientService,
-								ITempManager $tempManager,
-								ILogger $logger) {
+								ITempManager $tempManager) {
 		$appId = strtolower($appId);
 
 		$apps = $appFetcher->get();
@@ -261,7 +258,7 @@ class Installer {
 				$x509->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
 				$x509->loadX509($app['certificate']);
 				if($x509->validateSignature() !== true) {
-					$logger->error(
+					throw new \Exception(
 						sprintf(
 							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
 							$appId
@@ -270,13 +267,12 @@ class Installer {
 							'app' => 'core',
 						]
 					);
-					return false;
 				}
 
 				// Verify if the certificate is issued for the requested app id
 				$certInfo = openssl_x509_parse($app['certificate']);
 				if(!isset($certInfo['subject']['CN'])) {
-					$logger->error(
+					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert with no CN',
 							$appId
@@ -285,10 +281,9 @@ class Installer {
 							'app' => 'core',
 						]
 					);
-					return false;
 				}
 				if($certInfo['subject']['CN'] !== $appId) {
-					$logger->error(
+					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert issued to %s',
 							$appId,
@@ -298,13 +293,11 @@ class Installer {
 							'app' => 'core',
 						]
 					);
-					return false;
 				}
 
 				// Download the release
 				$tempFile = $tempManager->getTemporaryFile('.tar.gz');
 				$client = $clientService->newClient();
-				// FIXME: Proper way to determine what the latest release is
 				$client->get($app['releases'][0]['download'], ['save_to' => $tempFile]);
 
 				// Check if the signature actually matches the downloaded content
@@ -325,7 +318,7 @@ class Installer {
 						$xml = simplexml_load_file($extractDir . '/' . $appId . '/appinfo/info.xml');
 						libxml_disable_entity_loader($loadEntities);
 						if((string)$xml->id !== $appId) {
-							$logger->error(
+							throw new \Exception(
 								sprintf(
 									'App for id %s has a wrong app ID in info.xml: %s',
 									$appId,
@@ -335,7 +328,6 @@ class Installer {
 									'app' => 'core',
 								]
 							);
-							return false;
 						}
 
 						// Move to app folder
@@ -347,9 +339,8 @@ class Installer {
 						}
 						OC_Helper::copyr($extractDir, $baseDir);
 						OC_Helper::rmdirr($extractDir);
-						return true;
 					} else {
-						$logger->error(
+						throw new \Exception(
 							sprintf(
 								'Could not extract app with ID %s to %s',
 								$appId,
@@ -359,11 +350,10 @@ class Installer {
 								'app' => 'core',
 							]
 						);
-						return false;
 					}
 				} else {
 					// Signature does not match
-					$logger->error(
+					throw new \Exception(
 						sprintf(
 							'App with id %s has invalid signature',
 							$appId
@@ -375,8 +365,6 @@ class Installer {
 				}
 			}
 		}
-
-		return false;
 	}
 
 	/**
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 1db1ce74cdc..876eb98f293 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -345,7 +345,7 @@ class OC_App {
 		$isDownloaded = $installer->isDownloaded($appId);
 
 		if(!$isDownloaded) {
-			$state = $installer->downloadApp(
+			$installer->downloadApp(
 				$appId,
 				new \OC\App\AppStore\Fetcher\AppFetcher(
 					\OC::$server->getAppDataDir('appstore'),
@@ -354,18 +354,8 @@ class OC_App {
 					$config
 				),
 				\OC::$server->getHTTPClientService(),
-				\OC::$server->getTempManager(),
-				\OC::$server->getLogger()
+				\OC::$server->getTempManager()
 			);
-
-			if($state !== true) {
-				throw new \Exception(
-					sprintf(
-						'Could not download app with id: %s',
-						$appId
-					)
-				);
-			}
 		}
 
 		if (!Installer::isInstalled($appId)) {