nextcloud / server

lib/private/legacy/OC_Helper.php

Indentation +503 added lines, -503 removed lines

@@ -31,510 +31,510 @@
  * }
  */
 class OC_Helper {
-	private static $templateManager;
-	private static ?ICacheFactory $cacheFactory = null;
-	private static ?bool $quotaIncludeExternalStorage = null;
-
-	/**
-	 * Make a human file size
-	 * @param int|float $bytes file size in bytes
-	 * @return string a human readable file size
-	 * @deprecated 4.0.0 replaced with \OCP\Util::humanFileSize
-	 *
-	 * Makes 2048 to 2 kB.
-	 */
-	public static function humanFileSize(int|float $bytes): string {
-		return \OCP\Util::humanFileSize($bytes);
-	}
-
-	/**
-	 * Make a computer file size
-	 * @param string $str file size in human readable format
-	 * @return false|int|float a file size in bytes
-	 * @deprecated 4.0.0 Use \OCP\Util::computerFileSize
-	 *
-	 * Makes 2kB to 2048.
-	 *
-	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
-	 */
-	public static function computerFileSize(string $str): false|int|float {
-		return \OCP\Util::computerFileSize($str);
-	}
-
-	/**
-	 * Recursive copying of folders
-	 * @param string $src source folder
-	 * @param string $dest target folder
-	 * @return void
-	 * @deprecated 32.0.0 - use \OCP\Files\Folder::copy
-	 */
-	public static function copyr($src, $dest) {
-		if (!file_exists($src)) {
-			return;
-		}
-
-		if (is_dir($src)) {
-			if (!is_dir($dest)) {
-				mkdir($dest);
-			}
-			$files = scandir($src);
-			foreach ($files as $file) {
-				if ($file != '.' && $file != '..') {
-					self::copyr("$src/$file", "$dest/$file");
-				}
-			}
-		} else {
-			$validator = \OCP\Server::get(FilenameValidator::class);
-			if (!$validator->isForbidden($src)) {
-				copy($src, $dest);
-			}
-		}
-	}
-
-	/**
-	 * Recursive deletion of folders
-	 * @param string $dir path to the folder
-	 * @param bool $deleteSelf if set to false only the content of the folder will be deleted
-	 * @return bool
-	 * @deprecated 5.0.0 use \OCP\Files::rmdirr instead
-	 */
-	public static function rmdirr($dir, $deleteSelf = true) {
-		return \OCP\Files::rmdirr($dir, $deleteSelf);
-	}
-
-	/**
-	 * @deprecated 18.0.0
-	 * @return \OC\Files\Type\TemplateManager
-	 */
-	public static function getFileTemplateManager() {
-		if (!self::$templateManager) {
-			self::$templateManager = new \OC\Files\Type\TemplateManager();
-		}
-		return self::$templateManager;
-	}
-
-	/**
-	 * detect if a given program is found in the search PATH
-	 *
-	 * @param string $name
-	 * @param bool $path
-	 * @internal param string $program name
-	 * @internal param string $optional search path, defaults to $PATH
-	 * @return bool true if executable program found in path
-	 * @deprecated 32.0.0 use the \OCP\IBinaryFinder
-	 */
-	public static function canExecute($name, $path = false) {
-		// path defaults to PATH from environment if not set
-		if ($path === false) {
-			$path = getenv('PATH');
-		}
-		// we look for an executable file of that name
-		$exts = [''];
-		$check_fn = 'is_executable';
-		// Default check will be done with $path directories :
-		$dirs = explode(PATH_SEPARATOR, (string)$path);
-		// WARNING : We have to check if open_basedir is enabled :
-		$obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
-		if ($obd != 'none') {
-			$obd_values = explode(PATH_SEPARATOR, $obd);
-			if (count($obd_values) > 0 and $obd_values[0]) {
-				// open_basedir is in effect !
-				// We need to check if the program is in one of these dirs :
-				$dirs = $obd_values;
-			}
-		}
-		foreach ($dirs as $dir) {
-			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * copy the contents of one stream to another
-	 *
-	 * @param resource $source
-	 * @param resource $target
-	 * @return array the number of bytes copied and result
-	 */
-	public static function streamCopy($source, $target) {
-		if (!$source or !$target) {
-			return [0, false];
-		}
-		$bufSize = 8192;
-		$result = true;
-		$count = 0;
-		while (!feof($source)) {
-			$buf = fread($source, $bufSize);
-			$bytesWritten = fwrite($target, $buf);
-			if ($bytesWritten !== false) {
-				$count += $bytesWritten;
-			}
-			// note: strlen is expensive so only use it when necessary,
-			// on the last block
-			if ($bytesWritten === false
-				|| ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
-			) {
-				// write error, could be disk full ?
-				$result = false;
-				break;
-			}
-		}
-		return [$count, $result];
-	}
-
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 *
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 */
-	public static function buildNotExistingFileName($path, $filename) {
-		$view = \OC\Files\Filesystem::getView();
-		return self::buildNotExistingFileNameForView($path, $filename, $view);
-	}
-
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 *
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 */
-	public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
-		if ($path === '/') {
-			$path = '';
-		}
-		if ($pos = strrpos($filename, '.')) {
-			$name = substr($filename, 0, $pos);
-			$ext = substr($filename, $pos);
-		} else {
-			$name = $filename;
-			$ext = '';
-		}
-
-		$newpath = $path . '/' . $filename;
-		if ($view->file_exists($newpath)) {
-			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
-				//Replace the last "(number)" with "(number+1)"
-				$last_match = count($matches[0]) - 1;
-				$counter = $matches[1][$last_match][0] + 1;
-				$offset = $matches[0][$last_match][1];
-				$match_length = strlen($matches[0][$last_match][0]);
-			} else {
-				$counter = 2;
-				$match_length = 0;
-				$offset = false;
-			}
-			do {
-				if ($offset) {
-					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
-				} else {
-					$newname = $name . ' (' . $counter . ')';
-				}
-				$newpath = $path . '/' . $newname . $ext;
-				$counter++;
-			} while ($view->file_exists($newpath));
-		}
-
-		return $newpath;
-	}
-
-	/**
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 * Based on https://www.php.net/manual/en/function.array-change-key-case.php#107715
-	 *
-	 * @param array $input The array to work on
-	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @return array
-	 * @deprecated 4.5.0 use \OCP\Util::mb_array_change_key_case instead
-	 */
-	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
-		return \OCP\Util::mb_array_change_key_case($input, $case, $encoding);
-	}
-
-	/**
-	 * Performs a search in a nested array.
-	 * Taken from https://www.php.net/manual/en/function.array-search.php#97645
-	 *
-	 * @param array $haystack the array to be searched
-	 * @param string $needle the search string
-	 * @param mixed $index optional, only search this key name
-	 * @return mixed the key of the matching field, otherwise false
-	 * @deprecated 4.5.0 - use \OCP\Util::recursiveArraySearch
-	 */
-	public static function recursiveArraySearch($haystack, $needle, $index = null) {
-		return \OCP\Util::recursiveArraySearch($haystack, $needle, $index);
-	}
-
-	/**
-	 * calculates the maximum upload size respecting system settings, free space and user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @param int|float $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
-	 * @return int|float number of bytes representing
-	 * @deprecated 5.0.0 - use \OCP\Util::maxUploadFilesize
-	 */
-	public static function maxUploadFilesize($dir, $freeSpace = null) {
-		return \OCP\Util::maxUploadFilesize($dir, $freeSpace);
-	}
-
-	/**
-	 * Calculate free space left within user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @return int|float number of bytes representing
-	 * @deprecated 7.0.0 - use \OCP\Util::freeSpace
-	 */
-	public static function freeSpace($dir) {
-		return \OCP\Util::freeSpace($dir);
-	}
-
-	/**
-	 * Calculate PHP upload limit
-	 *
-	 * @return int|float PHP upload file size limit
-	 * @deprecated 7.0.0 - use \OCP\Util::uploadLimit
-	 */
-	public static function uploadLimit() {
-		return \OCP\Util::uploadLimit();
-	}
-
-	/**
-	 * Checks if a function is available
-	 *
-	 * @deprecated 25.0.0 use \OCP\Util::isFunctionEnabled instead
-	 */
-	public static function is_function_enabled(string $function_name): bool {
-		return \OCP\Util::isFunctionEnabled($function_name);
-	}
-
-	/**
-	 * Try to find a program
-	 * @deprecated 25.0.0 Use \OC\BinaryFinder directly
-	 */
-	public static function findBinaryPath(string $program): ?string {
-		$result = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath($program);
-		return $result !== false ? $result : null;
-	}
-
-	/**
-	 * Calculate the disc space for the given path
-	 *
-	 * BEWARE: this requires that Util::setupFS() was called
-	 * already !
-	 *
-	 * @param string $path
-	 * @param \OCP\Files\FileInfo $rootInfo (optional)
-	 * @param bool $includeMountPoints whether to include mount points in the size calculation
-	 * @param bool $useCache whether to use the cached quota values
-	 * @psalm-suppress LessSpecificReturnStatement Legacy code outputs weird types - manually validated that they are correct
-	 * @return StorageInfo
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true, $useCache = true) {
-		if (!self::$cacheFactory) {
-			self::$cacheFactory = \OC::$server->get(ICacheFactory::class);
-		}
-		$memcache = self::$cacheFactory->createLocal('storage_info');
-
-		// return storage info without adding mount points
-		if (self::$quotaIncludeExternalStorage === null) {
-			self::$quotaIncludeExternalStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
-		}
-
-		$view = Filesystem::getView();
-		if (!$view) {
-			throw new \OCP\Files\NotFoundException();
-		}
-		$fullPath = Filesystem::normalizePath($view->getAbsolutePath($path));
-
-		$cacheKey = $fullPath . '::' . ($includeMountPoints ? 'include' : 'exclude');
-		if ($useCache) {
-			$cached = $memcache->get($cacheKey);
-			if ($cached) {
-				return $cached;
-			}
-		}
-
-		if (!$rootInfo) {
-			$rootInfo = \OC\Files\Filesystem::getFileInfo($path, self::$quotaIncludeExternalStorage ? 'ext' : false);
-		}
-		if (!$rootInfo instanceof \OCP\Files\FileInfo) {
-			throw new \OCP\Files\NotFoundException('The root directory of the user\'s files is missing');
-		}
-		$used = $rootInfo->getSize($includeMountPoints);
-		if ($used < 0) {
-			$used = 0.0;
-		}
-		/** @var int|float $quota */
-		$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		$mount = $rootInfo->getMountPoint();
-		$storage = $mount->getStorage();
-		$sourceStorage = $storage;
-		if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			self::$quotaIncludeExternalStorage = false;
-		}
-		if (self::$quotaIncludeExternalStorage) {
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
-				|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
-			) {
-				/** @var \OC\Files\Storage\Home $storage */
-				$user = $storage->getUser();
-			} else {
-				$user = \OC::$server->getUserSession()->getUser();
-			}
-			$quota = OC_Util::getUserQuota($user);
-			if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				// always get free space / total space from root + mount points
-				return self::getGlobalStorageInfo($quota, $user, $mount);
-			}
-		}
-
-		// TODO: need a better way to get total space from storage
-		if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) {
-			/** @var \OC\Files\Storage\Wrapper\Quota $storage */
-			$quota = $sourceStorage->getQuota();
-		}
-		try {
-			$free = $sourceStorage->free_space($rootInfo->getInternalPath());
-			if (is_bool($free)) {
-				$free = 0.0;
-			}
-		} catch (\Exception $e) {
-			if ($path === '') {
-				throw $e;
-			}
-			/** @var LoggerInterface $logger */
-			$logger = \OC::$server->get(LoggerInterface::class);
-			$logger->warning('Error while getting quota info, using root quota', ['exception' => $e]);
-			$rootInfo = self::getStorageInfo('');
-			$memcache->set($cacheKey, $rootInfo, 5 * 60);
-			return $rootInfo;
-		}
-		if ($free >= 0) {
-			$total = $free + $used;
-		} else {
-			$total = $free; //either unknown or unlimited
-		}
-		if ($total > 0) {
-			if ($quota > 0 && $total > $quota) {
-				$total = $quota;
-			}
-			// prevent division by zero or error codes (negative values)
-			$relative = round(($used / $total) * 10000) / 100;
-		} else {
-			$relative = 0;
-		}
-
-		/*
+    private static $templateManager;
+    private static ?ICacheFactory $cacheFactory = null;
+    private static ?bool $quotaIncludeExternalStorage = null;
+
+    /**
+     * Make a human file size
+     * @param int|float $bytes file size in bytes
+     * @return string a human readable file size
+     * @deprecated 4.0.0 replaced with \OCP\Util::humanFileSize
+     *
+     * Makes 2048 to 2 kB.
+     */
+    public static function humanFileSize(int|float $bytes): string {
+        return \OCP\Util::humanFileSize($bytes);
+    }
+
+    /**
+     * Make a computer file size
+     * @param string $str file size in human readable format
+     * @return false|int|float a file size in bytes
+     * @deprecated 4.0.0 Use \OCP\Util::computerFileSize
+     *
+     * Makes 2kB to 2048.
+     *
+     * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
+     */
+    public static function computerFileSize(string $str): false|int|float {
+        return \OCP\Util::computerFileSize($str);
+    }
+
+    /**
+     * Recursive copying of folders
+     * @param string $src source folder
+     * @param string $dest target folder
+     * @return void
+     * @deprecated 32.0.0 - use \OCP\Files\Folder::copy
+     */
+    public static function copyr($src, $dest) {
+        if (!file_exists($src)) {
+            return;
+        }
+
+        if (is_dir($src)) {
+            if (!is_dir($dest)) {
+                mkdir($dest);
+            }
+            $files = scandir($src);
+            foreach ($files as $file) {
+                if ($file != '.' && $file != '..') {
+                    self::copyr("$src/$file", "$dest/$file");
+                }
+            }
+        } else {
+            $validator = \OCP\Server::get(FilenameValidator::class);
+            if (!$validator->isForbidden($src)) {
+                copy($src, $dest);
+            }
+        }
+    }
+
+    /**
+     * Recursive deletion of folders
+     * @param string $dir path to the folder
+     * @param bool $deleteSelf if set to false only the content of the folder will be deleted
+     * @return bool
+     * @deprecated 5.0.0 use \OCP\Files::rmdirr instead
+     */
+    public static function rmdirr($dir, $deleteSelf = true) {
+        return \OCP\Files::rmdirr($dir, $deleteSelf);
+    }
+
+    /**
+     * @deprecated 18.0.0
+     * @return \OC\Files\Type\TemplateManager
+     */
+    public static function getFileTemplateManager() {
+        if (!self::$templateManager) {
+            self::$templateManager = new \OC\Files\Type\TemplateManager();
+        }
+        return self::$templateManager;
+    }
+
+    /**
+     * detect if a given program is found in the search PATH
+     *
+     * @param string $name
+     * @param bool $path
+     * @internal param string $program name
+     * @internal param string $optional search path, defaults to $PATH
+     * @return bool true if executable program found in path
+     * @deprecated 32.0.0 use the \OCP\IBinaryFinder
+     */
+    public static function canExecute($name, $path = false) {
+        // path defaults to PATH from environment if not set
+        if ($path === false) {
+            $path = getenv('PATH');
+        }
+        // we look for an executable file of that name
+        $exts = [''];
+        $check_fn = 'is_executable';
+        // Default check will be done with $path directories :
+        $dirs = explode(PATH_SEPARATOR, (string)$path);
+        // WARNING : We have to check if open_basedir is enabled :
+        $obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
+        if ($obd != 'none') {
+            $obd_values = explode(PATH_SEPARATOR, $obd);
+            if (count($obd_values) > 0 and $obd_values[0]) {
+                // open_basedir is in effect !
+                // We need to check if the program is in one of these dirs :
+                $dirs = $obd_values;
+            }
+        }
+        foreach ($dirs as $dir) {
+            foreach ($exts as $ext) {
+                if ($check_fn("$dir/$name" . $ext)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * copy the contents of one stream to another
+     *
+     * @param resource $source
+     * @param resource $target
+     * @return array the number of bytes copied and result
+     */
+    public static function streamCopy($source, $target) {
+        if (!$source or !$target) {
+            return [0, false];
+        }
+        $bufSize = 8192;
+        $result = true;
+        $count = 0;
+        while (!feof($source)) {
+            $buf = fread($source, $bufSize);
+            $bytesWritten = fwrite($target, $buf);
+            if ($bytesWritten !== false) {
+                $count += $bytesWritten;
+            }
+            // note: strlen is expensive so only use it when necessary,
+            // on the last block
+            if ($bytesWritten === false
+                || ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
+            ) {
+                // write error, could be disk full ?
+                $result = false;
+                break;
+            }
+        }
+        return [$count, $result];
+    }
+
+    /**
+     * Adds a suffix to the name in case the file exists
+     *
+     * @param string $path
+     * @param string $filename
+     * @return string
+     */
+    public static function buildNotExistingFileName($path, $filename) {
+        $view = \OC\Files\Filesystem::getView();
+        return self::buildNotExistingFileNameForView($path, $filename, $view);
+    }
+
+    /**
+     * Adds a suffix to the name in case the file exists
+     *
+     * @param string $path
+     * @param string $filename
+     * @return string
+     */
+    public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
+        if ($path === '/') {
+            $path = '';
+        }
+        if ($pos = strrpos($filename, '.')) {
+            $name = substr($filename, 0, $pos);
+            $ext = substr($filename, $pos);
+        } else {
+            $name = $filename;
+            $ext = '';
+        }
+
+        $newpath = $path . '/' . $filename;
+        if ($view->file_exists($newpath)) {
+            if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
+                //Replace the last "(number)" with "(number+1)"
+                $last_match = count($matches[0]) - 1;
+                $counter = $matches[1][$last_match][0] + 1;
+                $offset = $matches[0][$last_match][1];
+                $match_length = strlen($matches[0][$last_match][0]);
+            } else {
+                $counter = 2;
+                $match_length = 0;
+                $offset = false;
+            }
+            do {
+                if ($offset) {
+                    //Replace the last "(number)" with "(number+1)"
+                    $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+                } else {
+                    $newname = $name . ' (' . $counter . ')';
+                }
+                $newpath = $path . '/' . $newname . $ext;
+                $counter++;
+            } while ($view->file_exists($newpath));
+        }
+
+        return $newpath;
+    }
+
+    /**
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     * Based on https://www.php.net/manual/en/function.array-change-key-case.php#107715
+     *
+     * @param array $input The array to work on
+     * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @return array
+     * @deprecated 4.5.0 use \OCP\Util::mb_array_change_key_case instead
+     */
+    public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
+        return \OCP\Util::mb_array_change_key_case($input, $case, $encoding);
+    }
+
+    /**
+     * Performs a search in a nested array.
+     * Taken from https://www.php.net/manual/en/function.array-search.php#97645
+     *
+     * @param array $haystack the array to be searched
+     * @param string $needle the search string
+     * @param mixed $index optional, only search this key name
+     * @return mixed the key of the matching field, otherwise false
+     * @deprecated 4.5.0 - use \OCP\Util::recursiveArraySearch
+     */
+    public static function recursiveArraySearch($haystack, $needle, $index = null) {
+        return \OCP\Util::recursiveArraySearch($haystack, $needle, $index);
+    }
+
+    /**
+     * calculates the maximum upload size respecting system settings, free space and user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @param int|float $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
+     * @return int|float number of bytes representing
+     * @deprecated 5.0.0 - use \OCP\Util::maxUploadFilesize
+     */
+    public static function maxUploadFilesize($dir, $freeSpace = null) {
+        return \OCP\Util::maxUploadFilesize($dir, $freeSpace);
+    }
+
+    /**
+     * Calculate free space left within user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @return int|float number of bytes representing
+     * @deprecated 7.0.0 - use \OCP\Util::freeSpace
+     */
+    public static function freeSpace($dir) {
+        return \OCP\Util::freeSpace($dir);
+    }
+
+    /**
+     * Calculate PHP upload limit
+     *
+     * @return int|float PHP upload file size limit
+     * @deprecated 7.0.0 - use \OCP\Util::uploadLimit
+     */
+    public static function uploadLimit() {
+        return \OCP\Util::uploadLimit();
+    }
+
+    /**
+     * Checks if a function is available
+     *
+     * @deprecated 25.0.0 use \OCP\Util::isFunctionEnabled instead
+     */
+    public static function is_function_enabled(string $function_name): bool {
+        return \OCP\Util::isFunctionEnabled($function_name);
+    }
+
+    /**
+     * Try to find a program
+     * @deprecated 25.0.0 Use \OC\BinaryFinder directly
+     */
+    public static function findBinaryPath(string $program): ?string {
+        $result = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath($program);
+        return $result !== false ? $result : null;
+    }
+
+    /**
+     * Calculate the disc space for the given path
+     *
+     * BEWARE: this requires that Util::setupFS() was called
+     * already !
+     *
+     * @param string $path
+     * @param \OCP\Files\FileInfo $rootInfo (optional)
+     * @param bool $includeMountPoints whether to include mount points in the size calculation
+     * @param bool $useCache whether to use the cached quota values
+     * @psalm-suppress LessSpecificReturnStatement Legacy code outputs weird types - manually validated that they are correct
+     * @return StorageInfo
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true, $useCache = true) {
+        if (!self::$cacheFactory) {
+            self::$cacheFactory = \OC::$server->get(ICacheFactory::class);
+        }
+        $memcache = self::$cacheFactory->createLocal('storage_info');
+
+        // return storage info without adding mount points
+        if (self::$quotaIncludeExternalStorage === null) {
+            self::$quotaIncludeExternalStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
+        }
+
+        $view = Filesystem::getView();
+        if (!$view) {
+            throw new \OCP\Files\NotFoundException();
+        }
+        $fullPath = Filesystem::normalizePath($view->getAbsolutePath($path));
+
+        $cacheKey = $fullPath . '::' . ($includeMountPoints ? 'include' : 'exclude');
+        if ($useCache) {
+            $cached = $memcache->get($cacheKey);
+            if ($cached) {
+                return $cached;
+            }
+        }
+
+        if (!$rootInfo) {
+            $rootInfo = \OC\Files\Filesystem::getFileInfo($path, self::$quotaIncludeExternalStorage ? 'ext' : false);
+        }
+        if (!$rootInfo instanceof \OCP\Files\FileInfo) {
+            throw new \OCP\Files\NotFoundException('The root directory of the user\'s files is missing');
+        }
+        $used = $rootInfo->getSize($includeMountPoints);
+        if ($used < 0) {
+            $used = 0.0;
+        }
+        /** @var int|float $quota */
+        $quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        $mount = $rootInfo->getMountPoint();
+        $storage = $mount->getStorage();
+        $sourceStorage = $storage;
+        if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            self::$quotaIncludeExternalStorage = false;
+        }
+        if (self::$quotaIncludeExternalStorage) {
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
+                || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
+            ) {
+                /** @var \OC\Files\Storage\Home $storage */
+                $user = $storage->getUser();
+            } else {
+                $user = \OC::$server->getUserSession()->getUser();
+            }
+            $quota = OC_Util::getUserQuota($user);
+            if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                // always get free space / total space from root + mount points
+                return self::getGlobalStorageInfo($quota, $user, $mount);
+            }
+        }
+
+        // TODO: need a better way to get total space from storage
+        if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) {
+            /** @var \OC\Files\Storage\Wrapper\Quota $storage */
+            $quota = $sourceStorage->getQuota();
+        }
+        try {
+            $free = $sourceStorage->free_space($rootInfo->getInternalPath());
+            if (is_bool($free)) {
+                $free = 0.0;
+            }
+        } catch (\Exception $e) {
+            if ($path === '') {
+                throw $e;
+            }
+            /** @var LoggerInterface $logger */
+            $logger = \OC::$server->get(LoggerInterface::class);
+            $logger->warning('Error while getting quota info, using root quota', ['exception' => $e]);
+            $rootInfo = self::getStorageInfo('');
+            $memcache->set($cacheKey, $rootInfo, 5 * 60);
+            return $rootInfo;
+        }
+        if ($free >= 0) {
+            $total = $free + $used;
+        } else {
+            $total = $free; //either unknown or unlimited
+        }
+        if ($total > 0) {
+            if ($quota > 0 && $total > $quota) {
+                $total = $quota;
+            }
+            // prevent division by zero or error codes (negative values)
+            $relative = round(($used / $total) * 10000) / 100;
+        } else {
+            $relative = 0;
+        }
+
+        /*
 		 * \OCA\Files_Sharing\External\Storage returns the cloud ID as the owner for the storage.
 		 * It is unnecessary to query the user manager for the display name, as it won't have this information.
 		 */
