nextcloud / server

lib/private/Config.php

Indentation +202 added lines, -202 removed lines

@@ -42,232 +42,232 @@
  */
 class Config {
 
-	const ENV_PREFIX = 'NC_';
+    const ENV_PREFIX = 'NC_';
 
-	/** @var array Associative array ($key => $value) */
-	protected $cache = [];
-	/** @var string */
-	protected $configDir;
-	/** @var string */
-	protected $configFilePath;
-	/** @var string */
-	protected $configFileName;
+    /** @var array Associative array ($key => $value) */
+    protected $cache = [];
+    /** @var string */
+    protected $configDir;
+    /** @var string */
+    protected $configFilePath;
+    /** @var string */
+    protected $configFileName;
 
-	/**
-	 * @param string $configDir Path to the config dir, needs to end with '/'
-	 * @param string $fileName (Optional) Name of the config file. Defaults to config.php
-	 */
-	public function __construct($configDir, $fileName = 'config.php') {
-		$this->configDir = $configDir;
-		$this->configFilePath = $this->configDir.$fileName;
-		$this->configFileName = $fileName;
-		$this->readData();
-	}
+    /**
+     * @param string $configDir Path to the config dir, needs to end with '/'
+     * @param string $fileName (Optional) Name of the config file. Defaults to config.php
+     */
+    public function __construct($configDir, $fileName = 'config.php') {
+        $this->configDir = $configDir;
+        $this->configFilePath = $this->configDir.$fileName;
+        $this->configFileName = $fileName;
+        $this->readData();
+    }
 
-	/**
-	 * Lists all available config keys
-	 *
-	 * Please note that it does not return the values.
-	 *
-	 * @return array an array of key names
-	 */
-	public function getKeys() {
-		return array_keys($this->cache);
-	}
+    /**
+     * Lists all available config keys
+     *
+     * Please note that it does not return the values.
+     *
+     * @return array an array of key names
+     */
+    public function getKeys() {
+        return array_keys($this->cache);
+    }
 
-	/**
-	 * Returns a config value
-	 *
-	 * gets its value from an `NC_` prefixed environment variable
-	 * if it doesn't exist from config.php
-	 * if this doesn't exist either, it will return the given `$default`
-	 *
-	 * @param string $key key
-	 * @param mixed $default = null default value
-	 * @return mixed the value or $default
-	 */
-	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
-		if ($envValue !== false) {
-			return $envValue;
-		}
+    /**
+     * Returns a config value
+     *
+     * gets its value from an `NC_` prefixed environment variable
+     * if it doesn't exist from config.php
+     * if this doesn't exist either, it will return the given `$default`
+     *
+     * @param string $key key
+     * @param mixed $default = null default value
+     * @return mixed the value or $default
+     */
+    public function getValue($key, $default = null) {
+        $envValue = getenv(self::ENV_PREFIX . $key);
+        if ($envValue !== false) {
+            return $envValue;
+        }
 
-		if (isset($this->cache[$key])) {
-			return $this->cache[$key];
-		}
+        if (isset($this->cache[$key])) {
+            return $this->cache[$key];
+        }
 
-		return $default;
-	}
+        return $default;
+    }
 
