Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing

Use path instead of app id for occ app signing

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/private/integritycheck/checker.php b/lib/private/integritycheck/checker.php
index 0cd01df7fe1..926a7725ff3 100644
--- a/lib/private/integritycheck/checker.php
+++ b/lib/private/integritycheck/checker.php
@@ -114,6 +114,7 @@ class Checker {
 	 *
 	 * @param string $folderToIterate
 	 * @return \RecursiveIteratorIterator
+	 * @throws \Exception
 	 */
 	private function getFolderIterator($folderToIterate) {
 		$dirItr = new \RecursiveDirectoryIterator(
@@ -189,17 +190,19 @@ class Checker {
 	}
 
 	/**
-	 * Write the signature of the specified app
+	 * Write the signature of the app in the specified folder
 	 *
-	 * @param string $appId
+	 * @param string $path
 	 * @param X509 $certificate
 	 * @param RSA $privateKey
 	 * @throws \Exception
 	 */
-	public function writeAppSignature($appId,
+	public function writeAppSignature($path,
 									  X509 $certificate,
 									  RSA $privateKey) {
-		$path = $this->appLocator->getAppPath($appId);
+		if(!is_dir($path)) {
+			throw new \Exception('Directory does not exist.');
+		}
 		$iterator = $this->getFolderIterator($path);
 		$hashes = $this->generateHashes($iterator, $path);
 		$signature = $this->createSignatureData($hashes, $certificate, $privateKey);