-		$isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);
-
-		$ownerId = $storage->getOwner($path);
-		$ownerDisplayName = '';
-
-		if ($isRemoteShare === false && $ownerId !== false) {
-			$ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
-		}
-
-		if (substr_count($mount->getMountPoint(), '/') < 3) {
-			$mountPoint = '';
-		} else {
-			[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
-		}
-
-		$info = [
-			'free' => $free,
-			'used' => $used,
-			'quota' => $quota,
-			'total' => $total,
-			'relative' => $relative,
-			'owner' => $ownerId,
-			'ownerDisplayName' => $ownerDisplayName,
-			'mountType' => $mount->getMountType(),
-			'mountPoint' => trim($mountPoint, '/'),
-		];
-
-		if ($isRemoteShare === false && $ownerId !== false && $path === '/') {
-			// If path is root, store this as last known quota usage for this user
-			\OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string)$relative);
-		}
-
-		$memcache->set($cacheKey, $info, 5 * 60);
-
-		return $info;
-	}
-
-	/**
-	 * Get storage info including all mount points and quota
-	 *
-	 * @psalm-suppress LessSpecificReturnStatement Legacy code outputs weird types - manually validated that they are correct
-	 * @return StorageInfo
-	 */
-	private static function getGlobalStorageInfo(int|float $quota, IUser $user, IMountPoint $mount): array {
-		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
-		/** @var int|float $used */
-		$used = $rootInfo['size'];
-		if ($used < 0) {
-			$used = 0.0;
-		}
-
-		$total = $quota;
-		/** @var int|float $free */
-		$free = $quota - $used;
-
-		if ($total > 0) {
-			if ($quota > 0 && $total > $quota) {
-				$total = $quota;
-			}
-			// prevent division by zero or error codes (negative values)
-			$relative = round(($used / $total) * 10000) / 100;
-		} else {
-			$relative = 0.0;
-		}
-
-		if (substr_count($mount->getMountPoint(), '/') < 3) {
-			$mountPoint = '';
-		} else {
-			[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
-		}
-
-		return [
-			'free' => $free,
-			'used' => $used,
-			'total' => $total,
-			'relative' => $relative,
-			'quota' => $quota,
-			'owner' => $user->getUID(),
-			'ownerDisplayName' => $user->getDisplayName(),
-			'mountType' => $mount->getMountType(),
-			'mountPoint' => trim($mountPoint, '/'),
-		];
-	}
-
-	public static function clearStorageInfo(string $absolutePath): void {
-		/** @var ICacheFactory $cacheFactory */
-		$cacheFactory = \OC::$server->get(ICacheFactory::class);
-		$memcache = $cacheFactory->createLocal('storage_info');
-		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath) . '::';
-		$memcache->remove($cacheKeyPrefix . 'include');
-		$memcache->remove($cacheKeyPrefix . 'exclude');
-	}
-
-	/**
-	 * Returns whether the config file is set manually to read-only
-	 * @return bool
-	 */
-	public static function isReadOnlyConfigEnabled() {
-		return \OC::$server->getConfig()->getSystemValueBool('config_is_read_only', false);
-	}
+        $isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);
+
+        $ownerId = $storage->getOwner($path);
+        $ownerDisplayName = '';
+
+        if ($isRemoteShare === false && $ownerId !== false) {
+            $ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
+        }
+
+        if (substr_count($mount->getMountPoint(), '/') < 3) {
+            $mountPoint = '';
+        } else {
+            [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
+        }
+
+        $info = [
+            'free' => $free,
+            'used' => $used,
+            'quota' => $quota,
+            'total' => $total,
+            'relative' => $relative,
+            'owner' => $ownerId,
+            'ownerDisplayName' => $ownerDisplayName,
+            'mountType' => $mount->getMountType(),
+            'mountPoint' => trim($mountPoint, '/'),
+        ];
+
+        if ($isRemoteShare === false && $ownerId !== false && $path === '/') {
+            // If path is root, store this as last known quota usage for this user
+            \OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string)$relative);
+        }
+
+        $memcache->set($cacheKey, $info, 5 * 60);
+
+        return $info;
+    }
+
+    /**
+     * Get storage info including all mount points and quota
+     *
+     * @psalm-suppress LessSpecificReturnStatement Legacy code outputs weird types - manually validated that they are correct
+     * @return StorageInfo
+     */
+    private static function getGlobalStorageInfo(int|float $quota, IUser $user, IMountPoint $mount): array {
+        $rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
+        /** @var int|float $used */
+        $used = $rootInfo['size'];
+        if ($used < 0) {
+            $used = 0.0;
+        }
+
+        $total = $quota;
+        /** @var int|float $free */
+        $free = $quota - $used;
+
+        if ($total > 0) {
+            if ($quota > 0 && $total > $quota) {
+                $total = $quota;
+            }
+            // prevent division by zero or error codes (negative values)
+            $relative = round(($used / $total) * 10000) / 100;
+        } else {
+            $relative = 0.0;
+        }
+
+        if (substr_count($mount->getMountPoint(), '/') < 3) {
+            $mountPoint = '';
+        } else {
+            [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
+        }
+
+        return [
+            'free' => $free,
+            'used' => $used,
+            'total' => $total,
+            'relative' => $relative,
+            'quota' => $quota,
+            'owner' => $user->getUID(),
+            'ownerDisplayName' => $user->getDisplayName(),
+            'mountType' => $mount->getMountType(),
+            'mountPoint' => trim($mountPoint, '/'),
+        ];
+    }
+
+    public static function clearStorageInfo(string $absolutePath): void {
+        /** @var ICacheFactory $cacheFactory */
+        $cacheFactory = \OC::$server->get(ICacheFactory::class);
+        $memcache = $cacheFactory->createLocal('storage_info');
+        $cacheKeyPrefix = Filesystem::normalizePath($absolutePath) . '::';
+        $memcache->remove($cacheKeyPrefix . 'include');
+        $memcache->remove($cacheKeyPrefix . 'exclude');
+    }
+
+    /**
+     * Returns whether the config file is set manually to read-only
+     * @return bool
+     */
+    public static function isReadOnlyConfigEnabled() {
+        return \OC::$server->getConfig()->getSystemValueBool('config_is_read_only', false);
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
 	 *
 	 * Makes 2048 to 2 kB.
 	 */
-	public static function humanFileSize(int|float $bytes): string {
+	public static function humanFileSize(int | float $bytes): string {
 		return \OCP\Util::humanFileSize($bytes);
 	}
 
@@ -57,7 +57,7 @@ 
 	 *
 	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
 	 */
-	public static function computerFileSize(string $str): false|int|float {
+	public static function computerFileSize(string $str): false | int | float {
 		return \OCP\Util::computerFileSize($str);
 	}
 
@@ -132,7 +132,7 @@ 
 		$exts = [''];
 		$check_fn = 'is_executable';
 		// Default check will be done with $path directories :
-		$dirs = explode(PATH_SEPARATOR, (string)$path);
+		$dirs = explode(PATH_SEPARATOR, (string) $path);
 		// WARNING : We have to check if open_basedir is enabled :
 		$obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
 		if ($obd != 'none') {
@@ -145,7 +145,7 @@ 
 		}
 		foreach ($dirs as $dir) {
 			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext)) {
+				if ($check_fn("$dir/$name".$ext)) {
 					return true;
 				}
 			}
@@ -217,7 +217,7 @@ 
 			$ext = '';
 		}
 
-		$newpath = $path . '/' . $filename;
+		$newpath = $path.'/'.$filename;
 		if ($view->file_exists($newpath)) {
 			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
 				//Replace the last "(number)" with "(number+1)"
@@ -233,11 +233,11 @@ 
 			do {
 				if ($offset) {
 					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
 				} else {
-					$newname = $name . ' (' . $counter . ')';
+					$newname = $name.' ('.$counter.')';
 				}
-				$newpath = $path . '/' . $newname . $ext;
+				$newpath = $path.'/'.$newname.$ext;
 				$counter++;
 			} while ($view->file_exists($newpath));
 		}
@@ -355,7 +355,7 @@ 
 		}
 		$fullPath = Filesystem::normalizePath($view->getAbsolutePath($path));
 
-		$cacheKey = $fullPath . '::' . ($includeMountPoints ? 'include' : 'exclude');
+		$cacheKey = $fullPath.'::'.($includeMountPoints ? 'include' : 'exclude');
 		if ($useCache) {
 			$cached = $memcache->get($cacheKey);
 			if ($cached) {
@@ -466,7 +466,7 @@ 
 
 		if ($isRemoteShare === false && $ownerId !== false && $path === '/') {
 			// If path is root, store this as last known quota usage for this user
-			\OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string)$relative);
+			\OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string) $relative);
 		}
 
 		$memcache->set($cacheKey, $info, 5 * 60);