-	/**
-	 * Sets and deletes values and writes the config.php
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setValues(array $configs) {
-		$needsUpdate = false;
-		foreach ($configs as $key => $value) {
-			if ($value !== null) {
-				$needsUpdate |= $this->set($key, $value);
-			} else {
-				$needsUpdate |= $this->delete($key);
-			}
-		}
+    /**
+     * Sets and deletes values and writes the config.php
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setValues(array $configs) {
+        $needsUpdate = false;
+        foreach ($configs as $key => $value) {
+            if ($value !== null) {
+                $needsUpdate |= $this->set($key, $value);
+            } else {
+                $needsUpdate |= $this->delete($key);
+            }
+        }
 
-		if ($needsUpdate) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+        if ($needsUpdate) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * Sets the value and writes it to config.php if required
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 */
-	public function setValue($key, $value) {
-		if ($this->set($key, $value)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Sets the value and writes it to config.php if required
+     *
+     * @param string $key key
+     * @param mixed $value value
+     */
+    public function setValue($key, $value) {
+        if ($this->set($key, $value)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function sets the value
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function set($key, $value) {
-		if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
-			// Add change
-			$this->cache[$key] = $value;
-			return true;
-		}
+    /**
+     * This function sets the value
+     *
+     * @param string $key key
+     * @param mixed $value value
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function set($key, $value) {
+        if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
+            // Add change
+            $this->cache[$key] = $value;
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Removes a key from the config and removes it from config.php if required
-	 * @param string $key
-	 */
-	public function deleteKey($key) {
-		if ($this->delete($key)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Removes a key from the config and removes it from config.php if required
+     * @param string $key
+     */
+    public function deleteKey($key) {
+        if ($this->delete($key)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function removes a key from the config
-	 *
-	 * @param string $key
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function delete($key) {
-		if (isset($this->cache[$key])) {
-			// Delete key from cache
-			unset($this->cache[$key]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * This function removes a key from the config
+     *
+     * @param string $key
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function delete($key) {
+        if (isset($this->cache[$key])) {
+            // Delete key from cache
+            unset($this->cache[$key]);
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Loads the config file
-	 *
-	 * Reads the config file and saves it to the cache
-	 *
-	 * @throws \Exception If no lock could be acquired or the config file has not been found
-	 */
-	private function readData() {
-		// Default config should always get loaded
-		$configFiles = [$this->configFilePath];
+    /**
+     * Loads the config file
+     *
+     * Reads the config file and saves it to the cache
+     *
+     * @throws \Exception If no lock could be acquired or the config file has not been found
+     */
+    private function readData() {
+        // Default config should always get loaded
+        $configFiles = [$this->configFilePath];
 
-		// Add all files in the config dir ending with the same file name
-		$extra = glob($this->configDir.'*.'.$this->configFileName);
-		if (is_array($extra)) {
-			natsort($extra);
-			$configFiles = array_merge($configFiles, $extra);
-		}
+        // Add all files in the config dir ending with the same file name
+        $extra = glob($this->configDir.'*.'.$this->configFileName);
+        if (is_array($extra)) {
+            natsort($extra);
+            $configFiles = array_merge($configFiles, $extra);
+        }
 
-		// Include file and merge config
-		foreach ($configFiles as $file) {
-			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
-			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
-				$filePointer === false) {
-				// Opening the main config might not be possible, e.g. if the wrong
-				// permissions are set (likely on a new installation)
-				continue;
-			}
+        // Include file and merge config
+        foreach ($configFiles as $file) {
+            $fileExistsAndIsReadable = file_exists($file) && is_readable($file);
+            $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
+            if($file === $this->configFilePath &&
+                $filePointer === false) {
+                // Opening the main config might not be possible, e.g. if the wrong
+                // permissions are set (likely on a new installation)
+                continue;
+            }
 
-			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
-				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
-			}
+            // Try to acquire a file lock
+            if(!flock($filePointer, LOCK_SH)) {
+                throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
+            }
 
-			unset($CONFIG);
-			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
-				$this->cache = array_merge($this->cache, $CONFIG);
-			}
+            unset($CONFIG);
+            include $file;
+            if(isset($CONFIG) && is_array($CONFIG)) {
+                $this->cache = array_merge($this->cache, $CONFIG);
+            }
 
-			// Close the file pointer and release the lock
-			flock($filePointer, LOCK_UN);
-			fclose($filePointer);
-		}
-	}
+            // Close the file pointer and release the lock
+            flock($filePointer, LOCK_UN);
+            fclose($filePointer);
+        }
+    }
 
-	/**
-	 * Writes the config file
-	 *
-	 * Saves the config to the config file.
-	 *
-	 * @throws HintException If the config file cannot be written to
-	 * @throws \Exception If no file lock can be acquired
-	 */
-	private function writeData() {
-		// Create a php file ...
-		$content = "<?php\n";
-		$content .= '$CONFIG = ';
-		$content .= var_export($this->cache, true);
-		$content .= ";\n";
+    /**
+     * Writes the config file
+     *
+     * Saves the config to the config file.
+     *
+     * @throws HintException If the config file cannot be written to
+     * @throws \Exception If no file lock can be acquired
+     */
+    private function writeData() {
+        // Create a php file ...
+        $content = "<?php\n";
+        $content .= '$CONFIG = ';
+        $content .= var_export($this->cache, true);
+        $content .= ";\n";
 
-		touch ($this->configFilePath);
-		$filePointer = fopen($this->configFilePath, 'r+');
+        touch ($this->configFilePath);
+        $filePointer = fopen($this->configFilePath, 'r+');
 
-		// Prevent others not to read the config
-		chmod($this->configFilePath, 0640);
+        // Prevent others not to read the config
+        chmod($this->configFilePath, 0640);
 
-		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
-			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
-			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
-			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
-			throw new HintException(
-				"Can't write into config directory!",
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
-		}
+        // File does not exist, this can happen when doing a fresh install
+        if(!is_resource ($filePointer)) {
+            // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
+            // currently this breaks app routes but also could have other side effects especially during setup and exception handling
+            $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
+            throw new HintException(
+                "Can't write into config directory!",
+                'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
+        }
 
-		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
-			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
-		}
+        // Try to acquire a file lock
+        if(!flock($filePointer, LOCK_EX)) {
+            throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
+        }
 
-		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
-		fwrite($filePointer, $content);
-		fflush($filePointer);
-		flock($filePointer, LOCK_UN);
-		fclose($filePointer);
+        // Write the config and release the lock
+        ftruncate ($filePointer, 0);
+        fwrite($filePointer, $content);
+        fflush($filePointer);
+        flock($filePointer, LOCK_UN);
+        fclose($filePointer);
 
-		if (function_exists('opcache_invalidate')) {
-			@opcache_invalidate($this->configFilePath, true);
-		}
-	}
+        if (function_exists('opcache_invalidate')) {
+            @opcache_invalidate($this->configFilePath, true);
+        }
+    }
 }

lib/private/Setup/AbstractDatabase.php

Indentation +104 added lines, -104 removed lines

@@ -38,118 +38,118 @@
 
 abstract class AbstractDatabase {
 
-	/** @var IL10N */
-	protected $trans;
-	/** @var string */
-	protected $dbUser;
-	/** @var string */
-	protected $dbPassword;
-	/** @var string */
-	protected $dbName;
-	/** @var string */
-	protected $dbHost;
-	/** @var string */
-	protected $dbPort;
-	/** @var string */
-	protected $tablePrefix;
-	/** @var SystemConfig */
-	protected $config;
-	/** @var ILogger */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var IL10N */
+    protected $trans;
+    /** @var string */
+    protected $dbUser;
+    /** @var string */
+    protected $dbPassword;
+    /** @var string */
+    protected $dbName;
+    /** @var string */
+    protected $dbHost;
+    /** @var string */
+    protected $dbPort;
+    /** @var string */
+    protected $tablePrefix;
+    /** @var SystemConfig */
+    protected $config;
+    /** @var ILogger */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
 
-	public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
-		$this->trans = $trans;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
+    public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
+        $this->trans = $trans;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
 
-	public function validate($config) {
-		$errors = [];
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
-		} else if(empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
-		} else if(empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
-		}
-		if(substr_count($config['dbname'], '.') >= 1) {
-			$errors[] = $this->trans->t("%s you may not use dots in the database name", [$this->dbprettyname]);
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = [];
+        if(empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
+        } else if(empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
+        } else if(empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
+        }
+        if(substr_count($config['dbname'], '.') >= 1) {
+            $errors[] = $this->trans->t("%s you may not use dots in the database name", [$this->dbprettyname]);
+        }
+        return $errors;
+    }
 
-	public function initialize($config) {
-		$dbUser = $config['dbuser'];
-		$dbPass = $config['dbpass'];
-		$dbName = $config['dbname'];
-		$dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
-		$dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
-		$dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+    public function initialize($config) {
+        $dbUser = $config['dbuser'];
+        $dbPass = $config['dbpass'];
+        $dbName = $config['dbname'];
+        $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+        $dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
+        $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
-		$this->config->setValues([
-			'dbname'		=> $dbName,
-			'dbhost'		=> $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix'	=> $dbTablePrefix,
-		]);
+        $this->config->setValues([
+            'dbname'		=> $dbName,
+            'dbhost'		=> $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix'	=> $dbTablePrefix,
+        ]);
 
-		$this->dbUser = $dbUser;
-		$this->dbPassword = $dbPass;
-		$this->dbName = $dbName;
-		$this->dbHost = $dbHost;
-		$this->dbPort = $dbPort;
-		$this->tablePrefix = $dbTablePrefix;
-	}
+        $this->dbUser = $dbUser;
+        $this->dbPassword = $dbPass;
+        $this->dbName = $dbName;
+        $this->dbHost = $dbHost;
+        $this->dbPort = $dbPort;
+        $this->tablePrefix = $dbTablePrefix;
+    }
 
-	/**
-	 * @param array $configOverwrite
-	 * @return \OC\DB\Connection
-	 */
-	protected function connect(array $configOverwrite = []) {
-		$connectionParams = [
-			'host' => $this->dbHost,
-			'user' => $this->dbUser,
-			'password' => $this->dbPassword,
-			'tablePrefix' => $this->tablePrefix,
-			'dbname' => $this->dbName
-		];
+    /**
+     * @param array $configOverwrite
+     * @return \OC\DB\Connection
+     */
+    protected function connect(array $configOverwrite = []) {
+        $connectionParams = [
+            'host' => $this->dbHost,
+            'user' => $this->dbUser,
+            'password' => $this->dbPassword,
+            'tablePrefix' => $this->tablePrefix,
+            'dbname' => $this->dbName
+        ];
 
-		// adding port support through installer
-		if (!empty($this->dbPort)) {
-			if (ctype_digit($this->dbPort)) {
-				$connectionParams['port'] = $this->dbPort;
-			} else {
-				$connectionParams['unix_socket'] = $this->dbPort;
-			}
-		} else if (strpos($this->dbHost, ':')) {
-			// Host variable may carry a port or socket.
-			list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
-			if (ctype_digit($portOrSocket)) {
-				$connectionParams['port'] = $portOrSocket;
-			} else {
-				$connectionParams['unix_socket'] = $portOrSocket;
-			}
-			$connectionParams['host'] = $host;
-		}
+        // adding port support through installer
+        if (!empty($this->dbPort)) {
+            if (ctype_digit($this->dbPort)) {
+                $connectionParams['port'] = $this->dbPort;
+            } else {
+                $connectionParams['unix_socket'] = $this->dbPort;
+            }
+        } else if (strpos($this->dbHost, ':')) {
+            // Host variable may carry a port or socket.
+            list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
+            if (ctype_digit($portOrSocket)) {
+                $connectionParams['port'] = $portOrSocket;
+            } else {
+                $connectionParams['unix_socket'] = $portOrSocket;
+            }
+            $connectionParams['host'] = $host;
+        }
 
-		$connectionParams = array_merge($connectionParams, $configOverwrite);
-		$cf = new ConnectionFactory($this->config);
-		return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
-	}
+        $connectionParams = array_merge($connectionParams, $configOverwrite);
+        $cf = new ConnectionFactory($this->config);
+        return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+    }
 
-	/**
-	 * @param string $userName
-	 */
-	abstract public function setupDatabase($userName);
+    /**
+     * @param string $userName
+     */
+    abstract public function setupDatabase($userName);
 
-	public function runMigrations() {
-		if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
-			return;
-		}
-		$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
-		$ms->migrate();
-	}
+    public function runMigrations() {
+        if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
+            return;
+        }
+        $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
+        $ms->migrate();
+    }
 }

lib/private/Setup/Sqlite.php

Indentation +29 added lines, -29 removed lines

@@ -26,14 +26,14 @@ 
 use OC\DB\ConnectionFactory;
 
 class Sqlite extends AbstractDatabase {
-	public $dbprettyname = 'Sqlite';
+    public $dbprettyname = 'Sqlite';
 
-	public function validate($config) {
-		return [];
-	}
+    public function validate($config) {
+        return [];
+    }
 
-	public function initialize($config) {
-		/*
+    public function initialize($config) {
+        /*
 		 * Web: When using web based installer its not possible to set dbname
 		 * or dbtableprefix. Defaults used from ConnectionFactory and dbtype = 'sqlite'
 		 * is written to config.php.
@@ -44,32 +44,32 @@ 
 		 * in connection factory configuration is obtained from config.php.
 		 */
 
-		$this->dbName = empty($config['dbname'])
-			? ConnectionFactory::DEFAULT_DBNAME
-			: $config['dbname'];
+        $this->dbName = empty($config['dbname'])
+            ? ConnectionFactory::DEFAULT_DBNAME
+            : $config['dbname'];
 
-		$this->tablePrefix = empty($config['dbtableprefix'])
-			? ConnectionFactory::DEFAULT_DBTABLEPREFIX
-			: $config['dbtableprefix'];
+        $this->tablePrefix = empty($config['dbtableprefix'])
+            ? ConnectionFactory::DEFAULT_DBTABLEPREFIX
+            : $config['dbtableprefix'];
 
-		if ($this->dbName !== ConnectionFactory::DEFAULT_DBNAME) {
-			$this->config->setValue('dbname', $this->dbName);
-		}
+        if ($this->dbName !== ConnectionFactory::DEFAULT_DBNAME) {
+            $this->config->setValue('dbname', $this->dbName);
+        }
 
-		if ($this->tablePrefix !== ConnectionFactory::DEFAULT_DBTABLEPREFIX) {
-			$this->config->setValue('dbtableprefix', $this->tablePrefix);
-		}
-	}
+        if ($this->tablePrefix !== ConnectionFactory::DEFAULT_DBTABLEPREFIX) {
+            $this->config->setValue('dbtableprefix', $this->tablePrefix);
+        }
+    }
 
-	public function setupDatabase($username) {
-		$datadir = $this->config->getValue(
-			'datadirectory',
-			\OC::$SERVERROOT . '/data'
-		);
+    public function setupDatabase($username) {
+        $datadir = $this->config->getValue(
+            'datadirectory',
+            \OC::$SERVERROOT . '/data'
+        );
 
-		$sqliteFile = $datadir . '/' . $this->dbName . 'db';
-		if (file_exists($sqliteFile)) {
-			unlink($sqliteFile);
-		}
-	}
+        $sqliteFile = $datadir . '/' . $this->dbName . 'db';
+        if (file_exists($sqliteFile)) {
+            unlink($sqliteFile);
+        }
+    }
 }

lib/private/Setup/OCI.php

Indentation +70 added lines, -70 removed lines

@@ -31,81 +31,81 @@
 namespace OC\Setup;
 
 class OCI extends AbstractDatabase {
-	public $dbprettyname = 'Oracle';
+    public $dbprettyname = 'Oracle';
 
-	protected $dbtablespace;
+    protected $dbtablespace;
 
-	public function initialize($config) {
-		parent::initialize($config);
-		if (array_key_exists('dbtablespace', $config)) {
-			$this->dbtablespace = $config['dbtablespace'];
-		} else {
-			$this->dbtablespace = 'USERS';
-		}
-		// allow empty hostname for oracle
-		$this->dbHost = $config['dbhost'];
+    public function initialize($config) {
+        parent::initialize($config);
+        if (array_key_exists('dbtablespace', $config)) {
+            $this->dbtablespace = $config['dbtablespace'];
+        } else {
+            $this->dbtablespace = 'USERS';
+        }
+        // allow empty hostname for oracle
+        $this->dbHost = $config['dbhost'];
 
-		$this->config->setValues([
-			'dbhost' => $this->dbHost,
-			'dbtablespace' => $this->dbtablespace,
-		]);
-	}
+        $this->config->setValues([
+            'dbhost' => $this->dbHost,
+            'dbtablespace' => $this->dbtablespace,
+        ]);
+    }
 
-	public function validate($config) {
-		$errors = [];
-		if (empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
-		} else if (empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
-		} else if (empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = [];
+        if (empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
+        } else if (empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
+        } else if (empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
+        }
+        return $errors;
+    }
 
-	public function setupDatabase($username) {
-		try {
-			$this->connect();
-		} catch (\Exception $e) {
-			$errorMessage = $this->getLastError();
-			if ($errorMessage) {
-				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
-					$errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-					. ' ORACLE_SID=' . getenv('ORACLE_SID')
-					. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-					. ' NLS_LANG=' . getenv('NLS_LANG')
-					. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
-			}
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-				'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-				. ' ORACLE_SID=' . getenv('ORACLE_SID')
-				. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-				. ' NLS_LANG=' . getenv('NLS_LANG')
-				. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
-		}
+    public function setupDatabase($username) {
+        try {
+            $this->connect();
+        } catch (\Exception $e) {
+            $errorMessage = $this->getLastError();
+            if ($errorMessage) {
+                throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+                    $errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
+                    . ' ORACLE_SID=' . getenv('ORACLE_SID')
+                    . ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
+                    . ' NLS_LANG=' . getenv('NLS_LANG')
+                    . ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+            }
+            throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
+                . ' ORACLE_SID=' . getenv('ORACLE_SID')
+                . ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
+                . ' NLS_LANG=' . getenv('NLS_LANG')
+                . ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+        }
 
-		$this->config->setValues([
-			'dbuser' => $this->dbUser,
-			'dbname' => $this->dbName,
-			'dbpassword' => $this->dbPassword,
-		]);
-	}
+        $this->config->setValues([
+            'dbuser' => $this->dbUser,
+            'dbname' => $this->dbName,
+            'dbpassword' => $this->dbPassword,
+        ]);
+    }
 
-	/**
-	 * @param resource $connection
-	 * @return string
-	 */
-	protected function getLastError($connection = null) {
-		if ($connection) {
-			$error = oci_error($connection);
-		} else {
-			$error = oci_error();
-		}
-		foreach (['message', 'code'] as $key) {
-			if (isset($error[$key])) {
-				return $error[$key];
-			}
-		}
-		return '';
-	}
+    /**
+     * @param resource $connection
+     * @return string
+     */
+    protected function getLastError($connection = null) {
+        if ($connection) {
+            $error = oci_error($connection);
+        } else {
+            $error = oci_error();
+        }
+        foreach (['message', 'code'] as $key) {
+            if (isset($error[$key])) {
+                return $error[$key];
+            }
+        }
+        return '';
+    }
 }

lib/private/Repair.php

Indentation +174 added lines, -174 removed lines

@@ -68,178 +68,178 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher  = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', ['No repair steps available']);
-
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
-			new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
-			\OC::$server->query(SwitchUpdateChannel::class),
-			\OC::$server->query(SetEnterpriseLogo::class),
-			\OC::$server->query(ResetGeneratedAvatarFlag::class),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config     = \OC::$server->getConfig();
-		$steps      = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection)
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', [$string]);
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /** @var IRepairStep[] */
+    private $repairSteps;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher  = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', ['No repair steps available']);
+
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
+            new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
+            \OC::$server->query(SwitchUpdateChannel::class),
+            \OC::$server->query(SetEnterpriseLogo::class),
+            \OC::$server->query(ResetGeneratedAvatarFlag::class),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config     = \OC::$server->getConfig();
+        $steps      = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection)
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', [$string]);
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/AppFramework/DependencyInjection/DIContainer.php

Indentation +350 added lines, -350 removed lines

@@ -69,354 +69,354 @@
 
 class DIContainer extends SimpleContainer implements IAppContainer {
 
-	/**
-	 * @var array
-	 */
-	private $middleWares = [];
-
-	/** @var ServerContainer */
-	private $server;
-
-	/**
-	 * Put your class dependencies in here
-	 * @param string $appName the name of the app
-	 * @param array $urlParams
-	 * @param ServerContainer|null $server
-	 */
-	public function __construct($appName, $urlParams = [], ServerContainer $server = null){
-		parent::__construct();
-		$this['AppName'] = $appName;
-		$this['urlParams'] = $urlParams;
-
-		$this->registerAlias('Request', IRequest::class);
-
-		/** @var \OC\ServerContainer $server */
-		if ($server === null) {
-			$server = \OC::$server;
-		}
-		$this->server = $server;
-		$this->server->registerAppContainer($appName, $this);
-
-		// aliases
-		$this->registerAlias('appName', 'AppName');
-		$this->registerAlias('webRoot', 'WebRoot');
-		$this->registerAlias('userId', 'UserId');
-
-		/**
-		 * Core services
-		 */
-		$this->registerService(IOutput::class, function(){
-			return new Output($this->getServer()->getWebRoot());
-		});
-
-		$this->registerService(Folder::class, function() {
-			return $this->getServer()->getUserFolder();
-		});
-
-		$this->registerService(IAppData::class, function (SimpleContainer $c) {
-			return $this->getServer()->getAppDataDir($c->query('AppName'));
-		});
-
-		$this->registerService(IL10N::class, function($c) {
-			return $this->getServer()->getL10N($c->query('AppName'));
-		});
-
-		// Log wrapper
-		$this->registerService(ILogger::class, function ($c) {
-			return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->query('AppName'));
-		});
-
-		$this->registerService(IServerContainer::class, function () {
-			return $this->getServer();
-		});
-		$this->registerAlias('ServerContainer', IServerContainer::class);
-
-		$this->registerService(\OCP\WorkflowEngine\IManager::class, function ($c) {
-			return $c->query(Manager::class);
-		});
-
-		$this->registerService(\OCP\AppFramework\IAppContainer::class, function ($c) {
-			return $c;
-		});
-
-		// commonly used attributes
-		$this->registerService('UserId', function ($c) {
-			return $c->query(IUserSession::class)->getSession()->get('user_id');
-		});
-
-		$this->registerService('WebRoot', function ($c) {
-			return $c->query('ServerContainer')->getWebRoot();
-		});
-
-		$this->registerService('OC_Defaults', function ($c) {
-			return $c->getServer()->getThemingDefaults();
-		});
-
-		$this->registerService(IConfig::class, function ($c) {
-			return $c->query(OC\GlobalScale\Config::class);
-		});
-
-		$this->registerService('Protocol', function($c){
-			/** @var \OC\Server $server */
-			$server = $c->query('ServerContainer');
-			$protocol = $server->getRequest()->getHttpProtocol();
-			return new Http($_SERVER, $protocol);
-		});
-
-		$this->registerService('Dispatcher', function($c) {
-			return new Dispatcher(
-				$c['Protocol'],
-				$c['MiddlewareDispatcher'],
-				$c->query(IControllerMethodReflector::class),
-				$c['Request']
-			);
-		});
-
-		/**
-		 * App Framework default arguments
-		 */
-		$this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
-		$this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
-		$this->registerParameter('corsMaxAge', 1728000);
-
-		/**
-		 * Middleware
-		 */
-		$this->registerService('MiddlewareDispatcher', function(SimpleContainer $c) {
-			$server =  $this->getServer();
-
-			$dispatcher = new MiddlewareDispatcher();
-			$dispatcher->registerMiddleware(
-				$c->query(OC\AppFramework\Middleware\Security\ReloadExecutionMiddleware::class)
-			);
-
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
-					$c->query(IRequest::class),
-					$c->query(IControllerMethodReflector::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new CORSMiddleware(
-					$c->query(IRequest::class),
-					$c->query(IControllerMethodReflector::class),
-					$c->query(IUserSession::class),
-					$c->query(OC\Security\Bruteforce\Throttler::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OCSMiddleware(
-					$c->query(IRequest::class)
-				)
-			);
-
-			$securityMiddleware = new SecurityMiddleware(
-				$c->query(IRequest::class),
-				$c->query(IControllerMethodReflector::class),
-				$c->query(INavigationManager::class),
-				$c->query(IURLGenerator::class),
-				$server->getLogger(),
-				$c['AppName'],
-				$server->getUserSession()->isLoggedIn(),
-				$server->getGroupManager()->isAdmin($this->getUserId()),
-				$server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
-				$server->getAppManager(),
-				$server->getL10N('lib')
-			);
-			$dispatcher->registerMiddleware($securityMiddleware);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\CSPMiddleware(
-					$server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
-					$server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
-					$server->query(OC\Security\CSRF\CsrfTokenManager::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				$server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
-					$c->query(IControllerMethodReflector::class),
-					$c->query(ISession::class),
-					$c->query(IUserSession::class),
-					$c->query(ITimeFactory::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new TwoFactorMiddleware(
-					$c->query(OC\Authentication\TwoFactorAuth\Manager::class),
-					$c->query(IUserSession::class),
-					$c->query(ISession::class),
-					$c->query(IURLGenerator::class),
-					$c->query(IControllerMethodReflector::class),
-					$c->query(IRequest::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
-					$c->query(IControllerMethodReflector::class),
-					$c->query(OC\Security\Bruteforce\Throttler::class),
-					$c->query(IRequest::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new RateLimitingMiddleware(
-					$c->query(IRequest::class),
-					$c->query(IUserSession::class),
-					$c->query(IControllerMethodReflector::class),
-					$c->query(OC\Security\RateLimiting\Limiter::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
-					$c->query(IRequest::class),
-					$c->query(ISession::class),
-					$c->query(\OCP\IConfig::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				$c->query(\OC\AppFramework\Middleware\AdditionalScriptsMiddleware::class)
-			);
-
-			foreach($this->middleWares as $middleWare) {
-				$dispatcher->registerMiddleware($c->query($middleWare));
-			}
-
-			$dispatcher->registerMiddleware(
-				new SessionMiddleware(
-					$c->query(IControllerMethodReflector::class),
-					$c->query(ISession::class)
-				)
-			);
-			return $dispatcher;
-		});
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, OC\Collaboration\Resources\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\IServerContainer
-	 */
-	public function getServer()
-	{
-		return $this->server;
-	}
-
-	/**
-	 * @param string $middleWare
-	 * @return boolean|null
-	 */
-	public function registerMiddleWare($middleWare) {
-		if (in_array($middleWare, $this->middleWares, true) !== false) {
-			return false;
-		}
-		$this->middleWares[] = $middleWare;
-	}
-
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 */
-	public function getAppName() {
-		return $this->query('AppName');
-	}
-
-	/**
-	 * @deprecated use IUserSession->isLoggedIn()
-	 * @return boolean
-	 */
-	public function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * @deprecated use IGroupManager->isAdmin($userId)
-	 * @return boolean
-	 */
-	public function isAdminUser() {
-		$uid = $this->getUserId();
-		return \OC_User::isAdminUser($uid);
-	}
-
-	private function getUserId() {
-		return $this->getServer()->getSession()->get('user_id');
-	}
-
-	/**
-	 * @deprecated use the ILogger instead
-	 * @param string $message
-	 * @param string $level
-	 * @return mixed
-	 */
-	public function log($message, $level) {
-		switch($level){
-			case 'debug':
-				$level = ILogger::DEBUG;
-				break;
-			case 'info':
-				$level = ILogger::INFO;
-				break;
-			case 'warn':
-				$level = ILogger::WARN;
-				break;
-			case 'fatal':
-				$level = ILogger::FATAL;
-				break;
-			default:
-				$level = ILogger::ERROR;
-				break;
-		}
-		\OCP\Util::writeLog($this->getAppName(), $message, $level);
-	}
-
-	/**
-	 * Register a capability
-	 *
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
-	 */
-	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
-			return $this->query($serviceName);
-		});
-	}
-
-	public function query(string $name, bool $autoload = true) {
-		try {
-			return $this->queryNoFallback($name);
-		} catch (QueryException $firstException) {
-			try {
-				return $this->getServer()->query($name, $autoload);
-			} catch (QueryException $secondException) {
-				if ($firstException->getCode() === 1) {
-					throw $secondException;
-				}
-				throw $firstException;
-			}
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function queryNoFallback($name) {
-		$name = $this->sanitizeName($name);
-
-		if ($this->offsetExists($name)) {
-			return parent::query($name);
-		} else {
-			if ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
-				return parent::query($name);
-			} else if ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
-				return parent::query($name);
-			} else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
-				return parent::query($name);
-			}
-		}
-
-		throw new QueryException('Could not resolve ' . $name . '!' .
-			' Class can not be instantiated', 1);
-	}
+    /**
+     * @var array
+     */
+    private $middleWares = [];
+
+    /** @var ServerContainer */
+    private $server;
+
+    /**
+     * Put your class dependencies in here
+     * @param string $appName the name of the app
+     * @param array $urlParams
+     * @param ServerContainer|null $server
+     */
+    public function __construct($appName, $urlParams = [], ServerContainer $server = null){
+        parent::__construct();
+        $this['AppName'] = $appName;
+        $this['urlParams'] = $urlParams;
+
+        $this->registerAlias('Request', IRequest::class);
+
+        /** @var \OC\ServerContainer $server */
+        if ($server === null) {
+            $server = \OC::$server;
+        }
+        $this->server = $server;
+        $this->server->registerAppContainer($appName, $this);
+
+        // aliases
+        $this->registerAlias('appName', 'AppName');
+        $this->registerAlias('webRoot', 'WebRoot');
+        $this->registerAlias('userId', 'UserId');
+
+        /**
+         * Core services
+         */
+        $this->registerService(IOutput::class, function(){
+            return new Output($this->getServer()->getWebRoot());
+        });
+
+        $this->registerService(Folder::class, function() {
+            return $this->getServer()->getUserFolder();
+        });
+
+        $this->registerService(IAppData::class, function (SimpleContainer $c) {
+            return $this->getServer()->getAppDataDir($c->query('AppName'));
+        });
+
+        $this->registerService(IL10N::class, function($c) {
+            return $this->getServer()->getL10N($c->query('AppName'));
+        });
+
+        // Log wrapper
+        $this->registerService(ILogger::class, function ($c) {
+            return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->query('AppName'));
+        });
+
+        $this->registerService(IServerContainer::class, function () {
+            return $this->getServer();
+        });
+        $this->registerAlias('ServerContainer', IServerContainer::class);
+
+        $this->registerService(\OCP\WorkflowEngine\IManager::class, function ($c) {
+            return $c->query(Manager::class);
+        });
+
+        $this->registerService(\OCP\AppFramework\IAppContainer::class, function ($c) {
+            return $c;
+        });
+
+        // commonly used attributes
+        $this->registerService('UserId', function ($c) {
+            return $c->query(IUserSession::class)->getSession()->get('user_id');
+        });
+
+        $this->registerService('WebRoot', function ($c) {
+            return $c->query('ServerContainer')->getWebRoot();
+        });
+
+        $this->registerService('OC_Defaults', function ($c) {
+            return $c->getServer()->getThemingDefaults();
+        });
+
+        $this->registerService(IConfig::class, function ($c) {
+            return $c->query(OC\GlobalScale\Config::class);
+        });
+
+        $this->registerService('Protocol', function($c){
+            /** @var \OC\Server $server */
+            $server = $c->query('ServerContainer');
+            $protocol = $server->getRequest()->getHttpProtocol();
+            return new Http($_SERVER, $protocol);
+        });
+
+        $this->registerService('Dispatcher', function($c) {
+            return new Dispatcher(
+                $c['Protocol'],
+                $c['MiddlewareDispatcher'],
+                $c->query(IControllerMethodReflector::class),
+                $c['Request']
+            );
+        });
+
+        /**
+         * App Framework default arguments
+         */
+        $this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
+        $this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
+        $this->registerParameter('corsMaxAge', 1728000);
+
+        /**
+         * Middleware
+         */
+        $this->registerService('MiddlewareDispatcher', function(SimpleContainer $c) {
+            $server =  $this->getServer();
+
+            $dispatcher = new MiddlewareDispatcher();
+            $dispatcher->registerMiddleware(
+                $c->query(OC\AppFramework\Middleware\Security\ReloadExecutionMiddleware::class)
+            );
+
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
+                    $c->query(IRequest::class),
+                    $c->query(IControllerMethodReflector::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new CORSMiddleware(
+                    $c->query(IRequest::class),
+                    $c->query(IControllerMethodReflector::class),
+                    $c->query(IUserSession::class),
+                    $c->query(OC\Security\Bruteforce\Throttler::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OCSMiddleware(
+                    $c->query(IRequest::class)
+                )
+            );
+
+            $securityMiddleware = new SecurityMiddleware(
+                $c->query(IRequest::class),
+                $c->query(IControllerMethodReflector::class),
+                $c->query(INavigationManager::class),
+                $c->query(IURLGenerator::class),
+                $server->getLogger(),
+                $c['AppName'],
+                $server->getUserSession()->isLoggedIn(),
+                $server->getGroupManager()->isAdmin($this->getUserId()),
+                $server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
+                $server->getAppManager(),
+                $server->getL10N('lib')
+            );
+            $dispatcher->registerMiddleware($securityMiddleware);
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\CSPMiddleware(
+                    $server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
+                    $server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
+                    $server->query(OC\Security\CSRF\CsrfTokenManager::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                $server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
+                    $c->query(IControllerMethodReflector::class),
+                    $c->query(ISession::class),
+                    $c->query(IUserSession::class),
+                    $c->query(ITimeFactory::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new TwoFactorMiddleware(
+                    $c->query(OC\Authentication\TwoFactorAuth\Manager::class),
+                    $c->query(IUserSession::class),
+                    $c->query(ISession::class),
+                    $c->query(IURLGenerator::class),
+                    $c->query(IControllerMethodReflector::class),
+                    $c->query(IRequest::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
+                    $c->query(IControllerMethodReflector::class),
+                    $c->query(OC\Security\Bruteforce\Throttler::class),
+                    $c->query(IRequest::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new RateLimitingMiddleware(
+                    $c->query(IRequest::class),
+                    $c->query(IUserSession::class),
+                    $c->query(IControllerMethodReflector::class),
+                    $c->query(OC\Security\RateLimiting\Limiter::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
+                    $c->query(IRequest::class),
+                    $c->query(ISession::class),
+                    $c->query(\OCP\IConfig::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                $c->query(\OC\AppFramework\Middleware\AdditionalScriptsMiddleware::class)
+            );
+
+            foreach($this->middleWares as $middleWare) {
+                $dispatcher->registerMiddleware($c->query($middleWare));
+            }
+
+            $dispatcher->registerMiddleware(
+                new SessionMiddleware(
+                    $c->query(IControllerMethodReflector::class),
+                    $c->query(ISession::class)
+                )
+            );
+            return $dispatcher;
+        });
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, OC\Collaboration\Resources\Manager::class);
+    }
+
+    /**
+     * @return \OCP\IServerContainer
+     */
+    public function getServer()
+    {
+        return $this->server;
+    }
+
+    /**
+     * @param string $middleWare
+     * @return boolean|null
+     */
+    public function registerMiddleWare($middleWare) {
+        if (in_array($middleWare, $this->middleWares, true) !== false) {
+            return false;
+        }
+        $this->middleWares[] = $middleWare;
+    }
+
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     */
+    public function getAppName() {
+        return $this->query('AppName');
+    }
+
+    /**
+     * @deprecated use IUserSession->isLoggedIn()
+     * @return boolean
+     */
+    public function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * @deprecated use IGroupManager->isAdmin($userId)
+     * @return boolean
+     */
+    public function isAdminUser() {
+        $uid = $this->getUserId();
+        return \OC_User::isAdminUser($uid);
+    }
+
+    private function getUserId() {
+        return $this->getServer()->getSession()->get('user_id');
+    }
+
+    /**
+     * @deprecated use the ILogger instead
+     * @param string $message
+     * @param string $level
+     * @return mixed
+     */
+    public function log($message, $level) {
+        switch($level){
+            case 'debug':
+                $level = ILogger::DEBUG;
+                break;
+            case 'info':
+                $level = ILogger::INFO;
+                break;
+            case 'warn':
+                $level = ILogger::WARN;
+                break;
+            case 'fatal':
+                $level = ILogger::FATAL;
+                break;
+            default:
+                $level = ILogger::ERROR;
+                break;
+        }
+        \OCP\Util::writeLog($this->getAppName(), $message, $level);
+    }
+
+    /**
+     * Register a capability
+     *
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+     */
+    public function registerCapability($serviceName) {
+        $this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
+            return $this->query($serviceName);
+        });
+    }
+
+    public function query(string $name, bool $autoload = true) {
+        try {
+            return $this->queryNoFallback($name);
+        } catch (QueryException $firstException) {
+            try {
+                return $this->getServer()->query($name, $autoload);
+            } catch (QueryException $secondException) {
+                if ($firstException->getCode() === 1) {
+                    throw $secondException;
+                }
+                throw $firstException;
+            }
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     */
+    public function queryNoFallback($name) {
+        $name = $this->sanitizeName($name);
+
+        if ($this->offsetExists($name)) {
+            return parent::query($name);
+        } else {
+            if ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
+                return parent::query($name);
+            } else if ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
+                return parent::query($name);
+            } else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
+                return parent::query($name);
+            }
+        }
+
+        throw new QueryException('Could not resolve ' . $name . '!' .
+            ' Class can not be instantiated', 1);
+    }
 }

lib/private/AppFramework/Http.php

Indentation +115 added lines, -115 removed lines

@@ -33,121 +33,121 @@
 
 class Http extends BaseHttp {
 
-	private $server;
-	private $protocolVersion;
-	protected $headers;
-
-	/**
-	 * @param array $server $_SERVER
-	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
-	 */
-	public function __construct($server, $protocolVersion='HTTP/1.1') {
-		$this->server = $server;
-		$this->protocolVersion = $protocolVersion;
-
-		$this->headers = [
-			self::STATUS_CONTINUE => 'Continue',
-			self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
-			self::STATUS_PROCESSING => 'Processing',
-			self::STATUS_OK => 'OK',
-			self::STATUS_CREATED => 'Created',
-			self::STATUS_ACCEPTED => 'Accepted',
-			self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
-			self::STATUS_NO_CONTENT => 'No Content',
-			self::STATUS_RESET_CONTENT => 'Reset Content',
-			self::STATUS_PARTIAL_CONTENT => 'Partial Content',
-			self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
-			self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
-			self::STATUS_IM_USED => 'IM Used', // RFC 3229
-			self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
-			self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
-			self::STATUS_FOUND => 'Found',
-			self::STATUS_SEE_OTHER => 'See Other',
-			self::STATUS_NOT_MODIFIED => 'Not Modified',
-			self::STATUS_USE_PROXY => 'Use Proxy',
-			self::STATUS_RESERVED => 'Reserved',
-			self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
-			self::STATUS_BAD_REQUEST => 'Bad request',
-			self::STATUS_UNAUTHORIZED => 'Unauthorized',
-			self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
-			self::STATUS_FORBIDDEN => 'Forbidden',
-			self::STATUS_NOT_FOUND => 'Not Found',
-			self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
-			self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
-			self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-			self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
-			self::STATUS_CONFLICT => 'Conflict',
-			self::STATUS_GONE => 'Gone',
-			self::STATUS_LENGTH_REQUIRED => 'Length Required',
-			self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
-			self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-			self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-			self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-			self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-			self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
-			self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
-			self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
-			self::STATUS_LOCKED => 'Locked', // RFC 4918
-			self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
-			self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
-			self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
-			self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
-			self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-			self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
-			self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
-			self::STATUS_BAD_GATEWAY => 'Bad Gateway',
-			self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
-			self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
-			self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
-			self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
-			self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
-			self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
-			self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
-			self::STATUS_NOT_EXTENDED => 'Not extended',
-			self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
-		];
-	}
-
-
-	/**
-	 * Gets the correct header
-	 * @param int Http::CONSTANT $status the constant from the Http class
-	 * @param \DateTime $lastModified formatted last modified date
-	 * @param string $ETag the etag
-	 * @return string
-	 */
-	public function getStatusHeader($status, \DateTime $lastModified=null, 
-	                                $ETag=null) {
-
-		if(!is_null($lastModified)) {
-			$lastModified = $lastModified->format(\DateTime::RFC2822);
-		}
-
-		// if etag or lastmodified have not changed, return a not modified
-		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
-
-			||
-
-			(isset($this->server['HTTP_IF_MODIFIED_SINCE'])
-			&& trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
-				$lastModified)) {
-
-			$status = self::STATUS_NOT_MODIFIED;
-		}
-
-		// we have one change currently for the http 1.0 header that differs
-		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
-		// if this differs any more, we want to create childclasses for this
-		if($status === self::STATUS_TEMPORARY_REDIRECT 
-			&& $this->protocolVersion === 'HTTP/1.0') {
-
-			$status = self::STATUS_FOUND;
-		}
-
-		return $this->protocolVersion . ' ' . $status . ' ' . 
-			$this->headers[$status];
-	}
+    private $server;
+    private $protocolVersion;
+    protected $headers;
+
+    /**
+     * @param array $server $_SERVER
+     * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+     */
+    public function __construct($server, $protocolVersion='HTTP/1.1') {
+        $this->server = $server;
+        $this->protocolVersion = $protocolVersion;
+
+        $this->headers = [
+            self::STATUS_CONTINUE => 'Continue',
+            self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+            self::STATUS_PROCESSING => 'Processing',
+            self::STATUS_OK => 'OK',
+            self::STATUS_CREATED => 'Created',
+            self::STATUS_ACCEPTED => 'Accepted',
+            self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+            self::STATUS_NO_CONTENT => 'No Content',
+            self::STATUS_RESET_CONTENT => 'Reset Content',
+            self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+            self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+            self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+            self::STATUS_IM_USED => 'IM Used', // RFC 3229
+            self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+            self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+            self::STATUS_FOUND => 'Found',
+            self::STATUS_SEE_OTHER => 'See Other',
+            self::STATUS_NOT_MODIFIED => 'Not Modified',
+            self::STATUS_USE_PROXY => 'Use Proxy',
+            self::STATUS_RESERVED => 'Reserved',
+            self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+            self::STATUS_BAD_REQUEST => 'Bad request',
+            self::STATUS_UNAUTHORIZED => 'Unauthorized',
+            self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+            self::STATUS_FORBIDDEN => 'Forbidden',
+            self::STATUS_NOT_FOUND => 'Not Found',
+            self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+            self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+            self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+            self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+            self::STATUS_CONFLICT => 'Conflict',
+            self::STATUS_GONE => 'Gone',
+            self::STATUS_LENGTH_REQUIRED => 'Length Required',
+            self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+            self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+            self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+            self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+            self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+            self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+            self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+            self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+            self::STATUS_LOCKED => 'Locked', // RFC 4918
+            self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+            self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+            self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+            self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+            self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+            self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+            self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+            self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+            self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+            self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+            self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+            self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+            self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+            self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+            self::STATUS_NOT_EXTENDED => 'Not extended',
+            self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+        ];
+    }
+
+
+    /**
+     * Gets the correct header
+     * @param int Http::CONSTANT $status the constant from the Http class
+     * @param \DateTime $lastModified formatted last modified date
+     * @param string $ETag the etag
+     * @return string
+     */
+    public function getStatusHeader($status, \DateTime $lastModified=null, 
+                                    $ETag=null) {
+
+        if(!is_null($lastModified)) {
+            $lastModified = $lastModified->format(\DateTime::RFC2822);
+        }
+
+        // if etag or lastmodified have not changed, return a not modified
+        if ((isset($this->server['HTTP_IF_NONE_MATCH'])
+            && trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
+
+            ||
+
+            (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
+            && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
+                $lastModified)) {
+
+            $status = self::STATUS_NOT_MODIFIED;
+        }
+
+        // we have one change currently for the http 1.0 header that differs
+        // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+        // if this differs any more, we want to create childclasses for this
+        if($status === self::STATUS_TEMPORARY_REDIRECT 
+            && $this->protocolVersion === 'HTTP/1.0') {
+
+            $status = self::STATUS_FOUND;
+        }
+
+        return $this->protocolVersion . ' ' . $status . ' ' . 
+            $this->headers[$status];
+    }
 
 
 }

lib/private/App/AppManager.php

Indentation +537 added lines, -537 removed lines

@@ -52,541 +52,541 @@
 
 class AppManager implements IAppManager {
 
-	/**
-	 * Apps with these types can not be enabled for certain groups only
-	 * @var string[]
-	 */
-	protected $protectedAppTypes = [
-		'filesystem',
-		'prelogin',
-		'authentication',
-		'logging',
-		'prevent_group_restriction',
-	];
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var AppConfig */
-	private $appConfig;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var ICacheFactory */
-	private $memCacheFactory;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string[] $appId => $enabled */
-	private $installedAppsCache;
-
-	/** @var string[] */
-	private $shippedApps;
-
-	/** @var string[] */
-	private $alwaysEnabled;
-
-	/** @var array */
-	private $appInfos = [];
-
-	/** @var array */
-	private $appVersions = [];
-
-	/** @var array */
-	private $autoDisabledApps = [];
-
-	/**
-	 * @param IUserSession $userSession
-	 * @param IConfig $config
-	 * @param AppConfig $appConfig
-	 * @param IGroupManager $groupManager
-	 * @param ICacheFactory $memCacheFactory
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(IUserSession $userSession,
-								IConfig $config,
-								AppConfig $appConfig,
-								IGroupManager $groupManager,
-								ICacheFactory $memCacheFactory,
-								EventDispatcherInterface $dispatcher,
-								ILogger $logger) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-		$this->appConfig = $appConfig;
-		$this->groupManager = $groupManager;
-		$this->memCacheFactory = $memCacheFactory;
-		$this->dispatcher = $dispatcher;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @return string[] $appId => $enabled
-	 */
-	private function getInstalledAppsValues() {
-		if (!$this->installedAppsCache) {
-			$values = $this->appConfig->getValues(false, 'enabled');
-
-			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
-			foreach($alwaysEnabledApps as $appId) {
-				$values[$appId] = 'yes';
-			}
-
-			$this->installedAppsCache = array_filter($values, function ($value) {
-				return $value !== 'no';
-			});
-			ksort($this->installedAppsCache);
-		}
-		return $this->installedAppsCache;
-	}
-
-	/**
-	 * List all installed apps
-	 *
-	 * @return string[]
-	 */
-	public function getInstalledApps() {
-		return array_keys($this->getInstalledAppsValues());
-	}
-
-	/**
-	 * List all apps enabled for a user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return string[]
-	 */
-	public function getEnabledAppsForUser(IUser $user) {
-		$apps = $this->getInstalledAppsValues();
-		$appsForUser = array_filter($apps, function ($enabled) use ($user) {
-			return $this->checkAppForUser($enabled, $user);
-		});
-		return array_keys($appsForUser);
-	}
-
-	/**
-	 * @param \OCP\IGroup $group
-	 * @return array
-	 */
-	public function getEnabledAppsForGroup(IGroup $group): array {
-		$apps = $this->getInstalledAppsValues();
-		$appsForGroups = array_filter($apps, function ($enabled) use ($group) {
-			return $this->checkAppForGroups($enabled, $group);
-		});
-		return array_keys($appsForGroups);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAutoDisabledApps(): array {
-		return $this->autoDisabledApps;
-	}
-
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function getAppRestriction(string $appId): array {
-		$values = $this->getInstalledAppsValues();
-
-		if (!isset($values[$appId])) {
-			return [];
-		}
-
-		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
-			return [];
-		}
-		return json_decode($values[$appId]);
-	}
-
-
-	/**
-	 * Check if an app is enabled for user
-	 *
-	 * @param string $appId
-	 * @param \OCP\IUser $user (optional) if not defined, the currently logged in user will be used
-	 * @return bool
-	 */
-	public function isEnabledForUser($appId, $user = null) {
-		if ($this->isAlwaysEnabled($appId)) {
-			return true;
-		}
-		if ($user === null) {
-			$user = $this->userSession->getUser();
-		}
-		$installedApps = $this->getInstalledAppsValues();
-		if (isset($installedApps[$appId])) {
-			return $this->checkAppForUser($installedApps[$appId], $user);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $enabled
-	 * @param IUser $user
-	 * @return bool
-	 */
-	private function checkAppForUser($enabled, $user) {
-		if ($enabled === 'yes') {
-			return true;
-		} elseif ($user === null) {
-			return false;
-		} else {
-			if(empty($enabled)){
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
-				return false;
-			}
-
-			$userGroups = $this->groupManager->getUserGroupIds($user);
-			foreach ($userGroups as $groupId) {
-				if (in_array($groupId, $groupIds, true)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $enabled
-	 * @param IGroup $group
-	 * @return bool
-	 */
-	private function checkAppForGroups(string $enabled, IGroup $group): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} elseif ($group === null) {
-			return false;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
-				return false;
-			}
-
-			return in_array($group->getGID(), $groupIds);
-		}
-	}
-
-	/**
-	 * Check if an app is enabled in the instance
-	 *
-	 * Notice: This actually checks if the app is enabled and not only if it is installed.
-	 *
-	 * @param string $appId
-	 * @param \OCP\IGroup[]|String[] $groups
-	 * @return bool
-	 */
-	public function isInstalled($appId) {
-		$installedApps = $this->getInstalledAppsValues();
-		return isset($installedApps[$appId]);
-	}
-
-	public function ignoreNextcloudRequirementForApp(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		if (!in_array($appId, $ignoreMaxApps, true)) {
-			$ignoreMaxApps[] = $appId;
-			$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-		}
-	}
-
-	/**
-	 * Enable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $forceEnable
-	 * @throws AppPathNotFoundException
-	 */
-	public function enableApp(string $appId, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		if ($forceEnable) {
-			$this->ignoreNextcloudRequirementForApp($appId);
-		}
-
-		$this->installedAppsCache[$appId] = 'yes';
-		$this->appConfig->setValue($appId, 'enabled', 'yes');
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE, $appId
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Whether a list of types contains a protected app type
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 */
-	public function hasProtectedAppType($types) {
-		if (empty($types)) {
-			return false;
-		}
-
-		$protectedTypes = array_intersect($this->protectedAppTypes, $types);
-		return !empty($protectedTypes);
-	}
-
-	/**
-	 * Enable an app only for specific groups
-	 *
-	 * @param string $appId
-	 * @param \OCP\IGroup[] $groups
-	 * @param bool $forceEnable
-	 * @throws \InvalidArgumentException if app can't be enabled for groups
-	 * @throws AppPathNotFoundException
-	 */
-	public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		$info = $this->getAppInfo($appId);
-		if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
-			throw new \InvalidArgumentException("$appId can't be enabled for groups.");
-		}
-
-		if ($forceEnable) {
-			$this->ignoreNextcloudRequirementForApp($appId);
-		}
-
-		$groupIds = array_map(function ($group) {
-			/** @var \OCP\IGroup $group */
-			return ($group instanceof IGroup)
-				? $group->getGID()
-				: $group;
-		}, $groups);
-
-		$this->installedAppsCache[$appId] = json_encode($groupIds);
-		$this->appConfig->setValue($appId, 'enabled', json_encode($groupIds));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
-		));
-		$this->clearAppsCache();
-
-	}
-
-	/**
-	 * Disable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $automaticDisabled
-	 * @throws \Exception if app can't be disabled
-	 */
-	public function disableApp($appId, $automaticDisabled = false) {
-		if ($this->isAlwaysEnabled($appId)) {
-			throw new \Exception("$appId can't be disabled.");
-		}
-
-		if ($automaticDisabled) {
-			$this->autoDisabledApps[] = $appId;
-		}
-
-		unset($this->installedAppsCache[$appId]);
-		$this->appConfig->setValue($appId, 'enabled', 'no');
-
-		// run uninstall steps
-		$appData = $this->getAppInfo($appId);
-		if (!is_null($appData)) {
-			\OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
-		}
-
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_DISABLE, $appId
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Get the directory for the given app.
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws AppPathNotFoundException if app folder can't be found
-	 */
-	public function getAppPath($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if($appPath === false) {
-			throw new AppPathNotFoundException('Could not find path for ' . $appId);
-		}
-		return $appPath;
-	}
-
-	/**
-	 * Get the web path for the given app.
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws AppPathNotFoundException if app path can't be found
-	 */
-	public function getAppWebPath(string $appId): string {
-		$appWebPath = \OC_App::getAppWebPath($appId);
-		if($appWebPath === false) {
-			throw new AppPathNotFoundException('Could not find web path for ' . $appId);
-		}
-		return $appWebPath;
-	}
-
-	/**
-	 * Clear the cached list of apps when enabling/disabling an app
-	 */
-	public function clearAppsCache() {
-		$settingsMemCache = $this->memCacheFactory->createDistributed('settings');
-		$settingsMemCache->clear('listApps');
-		$this->appInfos = [];
-	}
-
-	/**
-	 * Returns a list of apps that need upgrade
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 * @return array list of app info from apps that need an upgrade
-	 *
-	 * @internal
-	 */
-	public function getAppsNeedingUpgrade($version) {
-		$appsToUpgrade = [];
-		$apps = $this->getInstalledApps();
-		foreach ($apps as $appId) {
-			$appInfo = $this->getAppInfo($appId);
-			$appDbVersion = $this->appConfig->getValue($appId, 'installed_version');
-			if ($appDbVersion
-				&& isset($appInfo['version'])
-				&& version_compare($appInfo['version'], $appDbVersion, '>')
-				&& \OC_App::isAppCompatible($version, $appInfo)
-			) {
-				$appsToUpgrade[] = $appInfo;
-			}
-		}
-
-		return $appsToUpgrade;
-	}
-
-	/**
-	 * Returns the app information from "appinfo/info.xml".
-	 *
-	 * @param string $appId app id
-	 *
-	 * @param bool $path
-	 * @param null $lang
-	 * @return array|null app info
-	 */
-	public function getAppInfo(string $appId, bool $path = false, $lang = null) {
-		if ($path) {
-			$file = $appId;
-		} else {
-			if ($lang === null && isset($this->appInfos[$appId])) {
-				return $this->appInfos[$appId];
-			}
-			try {
-				$appPath = $this->getAppPath($appId);
-			} catch (AppPathNotFoundException $e) {
-				return null;
-			}
-			$file = $appPath . '/appinfo/info.xml';
-		}
-
-		$parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
-		$data = $parser->parse($file);
-
-		if (is_array($data)) {
-			$data = \OC_App::parseAppInfo($data, $lang);
-		}
-
-		if ($lang === null) {
-			$this->appInfos[$appId] = $data;
-		}
-
-		return $data;
-	}
-
-	public function getAppVersion(string $appId, bool $useCache = true): string {
-		if(!$useCache || !isset($this->appVersions[$appId])) {
-			$appInfo = $this->getAppInfo($appId);
-			$this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
-		}
-		return $this->appVersions[$appId];
-	}
-
-	/**
-	 * Returns a list of apps incompatible with the given version
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 *
-	 * @return array list of app info from incompatible apps
-	 *
-	 * @internal
-	 */
-	public function getIncompatibleApps(string $version): array {
-		$apps = $this->getInstalledApps();
-		$incompatibleApps = [];
-		foreach ($apps as $appId) {
-			$info = $this->getAppInfo($appId);
-			if ($info === null) {
-				$incompatibleApps[] = ['id' => $appId];
-			} else if (!\OC_App::isAppCompatible($version, $info)) {
-				$incompatibleApps[] = $info;
-			}
-		}
-		return $incompatibleApps;
-	}
-
-	/**
-	 * @inheritdoc
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
-	 */
-	public function isShipped($appId) {
-		$this->loadShippedJson();
-		return in_array($appId, $this->shippedApps, true);
-	}
-
-	private function isAlwaysEnabled($appId) {
-		$alwaysEnabled = $this->getAlwaysEnabledApps();
-		return in_array($appId, $alwaysEnabled, true);
-	}
-
-	/**
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
-	 * @throws \Exception
-	 */
-	private function loadShippedJson() {
-		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
-			if (!file_exists($shippedJson)) {
-				throw new \Exception("File not found: $shippedJson");
-			}
-			$content = json_decode(file_get_contents($shippedJson), true);
-			$this->shippedApps = $content['shippedApps'];
-			$this->alwaysEnabled = $content['alwaysEnabled'];
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAlwaysEnabledApps() {
-		$this->loadShippedJson();
-		return $this->alwaysEnabled;
-	}
+    /**
+     * Apps with these types can not be enabled for certain groups only
+     * @var string[]
+     */
+    protected $protectedAppTypes = [
+        'filesystem',
+        'prelogin',
+        'authentication',
+        'logging',
+        'prevent_group_restriction',
+    ];
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var AppConfig */
+    private $appConfig;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var ICacheFactory */
+    private $memCacheFactory;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string[] $appId => $enabled */
+    private $installedAppsCache;
+
+    /** @var string[] */
+    private $shippedApps;
+
+    /** @var string[] */
+    private $alwaysEnabled;
+
+    /** @var array */
+    private $appInfos = [];
+
+    /** @var array */
+    private $appVersions = [];
+
+    /** @var array */
+    private $autoDisabledApps = [];
+
+    /**
+     * @param IUserSession $userSession
+     * @param IConfig $config
+     * @param AppConfig $appConfig
+     * @param IGroupManager $groupManager
+     * @param ICacheFactory $memCacheFactory
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(IUserSession $userSession,
+                                IConfig $config,
+                                AppConfig $appConfig,
+                                IGroupManager $groupManager,
+                                ICacheFactory $memCacheFactory,
+                                EventDispatcherInterface $dispatcher,
+                                ILogger $logger) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+        $this->appConfig = $appConfig;
+        $this->groupManager = $groupManager;
+        $this->memCacheFactory = $memCacheFactory;
+        $this->dispatcher = $dispatcher;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @return string[] $appId => $enabled
+     */
+    private function getInstalledAppsValues() {
+        if (!$this->installedAppsCache) {
+            $values = $this->appConfig->getValues(false, 'enabled');
+
+            $alwaysEnabledApps = $this->getAlwaysEnabledApps();
+            foreach($alwaysEnabledApps as $appId) {
+                $values[$appId] = 'yes';
+            }
+
+            $this->installedAppsCache = array_filter($values, function ($value) {
+                return $value !== 'no';
+            });
+            ksort($this->installedAppsCache);
+        }
+        return $this->installedAppsCache;
+    }
+
+    /**
+     * List all installed apps
+     *
+     * @return string[]
+     */
+    public function getInstalledApps() {
+        return array_keys($this->getInstalledAppsValues());
+    }
+
+    /**
+     * List all apps enabled for a user
+     *
+     * @param \OCP\IUser $user
+     * @return string[]
+     */
+    public function getEnabledAppsForUser(IUser $user) {
+        $apps = $this->getInstalledAppsValues();
+        $appsForUser = array_filter($apps, function ($enabled) use ($user) {
+            return $this->checkAppForUser($enabled, $user);
+        });
+        return array_keys($appsForUser);
+    }
+
+    /**
+     * @param \OCP\IGroup $group
+     * @return array
+     */
+    public function getEnabledAppsForGroup(IGroup $group): array {
+        $apps = $this->getInstalledAppsValues();
+        $appsForGroups = array_filter($apps, function ($enabled) use ($group) {
+            return $this->checkAppForGroups($enabled, $group);
+        });
+        return array_keys($appsForGroups);
+    }
+
+    /**
+     * @return array
+     */
+    public function getAutoDisabledApps(): array {
+        return $this->autoDisabledApps;
+    }
+
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function getAppRestriction(string $appId): array {
+        $values = $this->getInstalledAppsValues();
+
+        if (!isset($values[$appId])) {
+            return [];
+        }
+
+        if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
+            return [];
+        }
+        return json_decode($values[$appId]);
+    }
+
+
+    /**
+     * Check if an app is enabled for user
+     *
+     * @param string $appId
+     * @param \OCP\IUser $user (optional) if not defined, the currently logged in user will be used
+     * @return bool
+     */
+    public function isEnabledForUser($appId, $user = null) {
+        if ($this->isAlwaysEnabled($appId)) {
+            return true;
+        }
+        if ($user === null) {
+            $user = $this->userSession->getUser();
+        }
+        $installedApps = $this->getInstalledAppsValues();
+        if (isset($installedApps[$appId])) {
+            return $this->checkAppForUser($installedApps[$appId], $user);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $enabled
+     * @param IUser $user
+     * @return bool
+     */
+    private function checkAppForUser($enabled, $user) {
+        if ($enabled === 'yes') {
+            return true;
+        } elseif ($user === null) {
+            return false;
+        } else {
+            if(empty($enabled)){
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
+                return false;
+            }
+
+            $userGroups = $this->groupManager->getUserGroupIds($user);
+            foreach ($userGroups as $groupId) {
+                if (in_array($groupId, $groupIds, true)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * @param string $enabled
+     * @param IGroup $group
+     * @return bool
+     */
+    private function checkAppForGroups(string $enabled, IGroup $group): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } elseif ($group === null) {
+            return false;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
+                return false;
+            }
+
+            return in_array($group->getGID(), $groupIds);
+        }
+    }
+
+    /**
+     * Check if an app is enabled in the instance
+     *
+     * Notice: This actually checks if the app is enabled and not only if it is installed.
+     *
+     * @param string $appId
+     * @param \OCP\IGroup[]|String[] $groups
+     * @return bool
+     */
+    public function isInstalled($appId) {
+        $installedApps = $this->getInstalledAppsValues();
+        return isset($installedApps[$appId]);
+    }
+
+    public function ignoreNextcloudRequirementForApp(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        if (!in_array($appId, $ignoreMaxApps, true)) {
+            $ignoreMaxApps[] = $appId;
+            $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+        }
+    }
+
+    /**
+     * Enable an app for every user
+     *
+     * @param string $appId
+     * @param bool $forceEnable
+     * @throws AppPathNotFoundException
+     */
+    public function enableApp(string $appId, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        if ($forceEnable) {
+            $this->ignoreNextcloudRequirementForApp($appId);
+        }
+
+        $this->installedAppsCache[$appId] = 'yes';
+        $this->appConfig->setValue($appId, 'enabled', 'yes');
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE, $appId
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Whether a list of types contains a protected app type
+     *
+     * @param string[] $types
+     * @return bool
+     */
+    public function hasProtectedAppType($types) {
+        if (empty($types)) {
+            return false;
+        }
+
+        $protectedTypes = array_intersect($this->protectedAppTypes, $types);
+        return !empty($protectedTypes);
+    }
+
+    /**
+     * Enable an app only for specific groups
+     *
+     * @param string $appId
+     * @param \OCP\IGroup[] $groups
+     * @param bool $forceEnable
+     * @throws \InvalidArgumentException if app can't be enabled for groups
+     * @throws AppPathNotFoundException
+     */
+    public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        $info = $this->getAppInfo($appId);
+        if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
+            throw new \InvalidArgumentException("$appId can't be enabled for groups.");
+        }
+
+        if ($forceEnable) {
+            $this->ignoreNextcloudRequirementForApp($appId);
+        }
+
+        $groupIds = array_map(function ($group) {
+            /** @var \OCP\IGroup $group */
+            return ($group instanceof IGroup)
+                ? $group->getGID()
+                : $group;
+        }, $groups);
+
+        $this->installedAppsCache[$appId] = json_encode($groupIds);
+        $this->appConfig->setValue($appId, 'enabled', json_encode($groupIds));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
+        ));
+        $this->clearAppsCache();
+
+    }
+
+    /**
+     * Disable an app for every user
+     *
+     * @param string $appId
+     * @param bool $automaticDisabled
+     * @throws \Exception if app can't be disabled
+     */
+    public function disableApp($appId, $automaticDisabled = false) {
+        if ($this->isAlwaysEnabled($appId)) {
+            throw new \Exception("$appId can't be disabled.");
+        }
+
+        if ($automaticDisabled) {
+            $this->autoDisabledApps[] = $appId;
+        }
+
+        unset($this->installedAppsCache[$appId]);
+        $this->appConfig->setValue($appId, 'enabled', 'no');
+
+        // run uninstall steps
+        $appData = $this->getAppInfo($appId);
+        if (!is_null($appData)) {
+            \OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
+        }
+
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_DISABLE, $appId
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Get the directory for the given app.
+     *
+     * @param string $appId
+     * @return string
+     * @throws AppPathNotFoundException if app folder can't be found
+     */
+    public function getAppPath($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if($appPath === false) {
+            throw new AppPathNotFoundException('Could not find path for ' . $appId);
+        }
+        return $appPath;
+    }
+
+    /**
+     * Get the web path for the given app.
+     *
+     * @param string $appId
+     * @return string
+     * @throws AppPathNotFoundException if app path can't be found
+     */
+    public function getAppWebPath(string $appId): string {
+        $appWebPath = \OC_App::getAppWebPath($appId);
+        if($appWebPath === false) {
+            throw new AppPathNotFoundException('Could not find web path for ' . $appId);
+        }
+        return $appWebPath;
+    }
+
+    /**
+     * Clear the cached list of apps when enabling/disabling an app
+     */
+    public function clearAppsCache() {
+        $settingsMemCache = $this->memCacheFactory->createDistributed('settings');
+        $settingsMemCache->clear('listApps');
+        $this->appInfos = [];
+    }
+
+    /**
+     * Returns a list of apps that need upgrade
+     *
+     * @param string $version Nextcloud version as array of version components
+     * @return array list of app info from apps that need an upgrade
+     *
+     * @internal
+     */
+    public function getAppsNeedingUpgrade($version) {
+        $appsToUpgrade = [];
+        $apps = $this->getInstalledApps();
+        foreach ($apps as $appId) {
+            $appInfo = $this->getAppInfo($appId);
+            $appDbVersion = $this->appConfig->getValue($appId, 'installed_version');
+            if ($appDbVersion
+                && isset($appInfo['version'])
+                && version_compare($appInfo['version'], $appDbVersion, '>')
+                && \OC_App::isAppCompatible($version, $appInfo)
+            ) {
+                $appsToUpgrade[] = $appInfo;
+            }
+        }
+
+        return $appsToUpgrade;
+    }
+
+    /**
+     * Returns the app information from "appinfo/info.xml".
+     *
+     * @param string $appId app id
+     *
+     * @param bool $path
+     * @param null $lang
+     * @return array|null app info
+     */
+    public function getAppInfo(string $appId, bool $path = false, $lang = null) {
+        if ($path) {
+            $file = $appId;
+        } else {
+            if ($lang === null && isset($this->appInfos[$appId])) {
+                return $this->appInfos[$appId];
+            }
+            try {
+                $appPath = $this->getAppPath($appId);
+            } catch (AppPathNotFoundException $e) {
+                return null;
+            }
+            $file = $appPath . '/appinfo/info.xml';
+        }
+
+        $parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
+        $data = $parser->parse($file);
+
+        if (is_array($data)) {
+            $data = \OC_App::parseAppInfo($data, $lang);
+        }
+
+        if ($lang === null) {
+            $this->appInfos[$appId] = $data;
+        }
+
+        return $data;
+    }
+
+    public function getAppVersion(string $appId, bool $useCache = true): string {
+        if(!$useCache || !isset($this->appVersions[$appId])) {
+            $appInfo = $this->getAppInfo($appId);
+            $this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
+        }
+        return $this->appVersions[$appId];
+    }
+
+    /**
+     * Returns a list of apps incompatible with the given version
+     *
+     * @param string $version Nextcloud version as array of version components
+     *
+     * @return array list of app info from incompatible apps
+     *
+     * @internal
+     */
+    public function getIncompatibleApps(string $version): array {
+        $apps = $this->getInstalledApps();
+        $incompatibleApps = [];
+        foreach ($apps as $appId) {
+            $info = $this->getAppInfo($appId);
+            if ($info === null) {
+                $incompatibleApps[] = ['id' => $appId];
+            } else if (!\OC_App::isAppCompatible($version, $info)) {
+                $incompatibleApps[] = $info;
+            }
+        }
+        return $incompatibleApps;
+    }
+
+    /**
+     * @inheritdoc
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
+     */
+    public function isShipped($appId) {
+        $this->loadShippedJson();
+        return in_array($appId, $this->shippedApps, true);
+    }
+
+    private function isAlwaysEnabled($appId) {
+        $alwaysEnabled = $this->getAlwaysEnabledApps();
+        return in_array($appId, $alwaysEnabled, true);
+    }
+
+    /**
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
+     * @throws \Exception
+     */
+    private function loadShippedJson() {
+        if ($this->shippedApps === null) {
+            $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+            if (!file_exists($shippedJson)) {
+                throw new \Exception("File not found: $shippedJson");
+            }
+            $content = json_decode(file_get_contents($shippedJson), true);
+            $this->shippedApps = $content['shippedApps'];
+            $this->alwaysEnabled = $content['alwaysEnabled'];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAlwaysEnabledApps() {
+        $this->loadShippedJson();
+        return $this->alwaysEnabled;
+    }
 }

lib/private/App/DependencyAnalyzer.php

Indentation +343 added lines, -343 removed lines

@@ -34,347 +34,347 @@
 
 class DependencyAnalyzer {
 
-	/** @var Platform */
-	private $platform;
-	/** @var \OCP\IL10N */
-	private $l;
-	/** @var array */
-	private $appInfo;
-
-	/**
-	 * @param Platform $platform
-	 * @param \OCP\IL10N $l
-	 */
-	public function __construct(Platform $platform, IL10N $l) {
-		$this->platform = $platform;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param array $app
-	 * @returns array of missing dependencies
-	 */
-	public function analyze(array $app, bool $ignoreMax = false) {
-		$this->appInfo = $app;
-		if (isset($app['dependencies'])) {
-			$dependencies = $app['dependencies'];
-		} else {
-			$dependencies = [];
-		}
-
-		return array_merge(
-			$this->analyzePhpVersion($dependencies),
-			$this->analyzeDatabases($dependencies),
-			$this->analyzeCommands($dependencies),
-			$this->analyzeLibraries($dependencies),
-			$this->analyzeOS($dependencies),
-			$this->analyzeOC($dependencies, $app, $ignoreMax)
-		);
-	}
-
-	public function isMarkedCompatible(array $app): bool {
-		if (isset($app['dependencies'])) {
-			$dependencies = $app['dependencies'];
-		} else {
-			$dependencies = [];
-		}
-
-		$maxVersion = $this->getMaxVersion($dependencies, $app);
-		if ($maxVersion === null) {
-			return true;
-		}
-		return !$this->compareBigger($this->platform->getOcVersion(), $maxVersion);
-	}
-
-	/**
-	 * Truncates both versions to the lowest common version, e.g.
-	 * 5.1.2.3 and 5.1 will be turned into 5.1 and 5.1,
-	 * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
-	 * @param string $first
-	 * @param string $second
-	 * @return string[] first element is the first version, second element is the
-	 * second version
-	 */
-	private function normalizeVersions($first, $second) {
-		$first = explode('.', $first);
-		$second = explode('.', $second);
-
-		// get both arrays to the same minimum size
-		$length = min(count($second), count($first));
-		$first = array_slice($first, 0, $length);
-		$second = array_slice($second, 0, $length);
-
-		return [implode('.', $first), implode('.', $second)];
-	}
-
-	/**
-	 * Parameters will be normalized and then passed into version_compare
-	 * in the same order they are specified in the method header
-	 * @param string $first
-	 * @param string $second
-	 * @param string $operator
-	 * @return bool result similar to version_compare
-	 */
-	private function compare($first, $second, $operator) {
-		// we can't normalize versions if one of the given parameters is not a
-		// version string but null. In case one parameter is null normalization
-		// will therefore be skipped
-		if ($first !== null && $second !== null) {
-			list($first, $second) = $this->normalizeVersions($first, $second);
-		}
-
-		return version_compare($first, $second, $operator);
-	}
-
-	/**
-	 * Checks if a version is bigger than another version
-	 * @param string $first
-	 * @param string $second
-	 * @return bool true if the first version is bigger than the second
-	 */
-	private function compareBigger($first, $second) {
-		return $this->compare($first, $second, '>');
-	}
-
-	/**
-	 * Checks if a version is smaller than another version
-	 * @param string $first
-	 * @param string $second
-	 * @return bool true if the first version is smaller than the second
-	 */
-	private function compareSmaller($first, $second) {
-		return $this->compare($first, $second, '<');
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzePhpVersion(array $dependencies) {
-		$missing = [];
-		if (isset($dependencies['php']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['php']['@attributes']['min-version'];
-			if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('PHP %s or higher is required.', [$minVersion]);
-			}
-		}
-		if (isset($dependencies['php']['@attributes']['max-version'])) {
-			$maxVersion = $dependencies['php']['@attributes']['max-version'];
-			if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('PHP with a version lower than %s is required.', [$maxVersion]);
-			}
-		}
-		if (isset($dependencies['php']['@attributes']['min-int-size'])) {
-			$intSize = $dependencies['php']['@attributes']['min-int-size'];
-			if ($intSize > $this->platform->getIntSize()*8) {
-				$missing[] = (string)$this->l->t('%sbit or higher PHP required.', [$intSize]);
-			}
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeDatabases(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['database'])) {
-			return $missing;
-		}
-
-		$supportedDatabases = $dependencies['database'];
-		if (empty($supportedDatabases)) {
-			return $missing;
-		}
-		if (!is_array($supportedDatabases)) {
-			$supportedDatabases = [$supportedDatabases];
-		}
-		$supportedDatabases = array_map(function ($db) {
-			return $this->getValue($db);
-		}, $supportedDatabases);
-		$currentDatabase = $this->platform->getDatabase();
-		if (!in_array($currentDatabase, $supportedDatabases)) {
-			$missing[] = (string)$this->l->t('Following databases are supported: %s', [implode(', ', $supportedDatabases)]);
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeCommands(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['command'])) {
-			return $missing;
-		}
-
-		$commands = $dependencies['command'];
-		if (!is_array($commands)) {
-			$commands = [$commands];
-		}
-		if (isset($commands['@value'])) {
-			$commands = [$commands];
-		}
-		$os = $this->platform->getOS();
-		foreach ($commands as $command) {
-			if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {
-				continue;
-			}
-			$commandName = $this->getValue($command);
-			if (!$this->platform->isCommandKnown($commandName)) {
-				$missing[] = (string)$this->l->t('The command line tool %s could not be found', [$commandName]);
-			}
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeLibraries(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['lib'])) {
-			return $missing;
-		}
-
-		$libs = $dependencies['lib'];
-		if (!is_array($libs)) {
-			$libs = [$libs];
-		}
-		if (isset($libs['@value'])) {
-			$libs = [$libs];
-		}
-		foreach ($libs as $lib) {
-			$libName = $this->getValue($lib);
-			$libVersion = $this->platform->getLibraryVersion($libName);
-			if (is_null($libVersion)) {
-				$missing[] = $this->l->t('The library %s is not available.', [$libName]);
-				continue;
-			}
-
-			if (is_array($lib)) {
-				if (isset($lib['@attributes']['min-version'])) {
-					$minVersion = $lib['@attributes']['min-version'];
-					if ($this->compareSmaller($libVersion, $minVersion)) {
-						$missing[] = $this->l->t('Library %1$s with a version higher than %2$s is required - available version %3$s.',
-							[$libName, $minVersion, $libVersion]);
-					}
-				}
-				if (isset($lib['@attributes']['max-version'])) {
-					$maxVersion = $lib['@attributes']['max-version'];
-					if ($this->compareBigger($libVersion, $maxVersion)) {
-						$missing[] = $this->l->t('Library %1$s with a version lower than %2$s is required - available version %3$s.',
-							[$libName, $maxVersion, $libVersion]);
-					}
-				}
-			}
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeOS(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['os'])) {
-			return $missing;
-		}
-
-		$oss = $dependencies['os'];
-		if (empty($oss)) {
-			return $missing;
-		}
-		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
-				return $this->getValue($os);
-			}, $oss);
-		} else {
-			$oss = [$oss];
-		}
-		$currentOS = $this->platform->getOS();
-		if (!in_array($currentOS, $oss)) {
-			$missing[] = (string)$this->l->t('Following platforms are supported: %s', [implode(', ', $oss)]);
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @param array $appInfo
-	 * @return array
-	 */
-	private function analyzeOC(array $dependencies, array $appInfo, bool $ignoreMax) {
-		$missing = [];
-		$minVersion = null;
-		if (isset($dependencies['nextcloud']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['nextcloud']['@attributes']['min-version'];
-		} elseif (isset($dependencies['owncloud']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['owncloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['requiremin'])) {
-			$minVersion = $appInfo['requiremin'];
-		} elseif (isset($appInfo['require'])) {
-			$minVersion = $appInfo['require'];
-		}
-		$maxVersion = $this->getMaxVersion($dependencies, $appInfo);
-
-		if (!is_null($minVersion)) {
-			if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or higher is required.', [$this->toVisibleVersion($minVersion)]);
-			}
-		}
-		if (!$ignoreMax && !is_null($maxVersion)) {
-			if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or lower is required.', [$this->toVisibleVersion($maxVersion)]);
-			}
-		}
-		return $missing;
-	}
-
-	private function getMaxVersion(array $dependencies, array $appInfo): ?string {
-		if (isset($dependencies['nextcloud']['@attributes']['max-version'])) {
-			return $dependencies['nextcloud']['@attributes']['max-version'];
-		}
-		if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
-			return $dependencies['owncloud']['@attributes']['max-version'];
-		}
-		if (isset($appInfo['requiremax'])) {
-			return $appInfo['requiremax'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Map the internal version number to the Nextcloud version
-	 *
-	 * @param string $version
-	 * @return string
-	 */
-	protected function toVisibleVersion($version) {
-		switch ($version) {
-			case '9.1':
-				return '10';
-			default:
-				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
-				}
-				return $version;
-		}
-	}
-
-	/**
-	 * @param $element
-	 * @return mixed
-	 */
-	private function getValue($element) {
-		if (isset($element['@value'])) {
-			return $element['@value'];
-		}
-		return (string)$element;
-	}
+    /** @var Platform */
+    private $platform;
+    /** @var \OCP\IL10N */
+    private $l;
+    /** @var array */
+    private $appInfo;
+
+    /**
+     * @param Platform $platform
+     * @param \OCP\IL10N $l
+     */
+    public function __construct(Platform $platform, IL10N $l) {
+        $this->platform = $platform;
+        $this->l = $l;
+    }
+
+    /**
+     * @param array $app
+     * @returns array of missing dependencies
+     */
+    public function analyze(array $app, bool $ignoreMax = false) {
+        $this->appInfo = $app;
+        if (isset($app['dependencies'])) {
+            $dependencies = $app['dependencies'];
+        } else {
+            $dependencies = [];
+        }
+
+        return array_merge(
+            $this->analyzePhpVersion($dependencies),
+            $this->analyzeDatabases($dependencies),
+            $this->analyzeCommands($dependencies),
+            $this->analyzeLibraries($dependencies),
+            $this->analyzeOS($dependencies),
+            $this->analyzeOC($dependencies, $app, $ignoreMax)
+        );
+    }
+
+    public function isMarkedCompatible(array $app): bool {
+        if (isset($app['dependencies'])) {
+            $dependencies = $app['dependencies'];
+        } else {
+            $dependencies = [];
+        }
+
+        $maxVersion = $this->getMaxVersion($dependencies, $app);
+        if ($maxVersion === null) {
+            return true;
+        }
+        return !$this->compareBigger($this->platform->getOcVersion(), $maxVersion);
+    }
+
+    /**
+     * Truncates both versions to the lowest common version, e.g.
+     * 5.1.2.3 and 5.1 will be turned into 5.1 and 5.1,
+     * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
+     * @param string $first
+     * @param string $second
+     * @return string[] first element is the first version, second element is the
+     * second version
+     */
+    private function normalizeVersions($first, $second) {
+        $first = explode('.', $first);
+        $second = explode('.', $second);
+
+        // get both arrays to the same minimum size
+        $length = min(count($second), count($first));
+        $first = array_slice($first, 0, $length);
+        $second = array_slice($second, 0, $length);
+
+        return [implode('.', $first), implode('.', $second)];
+    }
+
+    /**
+     * Parameters will be normalized and then passed into version_compare
+     * in the same order they are specified in the method header
+     * @param string $first
+     * @param string $second
+     * @param string $operator
+     * @return bool result similar to version_compare
+     */
+    private function compare($first, $second, $operator) {
+        // we can't normalize versions if one of the given parameters is not a
+        // version string but null. In case one parameter is null normalization
+        // will therefore be skipped
+        if ($first !== null && $second !== null) {
+            list($first, $second) = $this->normalizeVersions($first, $second);
+        }
+
+        return version_compare($first, $second, $operator);
+    }
+
+    /**
+     * Checks if a version is bigger than another version
+     * @param string $first
+     * @param string $second
+     * @return bool true if the first version is bigger than the second
+     */
+    private function compareBigger($first, $second) {
+        return $this->compare($first, $second, '>');
+    }
+
+    /**
+     * Checks if a version is smaller than another version
+     * @param string $first
+     * @param string $second
+     * @return bool true if the first version is smaller than the second
+     */
+    private function compareSmaller($first, $second) {
+        return $this->compare($first, $second, '<');
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzePhpVersion(array $dependencies) {
+        $missing = [];
+        if (isset($dependencies['php']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['php']['@attributes']['min-version'];
+            if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
+                $missing[] = (string)$this->l->t('PHP %s or higher is required.', [$minVersion]);
+            }
+        }
+        if (isset($dependencies['php']['@attributes']['max-version'])) {
+            $maxVersion = $dependencies['php']['@attributes']['max-version'];
+            if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
+                $missing[] = (string)$this->l->t('PHP with a version lower than %s is required.', [$maxVersion]);
+            }
+        }
+        if (isset($dependencies['php']['@attributes']['min-int-size'])) {
+            $intSize = $dependencies['php']['@attributes']['min-int-size'];
+            if ($intSize > $this->platform->getIntSize()*8) {
+                $missing[] = (string)$this->l->t('%sbit or higher PHP required.', [$intSize]);
+            }
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeDatabases(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['database'])) {
+            return $missing;
+        }
+
+        $supportedDatabases = $dependencies['database'];
+        if (empty($supportedDatabases)) {
+            return $missing;
+        }
+        if (!is_array($supportedDatabases)) {
+            $supportedDatabases = [$supportedDatabases];
+        }
+        $supportedDatabases = array_map(function ($db) {
+            return $this->getValue($db);
+        }, $supportedDatabases);
+        $currentDatabase = $this->platform->getDatabase();
+        if (!in_array($currentDatabase, $supportedDatabases)) {
+            $missing[] = (string)$this->l->t('Following databases are supported: %s', [implode(', ', $supportedDatabases)]);
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeCommands(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['command'])) {
+            return $missing;
+        }
+
+        $commands = $dependencies['command'];
+        if (!is_array($commands)) {
+            $commands = [$commands];
+        }
+        if (isset($commands['@value'])) {
+            $commands = [$commands];
+        }
+        $os = $this->platform->getOS();
+        foreach ($commands as $command) {
+            if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {
+                continue;
+            }
+            $commandName = $this->getValue($command);
+            if (!$this->platform->isCommandKnown($commandName)) {
+                $missing[] = (string)$this->l->t('The command line tool %s could not be found', [$commandName]);
+            }
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeLibraries(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['lib'])) {
+            return $missing;
+        }
+
+        $libs = $dependencies['lib'];
+        if (!is_array($libs)) {
+            $libs = [$libs];
+        }
+        if (isset($libs['@value'])) {
+            $libs = [$libs];
+        }
+        foreach ($libs as $lib) {
+            $libName = $this->getValue($lib);
+            $libVersion = $this->platform->getLibraryVersion($libName);
+            if (is_null($libVersion)) {
+                $missing[] = $this->l->t('The library %s is not available.', [$libName]);
+                continue;
+            }
+
+            if (is_array($lib)) {
+                if (isset($lib['@attributes']['min-version'])) {
+                    $minVersion = $lib['@attributes']['min-version'];
+                    if ($this->compareSmaller($libVersion, $minVersion)) {
+                        $missing[] = $this->l->t('Library %1$s with a version higher than %2$s is required - available version %3$s.',
+                            [$libName, $minVersion, $libVersion]);
+                    }
+                }
+                if (isset($lib['@attributes']['max-version'])) {
+                    $maxVersion = $lib['@attributes']['max-version'];
+                    if ($this->compareBigger($libVersion, $maxVersion)) {
+                        $missing[] = $this->l->t('Library %1$s with a version lower than %2$s is required - available version %3$s.',
+                            [$libName, $maxVersion, $libVersion]);
+                    }
+                }
+            }
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeOS(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['os'])) {
+            return $missing;
+        }
+
+        $oss = $dependencies['os'];
+        if (empty($oss)) {
+            return $missing;
+        }
+        if (is_array($oss)) {
+            $oss = array_map(function ($os) {
+                return $this->getValue($os);
+            }, $oss);
+        } else {
+            $oss = [$oss];
+        }
+        $currentOS = $this->platform->getOS();
+        if (!in_array($currentOS, $oss)) {
+            $missing[] = (string)$this->l->t('Following platforms are supported: %s', [implode(', ', $oss)]);
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @param array $appInfo
+     * @return array
+     */
+    private function analyzeOC(array $dependencies, array $appInfo, bool $ignoreMax) {
+        $missing = [];
+        $minVersion = null;
+        if (isset($dependencies['nextcloud']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['nextcloud']['@attributes']['min-version'];
+        } elseif (isset($dependencies['owncloud']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['owncloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['requiremin'])) {
+            $minVersion = $appInfo['requiremin'];
+        } elseif (isset($appInfo['require'])) {
+            $minVersion = $appInfo['require'];
+        }
+        $maxVersion = $this->getMaxVersion($dependencies, $appInfo);
+
+        if (!is_null($minVersion)) {
+            if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
+                $missing[] = (string)$this->l->t('Server version %s or higher is required.', [$this->toVisibleVersion($minVersion)]);
+            }
+        }
+        if (!$ignoreMax && !is_null($maxVersion)) {
+            if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
+                $missing[] = (string)$this->l->t('Server version %s or lower is required.', [$this->toVisibleVersion($maxVersion)]);
+            }
+        }
+        return $missing;
+    }
+
+    private function getMaxVersion(array $dependencies, array $appInfo): ?string {
+        if (isset($dependencies['nextcloud']['@attributes']['max-version'])) {
+            return $dependencies['nextcloud']['@attributes']['max-version'];
+        }
+        if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
+            return $dependencies['owncloud']['@attributes']['max-version'];
+        }
+        if (isset($appInfo['requiremax'])) {
+            return $appInfo['requiremax'];
+        }
+
+        return null;
+    }
+
+    /**
+     * Map the internal version number to the Nextcloud version
+     *
+     * @param string $version
+     * @return string
+     */
+    protected function toVisibleVersion($version) {
+        switch ($version) {
+            case '9.1':
+                return '10';
+            default:
+                if (strpos($version, '9.1.') === 0) {
+                    $version = '10.0.' . substr($version, 4);
+                }
+                return $version;
+        }
+    }
+
+    /**
+     * @param $element
+     * @return mixed
+     */
+    private function getValue($element) {
+        if (isset($element['@value'])) {
+            return $element['@value'];
+        }
+        return (string)$element;
+    }
 }