@@ -480,7 +480,7 @@ 
 	 * @psalm-suppress LessSpecificReturnStatement Legacy code outputs weird types - manually validated that they are correct
 	 * @return StorageInfo
 	 */
-	private static function getGlobalStorageInfo(int|float $quota, IUser $user, IMountPoint $mount): array {
+	private static function getGlobalStorageInfo(int | float $quota, IUser $user, IMountPoint $mount): array {
 		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
 		/** @var int|float $used */
 		$used = $rootInfo['size'];
@@ -525,9 +525,9 @@ 
 		/** @var ICacheFactory $cacheFactory */
 		$cacheFactory = \OC::$server->get(ICacheFactory::class);
 		$memcache = $cacheFactory->createLocal('storage_info');
-		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath) . '::';
-		$memcache->remove($cacheKeyPrefix . 'include');
-		$memcache->remove($cacheKeyPrefix . 'exclude');
+		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath).'::';
+		$memcache->remove($cacheKeyPrefix.'include');
+		$memcache->remove($cacheKeyPrefix.'exclude');
 	}
 
 	/**

lib/private/Installer.php

Indentation +592 added lines, -592 removed lines

@@ -33,596 +33,596 @@
  * This class provides the functionality needed to install, update and remove apps
  */
 class Installer {
-	private ?bool $isInstanceReadyForUpdates = null;
-	private ?array $apps = null;
-
-	public function __construct(
-		private AppFetcher $appFetcher,
-		private IClientService $clientService,
-		private ITempManager $tempManager,
-		private LoggerInterface $logger,
-		private IConfig $config,
-		private bool $isCLI,
-	) {
-	}
-
-	/**
-	 * Installs an app that is located in one of the app folders already
-	 *
-	 * @param string $appId App to install
-	 * @param bool $forceEnable
-	 * @throws \Exception
-	 * @return string app ID
-	 */
-	public function installApp(string $appId, bool $forceEnable = false): string {
-		$app = \OC_App::findAppInDirectories($appId);
-		if ($app === false) {
-			throw new \Exception('App not found in any app directory');
-		}
-
-		$basedir = $app['path'] . '/' . $appId;
-
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
-		}
-
-		$l = \OCP\Util::getL10N('core');
-		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir . '/appinfo/info.xml', $l->getLanguageCode());
-
-		if (!is_array($info)) {
-			throw new \Exception(
-				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
-					[$appId]
-				)
-			);
-		}
-
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
-
-		$version = implode('.', \OCP\Util::getVersion());
-		if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
-			throw new \Exception(
-				// TODO $l
-				$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
-					[$info['name']]
-				)
-			);
-		}
-
-		// check for required dependencies
-		\OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
-		/** @var Coordinator $coordinator */
-		$coordinator = \OC::$server->get(Coordinator::class);
-		$coordinator->runLazyRegistration($appId);
-		\OC_App::registerAutoloading($appId, $basedir);
-
-		$previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
-		if ($previousVersion) {
-			OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
-		}
-
-		//install the database
-		$ms = new MigrationService($info['id'], \OCP\Server::get(Connection::class));
-		$ms->migrate('latest', !$previousVersion);
-
-		if ($previousVersion) {
-			OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
-		}
-
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
-
-		OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
-
-		$config = \OCP\Server::get(IConfig::class);
-		//set the installed version
-		$config->setAppValue($info['id'], 'installed_version', \OCP\Server::get(IAppManager::class)->getAppVersion($info['id'], false));
-		$config->setAppValue($info['id'], 'enabled', 'no');
-
-		//set remote/public handlers
-		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
-		}
-		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * Updates the specified app from the appstore
-	 *
-	 * @param bool $allowUnstable Allow unstable releases
-	 */
-	public function updateAppstoreApp(string $appId, bool $allowUnstable = false): bool {
-		if ($this->isUpdateAvailable($appId, $allowUnstable)) {
-			try {
-				$this->downloadApp($appId, $allowUnstable);
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), [
-					'exception' => $e,
-				]);
-				return false;
-			}
-			return OC_App::updateApp($appId);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Split the certificate file in individual certs
-	 *
-	 * @param string $cert
-	 * @return string[]
-	 */
-	private function splitCerts(string $cert): array {
-		preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
-
-		return $matches[0];
-	}
-
-	/**
-	 * Downloads an app and puts it into the app directory
-	 *
-	 * @param string $appId
-	 * @param bool [$allowUnstable]
-	 *
-	 * @throws \Exception If the installation was not successful
-	 */
-	public function downloadApp(string $appId, bool $allowUnstable = false): void {
-		$appId = strtolower($appId);
-
-		$apps = $this->appFetcher->get($allowUnstable);
-		foreach ($apps as $app) {
-			if ($app['id'] === $appId) {
-				// Load the certificate
-				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
-				$rootCrts = $this->splitCerts($rootCrt);
-				foreach ($rootCrts as $rootCrt) {
-					$certificate->loadCA($rootCrt);
-				}
-				$loadedCertificate = $certificate->loadX509($app['certificate']);
-
-				// Verify if the certificate has been revoked
-				$crl = new X509();
-				foreach ($rootCrts as $rootCrt) {
-					$crl->loadCA($rootCrt);
-				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if ($crl->validateSignature() !== true) {
-					throw new \Exception('Could not validate CRL signature');
-				}
-				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
-				$revoked = $crl->getRevoked($csn);
-				if ($revoked !== false) {
-					throw new \Exception(
-						sprintf(
-							'Certificate "%s" has been revoked',
-							$csn
-						)
-					);
-				}
-
-				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if ($certificate->validateSignature() !== true) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
-							$appId
-						)
-					);
-				}
-
-				// Verify if the certificate is issued for the requested app id
-				$certInfo = openssl_x509_parse($app['certificate']);
-				if (!isset($certInfo['subject']['CN'])) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert with no CN',
-							$appId
-						)
-					);
-				}
-				if ($certInfo['subject']['CN'] !== $appId) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert issued to %s',
-							$appId,
-							$certInfo['subject']['CN']
-						)
-					);
-				}
-
-				// Download the release
-				$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
-				if ($tempFile === false) {
-					throw new \RuntimeException('Could not create temporary file for downloading app archive.');
-				}
-
-				$timeout = $this->isCLI ? 0 : 120;
-				$client = $this->clientService->newClient();
-				$client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
-
-				// Check if the signature actually matches the downloaded content
-				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512) === 1;
-
-				if ($verified === true) {
-					// Seems to match, let's proceed
-					$extractDir = $this->tempManager->getTemporaryFolder();
-					if ($extractDir === false) {
-						throw new \RuntimeException('Could not create temporary directory for unpacking app.');
-					}
-
-					$archive = new TAR($tempFile);
-					if (!$archive->extract($extractDir)) {
-						$errorMessage = 'Could not extract app ' . $appId;
-
-						$archiveError = $archive->getError();
-						if ($archiveError instanceof \PEAR_Error) {
-							$errorMessage .= ': ' . $archiveError->getMessage();
-						}
-
-						throw new \Exception($errorMessage);
-					}
-					$allFiles = scandir($extractDir);
-					$folders = array_diff($allFiles, ['.', '..']);
-					$folders = array_values($folders);
-
-					if (count($folders) < 1) {
-						throw new \Exception(
-							sprintf(
-								'Extracted app %s has no folders',
-								$appId
-							)
-						);
-					}
-
-					if (count($folders) > 1) {
-						throw new \Exception(
-							sprintf(
-								'Extracted app %s has more than 1 folder',
-								$appId
-							)
-						);
-					}
-
-					// Check if appinfo/info.xml has the same app ID as well
-					$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
-
-					if ($xml === false) {
-						throw new \Exception(
-							sprintf(
-								'Failed to load info.xml for app id %s',
-								$appId,
-							)
-						);
-					}
-
-					if ((string)$xml->id !== $appId) {
-						throw new \Exception(
-							sprintf(
-								'App for id %s has a wrong app ID in info.xml: %s',
-								$appId,
-								(string)$xml->id
-							)
-						);
-					}
-
-					// Check if the version is lower than before
-					$currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
-					$newVersion = (string)$xml->version;
-					if (version_compare($currentVersion, $newVersion) === 1) {
-						throw new \Exception(
-							sprintf(
-								'App for id %s has version %s and tried to update to lower version %s',
-								$appId,
-								$currentVersion,
-								$newVersion
-							)
-						);
-					}
-
-					$baseDir = OC_App::getInstallPath() . '/' . $appId;
-					// Remove old app with the ID if existent
-					Files::rmdirr($baseDir);
-					// Move to app folder
-					if (@mkdir($baseDir)) {
-						$extractDir .= '/' . $folders[0];
-					}
-					// otherwise we just copy the outer directory
-					$this->copyRecursive($extractDir, $baseDir);
-					Files::rmdirr($extractDir);
-					return;
-				}
-				// Signature does not match
-				throw new \Exception(
-					sprintf(
-						'App with id %s has invalid signature',
-						$appId
-					)
-				);
-			}
-		}
-
-		throw new \Exception(
-			sprintf(
-				'Could not download app %s',
-				$appId
-			)
-		);
-	}
-
-	/**
-	 * Check if an update for the app is available
-	 *
-	 * @param string $appId
-	 * @param bool $allowUnstable
-	 * @return string|false false or the version number of the update
-	 */
-	public function isUpdateAvailable($appId, $allowUnstable = false): string|false {
-		if ($this->isInstanceReadyForUpdates === null) {
-			$installPath = OC_App::getInstallPath();
-			if ($installPath === null) {
-				$this->isInstanceReadyForUpdates = false;
-			} else {
-				$this->isInstanceReadyForUpdates = true;
-			}
-		}
-
-		if ($this->isInstanceReadyForUpdates === false) {
-			return false;
-		}
-
-		if ($this->isInstalledFromGit($appId) === true) {
-			return false;
-		}
-
-		if ($this->apps === null) {
-			$this->apps = $this->appFetcher->get($allowUnstable);
-		}
-
-		foreach ($this->apps as $app) {
-			if ($app['id'] === $appId) {
-				$currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
-
-				if (!isset($app['releases'][0]['version'])) {
-					return false;
-				}
-				$newestVersion = $app['releases'][0]['version'];
-				if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
-					return $newestVersion;
-				} else {
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if app has been installed from git
-	 *
-	 * The function will check if the path contains a .git folder
-	 */
-	private function isInstalledFromGit(string $appId): bool {
-		$app = \OC_App::findAppInDirectories($appId);
-		if ($app === false) {
-			return false;
-		}
-		$basedir = $app['path'] . '/' . $appId;
-		return file_exists($basedir . '/.git/');
-	}
-
-	/**
-	 * Check if app is already downloaded
-	 *
-	 * The function will check if the app is already downloaded in the apps repository
-	 */
-	public function isDownloaded(string $name): bool {
-		foreach (\OC::$APPSROOTS as $dir) {
-			$dirToTest = $dir['path'];
-			$dirToTest .= '/';
-			$dirToTest .= $name;
-			$dirToTest .= '/';
-
-			if (is_dir($dirToTest)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes an app
-	 *
-	 * This function works as follows
-	 *   -# call uninstall repair steps
-	 *   -# removing the files
-	 *
-	 * The function will not delete preferences, tables and the configuration,
-	 * this has to be done by the function oc_app_uninstall().
-	 */
-	public function removeApp(string $appId): bool {
-		if ($this->isDownloaded($appId)) {
-			if (\OCP\Server::get(IAppManager::class)->isShipped($appId)) {
-				return false;
-			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
-			Files::rmdirr($appDir);
-			return true;
-		} else {
-			$this->logger->error('can\'t remove app ' . $appId . '. It is not installed.');
-
-			return false;
-		}
-	}
-
-	/**
-	 * Installs the app within the bundle and marks the bundle as installed
-	 *
-	 * @throws \Exception If app could not get installed
-	 */
-	public function installAppBundle(Bundle $bundle): void {
-		$appIds = $bundle->getAppIdentifiers();
-		foreach ($appIds as $appId) {
-			if (!$this->isDownloaded($appId)) {
-				$this->downloadApp($appId);
-			}
-			$this->installApp($appId);
-			$app = new OC_App();
-			$app->enable($appId);
-		}
-		$bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
-		$bundles[] = $bundle->getIdentifier();
-		$this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
-	}
-
-	/**
-	 * Installs shipped apps
-	 *
-	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
-	 * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
-	 *                         working ownCloud at the end instead of an aborted update.
-	 * @return array Array of error messages (appid => Exception)
-	 */
-	public static function installShippedApps(bool $softErrors = false, ?IOutput $output = null): array {
-		if ($output instanceof IOutput) {
-			$output->debug('Installing shipped apps');
-		}
-		$appManager = \OCP\Server::get(IAppManager::class);
-		$config = \OCP\Server::get(IConfig::class);
-		$errors = [];
-		foreach (\OC::$APPSROOTS as $app_dir) {
-			if ($dir = opendir($app_dir['path'])) {
-				while (false !== ($filename = readdir($dir))) {
-					if ($filename[0] !== '.' and is_dir($app_dir['path'] . "/$filename")) {
-						if (file_exists($app_dir['path'] . "/$filename/appinfo/info.xml")) {
-							if ($config->getAppValue($filename, 'installed_version', null) === null) {
-								$enabled = $appManager->isDefaultEnabled($filename);
-								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
-									  && $config->getAppValue($filename, 'enabled') !== 'no') {
-									if ($softErrors) {
-										try {
-											Installer::installShippedApp($filename, $output);
-										} catch (HintException $e) {
-											if ($e->getPrevious() instanceof TableExistsException) {
-												$errors[$filename] = $e;
-												continue;
-											}
-											throw $e;
-										}
-									} else {
-										Installer::installShippedApp($filename, $output);
-									}
-									$config->setAppValue($filename, 'enabled', 'yes');
-								}
-							}
-						}
-					}
-				}
-				closedir($dir);
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * install an app already placed in the app folder
-	 */
-	public static function installShippedApp(string $app, ?IOutput $output = null): string|false {
-		if ($output instanceof IOutput) {
-			$output->debug('Installing ' . $app);
-		}
-
-		$appManager = \OCP\Server::get(IAppManager::class);
-		$config = \OCP\Server::get(IConfig::class);
-
-		$appPath = $appManager->getAppPath($app);
-		\OC_App::registerAutoloading($app, $appPath);
-
-		$ms = new MigrationService($app, \OCP\Server::get(Connection::class));
-		if ($output instanceof IOutput) {
-			$ms->setOutput($output);
-		}
-		$previousVersion = $config->getAppValue($app, 'installed_version', false);
-		$ms->migrate('latest', !$previousVersion);
-
-		//run appinfo/install.php
-		self::includeAppScript("$appPath/appinfo/install.php");
-
-		$info = \OCP\Server::get(IAppManager::class)->getAppInfo($app);
-		if (is_null($info)) {
-			return false;
-		}
-		if ($output instanceof IOutput) {
-			$output->debug('Registering tasks of ' . $app);
-		}
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
-
-		$config->setAppValue($app, 'installed_version', \OCP\Server::get(IAppManager::class)->getAppVersion($app));
-		if (array_key_exists('ocsid', $info)) {
-			$config->setAppValue($app, 'ocsid', $info['ocsid']);
-		}
-
-		//set remote/public handlers
-		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $app . '/' . $path);
-		}
-		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $app . '/' . $path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	private static function includeAppScript(string $script): void {
-		if (file_exists($script)) {
-			include $script;
-		}
-	}
-
-	/**
-	 * Recursive copying of local folders.
-	 *
-	 * @param string $src source folder
-	 * @param string $dest target folder
-	 */
-	private function copyRecursive(string $src, string $dest): void {
-		if (!file_exists($src)) {
-			return;
-		}
-
-		if (is_dir($src)) {
-			if (!is_dir($dest)) {
-				mkdir($dest);
-			}
-			$files = scandir($src);
-			foreach ($files as $file) {
-				if ($file != '.' && $file != '..') {
-					$this->copyRecursive("$src/$file", "$dest/$file");
-				}
-			}
-		} else {
-			$validator = Server::get(FilenameValidator::class);
-			if (!$validator->isForbidden($src)) {
-				copy($src, $dest);
-			}
-		}
-	}
+    private ?bool $isInstanceReadyForUpdates = null;
+    private ?array $apps = null;
+
+    public function __construct(
+        private AppFetcher $appFetcher,
+        private IClientService $clientService,
+        private ITempManager $tempManager,
+        private LoggerInterface $logger,
+        private IConfig $config,
+        private bool $isCLI,
+    ) {
+    }
+
+    /**
+     * Installs an app that is located in one of the app folders already
+     *
+     * @param string $appId App to install
+     * @param bool $forceEnable
+     * @throws \Exception
+     * @return string app ID
+     */
+    public function installApp(string $appId, bool $forceEnable = false): string {
+        $app = \OC_App::findAppInDirectories($appId);
+        if ($app === false) {
+            throw new \Exception('App not found in any app directory');
+        }
+
+        $basedir = $app['path'] . '/' . $appId;
+
+        if (is_file($basedir . '/appinfo/database.xml')) {
+            throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+        }
+
+        $l = \OCP\Util::getL10N('core');
+        $info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir . '/appinfo/info.xml', $l->getLanguageCode());
+
+        if (!is_array($info)) {
+            throw new \Exception(
+                $l->t('App "%s" cannot be installed because appinfo file cannot be read.',
+                    [$appId]
+                )
+            );
+        }
+
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
+
+        $version = implode('.', \OCP\Util::getVersion());
+        if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
+            throw new \Exception(
+                // TODO $l
+                $l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
+                    [$info['name']]
+                )
+            );
+        }
+
+        // check for required dependencies
+        \OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
+        /** @var Coordinator $coordinator */
+        $coordinator = \OC::$server->get(Coordinator::class);
+        $coordinator->runLazyRegistration($appId);
+        \OC_App::registerAutoloading($appId, $basedir);
+
+        $previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
+        if ($previousVersion) {
+            OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
+        }
+
+        //install the database
+        $ms = new MigrationService($info['id'], \OCP\Server::get(Connection::class));
+        $ms->migrate('latest', !$previousVersion);
+
+        if ($previousVersion) {
+            OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
+        }
+
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        //run appinfo/install.php
+        self::includeAppScript($basedir . '/appinfo/install.php');
+
+        OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
+
+        $config = \OCP\Server::get(IConfig::class);
+        //set the installed version
+        $config->setAppValue($info['id'], 'installed_version', \OCP\Server::get(IAppManager::class)->getAppVersion($info['id'], false));
+        $config->setAppValue($info['id'], 'enabled', 'no');
+
+        //set remote/public handlers
+        foreach ($info['remote'] as $name => $path) {
+            $config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
+        }
+        foreach ($info['public'] as $name => $path) {
+            $config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * Updates the specified app from the appstore
+     *
+     * @param bool $allowUnstable Allow unstable releases
+     */
+    public function updateAppstoreApp(string $appId, bool $allowUnstable = false): bool {
+        if ($this->isUpdateAvailable($appId, $allowUnstable)) {
+            try {
+                $this->downloadApp($appId, $allowUnstable);
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), [
+                    'exception' => $e,
+                ]);
+                return false;
+            }
+            return OC_App::updateApp($appId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Split the certificate file in individual certs
+     *
+     * @param string $cert
+     * @return string[]
+     */
+    private function splitCerts(string $cert): array {
+        preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
+
+        return $matches[0];
+    }
+
+    /**
+     * Downloads an app and puts it into the app directory
+     *
+     * @param string $appId
+     * @param bool [$allowUnstable]
+     *
+     * @throws \Exception If the installation was not successful
+     */
+    public function downloadApp(string $appId, bool $allowUnstable = false): void {
+        $appId = strtolower($appId);
+
+        $apps = $this->appFetcher->get($allowUnstable);
+        foreach ($apps as $app) {
+            if ($app['id'] === $appId) {
+                // Load the certificate
+                $certificate = new X509();
+                $rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+                $rootCrts = $this->splitCerts($rootCrt);
+                foreach ($rootCrts as $rootCrt) {
+                    $certificate->loadCA($rootCrt);
+                }
+                $loadedCertificate = $certificate->loadX509($app['certificate']);
+
+                // Verify if the certificate has been revoked
+                $crl = new X509();
+                foreach ($rootCrts as $rootCrt) {
+                    $crl->loadCA($rootCrt);
+                }
+                $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+                if ($crl->validateSignature() !== true) {
+                    throw new \Exception('Could not validate CRL signature');
+                }
+                $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+                $revoked = $crl->getRevoked($csn);
+                if ($revoked !== false) {
+                    throw new \Exception(
+                        sprintf(
+                            'Certificate "%s" has been revoked',
+                            $csn
+                        )
+                    );
+                }
+
+                // Verify if the certificate has been issued by the Nextcloud Code Authority CA
+                if ($certificate->validateSignature() !== true) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a certificate not issued by a trusted Code Signing Authority',
+                            $appId
+                        )
+                    );
+                }
+
+                // Verify if the certificate is issued for the requested app id
+                $certInfo = openssl_x509_parse($app['certificate']);
+                if (!isset($certInfo['subject']['CN'])) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert with no CN',
+                            $appId
+                        )
+                    );
+                }
+                if ($certInfo['subject']['CN'] !== $appId) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert issued to %s',
+                            $appId,
+                            $certInfo['subject']['CN']
+                        )
+                    );
+                }
+
+                // Download the release
+                $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
+                if ($tempFile === false) {
+                    throw new \RuntimeException('Could not create temporary file for downloading app archive.');
+                }
+
+                $timeout = $this->isCLI ? 0 : 120;
+                $client = $this->clientService->newClient();
+                $client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
+
+                // Check if the signature actually matches the downloaded content
+                $certificate = openssl_get_publickey($app['certificate']);
+                $verified = openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512) === 1;
+
+                if ($verified === true) {
+                    // Seems to match, let's proceed
+                    $extractDir = $this->tempManager->getTemporaryFolder();
+                    if ($extractDir === false) {
+                        throw new \RuntimeException('Could not create temporary directory for unpacking app.');
+                    }
+
+                    $archive = new TAR($tempFile);
+                    if (!$archive->extract($extractDir)) {
+                        $errorMessage = 'Could not extract app ' . $appId;
+
+                        $archiveError = $archive->getError();
+                        if ($archiveError instanceof \PEAR_Error) {
+                            $errorMessage .= ': ' . $archiveError->getMessage();
+                        }
+
+                        throw new \Exception($errorMessage);
+                    }
+                    $allFiles = scandir($extractDir);
+                    $folders = array_diff($allFiles, ['.', '..']);
+                    $folders = array_values($folders);
+
+                    if (count($folders) < 1) {
+                        throw new \Exception(
+                            sprintf(
+                                'Extracted app %s has no folders',
+                                $appId
+                            )
+                        );
+                    }
+
+                    if (count($folders) > 1) {
+                        throw new \Exception(
+                            sprintf(
+                                'Extracted app %s has more than 1 folder',
+                                $appId
+                            )
+                        );
+                    }
+
+                    // Check if appinfo/info.xml has the same app ID as well
+                    $xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
+
+                    if ($xml === false) {
+                        throw new \Exception(
+                            sprintf(
+                                'Failed to load info.xml for app id %s',
+                                $appId,
+                            )
+                        );
+                    }
+
+                    if ((string)$xml->id !== $appId) {
+                        throw new \Exception(
+                            sprintf(
+                                'App for id %s has a wrong app ID in info.xml: %s',
+                                $appId,
+                                (string)$xml->id
+                            )
+                        );
+                    }
+
+                    // Check if the version is lower than before
+                    $currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
+                    $newVersion = (string)$xml->version;
+                    if (version_compare($currentVersion, $newVersion) === 1) {
+                        throw new \Exception(
+                            sprintf(
+                                'App for id %s has version %s and tried to update to lower version %s',
+                                $appId,
+                                $currentVersion,
+                                $newVersion
+                            )
+                        );
+                    }
+
+                    $baseDir = OC_App::getInstallPath() . '/' . $appId;
+                    // Remove old app with the ID if existent
+                    Files::rmdirr($baseDir);
+                    // Move to app folder
+                    if (@mkdir($baseDir)) {
+                        $extractDir .= '/' . $folders[0];
+                    }
+                    // otherwise we just copy the outer directory
+                    $this->copyRecursive($extractDir, $baseDir);
+                    Files::rmdirr($extractDir);
+                    return;
+                }
+                // Signature does not match
+                throw new \Exception(
+                    sprintf(
+                        'App with id %s has invalid signature',
+                        $appId
+                    )
+                );
+            }
+        }
+
+        throw new \Exception(
+            sprintf(
+                'Could not download app %s',
+                $appId
+            )
+        );
+    }
+
+    /**
+     * Check if an update for the app is available
+     *
+     * @param string $appId
+     * @param bool $allowUnstable
+     * @return string|false false or the version number of the update
+     */
+    public function isUpdateAvailable($appId, $allowUnstable = false): string|false {
+        if ($this->isInstanceReadyForUpdates === null) {
+            $installPath = OC_App::getInstallPath();
+            if ($installPath === null) {
+                $this->isInstanceReadyForUpdates = false;
+            } else {
+                $this->isInstanceReadyForUpdates = true;
+            }
+        }
+
+        if ($this->isInstanceReadyForUpdates === false) {
+            return false;
+        }
+
+        if ($this->isInstalledFromGit($appId) === true) {
+            return false;
+        }
+
+        if ($this->apps === null) {
+            $this->apps = $this->appFetcher->get($allowUnstable);
+        }
+
+        foreach ($this->apps as $app) {
+            if ($app['id'] === $appId) {
+                $currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
+
+                if (!isset($app['releases'][0]['version'])) {
+                    return false;
+                }
+                $newestVersion = $app['releases'][0]['version'];
+                if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
+                    return $newestVersion;
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if app has been installed from git
+     *
+     * The function will check if the path contains a .git folder
+     */
+    private function isInstalledFromGit(string $appId): bool {
+        $app = \OC_App::findAppInDirectories($appId);
+        if ($app === false) {
+            return false;
+        }
+        $basedir = $app['path'] . '/' . $appId;
+        return file_exists($basedir . '/.git/');
+    }
+
+    /**
+     * Check if app is already downloaded
+     *
+     * The function will check if the app is already downloaded in the apps repository
+     */
+    public function isDownloaded(string $name): bool {
+        foreach (\OC::$APPSROOTS as $dir) {
+            $dirToTest = $dir['path'];
+            $dirToTest .= '/';
+            $dirToTest .= $name;
+            $dirToTest .= '/';
+
+            if (is_dir($dirToTest)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes an app
+     *
+     * This function works as follows
+     *   -# call uninstall repair steps
+     *   -# removing the files
+     *
+     * The function will not delete preferences, tables and the configuration,
+     * this has to be done by the function oc_app_uninstall().
+     */
+    public function removeApp(string $appId): bool {
+        if ($this->isDownloaded($appId)) {
+            if (\OCP\Server::get(IAppManager::class)->isShipped($appId)) {
+                return false;
+            }
+            $appDir = OC_App::getInstallPath() . '/' . $appId;
+            Files::rmdirr($appDir);
+            return true;
+        } else {
+            $this->logger->error('can\'t remove app ' . $appId . '. It is not installed.');
+
+            return false;
+        }
+    }
+
+    /**
+     * Installs the app within the bundle and marks the bundle as installed
+     *
+     * @throws \Exception If app could not get installed
+     */
+    public function installAppBundle(Bundle $bundle): void {
+        $appIds = $bundle->getAppIdentifiers();
+        foreach ($appIds as $appId) {
+            if (!$this->isDownloaded($appId)) {
+                $this->downloadApp($appId);
+            }
+            $this->installApp($appId);
+            $app = new OC_App();
+            $app->enable($appId);
+        }
+        $bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
+        $bundles[] = $bundle->getIdentifier();
+        $this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
+    }
+
+    /**
+     * Installs shipped apps
+     *
+     * This function installs all apps found in the 'apps' directory that should be enabled by default;
+     * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
+     *                         working ownCloud at the end instead of an aborted update.
+     * @return array Array of error messages (appid => Exception)
+     */
+    public static function installShippedApps(bool $softErrors = false, ?IOutput $output = null): array {
+        if ($output instanceof IOutput) {
+            $output->debug('Installing shipped apps');
+        }
+        $appManager = \OCP\Server::get(IAppManager::class);
+        $config = \OCP\Server::get(IConfig::class);
+        $errors = [];
+        foreach (\OC::$APPSROOTS as $app_dir) {
+            if ($dir = opendir($app_dir['path'])) {
+                while (false !== ($filename = readdir($dir))) {
+                    if ($filename[0] !== '.' and is_dir($app_dir['path'] . "/$filename")) {
+                        if (file_exists($app_dir['path'] . "/$filename/appinfo/info.xml")) {
+                            if ($config->getAppValue($filename, 'installed_version', null) === null) {
+                                $enabled = $appManager->isDefaultEnabled($filename);
+                                if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
+                                      && $config->getAppValue($filename, 'enabled') !== 'no') {
+                                    if ($softErrors) {
+                                        try {
+                                            Installer::installShippedApp($filename, $output);
+                                        } catch (HintException $e) {
+                                            if ($e->getPrevious() instanceof TableExistsException) {
+                                                $errors[$filename] = $e;
+                                                continue;
+                                            }
+                                            throw $e;
+                                        }
+                                    } else {
+                                        Installer::installShippedApp($filename, $output);
+                                    }
+                                    $config->setAppValue($filename, 'enabled', 'yes');
+                                }
+                            }
+                        }
+                    }
+                }
+                closedir($dir);
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * install an app already placed in the app folder
+     */
+    public static function installShippedApp(string $app, ?IOutput $output = null): string|false {
+        if ($output instanceof IOutput) {
+            $output->debug('Installing ' . $app);
+        }
+
+        $appManager = \OCP\Server::get(IAppManager::class);
+        $config = \OCP\Server::get(IConfig::class);
+
+        $appPath = $appManager->getAppPath($app);
+        \OC_App::registerAutoloading($app, $appPath);
+
+        $ms = new MigrationService($app, \OCP\Server::get(Connection::class));
+        if ($output instanceof IOutput) {
+            $ms->setOutput($output);
+        }
+        $previousVersion = $config->getAppValue($app, 'installed_version', false);
+        $ms->migrate('latest', !$previousVersion);
+
+        //run appinfo/install.php
+        self::includeAppScript("$appPath/appinfo/install.php");
+
+        $info = \OCP\Server::get(IAppManager::class)->getAppInfo($app);
+        if (is_null($info)) {
+            return false;
+        }
+        if ($output instanceof IOutput) {
+            $output->debug('Registering tasks of ' . $app);
+        }
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
+
+        $config->setAppValue($app, 'installed_version', \OCP\Server::get(IAppManager::class)->getAppVersion($app));
+        if (array_key_exists('ocsid', $info)) {
+            $config->setAppValue($app, 'ocsid', $info['ocsid']);
+        }
+
+        //set remote/public handlers
+        foreach ($info['remote'] as $name => $path) {
+            $config->setAppValue('core', 'remote_' . $name, $app . '/' . $path);
+        }
+        foreach ($info['public'] as $name => $path) {
+            $config->setAppValue('core', 'public_' . $name, $app . '/' . $path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    private static function includeAppScript(string $script): void {
+        if (file_exists($script)) {
+            include $script;
+        }
+    }
+
+    /**
+     * Recursive copying of local folders.
+     *
+     * @param string $src source folder
+     * @param string $dest target folder
+     */
+    private function copyRecursive(string $src, string $dest): void {
+        if (!file_exists($src)) {
+            return;
+        }
+
+        if (is_dir($src)) {
+            if (!is_dir($dest)) {
+                mkdir($dest);
+            }
+            $files = scandir($src);
+            foreach ($files as $file) {
+                if ($file != '.' && $file != '..') {
+                    $this->copyRecursive("$src/$file", "$dest/$file");
+                }
+            }
+        } else {
+            $validator = Server::get(FilenameValidator::class);
+            if (!$validator->isForbidden($src)) {
+                copy($src, $dest);
+            }
+        }
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -60,14 +60,14 @@ 
 			throw new \Exception('App not found in any app directory');
 		}
 
-		$basedir = $app['path'] . '/' . $appId;
+		$basedir = $app['path'].'/'.$appId;
 
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+		if (is_file($basedir.'/appinfo/database.xml')) {
+			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in '.$appId);
 		}
 
 		$l = \OCP\Util::getL10N('core');
-		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir . '/appinfo/info.xml', $l->getLanguageCode());
+		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir.'/appinfo/info.xml', $l->getLanguageCode());
 
 		if (!is_array($info)) {
 			throw new \Exception(
@@ -113,7 +113,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
 
@@ -124,10 +124,10 @@ 
 
 		//set remote/public handlers
 		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
+			$config->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
 		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
+			$config->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);
@@ -184,7 +184,7 @@ 
 			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+				$rootCrt = file_get_contents(__DIR__.'/../../resources/codesigning/root.crt');
 				$rootCrts = $this->splitCerts($rootCrt);
 				foreach ($rootCrts as $rootCrt) {
 					$certificate->loadCA($rootCrt);
@@ -196,7 +196,7 @@ 
 				foreach ($rootCrts as $rootCrt) {
 					$crl->loadCA($rootCrt);
 				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
 				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
@@ -264,11 +264,11 @@ 
 
 					$archive = new TAR($tempFile);
 					if (!$archive->extract($extractDir)) {
-						$errorMessage = 'Could not extract app ' . $appId;
+						$errorMessage = 'Could not extract app '.$appId;
 
 						$archiveError = $archive->getError();
 						if ($archiveError instanceof \PEAR_Error) {
-							$errorMessage .= ': ' . $archiveError->getMessage();
+							$errorMessage .= ': '.$archiveError->getMessage();
 						}
 
 						throw new \Exception($errorMessage);
@@ -296,7 +296,7 @@ 
 					}
 
 					// Check if appinfo/info.xml has the same app ID as well
-					$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
+					$xml = simplexml_load_string(file_get_contents($extractDir.'/'.$folders[0].'/appinfo/info.xml'));
 
 					if ($xml === false) {
 						throw new \Exception(
@@ -307,19 +307,19 @@ 
 						);
 					}
 
-					if ((string)$xml->id !== $appId) {
+					if ((string) $xml->id !== $appId) {
 						throw new \Exception(
 							sprintf(
 								'App for id %s has a wrong app ID in info.xml: %s',
 								$appId,
-								(string)$xml->id
+								(string) $xml->id
 							)
 						);
 					}
 
 					// Check if the version is lower than before
 					$currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
-					$newVersion = (string)$xml->version;
+					$newVersion = (string) $xml->version;
 					if (version_compare($currentVersion, $newVersion) === 1) {
 						throw new \Exception(
 							sprintf(
@@ -331,12 +331,12 @@ 
 						);
 					}
 
-					$baseDir = OC_App::getInstallPath() . '/' . $appId;
+					$baseDir = OC_App::getInstallPath().'/'.$appId;
 					// Remove old app with the ID if existent
 					Files::rmdirr($baseDir);
 					// Move to app folder
 					if (@mkdir($baseDir)) {
-						$extractDir .= '/' . $folders[0];
+						$extractDir .= '/'.$folders[0];
 					}
 					// otherwise we just copy the outer directory
 					$this->copyRecursive($extractDir, $baseDir);
@@ -368,7 +368,7 @@ 
 	 * @param bool $allowUnstable
 	 * @return string|false false or the version number of the update
 	 */
-	public function isUpdateAvailable($appId, $allowUnstable = false): string|false {
+	public function isUpdateAvailable($appId, $allowUnstable = false): string | false {
 		if ($this->isInstanceReadyForUpdates === null) {
 			$installPath = OC_App::getInstallPath();
 			if ($installPath === null) {
@@ -419,8 +419,8 @@ 
 		if ($app === false) {
 			return false;
 		}
-		$basedir = $app['path'] . '/' . $appId;
-		return file_exists($basedir . '/.git/');
+		$basedir = $app['path'].'/'.$appId;
+		return file_exists($basedir.'/.git/');
 	}
 
 	/**
@@ -458,11 +458,11 @@ 
 			if (\OCP\Server::get(IAppManager::class)->isShipped($appId)) {
 				return false;
 			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			Files::rmdirr($appDir);
 			return true;
 		} else {
-			$this->logger->error('can\'t remove app ' . $appId . '. It is not installed.');
+			$this->logger->error('can\'t remove app '.$appId.'. It is not installed.');
 
 			return false;
 		}
@@ -506,8 +506,8 @@ 
 		foreach (\OC::$APPSROOTS as $app_dir) {
 			if ($dir = opendir($app_dir['path'])) {
 				while (false !== ($filename = readdir($dir))) {
-					if ($filename[0] !== '.' and is_dir($app_dir['path'] . "/$filename")) {
-						if (file_exists($app_dir['path'] . "/$filename/appinfo/info.xml")) {
+					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
 							if ($config->getAppValue($filename, 'installed_version', null) === null) {
 								$enabled = $appManager->isDefaultEnabled($filename);
 								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
@@ -541,9 +541,9 @@ 
 	/**
 	 * install an app already placed in the app folder
 	 */
-	public static function installShippedApp(string $app, ?IOutput $output = null): string|false {
+	public static function installShippedApp(string $app, ?IOutput $output = null): string | false {
 		if ($output instanceof IOutput) {
-			$output->debug('Installing ' . $app);
+			$output->debug('Installing '.$app);
 		}
 
 		$appManager = \OCP\Server::get(IAppManager::class);
@@ -567,7 +567,7 @@ 
 			return false;
 		}
 		if ($output instanceof IOutput) {
-			$output->debug('Registering tasks of ' . $app);
+			$output->debug('Registering tasks of '.$app);
 		}
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
@@ -580,10 +580,10 @@ 
 
 		//set remote/public handlers
 		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $app . '/' . $path);
+			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
 		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $app . '/' . $path);
+			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);