nextcloud / server

lib/private/Search.php

Indentation +76 added lines, -76 removed lines

@@ -35,86 +35,86 @@
  */
 class Search implements ISearch {
 
-	private $providers = [];
-	private $registeredProviders = [];
+    private $providers = [];
+    private $registeredProviders = [];
 
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @param string[] $inApps optionally limit results to the given apps
-	 * @param int $page pages start at page 1
-	 * @param int $size, 0 = all
-	 * @return array An array of OC\Search\Result's
-	 */
-	public function searchPaged($query, array $inApps = [], $page = 1, $size = 30) {
-		$this->initProviders();
-		$results = [];
-		foreach($this->providers as $provider) {
-			/** @var $provider Provider */
-			if ( ! $provider->providesResultsFor($inApps) ) {
-				continue;
-			}
-			if ($provider instanceof PagedProvider) {
-				$results = array_merge($results, $provider->searchPaged($query, $page, $size));
-			} else if ($provider instanceof Provider) {
-				$providerResults = $provider->search($query);
-				if ($size > 0) {
-					$slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
-					$results = array_merge($results, $slicedResults);
-				} else {
-					$results = array_merge($results, $providerResults);
-				}
-			} else {
-				\OC::$server->getLogger()->warning('Ignoring Unknown search provider', ['provider' => $provider]);
-			}
-		}
-		return $results;
-	}
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @param int $page pages start at page 1
+     * @param int $size, 0 = all
+     * @return array An array of OC\Search\Result's
+     */
+    public function searchPaged($query, array $inApps = [], $page = 1, $size = 30) {
+        $this->initProviders();
+        $results = [];
+        foreach($this->providers as $provider) {
+            /** @var $provider Provider */
+            if ( ! $provider->providesResultsFor($inApps) ) {
+                continue;
+            }
+            if ($provider instanceof PagedProvider) {
+                $results = array_merge($results, $provider->searchPaged($query, $page, $size));
+            } else if ($provider instanceof Provider) {
+                $providerResults = $provider->search($query);
+                if ($size > 0) {
+                    $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
+                    $results = array_merge($results, $slicedResults);
+                } else {
+                    $results = array_merge($results, $providerResults);
+                }
+            } else {
+                \OC::$server->getLogger()->warning('Ignoring Unknown search provider', ['provider' => $provider]);
+            }
+        }
+        return $results;
+    }
 
-	/**
-	 * Remove all registered search providers
-	 */
-	public function clearProviders() {
-		$this->providers = [];
-		$this->registeredProviders = [];
-	}
+    /**
+     * Remove all registered search providers
+     */
+    public function clearProviders() {
+        $this->providers = [];
+        $this->registeredProviders = [];
+    }
 
-	/**
-	 * Remove one existing search provider
-	 * @param string $provider class name of a OC\Search\Provider
-	 */
-	public function removeProvider($provider) {
-		$this->registeredProviders = array_filter(
-			$this->registeredProviders,
-			function ($element) use ($provider) {
-				return ($element['class'] != $provider);
-			}
-		);
-		// force regeneration of providers on next search
-		$this->providers = [];
-	}
+    /**
+     * Remove one existing search provider
+     * @param string $provider class name of a OC\Search\Provider
+     */
+    public function removeProvider($provider) {
+        $this->registeredProviders = array_filter(
+            $this->registeredProviders,
+            function ($element) use ($provider) {
+                return ($element['class'] != $provider);
+            }
+        );
+        // force regeneration of providers on next search
+        $this->providers = [];
+    }
 
-	/**
-	 * Register a new search provider to search with
-	 * @param string $class class name of a OC\Search\Provider
-	 * @param array $options optional
-	 */
-	public function registerProvider($class, array $options = []) {
-		$this->registeredProviders[] = ['class' => $class, 'options' => $options];
-	}
+    /**
+     * Register a new search provider to search with
+     * @param string $class class name of a OC\Search\Provider
+     * @param array $options optional
+     */
+    public function registerProvider($class, array $options = []) {
+        $this->registeredProviders[] = ['class' => $class, 'options' => $options];
+    }
 
-	/**
-	 * Create instances of all the registered search providers
-	 */
-	private function initProviders() {
-		if( ! empty($this->providers) ) {
-			return;
-		}
-		foreach($this->registeredProviders as $provider) {
-			$class = $provider['class'];
-			$options = $provider['options'];
-			$this->providers[] = new $class($options);
-		}
-	}
+    /**
+     * Create instances of all the registered search providers
+     */
+    private function initProviders() {
+        if( ! empty($this->providers) ) {
+            return;
+        }
+        foreach($this->registeredProviders as $provider) {
+            $class = $provider['class'];
+            $options = $provider['options'];
+            $this->providers[] = new $class($options);
+        }
+    }
 
 }

lib/private/OCS/Result.php

Indentation +124 added lines, -124 removed lines

@@ -32,129 +32,129 @@
 
 class Result {
 
-	/** @var array  */
-	protected $data;
-
-	/** @var null|string */
-	protected $message;
-
-	/** @var int */
-	protected $statusCode;
-
-	/** @var integer */
-	protected $items;
-
-	/** @var integer */
-	protected $perPage;
-
-	/** @var array */
-	private $headers = [];
-
-	/**
-	 * create the OCS_Result object
-	 * @param mixed $data the data to return
-	 * @param int $code
-	 * @param null|string $message
-	 * @param array $headers
-	 */
-	public function __construct($data = null, $code = 100, $message = null, $headers = []) {
-		if ($data === null) {
-			$this->data = [];
-		} elseif (!is_array($data)) {
-			$this->data = [$this->data];
-		} else {
-			$this->data = $data;
-		}
-		$this->statusCode = $code;
-		$this->message = $message;
-		$this->headers = $headers;
-	}
-
-	/**
-	 * optionally set the total number of items available
-	 * @param int $items
-	 */
-	public function setTotalItems($items) {
-		$this->items = $items;
-	}
-
-	/**
-	 * optionally set the the number of items per page
-	 * @param int $items
-	 */
-	public function setItemsPerPage($items) {
-		$this->perPage = $items;
-	}
-
-	/**
-	 * get the status code
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-
-	/**
-	 * get the meta data for the result
-	 * @return array
-	 */
-	public function getMeta() {
-		$meta = [];
-		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
-		$meta['statuscode'] = $this->statusCode;
-		$meta['message'] = $this->message;
-		if(isset($this->items)) {
-			$meta['totalitems'] = $this->items;
-		}
-		if(isset($this->perPage)) {
-			$meta['itemsperpage'] = $this->perPage;
-		}
-		return $meta;
-
-	}
-
-	/**
-	 * get the result data
-	 * @return array
-	 */
-	public function getData() {
-		return $this->data;
-	}
-
-	/**
-	 * return bool Whether the method succeeded
-	 * @return bool
-	 */
-	public function succeeded() {
-		return ($this->statusCode == 100);
-	}
-
-	/**
-	 * Adds a new header to the response
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		// to be able to reliably check for security
-		// headers
-
-		if(is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 */
-	public function getHeaders() {
-		return $this->headers;
-	}
+    /** @var array  */
+    protected $data;
+
+    /** @var null|string */
+    protected $message;
+
+    /** @var int */
+    protected $statusCode;
+
+    /** @var integer */
+    protected $items;
+
+    /** @var integer */
+    protected $perPage;
+
+    /** @var array */
+    private $headers = [];
+
+    /**
+     * create the OCS_Result object
+     * @param mixed $data the data to return
+     * @param int $code
+     * @param null|string $message
+     * @param array $headers
+     */
+    public function __construct($data = null, $code = 100, $message = null, $headers = []) {
+        if ($data === null) {
+            $this->data = [];
+        } elseif (!is_array($data)) {
+            $this->data = [$this->data];
+        } else {
+            $this->data = $data;
+        }
+        $this->statusCode = $code;
+        $this->message = $message;
+        $this->headers = $headers;
+    }
+
+    /**
+     * optionally set the total number of items available
+     * @param int $items
+     */
+    public function setTotalItems($items) {
+        $this->items = $items;
+    }
+
+    /**
+     * optionally set the the number of items per page
+     * @param int $items
+     */
+    public function setItemsPerPage($items) {
+        $this->perPage = $items;
+    }
+
+    /**
+     * get the status code
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
+
+    /**
+     * get the meta data for the result
+     * @return array
+     */
+    public function getMeta() {
+        $meta = [];
+        $meta['status'] = $this->succeeded() ? 'ok' : 'failure';
+        $meta['statuscode'] = $this->statusCode;
+        $meta['message'] = $this->message;
+        if(isset($this->items)) {
+            $meta['totalitems'] = $this->items;
+        }
+        if(isset($this->perPage)) {
+            $meta['itemsperpage'] = $this->perPage;
+        }
+        return $meta;
+
+    }
+
+    /**
+     * get the result data
+     * @return array
+     */
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * return bool Whether the method succeeded
+     * @return bool
+     */
+    public function succeeded() {
+        return ($this->statusCode == 100);
+    }
+
+    /**
+     * Adds a new header to the response
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+        // to be able to reliably check for security
+        // headers
+
+        if(is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     */
+    public function getHeaders() {
+        return $this->headers;
+    }
 
 }

lib/private/NaturalSort.php

Indentation +102 added lines, -102 removed lines

@@ -30,113 +30,113 @@
 use OCP\ILogger;
 
 class NaturalSort {
-	private static $instance;
-	private $collator;
-	private $cache = [];
+    private static $instance;
+    private $collator;
+    private $cache = [];
 
-	/**
-	 * Instantiate a new \OC\NaturalSort instance.
-	 * @param object $injectedCollator
-	 */
-	public function __construct($injectedCollator = null) {
-		// inject an instance of \Collator('en_US') to force using the php5-intl Collator
-		// or inject an instance of \OC\NaturalSort_DefaultCollator to force using Owncloud's default collator
-		if (isset($injectedCollator)) {
-			$this->collator = $injectedCollator;
-			\OCP\Util::writeLog('core', 'forced use of '.get_class($injectedCollator), ILogger::DEBUG);
-		}
-	}
+    /**
+     * Instantiate a new \OC\NaturalSort instance.
+     * @param object $injectedCollator
+     */
+    public function __construct($injectedCollator = null) {
+        // inject an instance of \Collator('en_US') to force using the php5-intl Collator
+        // or inject an instance of \OC\NaturalSort_DefaultCollator to force using Owncloud's default collator
+        if (isset($injectedCollator)) {
+            $this->collator = $injectedCollator;
+            \OCP\Util::writeLog('core', 'forced use of '.get_class($injectedCollator), ILogger::DEBUG);
+        }
+    }
 
-	/**
-	 * Split the given string in chunks of numbers and strings
-	 * @param string $t string
-	 * @return array of strings and number chunks
-	 */
-	private function naturalSortChunkify($t) {
-		// Adapted and ported to PHP from
-		// http://my.opera.com/GreyWyvern/blog/show.dml/1671288
-		if (isset($this->cache[$t])) {
-			return $this->cache[$t];
-		}
-		$tz = [];
-		$x = 0;
-		$y = -1;
-		$n = null;
+    /**
+     * Split the given string in chunks of numbers and strings
+     * @param string $t string
+     * @return array of strings and number chunks
+     */
+    private function naturalSortChunkify($t) {
+        // Adapted and ported to PHP from
+        // http://my.opera.com/GreyWyvern/blog/show.dml/1671288
+        if (isset($this->cache[$t])) {
+            return $this->cache[$t];
+        }
+        $tz = [];
+        $x = 0;
+        $y = -1;
+        $n = null;
 
-		while (isset($t[$x])) {
-			$c = $t[$x];
-			// only include the dot in strings
-			$m = ((!$n && $c === '.') || ($c >= '0' && $c <= '9'));
-			if ($m !== $n) {
-				// next chunk
-				$y++;
-				$tz[$y] = '';
-				$n = $m;
-			}
-			$tz[$y] .= $c;
-			$x++;
-		}
-		$this->cache[$t] = $tz;
-		return $tz;
-	}
+        while (isset($t[$x])) {
+            $c = $t[$x];
+            // only include the dot in strings
+            $m = ((!$n && $c === '.') || ($c >= '0' && $c <= '9'));
+            if ($m !== $n) {
+                // next chunk
+                $y++;
+                $tz[$y] = '';
+                $n = $m;
+            }
+            $tz[$y] .= $c;
+            $x++;
+        }
+        $this->cache[$t] = $tz;
+        return $tz;
+    }
 
-	/**
-	 * Returns the string collator
-	 * @return \Collator string collator
-	 */
-	private function getCollator() {
-		if (!isset($this->collator)) {
-			// looks like the default is en_US_POSIX which yields wrong sorting with
-			// German umlauts, so using en_US instead
-			if (class_exists('Collator')) {
-				$this->collator = new \Collator('en_US');
-			}
-			else {
-				$this->collator = new \OC\NaturalSort_DefaultCollator();
-			}
-		}
-		return $this->collator;
-	}
+    /**
+     * Returns the string collator
+     * @return \Collator string collator
+     */
+    private function getCollator() {
+        if (!isset($this->collator)) {
+            // looks like the default is en_US_POSIX which yields wrong sorting with
+            // German umlauts, so using en_US instead
+            if (class_exists('Collator')) {
+                $this->collator = new \Collator('en_US');
+            }
+            else {
+                $this->collator = new \OC\NaturalSort_DefaultCollator();
+            }
+        }
+        return $this->collator;
+    }
 
-	/**
-	 * Compare two strings to provide a natural sort
-	 * @param string $a first string to compare
-	 * @param string $b second string to compare
-	 * @return int -1 if $b comes before $a, 1 if $a comes before $b
-	 * or 0 if the strings are identical
-	 */
-	public function compare($a, $b) {
-		// Needed because PHP doesn't sort correctly when numbers are enclosed in
-		// parenthesis, even with NUMERIC_COLLATION enabled.
-		// For example it gave ["test (2).txt", "test.txt"]
-		// instead of ["test.txt", "test (2).txt"]
-		$aa = self::naturalSortChunkify($a);
-		$bb = self::naturalSortChunkify($b);
+    /**
+     * Compare two strings to provide a natural sort
+     * @param string $a first string to compare
+     * @param string $b second string to compare
+     * @return int -1 if $b comes before $a, 1 if $a comes before $b
+     * or 0 if the strings are identical
+     */
+    public function compare($a, $b) {
+        // Needed because PHP doesn't sort correctly when numbers are enclosed in
+        // parenthesis, even with NUMERIC_COLLATION enabled.
+        // For example it gave ["test (2).txt", "test.txt"]
+        // instead of ["test.txt", "test (2).txt"]
+        $aa = self::naturalSortChunkify($a);
+        $bb = self::naturalSortChunkify($b);
 
-		for ($x = 0; isset($aa[$x]) && isset($bb[$x]); $x++) {
-			$aChunk = $aa[$x];
-			$bChunk = $bb[$x];
-			if ($aChunk !== $bChunk) {
-				// test first character (character comparison, not number comparison)
-				if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') {
-					$aNum = (int)$aChunk;
-					$bNum = (int)$bChunk;
-					return $aNum - $bNum;
-				}
-				return self::getCollator()->compare($aChunk, $bChunk);
-			}
-		}
-		return count($aa) - count($bb);
-	}
+        for ($x = 0; isset($aa[$x]) && isset($bb[$x]); $x++) {
+            $aChunk = $aa[$x];
+            $bChunk = $bb[$x];
+            if ($aChunk !== $bChunk) {
+                // test first character (character comparison, not number comparison)
+                if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') {
+                    $aNum = (int)$aChunk;
+                    $bNum = (int)$bChunk;
+                    return $aNum - $bNum;
+                }
+                return self::getCollator()->compare($aChunk, $bChunk);
+            }
+        }
+        return count($aa) - count($bb);
+    }
 
-	/**
-	 * Returns a singleton
-	 * @return \OC\NaturalSort instance
-	 */
-	public static function getInstance() {
-		if (!isset(self::$instance)) {
-			self::$instance = new \OC\NaturalSort();
-		}
-		return self::$instance;
-	}
+    /**
+     * Returns a singleton
+     * @return \OC\NaturalSort instance
+     */
+    public static function getInstance() {
+        if (!isset(self::$instance)) {
+            self::$instance = new \OC\NaturalSort();
+        }
+        return self::$instance;
+    }
 }

lib/private/Security/CertificateManager.php

Indentation +248 added lines, -248 removed lines

@@ -38,253 +38,253 @@
  * Manage trusted certificates for users
  */
 class CertificateManager implements ICertificateManager {
-	/**
-	 * @var string
-	 */
-	protected $uid;
-
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $view;
-
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
-
-	/** @var ISecureRandom */
-	protected $random;
-
-	/**
-	 * @param string $uid
-	 * @param \OC\Files\View $view relative to data/
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param ISecureRandom $random
-	 */
-	public function __construct($uid,
-								\OC\Files\View $view,
-								IConfig $config,
-								ILogger $logger,
-								ISecureRandom $random) {
-		$this->uid = $uid;
-		$this->view = $view;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
-
-	/**
-	 * Returns all certificates trusted by the user
-	 *
-	 * @return \OCP\ICertificate[]
-	 */
-	public function listCertificates() {
-
-		if (!$this->config->getSystemValue('installed', false)) {
-			return [];
-		}
-
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->is_dir($path)) {
-			return [];
-		}
-		$result = [];
-		$handle = $this->view->opendir($path);
-		if (!is_resource($handle)) {
-			return [];
-		}
-		while (false !== ($file = readdir($handle))) {
-			if ($file != '.' && $file != '..') {
-				try {
-					$result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
-				} catch (\Exception $e) {
-				}
-			}
-		}
-		closedir($handle);
-		return $result;
-	}
-
-	/**
-	 * create the certificate bundle of all trusted certificated
-	 */
-	public function createCertificateBundle() {
-		$path = $this->getPathToCertificates();
-		$certs = $this->listCertificates();
-
-		if (!$this->view->file_exists($path)) {
-			$this->view->mkdir($path);
-		}
-
-		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-		if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
-			// log as exception so we have a stacktrace
-			$this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
-			return;
-		}
-
-		$certPath = $path . 'rootcerts.crt';
-		$tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
-		$fhCerts = $this->view->fopen($tmpPath, 'w');
-
-		// Write user certificates
-		foreach ($certs as $cert) {
-			$file = $path . '/uploads/' . $cert->getName();
-			$data = $this->view->file_get_contents($file);
-			if (strpos($data, 'BEGIN CERTIFICATE')) {
-				fwrite($fhCerts, $data);
-				fwrite($fhCerts, "\r\n");
-			}
-		}
-
-		// Append the default certificates
-		fwrite($fhCerts, $defaultCertificates);
-
-		// Append the system certificate bundle
-		$systemBundle = $this->getCertificateBundle(null);
-		if ($systemBundle !== $certPath && $this->view->file_exists($systemBundle)) {
-			$systemCertificates = $this->view->file_get_contents($systemBundle);
-			fwrite($fhCerts, $systemCertificates);
-		}
-
-		fclose($fhCerts);
-
-		$this->view->rename($tmpPath, $certPath);
-	}
-
-	/**
-	 * Save the certificate and re-generate the certificate bundle
-	 *
-	 * @param string $certificate the certificate data
-	 * @param string $name the filename for the certificate
-	 * @return \OCP\ICertificate
-	 * @throws \Exception If the certificate could not get added
-	 */
-	public function addCertificate($certificate, $name) {
-		if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
-			throw new \Exception('Filename is not valid');
-		}
-
-		$dir = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->file_exists($dir)) {
-			$this->view->mkdir($dir);
-		}
-
-		try {
-			$file = $dir . $name;
-			$certificateObject = new Certificate($certificate, $name);
-			$this->view->file_put_contents($file, $certificate);
-			$this->createCertificateBundle();
-			return $certificateObject;
-		} catch (\Exception $e) {
-			throw $e;
-		}
-
-	}
-
-	/**
-	 * Remove the certificate and re-generate the certificate bundle
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function removeCertificate($name) {
-		if (!Filesystem::isValidPath($name)) {
-			return false;
-		}
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if ($this->view->file_exists($path . $name)) {
-			$this->view->unlink($path . $name);
-			$this->createCertificateBundle();
-		}
-		return true;
-	}
-
-	/**
-	 * Get the path to the certificate bundle for this user
-	 *
-	 * @param string|null $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
-	 * @return string
-	 */
-	public function getCertificateBundle($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		return $this->getPathToCertificates($uid) . 'rootcerts.crt';
-	}
-
-	/**
-	 * Get the full local path to the certificate bundle for this user
-	 *
-	 * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
-	 * @return string
-	 */
-	public function getAbsoluteBundlePath($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		if ($this->needsRebundling($uid)) {
-			if (is_null($uid)) {
-				$manager = new CertificateManager(null, $this->view, $this->config, $this->logger, $this->random);
-				$manager->createCertificateBundle();
-			} else {
-				$this->createCertificateBundle();
-			}
-		}
-		return $this->view->getLocalFile($this->getCertificateBundle($uid));
-	}
-
-	/**
-	 * @param string|null $uid (optional) user to get the certificate path for, use `null` to get the system path
-	 * @return string
-	 */
-	private function getPathToCertificates($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		return is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/';
-	}
-
-	/**
-	 * Check if we need to re-bundle the certificates because one of the sources has updated
-	 *
-	 * @param string $uid (optional) user to get the certificate path for, use `null` to get the system path
-	 * @return bool
-	 */
-	private function needsRebundling($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		$sourceMTimes = [$this->getFilemtimeOfCaBundle()];
-		$targetBundle = $this->getCertificateBundle($uid);
-		if (!$this->view->file_exists($targetBundle)) {
-			return true;
-		}
-
-		if (!is_null($uid)) { // also depend on the system bundle
-			$sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));
-		}
-
-		$sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {
-			return max($max, $mtime);
-		}, 0);
-		return $sourceMTime > $this->view->filemtime($targetBundle);
-	}
-
-	/**
-	 * get mtime of ca-bundle shipped by Nextcloud
-	 *
-	 * @return int
-	 */
-	protected function getFilemtimeOfCaBundle() {
-		return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-	}
+    /**
+     * @var string
+     */
+    protected $uid;
+
+    /**
+     * @var \OC\Files\View
+     */
+    protected $view;
+
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var ILogger
+     */
+    protected $logger;
+
+    /** @var ISecureRandom */
+    protected $random;
+
+    /**
+     * @param string $uid
+     * @param \OC\Files\View $view relative to data/
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param ISecureRandom $random
+     */
+    public function __construct($uid,
+                                \OC\Files\View $view,
+                                IConfig $config,
+                                ILogger $logger,
+                                ISecureRandom $random) {
+        $this->uid = $uid;
+        $this->view = $view;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
+
+    /**
+     * Returns all certificates trusted by the user
+     *
+     * @return \OCP\ICertificate[]
+     */
+    public function listCertificates() {
+
+        if (!$this->config->getSystemValue('installed', false)) {
+            return [];
+        }
+
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->is_dir($path)) {
+            return [];
+        }
+        $result = [];
+        $handle = $this->view->opendir($path);
+        if (!is_resource($handle)) {
+            return [];
+        }
+        while (false !== ($file = readdir($handle))) {
+            if ($file != '.' && $file != '..') {
+                try {
+                    $result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
+                } catch (\Exception $e) {
+                }
+            }
+        }
+        closedir($handle);
+        return $result;
+    }
+
+    /**
+     * create the certificate bundle of all trusted certificated
+     */
+    public function createCertificateBundle() {
+        $path = $this->getPathToCertificates();
+        $certs = $this->listCertificates();
+
+        if (!$this->view->file_exists($path)) {
+            $this->view->mkdir($path);
+        }
+
+        $defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+        if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
+            // log as exception so we have a stacktrace
+            $this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
+            return;
+        }
+
+        $certPath = $path . 'rootcerts.crt';
+        $tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
+        $fhCerts = $this->view->fopen($tmpPath, 'w');
+
+        // Write user certificates
+        foreach ($certs as $cert) {
+            $file = $path . '/uploads/' . $cert->getName();
+            $data = $this->view->file_get_contents($file);
+            if (strpos($data, 'BEGIN CERTIFICATE')) {
+                fwrite($fhCerts, $data);
+                fwrite($fhCerts, "\r\n");
+            }
+        }
+
+        // Append the default certificates
+        fwrite($fhCerts, $defaultCertificates);
+
+        // Append the system certificate bundle
+        $systemBundle = $this->getCertificateBundle(null);
+        if ($systemBundle !== $certPath && $this->view->file_exists($systemBundle)) {
+            $systemCertificates = $this->view->file_get_contents($systemBundle);
+            fwrite($fhCerts, $systemCertificates);
+        }
+
+        fclose($fhCerts);
+
+        $this->view->rename($tmpPath, $certPath);
+    }
+
+    /**
+     * Save the certificate and re-generate the certificate bundle
+     *
+     * @param string $certificate the certificate data
+     * @param string $name the filename for the certificate
+     * @return \OCP\ICertificate
+     * @throws \Exception If the certificate could not get added
+     */
+    public function addCertificate($certificate, $name) {
+        if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
+            throw new \Exception('Filename is not valid');
+        }
+
+        $dir = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->file_exists($dir)) {
+            $this->view->mkdir($dir);
+        }
+
+        try {
+            $file = $dir . $name;
+            $certificateObject = new Certificate($certificate, $name);
+            $this->view->file_put_contents($file, $certificate);
+            $this->createCertificateBundle();
+            return $certificateObject;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+
+    }
+
+    /**
+     * Remove the certificate and re-generate the certificate bundle
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function removeCertificate($name) {
+        if (!Filesystem::isValidPath($name)) {
+            return false;
+        }
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if ($this->view->file_exists($path . $name)) {
+            $this->view->unlink($path . $name);
+            $this->createCertificateBundle();
+        }
+        return true;
+    }
+
+    /**
+     * Get the path to the certificate bundle for this user
+     *
+     * @param string|null $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
+     * @return string
+     */
+    public function getCertificateBundle($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        return $this->getPathToCertificates($uid) . 'rootcerts.crt';
+    }
+
+    /**
+     * Get the full local path to the certificate bundle for this user
+     *
+     * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
+     * @return string
+     */
+    public function getAbsoluteBundlePath($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        if ($this->needsRebundling($uid)) {
+            if (is_null($uid)) {
+                $manager = new CertificateManager(null, $this->view, $this->config, $this->logger, $this->random);
+                $manager->createCertificateBundle();
+            } else {
+                $this->createCertificateBundle();
+            }
+        }
+        return $this->view->getLocalFile($this->getCertificateBundle($uid));
+    }
+
+    /**
+     * @param string|null $uid (optional) user to get the certificate path for, use `null` to get the system path
+     * @return string
+     */
+    private function getPathToCertificates($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        return is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/';
+    }
+
+    /**
+     * Check if we need to re-bundle the certificates because one of the sources has updated
+     *
+     * @param string $uid (optional) user to get the certificate path for, use `null` to get the system path
+     * @return bool
+     */
+    private function needsRebundling($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        $sourceMTimes = [$this->getFilemtimeOfCaBundle()];
+        $targetBundle = $this->getCertificateBundle($uid);
+        if (!$this->view->file_exists($targetBundle)) {
+            return true;
+        }
+
+        if (!is_null($uid)) { // also depend on the system bundle
+            $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));
+        }
+
+        $sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {
+            return max($max, $mtime);
+        }, 0);
+        return $sourceMTime > $this->view->filemtime($targetBundle);
+    }
+
+    /**
+     * get mtime of ca-bundle shipped by Nextcloud
+     *
+     * @return int
+     */
+    protected function getFilemtimeOfCaBundle() {
+        return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+    }
 
 }

lib/private/ContactsManager.php

Indentation +177 added lines, -177 removed lines

@@ -29,181 +29,181 @@
 
 namespace OC {
 
-	class ContactsManager implements \OCP\Contacts\IManager {
-
-		/**
-		 * This function is used to search and find contacts within the users address books.
-		 * In case $pattern is empty all contacts will be returned.
-		 *
-		 * @param string $pattern which should match within the $searchProperties
-		 * @param array $searchProperties defines the properties within the query pattern should match
-		 * @param array $options = array() to define the search behavior
-		 * 	- 'escape_like_param' - If set to false wildcards _ and % are not escaped
-		 * @return array an array of contacts which are arrays of key-value-pairs
-		 */
-		public function search($pattern, $searchProperties = [], $options = []) {
-			$this->loadAddressBooks();
-			$result = [];
-			foreach($this->addressBooks as $addressBook) {
-				$r = $addressBook->search($pattern, $searchProperties, $options);
-				$contacts = [];
-				foreach($r as $c){
-					$c['addressbook-key'] = $addressBook->getKey();
-					$contacts[] = $c;
-				}
-				$result = array_merge($result, $contacts);
-			}
-
-			return $result;
-		}
-
-		/**
-		 * This function can be used to delete the contact identified by the given id
-		 *
-		 * @param object $id the unique identifier to a contact
-		 * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
-		 * @return bool successful or not
-		 */
-		public function delete($id, $addressBookKey) {
-			$addressBook = $this->getAddressBook($addressBookKey);
-			if (!$addressBook) {
-				return null;
-			}
-
-			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
-				return $addressBook->delete($id);
-			}
-
-			return null;
-		}
-
-		/**
-		 * This function is used to create a new contact if 'id' is not given or not present.
-		 * Otherwise the contact will be updated by replacing the entire data set.
-		 *
-		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
-		 * @return array representing the contact just created or updated
-		 */
-		public function createOrUpdate($properties, $addressBookKey) {
-			$addressBook = $this->getAddressBook($addressBookKey);
-			if (!$addressBook) {
-				return null;
-			}
-
-			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
-				return $addressBook->createOrUpdate($properties);
-			}
-
-			return null;
-		}
-
-		/**
-		 * Check if contacts are available (e.g. contacts app enabled)
-		 *
-		 * @return bool true if enabled, false if not
-		 */
-		public function isEnabled() {
-			return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
-		}
-
-		/**
-		 * @param \OCP\IAddressBook $addressBook
-		 */
-		public function registerAddressBook(\OCP\IAddressBook $addressBook) {
-			$this->addressBooks[$addressBook->getKey()] = $addressBook;
-		}
-
-		/**
-		 * @param \OCP\IAddressBook $addressBook
-		 */
-		public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
-			unset($this->addressBooks[$addressBook->getKey()]);
-		}
-
-		/**
-		 * Return a list of the user's addressbooks display names
-		 * ! The addressBook displayName are not unique, please use getUserAddressBooks
-		 * 
-		 * @return array
-		 * @since 6.0.0
-		 * @deprecated 16.0.0 - Use `$this->getUserAddressBooks()` instead
-		 */
-		public function getAddressBooks() {
-			$this->loadAddressBooks();
-			$result = [];
-			foreach($this->addressBooks as $addressBook) {
-				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Return a list of the user's addressbooks
-		 * 
-		 * @return IAddressBook[]
-		 * @since 16.0.0
-		 */
-		public function getUserAddressBooks(): Array {
-			$this->loadAddressBooks();
-			return $this->addressBooks;
-		}
-
-		/**
-		 * removes all registered address book instances
-		 */
-		public function clear() {
-			$this->addressBooks = [];
-			$this->addressBookLoaders = [];
-		}
-
-		/**
-		 * @var \OCP\IAddressBook[] which holds all registered address books
-		 */
-		private $addressBooks = [];
-
-		/**
-		 * @var \Closure[] to call to load/register address books
-		 */
-		private $addressBookLoaders = [];
-
-		/**
-		 * In order to improve lazy loading a closure can be registered which will be called in case
-		 * address books are actually requested
-		 *
-		 * @param \Closure $callable
-		 */
-		public function register(\Closure $callable)
-		{
-			$this->addressBookLoaders[] = $callable;
-		}
-
-		/**
-		 * Get (and load when needed) the address book for $key
-		 *
-		 * @param string $addressBookKey
-		 * @return \OCP\IAddressBook
-		 */
-		protected function getAddressBook($addressBookKey)
-		{
-			$this->loadAddressBooks();
-			if (!array_key_exists($addressBookKey, $this->addressBooks)) {
-				return null;
-			}
-
-			return $this->addressBooks[$addressBookKey];
-		}
-
-		/**
-		 * Load all address books registered with 'register'
-		 */
-		protected function loadAddressBooks()
-		{
-			foreach($this->addressBookLoaders as $callable) {
-				$callable($this);
-			}
-			$this->addressBookLoaders = [];
-		}
-	}
+    class ContactsManager implements \OCP\Contacts\IManager {
+
+        /**
+         * This function is used to search and find contacts within the users address books.
+         * In case $pattern is empty all contacts will be returned.
+         *
+         * @param string $pattern which should match within the $searchProperties
+         * @param array $searchProperties defines the properties within the query pattern should match
+         * @param array $options = array() to define the search behavior
+         * 	- 'escape_like_param' - If set to false wildcards _ and % are not escaped
+         * @return array an array of contacts which are arrays of key-value-pairs
+         */
+        public function search($pattern, $searchProperties = [], $options = []) {
+            $this->loadAddressBooks();
+            $result = [];
+            foreach($this->addressBooks as $addressBook) {
+                $r = $addressBook->search($pattern, $searchProperties, $options);
+                $contacts = [];
+                foreach($r as $c){
+                    $c['addressbook-key'] = $addressBook->getKey();
+                    $contacts[] = $c;
+                }
+                $result = array_merge($result, $contacts);
+            }
+
+            return $result;
+        }
+
+        /**
+         * This function can be used to delete the contact identified by the given id
+         *
+         * @param object $id the unique identifier to a contact
+         * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
+         * @return bool successful or not
+         */
+        public function delete($id, $addressBookKey) {
+            $addressBook = $this->getAddressBook($addressBookKey);
+            if (!$addressBook) {
+                return null;
+            }
+
+            if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+                return $addressBook->delete($id);
+            }
+
+            return null;
+        }
+
+        /**
+         * This function is used to create a new contact if 'id' is not given or not present.
+         * Otherwise the contact will be updated by replacing the entire data set.
+         *
+         * @param array $properties this array if key-value-pairs defines a contact
+         * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
+         * @return array representing the contact just created or updated
+         */
+        public function createOrUpdate($properties, $addressBookKey) {
+            $addressBook = $this->getAddressBook($addressBookKey);
+            if (!$addressBook) {
+                return null;
+            }
+
+            if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+                return $addressBook->createOrUpdate($properties);
+            }
+
+            return null;
+        }
+
+        /**
+         * Check if contacts are available (e.g. contacts app enabled)
+         *
+         * @return bool true if enabled, false if not
+         */
+        public function isEnabled() {
+            return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
+        }
+
+        /**
+         * @param \OCP\IAddressBook $addressBook
+         */
+        public function registerAddressBook(\OCP\IAddressBook $addressBook) {
+            $this->addressBooks[$addressBook->getKey()] = $addressBook;
+        }
+
+        /**
+         * @param \OCP\IAddressBook $addressBook
+         */
+        public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
+            unset($this->addressBooks[$addressBook->getKey()]);
+        }
+
+        /**
+         * Return a list of the user's addressbooks display names
+         * ! The addressBook displayName are not unique, please use getUserAddressBooks
+         * 
+         * @return array
+         * @since 6.0.0
+         * @deprecated 16.0.0 - Use `$this->getUserAddressBooks()` instead
+         */
+        public function getAddressBooks() {
+            $this->loadAddressBooks();
+            $result = [];
+            foreach($this->addressBooks as $addressBook) {
+                $result[$addressBook->getKey()] = $addressBook->getDisplayName();
+            }
+
+            return $result;
+        }
+
+        /**
+         * Return a list of the user's addressbooks
+         * 
+         * @return IAddressBook[]
+         * @since 16.0.0
+         */
+        public function getUserAddressBooks(): Array {
+            $this->loadAddressBooks();
+            return $this->addressBooks;
+        }
+
+        /**
+         * removes all registered address book instances
+         */
+        public function clear() {
+            $this->addressBooks = [];
+            $this->addressBookLoaders = [];
+        }
+
+        /**
+         * @var \OCP\IAddressBook[] which holds all registered address books
+         */
+        private $addressBooks = [];
+
+        /**
+         * @var \Closure[] to call to load/register address books
+         */
+        private $addressBookLoaders = [];
+
+        /**
+         * In order to improve lazy loading a closure can be registered which will be called in case
+         * address books are actually requested
+         *
+         * @param \Closure $callable
+         */
+        public function register(\Closure $callable)
+        {
+            $this->addressBookLoaders[] = $callable;
+        }
+
+        /**
+         * Get (and load when needed) the address book for $key
+         *
+         * @param string $addressBookKey
+         * @return \OCP\IAddressBook
+         */
+        protected function getAddressBook($addressBookKey)
+        {
+            $this->loadAddressBooks();
+            if (!array_key_exists($addressBookKey, $this->addressBooks)) {
+                return null;
+            }
+
+            return $this->addressBooks[$addressBookKey];
+        }
+
+        /**
+         * Load all address books registered with 'register'
+         */
+        protected function loadAddressBooks()
+        {
+            foreach($this->addressBookLoaders as $callable) {
+                $callable($this);
+            }
+            $this->addressBookLoaders = [];
+        }
+    }
 }

lib/private/Tags.php

Indentation +805 added lines, -805 removed lines

@@ -52,809 +52,809 @@
 
 class Tags implements ITags {
 
-	/**
-	 * Tags
-	 *
-	 * @var array
-	 */
-	private $tags = [];
-
-	/**
-	 * Used for storing objectid/categoryname pairs while rescanning.
-	 *
-	 * @var array
-	 */
-	private static $relations = [];
-
-	/**
-	 * Type
-	 *
-	 * @var string
-	 */
-	private $type;
-
-	/**
-	 * User
-	 *
-	 * @var string
-	 */
-	private $user;
-
-	/**
-	 * Are we including tags for shared items?
-	 *
-	 * @var bool
-	 */
-	private $includeShared = false;
-
-	/**
-	 * The current user, plus any owners of the items shared with the current
-	 * user, if $this->includeShared === true.
-	 *
-	 * @var array
-	 */
-	private $owners = [];
-
-	/**
-	 * The Mapper we're using to communicate our Tag objects to the database.
-	 *
-	 * @var TagMapper
-	 */
-	private $mapper;
-
-	/**
-	 * The sharing backend for objects of $this->type. Required if
-	 * $this->includeShared === true to determine ownership of items.
-	 *
-	 * @var \OCP\Share_Backend
-	 */
-	private $backend;
-
-	const TAG_TABLE = '*PREFIX*vcategory';
-	const RELATION_TABLE = '*PREFIX*vcategory_to_object';
-
-	/**
-	* Constructor.
-	*
-	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
-	* @param string $user The user whose data the object will operate on.
-	* @param string $type The type of items for which tags will be loaded.
-	* @param array $defaultTags Tags that should be created at construction.
-	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	*/
-	public function __construct(TagMapper $mapper, $user, $type, $defaultTags = [], $includeShared = false) {
-		$this->mapper = $mapper;
-		$this->user = $user;
-		$this->type = $type;
-		$this->includeShared = $includeShared;
-		$this->owners = [$this->user];
-		if ($this->includeShared) {
-			$this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
-			$this->backend = \OC\Share\Share::getBackend($this->type);
-		}
-		$this->tags = $this->mapper->loadTags($this->owners, $this->type);
-
-		if(count($defaultTags) > 0 && count($this->tags) === 0) {
-			$this->addMultiple($defaultTags, true);
-		}
-	}
-
-	/**
-	* Check if any tags are saved for this type and user.
-	*
-	* @return boolean
-	*/
-	public function isEmpty() {
-		return count($this->tags) === 0;
-	}
-
-	/**
-	* Returns an array mapping a given tag's properties to its values:
-	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
-	*
-	* @param string $id The ID of the tag that is going to be mapped
-	* @return array|false
-	*/
-	public function getTag($id) {
-		$key = $this->getTagById($id);
-		if ($key !== false) {
-			return $this->tagMap($this->tags[$key]);
-		}
-		return false;
-	}
-
-	/**
-	* Get the tags for a specific user.
-	*
-	* This returns an array with maps containing each tag's properties:
-	* [
-	* 	['id' => 0, 'name' = 'First tag', 'owner' = 'User', 'type' => 'tagtype'],
-	* 	['id' => 1, 'name' = 'Shared tag', 'owner' = 'Other user', 'type' => 'tagtype'],
-	* ]
-	*
-	* @return array
-	*/
-	public function getTags() {
-		if(!count($this->tags)) {
-			return [];
-		}
-
-		usort($this->tags, function($a, $b) {
-			return strnatcasecmp($a->getName(), $b->getName());
-		});
-		$tagMap = [];
-
-		foreach($this->tags as $tag) {
-			if($tag->getName() !== ITags::TAG_FAVORITE) {
-				$tagMap[] = $this->tagMap($tag);
-			}
-		}
-		return $tagMap;
-
-	}
-
-	/**
-	* Return only the tags owned by the given user, omitting any tags shared
-	* by other users.
-	*
-	* @param string $user The user whose tags are to be checked.
-	* @return array An array of Tag objects.
-	*/
-	public function getTagsForUser($user) {
-		return array_filter($this->tags,
-			function($tag) use($user) {
-				return $tag->getOwner() === $user;
-			}
-		);
-	}
-
-	/**
-	 * Get the list of tags for the given ids.
-	 *
-	 * @param array $objIds array of object ids
-	 * @return array|boolean of tags id as key to array of tag names
-	 * or false if an error occurred
-	 */
-	public function getTagsForObjects(array $objIds) {
-		$entries = [];
-
-		try {
-			$conn = \OC::$server->getDatabaseConnection();
-			$chunks = array_chunk($objIds, 900, false);
-			foreach ($chunks as $chunk) {
-				$result = $conn->executeQuery(
-					'SELECT `category`, `categoryid`, `objid` ' .
-					'FROM `' . self::RELATION_TABLE . '` r, `' . self::TAG_TABLE . '` ' .
-					'WHERE `categoryid` = `id` AND `uid` = ? AND r.`type` = ? AND `objid` IN (?)',
-					[$this->user, $this->type, $chunk],
-					[null, null, IQueryBuilder::PARAM_INT_ARRAY]
-				);
-				while ($row = $result->fetch()) {
-					$objId = (int)$row['objid'];
-					if (!isset($entries[$objId])) {
-						$entries[$objId] = [];
-					}
-					$entries[$objId][] = $row['category'];
-				}
-				if ($result === null) {
-					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
-					return false;
-				}
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-
-		return $entries;
-	}
-
-	/**
-	* Get the a list if items tagged with $tag.
-	*
-	* Throws an exception if the tag could not be found.
-	*
-	* @param string $tag Tag id or name.
-	* @return array|false An array of object ids or false on error.
-	* @throws \Exception
-	*/
-	public function getIdsForTag($tag) {
-		$result = null;
-		$tagId = false;
-		if(is_numeric($tag)) {
-			$tagId = $tag;
-		} elseif(is_string($tag)) {
-			$tag = trim($tag);
-			if($tag === '') {
-				\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', ILogger::DEBUG);
-				return false;
-			}
-			$tagId = $this->getTagId($tag);
-		}
-
-		if($tagId === false) {
-			$l10n = \OC::$server->getL10N('core');
-			throw new \Exception(
-				$l10n->t('Could not find category "%s"', [$tag])
-			);
-		}
-
-		$ids = [];
-		$sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE
-			. '` WHERE `categoryid` = ?';
-
-		try {
-			$stmt = \OC_DB::prepare($sql);
-			$result = $stmt->execute([$tagId]);
-			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
-				return false;
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-
-		if(!is_null($result)) {
-			while( $row = $result->fetchRow()) {
-				$id = (int)$row['objid'];
-
-				if ($this->includeShared) {
-					// We have to check if we are really allowed to access the
-					// items that are tagged with $tag. To that end, we ask the
-					// corresponding sharing backend if the item identified by $id
-					// is owned by any of $this->owners.
-					foreach ($this->owners as $owner) {
-						if ($this->backend->isValidSource($id, $owner)) {
-							$ids[] = $id;
-							break;
-						}
-					}
-				} else {
-					$ids[] = $id;
-				}
-			}
-		}
-
-		return $ids;
-	}
-
-	/**
-	* Checks whether a tag is saved for the given user,
-	* disregarding the ones shared with him or her.
-	*
-	* @param string $name The tag name to check for.
-	* @param string $user The user whose tags are to be checked.
-	* @return bool
-	*/
-	public function userHasTag($name, $user) {
-		$key = $this->array_searchi($name, $this->getTagsForUser($user));
-		return ($key !== false) ? $this->tags[$key]->getId() : false;
-	}
-
-	/**
-	* Checks whether a tag is saved for or shared with the current user.
-	*
-	* @param string $name The tag name to check for.
-	* @return bool
-	*/
-	public function hasTag($name) {
-		return $this->getTagId($name) !== false;
-	}
-
-	/**
-	* Add a new tag.
-	*
-	* @param string $name A string with a name of the tag
-	* @return false|int the id of the added tag or false on error.
-	*/
-	public function add($name) {
-		$name = trim($name);
-
-		if($name === '') {
-			\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', ILogger::DEBUG);
-			return false;
-		}
-		if($this->userHasTag($name, $this->user)) {
-			\OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', ILogger::DEBUG);
-			return false;
-		}
-		try {
-			$tag = new Tag($this->user, $this->type, $name);
-			$tag = $this->mapper->insert($tag);
-			$this->tags[] = $tag;
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-		\OCP\Util::writeLog('core', __METHOD__.', id: ' . $tag->getId(), ILogger::DEBUG);
-		return $tag->getId();
-	}
-
-	/**
-	* Rename tag.
-	*
-	* @param string|integer $from The name or ID of the existing tag
-	* @param string $to The new name of the tag.
-	* @return bool
-	*/
-	public function rename($from, $to) {
-		$from = trim($from);
-		$to = trim($to);
-
-		if($to === '' || $from === '') {
-			\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', ILogger::DEBUG);
-			return false;
-		}
-
-		if (is_numeric($from)) {
-			$key = $this->getTagById($from);
-		} else {
-			$key = $this->getTagByName($from);
-		}
-		if($key === false) {
-			\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', ILogger::DEBUG);
-			return false;
-		}
-		$tag = $this->tags[$key];
-
-		if($this->userHasTag($to, $tag->getOwner())) {
-			\OCP\Util::writeLog('core', __METHOD__.', A tag named ' . $to. ' already exists for user ' . $tag->getOwner() . '.', ILogger::DEBUG);
-			return false;
-		}
-
-		try {
-			$tag->setName($to);
-			$this->tags[$key] = $this->mapper->update($tag);
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Add a list of new tags.
-	*
-	* @param string[] $names A string with a name or an array of strings containing
-	* the name(s) of the tag(s) to add.
-	* @param bool $sync When true, save the tags
-	* @param int|null $id int Optional object id to add to this|these tag(s)
-	* @return bool Returns false on error.
-	*/
-	public function addMultiple($names, $sync=false, $id = null) {
-		if(!is_array($names)) {
-			$names = [$names];
-		}
-		$names = array_map('trim', $names);
-		array_filter($names);
-
-		$newones = [];
-		foreach($names as $name) {
-			if(!$this->hasTag($name) && $name !== '') {
-				$newones[] = new Tag($this->user, $this->type, $name);
-			}
-			if(!is_null($id) ) {
-				// Insert $objectid, $categoryid  pairs if not exist.
-				self::$relations[] = ['objid' => $id, 'tag' => $name];
-			}
-		}
-		$this->tags = array_merge($this->tags, $newones);
-		if($sync === true) {
-			$this->save();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Save the list of tags and their object relations
-	 */
-	protected function save() {
-		if(is_array($this->tags)) {
-			foreach($this->tags as $tag) {
-				try {
-					if (!$this->mapper->tagExists($tag)) {
-						$this->mapper->insert($tag);
-					}
-				} catch(\Exception $e) {
-					\OC::$server->getLogger()->logException($e, [
-						'message' => __METHOD__,
-						'level' => ILogger::ERROR,
-						'app' => 'core',
-					]);
-				}
-			}
-
-			// reload tags to get the proper ids.
-			$this->tags = $this->mapper->loadTags($this->owners, $this->type);
-			\OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
-				ILogger::DEBUG);
-			// Loop through temporarily cached objectid/tagname pairs
-			// and save relations.
-			$tags = $this->tags;
-			// For some reason this is needed or array_search(i) will return 0..?
-			ksort($tags);
-			$dbConnection = \OC::$server->getDatabaseConnection();
-			foreach(self::$relations as $relation) {
-				$tagId = $this->getTagId($relation['tag']);
-				\OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, ILogger::DEBUG);
-				if($tagId) {
-					try {
-						$dbConnection->insertIfNotExist(self::RELATION_TABLE,
-							[
-								'objid' => $relation['objid'],
-								'categoryid' => $tagId,
-								'type' => $this->type,
-								]);
-					} catch(\Exception $e) {
-						\OC::$server->getLogger()->logException($e, [
-							'message' => __METHOD__,
-							'level' => ILogger::ERROR,
-							'app' => 'core',
-						]);
-					}
-				}
-			}
-			self::$relations = []; // reset
-		} else {
-			\OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! '
-				. print_r($this->tags, true), ILogger::ERROR);
-		}
-	}
-
-	/**
-	* Delete tags and tag/object relations for a user.
-	*
-	* For hooking up on post_deleteUser
-	*
-	* @param array $arguments
-	*/
-	public static function post_deleteUser($arguments) {
-		// Find all objectid/tagId pairs.
-		$result = null;
-		try {
-			$stmt = \OC_DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` '
-				. 'WHERE `uid` = ?');
-			$result = $stmt->execute([$arguments['uid']]);
-			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-		}
-
-		if(!is_null($result)) {
-			try {
-				$stmt = \OC_DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
-					. 'WHERE `categoryid` = ?');
-				while( $row = $result->fetchRow()) {
-					try {
-						$stmt->execute([$row['id']]);
-					} catch(\Exception $e) {
-						\OC::$server->getLogger()->logException($e, [
-							'message' => __METHOD__,
-							'level' => ILogger::ERROR,
-							'app' => 'core',
-						]);
-					}
-				}
-			} catch(\Exception $e) {
-				\OC::$server->getLogger()->logException($e, [
-					'message' => __METHOD__,
-					'level' => ILogger::ERROR,
-					'app' => 'core',
-				]);
-			}
-		}
-		try {
-			$stmt = \OC_DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` '
-				. 'WHERE `uid` = ?');
-			$result = $stmt->execute([$arguments['uid']]);
-			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-		}
-	}
-
-	/**
-	* Delete tag/object relations from the db
-	*
-	* @param array $ids The ids of the objects
-	* @return boolean Returns false on error.
-	*/
-	public function purgeObjects(array $ids) {
-		if(count($ids) === 0) {
-			// job done ;)
-			return true;
-		}
-		$updates = $ids;
-		try {
-			$query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
-			$query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
-			$query .= 'AND `type`= ?';
-			$updates[] = $this->type;
-			$stmt = \OC_DB::prepare($query);
-			$result = $stmt->execute($updates);
-			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
-				return false;
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Get favorites for an object type
-	*
-	* @return array|false An array of object ids.
-	*/
-	public function getFavorites() {
-		if(!$this->userHasTag(ITags::TAG_FAVORITE, $this->user)) {
-			return [];
-		}
-
-		try {
-			return $this->getIdsForTag(ITags::TAG_FAVORITE);
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return [];
-		}
-	}
-
-	/**
-	* Add an object to favorites
-	*
-	* @param int $objid The id of the object
-	* @return boolean
-	*/
-	public function addToFavorites($objid) {
-		if(!$this->userHasTag(ITags::TAG_FAVORITE, $this->user)) {
-			$this->add(ITags::TAG_FAVORITE);
-		}
-		return $this->tagAs($objid, ITags::TAG_FAVORITE);
-	}
-
-	/**
-	* Remove an object from favorites
-	*
-	* @param int $objid The id of the object
-	* @return boolean
-	*/
-	public function removeFromFavorites($objid) {
-		return $this->unTag($objid, ITags::TAG_FAVORITE);
-	}
-
-	/**
-	* Creates a tag/object relation.
-	*
-	* @param int $objid The id of the object
-	* @param string $tag The id or name of the tag
-	* @return boolean Returns false on error.
-	*/
-	public function tagAs($objid, $tag) {
-		if(is_string($tag) && !is_numeric($tag)) {
-			$tag = trim($tag);
-			if($tag === '') {
-				\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', ILogger::DEBUG);
-				return false;
-			}
-			if(!$this->hasTag($tag)) {
-				$this->add($tag);
-			}
-			$tagId =  $this->getTagId($tag);
-		} else {
-			$tagId = $tag;
-		}
-		try {
-			\OC::$server->getDatabaseConnection()->insertIfNotExist(self::RELATION_TABLE,
-				[
-					'objid' => $objid,
-					'categoryid' => $tagId,
-					'type' => $this->type,
-				]);
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Delete single tag/object relation from the db
-	*
-	* @param int $objid The id of the object
-	* @param string $tag The id or name of the tag
-	* @return boolean
-	*/
-	public function unTag($objid, $tag) {
-		if(is_string($tag) && !is_numeric($tag)) {
-			$tag = trim($tag);
-			if($tag === '') {
-				\OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', ILogger::DEBUG);
-				return false;
-			}
-			$tagId =  $this->getTagId($tag);
-		} else {
-			$tagId = $tag;
-		}
-
-		try {
-			$sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
-					. 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?';
-			$stmt = \OC_DB::prepare($sql);
-			$stmt->execute([$objid, $tagId, $this->type]);
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => __METHOD__,
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Delete tags from the database.
-	*
-	* @param string[]|integer[] $names An array of tags (names or IDs) to delete
-	* @return bool Returns false on error
-	*/
-	public function delete($names) {
-		if(!is_array($names)) {
-			$names = [$names];
-		}
-
-		$names = array_map('trim', $names);
-		array_filter($names);
-
-		\OCP\Util::writeLog('core', __METHOD__ . ', before: '
-			. print_r($this->tags, true), ILogger::DEBUG);
-		foreach($names as $name) {
-			$id = null;
-
-			if (is_numeric($name)) {
-				$key = $this->getTagById($name);
-			} else {
-				$key = $this->getTagByName($name);
-			}
-			if ($key !== false) {
-				$tag = $this->tags[$key];
-				$id = $tag->getId();
-				unset($this->tags[$key]);
-				$this->mapper->delete($tag);
-			} else {
-				\OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
-					. ': not found.', ILogger::ERROR);
-			}
-			if(!is_null($id) && $id !== false) {
-				try {
-					$sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
-							. 'WHERE `categoryid` = ?';
-					$stmt = \OC_DB::prepare($sql);
-					$result = $stmt->execute([$id]);
-					if ($result === null) {
-						\OCP\Util::writeLog('core',
-							__METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(),
-							ILogger::ERROR);
-						return false;
-					}
-				} catch(\Exception $e) {
-					\OC::$server->getLogger()->logException($e, [
-						'message' => __METHOD__,
-						'level' => ILogger::ERROR,
-						'app' => 'core',
-					]);
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	// case-insensitive array_search
-	protected function array_searchi($needle, $haystack, $mem='getName') {
-		if(!is_array($haystack)) {
-			return false;
-		}
-		return array_search(strtolower($needle), array_map(
-			function($tag) use($mem) {
-				return strtolower(call_user_func([$tag, $mem]));
-			}, $haystack)
-		);
-	}
-
-	/**
-	* Get a tag's ID.
-	*
-	* @param string $name The tag name to look for.
-	* @return string|bool The tag's id or false if no matching tag is found.
-	*/
-	private function getTagId($name) {
-		$key = $this->array_searchi($name, $this->tags);
-		if ($key !== false) {
-			return $this->tags[$key]->getId();
-		}
-		return false;
-	}
-
-	/**
-	* Get a tag by its name.
-	*
-	* @param string $name The tag name.
-	* @return integer|bool The tag object's offset within the $this->tags
-	*                      array or false if it doesn't exist.
-	*/
-	private function getTagByName($name) {
-		return $this->array_searchi($name, $this->tags, 'getName');
-	}
-
-	/**
-	* Get a tag by its ID.
-	*
-	* @param string $id The tag ID to look for.
-	* @return integer|bool The tag object's offset within the $this->tags
-	*                      array or false if it doesn't exist.
-	*/
-	private function getTagById($id) {
-		return $this->array_searchi($id, $this->tags, 'getId');
-	}
-
-	/**
-	* Returns an array mapping a given tag's properties to its values:
-	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
-	*
-	* @param Tag $tag The tag that is going to be mapped
-	* @return array
-	*/
-	private function tagMap(Tag $tag) {
-		return [
-			'id'    => $tag->getId(),
-			'name'  => $tag->getName(),
-			'owner' => $tag->getOwner(),
-			'type'  => $tag->getType()
-		];
-	}
+    /**
+     * Tags
+     *
+     * @var array
+     */
+    private $tags = [];
+
+    /**
+     * Used for storing objectid/categoryname pairs while rescanning.
+     *
+     * @var array
+     */
+    private static $relations = [];
+
+    /**
+     * Type
+     *
+     * @var string
+     */
+    private $type;
+
+    /**
+     * User
+     *
+     * @var string
+     */
+    private $user;
+
+    /**
+     * Are we including tags for shared items?
+     *
+     * @var bool
+     */
+    private $includeShared = false;
+
+    /**
+     * The current user, plus any owners of the items shared with the current
+     * user, if $this->includeShared === true.
+     *
+     * @var array
+     */
+    private $owners = [];
+
+    /**
+     * The Mapper we're using to communicate our Tag objects to the database.
+     *
+     * @var TagMapper
+     */
+    private $mapper;
+
+    /**
+     * The sharing backend for objects of $this->type. Required if
+     * $this->includeShared === true to determine ownership of items.
+     *
+     * @var \OCP\Share_Backend
+     */
+    private $backend;
+
+    const TAG_TABLE = '*PREFIX*vcategory';
+    const RELATION_TABLE = '*PREFIX*vcategory_to_object';
+
+    /**
+     * Constructor.
+     *
+     * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+     * @param string $user The user whose data the object will operate on.
+     * @param string $type The type of items for which tags will be loaded.
+     * @param array $defaultTags Tags that should be created at construction.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     */
+    public function __construct(TagMapper $mapper, $user, $type, $defaultTags = [], $includeShared = false) {
+        $this->mapper = $mapper;
+        $this->user = $user;
+        $this->type = $type;
+        $this->includeShared = $includeShared;
+        $this->owners = [$this->user];
+        if ($this->includeShared) {
+            $this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
+            $this->backend = \OC\Share\Share::getBackend($this->type);
+        }
+        $this->tags = $this->mapper->loadTags($this->owners, $this->type);
+
+        if(count($defaultTags) > 0 && count($this->tags) === 0) {
+            $this->addMultiple($defaultTags, true);
+        }
+    }
+
+    /**
+     * Check if any tags are saved for this type and user.
+     *
+     * @return boolean
+     */
+    public function isEmpty() {
+        return count($this->tags) === 0;
+    }
+
+    /**
+     * Returns an array mapping a given tag's properties to its values:
+     * ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+     *
+     * @param string $id The ID of the tag that is going to be mapped
+     * @return array|false
+     */
+    public function getTag($id) {
+        $key = $this->getTagById($id);
+        if ($key !== false) {
+            return $this->tagMap($this->tags[$key]);
+        }
+        return false;
+    }
+
+    /**
+     * Get the tags for a specific user.
+     *
+     * This returns an array with maps containing each tag's properties:
+     * [
+     * 	['id' => 0, 'name' = 'First tag', 'owner' = 'User', 'type' => 'tagtype'],
+     * 	['id' => 1, 'name' = 'Shared tag', 'owner' = 'Other user', 'type' => 'tagtype'],
+     * ]
+     *
+     * @return array
+     */
+    public function getTags() {
+        if(!count($this->tags)) {
+            return [];
+        }
+
+        usort($this->tags, function($a, $b) {
+            return strnatcasecmp($a->getName(), $b->getName());
+        });
+        $tagMap = [];
+
+        foreach($this->tags as $tag) {
+            if($tag->getName() !== ITags::TAG_FAVORITE) {
+                $tagMap[] = $this->tagMap($tag);
+            }
+        }
+        return $tagMap;
+
+    }
+
+    /**
+     * Return only the tags owned by the given user, omitting any tags shared
+     * by other users.
+     *
+     * @param string $user The user whose tags are to be checked.
+     * @return array An array of Tag objects.
+     */
+    public function getTagsForUser($user) {
+        return array_filter($this->tags,
+            function($tag) use($user) {
+                return $tag->getOwner() === $user;
+            }
+        );
+    }
+
+    /**
+     * Get the list of tags for the given ids.
+     *
+     * @param array $objIds array of object ids
+     * @return array|boolean of tags id as key to array of tag names
+     * or false if an error occurred
+     */
+    public function getTagsForObjects(array $objIds) {
+        $entries = [];
+
+        try {
+            $conn = \OC::$server->getDatabaseConnection();
+            $chunks = array_chunk($objIds, 900, false);
+            foreach ($chunks as $chunk) {
+                $result = $conn->executeQuery(
+                    'SELECT `category`, `categoryid`, `objid` ' .
+                    'FROM `' . self::RELATION_TABLE . '` r, `' . self::TAG_TABLE . '` ' .
+                    'WHERE `categoryid` = `id` AND `uid` = ? AND r.`type` = ? AND `objid` IN (?)',
+                    [$this->user, $this->type, $chunk],
+                    [null, null, IQueryBuilder::PARAM_INT_ARRAY]
+                );
+                while ($row = $result->fetch()) {
+                    $objId = (int)$row['objid'];
+                    if (!isset($entries[$objId])) {
+                        $entries[$objId] = [];
+                    }
+                    $entries[$objId][] = $row['category'];
+                }
+                if ($result === null) {
+                    \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
+                    return false;
+                }
+            }
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+
+        return $entries;
+    }
+
+    /**
+     * Get the a list if items tagged with $tag.
+     *
+     * Throws an exception if the tag could not be found.
+     *
+     * @param string $tag Tag id or name.
+     * @return array|false An array of object ids or false on error.
+     * @throws \Exception
+     */
+    public function getIdsForTag($tag) {
+        $result = null;
+        $tagId = false;
+        if(is_numeric($tag)) {
+            $tagId = $tag;
+        } elseif(is_string($tag)) {
+            $tag = trim($tag);
+            if($tag === '') {
+                \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', ILogger::DEBUG);
+                return false;
+            }
+            $tagId = $this->getTagId($tag);
+        }
+
+        if($tagId === false) {
+            $l10n = \OC::$server->getL10N('core');
+            throw new \Exception(
+                $l10n->t('Could not find category "%s"', [$tag])
+            );
+        }
+
+        $ids = [];
+        $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE
+            . '` WHERE `categoryid` = ?';
+
+        try {
+            $stmt = \OC_DB::prepare($sql);
+            $result = $stmt->execute([$tagId]);
+            if ($result === null) {
+                \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
+                return false;
+            }
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+
+        if(!is_null($result)) {
+            while( $row = $result->fetchRow()) {
+                $id = (int)$row['objid'];
+
+                if ($this->includeShared) {
+                    // We have to check if we are really allowed to access the
+                    // items that are tagged with $tag. To that end, we ask the
+                    // corresponding sharing backend if the item identified by $id
+                    // is owned by any of $this->owners.
+                    foreach ($this->owners as $owner) {
+                        if ($this->backend->isValidSource($id, $owner)) {
+                            $ids[] = $id;
+                            break;
+                        }
+                    }
+                } else {
+                    $ids[] = $id;
+                }
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Checks whether a tag is saved for the given user,
+     * disregarding the ones shared with him or her.
+     *
+     * @param string $name The tag name to check for.
+     * @param string $user The user whose tags are to be checked.
+     * @return bool
+     */
+    public function userHasTag($name, $user) {
+        $key = $this->array_searchi($name, $this->getTagsForUser($user));
+        return ($key !== false) ? $this->tags[$key]->getId() : false;
+    }
+
+    /**
+     * Checks whether a tag is saved for or shared with the current user.
+     *
+     * @param string $name The tag name to check for.
+     * @return bool
+     */
+    public function hasTag($name) {
+        return $this->getTagId($name) !== false;
+    }
+
+    /**
+     * Add a new tag.
+     *
+     * @param string $name A string with a name of the tag
+     * @return false|int the id of the added tag or false on error.
+     */
+    public function add($name) {
+        $name = trim($name);
+
+        if($name === '') {
+            \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', ILogger::DEBUG);
+            return false;
+        }
+        if($this->userHasTag($name, $this->user)) {
+            \OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', ILogger::DEBUG);
+            return false;
+        }
+        try {
+            $tag = new Tag($this->user, $this->type, $name);
+            $tag = $this->mapper->insert($tag);
+            $this->tags[] = $tag;
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+        \OCP\Util::writeLog('core', __METHOD__.', id: ' . $tag->getId(), ILogger::DEBUG);
+        return $tag->getId();
+    }
+
+    /**
+     * Rename tag.
+     *
+     * @param string|integer $from The name or ID of the existing tag
+     * @param string $to The new name of the tag.
+     * @return bool
+     */
+    public function rename($from, $to) {
+        $from = trim($from);
+        $to = trim($to);
+
+        if($to === '' || $from === '') {
+            \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', ILogger::DEBUG);
+            return false;
+        }
+
+        if (is_numeric($from)) {
+            $key = $this->getTagById($from);
+        } else {
+            $key = $this->getTagByName($from);
+        }
+        if($key === false) {
+            \OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', ILogger::DEBUG);
+            return false;
+        }
+        $tag = $this->tags[$key];
+
+        if($this->userHasTag($to, $tag->getOwner())) {
+            \OCP\Util::writeLog('core', __METHOD__.', A tag named ' . $to. ' already exists for user ' . $tag->getOwner() . '.', ILogger::DEBUG);
+            return false;
+        }
+
+        try {
+            $tag->setName($to);
+            $this->tags[$key] = $this->mapper->update($tag);
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Add a list of new tags.
+     *
+     * @param string[] $names A string with a name or an array of strings containing
+     * the name(s) of the tag(s) to add.
+     * @param bool $sync When true, save the tags
+     * @param int|null $id int Optional object id to add to this|these tag(s)
+     * @return bool Returns false on error.
+     */
+    public function addMultiple($names, $sync=false, $id = null) {
+        if(!is_array($names)) {
+            $names = [$names];
+        }
+        $names = array_map('trim', $names);
+        array_filter($names);
+
+        $newones = [];
+        foreach($names as $name) {
+            if(!$this->hasTag($name) && $name !== '') {
+                $newones[] = new Tag($this->user, $this->type, $name);
+            }
+            if(!is_null($id) ) {
+                // Insert $objectid, $categoryid  pairs if not exist.
+                self::$relations[] = ['objid' => $id, 'tag' => $name];
+            }
+        }
+        $this->tags = array_merge($this->tags, $newones);
+        if($sync === true) {
+            $this->save();
+        }
+
+        return true;
+    }
+
+    /**
+     * Save the list of tags and their object relations
+     */
+    protected function save() {
+        if(is_array($this->tags)) {
+            foreach($this->tags as $tag) {
+                try {
+                    if (!$this->mapper->tagExists($tag)) {
+                        $this->mapper->insert($tag);
+                    }
+                } catch(\Exception $e) {
+                    \OC::$server->getLogger()->logException($e, [
+                        'message' => __METHOD__,
+                        'level' => ILogger::ERROR,
+                        'app' => 'core',
+                    ]);
+                }
+            }
+
+            // reload tags to get the proper ids.
+            $this->tags = $this->mapper->loadTags($this->owners, $this->type);
+            \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
+                ILogger::DEBUG);
+            // Loop through temporarily cached objectid/tagname pairs
+            // and save relations.
+            $tags = $this->tags;
+            // For some reason this is needed or array_search(i) will return 0..?
+            ksort($tags);
+            $dbConnection = \OC::$server->getDatabaseConnection();
+            foreach(self::$relations as $relation) {
+                $tagId = $this->getTagId($relation['tag']);
+                \OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, ILogger::DEBUG);
+                if($tagId) {
+                    try {
+                        $dbConnection->insertIfNotExist(self::RELATION_TABLE,
+                            [
+                                'objid' => $relation['objid'],
+                                'categoryid' => $tagId,
+                                'type' => $this->type,
+                                ]);
+                    } catch(\Exception $e) {
+                        \OC::$server->getLogger()->logException($e, [
+                            'message' => __METHOD__,
+                            'level' => ILogger::ERROR,
+                            'app' => 'core',
+                        ]);
+                    }
+                }
+            }
+            self::$relations = []; // reset
+        } else {
+            \OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! '
+                . print_r($this->tags, true), ILogger::ERROR);
+        }
+    }
+
+    /**
+     * Delete tags and tag/object relations for a user.
+     *
+     * For hooking up on post_deleteUser
+     *
+     * @param array $arguments
+     */
+    public static function post_deleteUser($arguments) {
+        // Find all objectid/tagId pairs.
+        $result = null;
+        try {
+            $stmt = \OC_DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` '
+                . 'WHERE `uid` = ?');
+            $result = $stmt->execute([$arguments['uid']]);
+            if ($result === null) {
+                \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
+            }
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+        }
+
+        if(!is_null($result)) {
+            try {
+                $stmt = \OC_DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
+                    . 'WHERE `categoryid` = ?');
+                while( $row = $result->fetchRow()) {
+                    try {
+                        $stmt->execute([$row['id']]);
+                    } catch(\Exception $e) {
+                        \OC::$server->getLogger()->logException($e, [
+                            'message' => __METHOD__,
+                            'level' => ILogger::ERROR,
+                            'app' => 'core',
+                        ]);
+                    }
+                }
+            } catch(\Exception $e) {
+                \OC::$server->getLogger()->logException($e, [
+                    'message' => __METHOD__,
+                    'level' => ILogger::ERROR,
+                    'app' => 'core',
+                ]);
+            }
+        }
+        try {
+            $stmt = \OC_DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` '
+                . 'WHERE `uid` = ?');
+            $result = $stmt->execute([$arguments['uid']]);
+            if ($result === null) {
+                \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
+            }
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+        }
+    }
+
+    /**
+     * Delete tag/object relations from the db
+     *
+     * @param array $ids The ids of the objects
+     * @return boolean Returns false on error.
+     */
+    public function purgeObjects(array $ids) {
+        if(count($ids) === 0) {
+            // job done ;)
+            return true;
+        }
+        $updates = $ids;
+        try {
+            $query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
+            $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
+            $query .= 'AND `type`= ?';
+            $updates[] = $this->type;
+            $stmt = \OC_DB::prepare($query);
+            $result = $stmt->execute($updates);
+            if ($result === null) {
+                \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), ILogger::ERROR);
+                return false;
+            }
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Get favorites for an object type
+     *
+     * @return array|false An array of object ids.
+     */
+    public function getFavorites() {
+        if(!$this->userHasTag(ITags::TAG_FAVORITE, $this->user)) {
+            return [];
+        }
+
+        try {
+            return $this->getIdsForTag(ITags::TAG_FAVORITE);
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return [];
+        }
+    }
+
+    /**
+     * Add an object to favorites
+     *
+     * @param int $objid The id of the object
+     * @return boolean
+     */
+    public function addToFavorites($objid) {
+        if(!$this->userHasTag(ITags::TAG_FAVORITE, $this->user)) {
+            $this->add(ITags::TAG_FAVORITE);
+        }
+        return $this->tagAs($objid, ITags::TAG_FAVORITE);
+    }
+
+    /**
+     * Remove an object from favorites
+     *
+     * @param int $objid The id of the object
+     * @return boolean
+     */
+    public function removeFromFavorites($objid) {
+        return $this->unTag($objid, ITags::TAG_FAVORITE);
+    }
+
+    /**
+     * Creates a tag/object relation.
+     *
+     * @param int $objid The id of the object
+     * @param string $tag The id or name of the tag
+     * @return boolean Returns false on error.
+     */
+    public function tagAs($objid, $tag) {
+        if(is_string($tag) && !is_numeric($tag)) {
+            $tag = trim($tag);
+            if($tag === '') {
+                \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', ILogger::DEBUG);
+                return false;
+            }
+            if(!$this->hasTag($tag)) {
+                $this->add($tag);
+            }
+            $tagId =  $this->getTagId($tag);
+        } else {
+            $tagId = $tag;
+        }
+        try {
+            \OC::$server->getDatabaseConnection()->insertIfNotExist(self::RELATION_TABLE,
+                [
+                    'objid' => $objid,
+                    'categoryid' => $tagId,
+                    'type' => $this->type,
+                ]);
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Delete single tag/object relation from the db
+     *
+     * @param int $objid The id of the object
+     * @param string $tag The id or name of the tag
+     * @return boolean
+     */
+    public function unTag($objid, $tag) {
+        if(is_string($tag) && !is_numeric($tag)) {
+            $tag = trim($tag);
+            if($tag === '') {
+                \OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', ILogger::DEBUG);
+                return false;
+            }
+            $tagId =  $this->getTagId($tag);
+        } else {
+            $tagId = $tag;
+        }
+
+        try {
+            $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
+                    . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?';
+            $stmt = \OC_DB::prepare($sql);
+            $stmt->execute([$objid, $tagId, $this->type]);
+        } catch(\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => __METHOD__,
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Delete tags from the database.
+     *
+     * @param string[]|integer[] $names An array of tags (names or IDs) to delete
+     * @return bool Returns false on error
+     */
+    public function delete($names) {
+        if(!is_array($names)) {
+            $names = [$names];
+        }
+
+        $names = array_map('trim', $names);
+        array_filter($names);
+
+        \OCP\Util::writeLog('core', __METHOD__ . ', before: '
+            . print_r($this->tags, true), ILogger::DEBUG);
+        foreach($names as $name) {
+            $id = null;
+
+            if (is_numeric($name)) {
+                $key = $this->getTagById($name);
+            } else {
+                $key = $this->getTagByName($name);
+            }
+            if ($key !== false) {
+                $tag = $this->tags[$key];
+                $id = $tag->getId();
+                unset($this->tags[$key]);
+                $this->mapper->delete($tag);
+            } else {
+                \OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
+                    . ': not found.', ILogger::ERROR);
+            }
+            if(!is_null($id) && $id !== false) {
+                try {
+                    $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
+                            . 'WHERE `categoryid` = ?';
+                    $stmt = \OC_DB::prepare($sql);
+                    $result = $stmt->execute([$id]);
+                    if ($result === null) {
+                        \OCP\Util::writeLog('core',
+                            __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(),
+                            ILogger::ERROR);
+                        return false;
+                    }
+                } catch(\Exception $e) {
+                    \OC::$server->getLogger()->logException($e, [
+                        'message' => __METHOD__,
+                        'level' => ILogger::ERROR,
+                        'app' => 'core',
+                    ]);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    // case-insensitive array_search
+    protected function array_searchi($needle, $haystack, $mem='getName') {
+        if(!is_array($haystack)) {
+            return false;
+        }
+        return array_search(strtolower($needle), array_map(
+            function($tag) use($mem) {
+                return strtolower(call_user_func([$tag, $mem]));
+            }, $haystack)
+        );
+    }
+
+    /**
+     * Get a tag's ID.
+     *
+     * @param string $name The tag name to look for.
+     * @return string|bool The tag's id or false if no matching tag is found.
+     */
+    private function getTagId($name) {
+        $key = $this->array_searchi($name, $this->tags);
+        if ($key !== false) {
+            return $this->tags[$key]->getId();
+        }
+        return false;
+    }
+
+    /**
+     * Get a tag by its name.
+     *
+     * @param string $name The tag name.
+     * @return integer|bool The tag object's offset within the $this->tags
+     *                      array or false if it doesn't exist.
+     */
+    private function getTagByName($name) {
+        return $this->array_searchi($name, $this->tags, 'getName');
+    }
+
+    /**
+     * Get a tag by its ID.
+     *
+     * @param string $id The tag ID to look for.
+     * @return integer|bool The tag object's offset within the $this->tags
+     *                      array or false if it doesn't exist.
+     */
+    private function getTagById($id) {
+        return $this->array_searchi($id, $this->tags, 'getId');
+    }
+
+    /**
+     * Returns an array mapping a given tag's properties to its values:
+     * ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+     *
+     * @param Tag $tag The tag that is going to be mapped
+     * @return array
+     */
+    private function tagMap(Tag $tag) {
+        return [
+            'id'    => $tag->getId(),
+            'name'  => $tag->getName(),
+            'owner' => $tag->getOwner(),
+            'type'  => $tag->getType()
+        ];
+    }
 }

lib/private/Setup.php

Indentation +545 added lines, -545 removed lines

@@ -63,549 +63,549 @@
 use OCP\Security\ISecureRandom;
 
 class Setup {
-	/** @var SystemConfig */
-	protected $config;
-	/** @var IniGetWrapper */
-	protected $iniWrapper;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var Defaults */
-	protected $defaults;
-	/** @var ILogger */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
-	/** @var Installer */
-	protected $installer;
-
-	/**
-	 * @param SystemConfig $config
-	 * @param IniGetWrapper $iniWrapper
-	 * @param IL10N $l10n
-	 * @param Defaults $defaults
-	 * @param ILogger $logger
-	 * @param ISecureRandom $random
-	 * @param Installer $installer
-	 */
-	public function __construct(
-		SystemConfig $config,
-		IniGetWrapper $iniWrapper,
-		IL10N $l10n,
-		Defaults $defaults,
-		ILogger $logger,
-		ISecureRandom $random,
-		Installer $installer
-	) {
-		$this->config = $config;
-		$this->iniWrapper = $iniWrapper;
-		$this->l10n = $l10n;
-		$this->defaults = $defaults;
-		$this->logger = $logger;
-		$this->random = $random;
-		$this->installer = $installer;
-	}
-
-	static protected $dbSetupClasses = [
-		'mysql' => \OC\Setup\MySQL::class,
-		'pgsql' => \OC\Setup\PostgreSQL::class,
-		'oci' => \OC\Setup\OCI::class,
-		'sqlite' => \OC\Setup\Sqlite::class,
-		'sqlite3' => \OC\Setup\Sqlite::class,
-	];
-
-	/**
-	 * Wrapper around the "class_exists" PHP function to be able to mock it
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	protected function class_exists($name) {
-		return class_exists($name);
-	}
-
-	/**
-	 * Wrapper around the "is_callable" PHP function to be able to mock it
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	protected function is_callable($name) {
-		return is_callable($name);
-	}
-
-	/**
-	 * Wrapper around \PDO::getAvailableDrivers
-	 *
-	 * @return array
-	 */
-	protected function getAvailableDbDriversForPdo() {
-		return \PDO::getAvailableDrivers();
-	}
-
-	/**
-	 * Get the available and supported databases of this instance
-	 *
-	 * @param bool $allowAllDatabases
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getSupportedDatabases($allowAllDatabases = false) {
-		$availableDatabases = [
-			'sqlite' => [
-				'type' => 'pdo',
-				'call' => 'sqlite',
-				'name' => 'SQLite',
-			],
-			'mysql' => [
-				'type' => 'pdo',
-				'call' => 'mysql',
-				'name' => 'MySQL/MariaDB',
-			],
-			'pgsql' => [
-				'type' => 'pdo',
-				'call' => 'pgsql',
-				'name' => 'PostgreSQL',
-			],
-			'oci' => [
-				'type' => 'function',
-				'call' => 'oci_connect',
-				'name' => 'Oracle',
-			],
-		];
-		if ($allowAllDatabases) {
-			$configuredDatabases = array_keys($availableDatabases);
-		} else {
-			$configuredDatabases = $this->config->getValue('supportedDatabases',
-				['sqlite', 'mysql', 'pgsql']);
-		}
-		if (!is_array($configuredDatabases)) {
-			throw new Exception('Supported databases are not properly configured.');
-		}
-
-		$supportedDatabases = [];
-
-		foreach ($configuredDatabases as $database) {
-			if (array_key_exists($database, $availableDatabases)) {
-				$working = false;
-				$type = $availableDatabases[$database]['type'];
-				$call = $availableDatabases[$database]['call'];
-
-				if ($type === 'function') {
-					$working = $this->is_callable($call);
-				} elseif ($type === 'pdo') {
-					$working = in_array($call, $this->getAvailableDbDriversForPdo(), true);
-				}
-				if ($working) {
-					$supportedDatabases[$database] = $availableDatabases[$database]['name'];
-				}
-			}
-		}
-
-		return $supportedDatabases;
-	}
-
-	/**
-	 * Gathers system information like database type and does
-	 * a few system checks.
-	 *
-	 * @return array of system info, including an "errors" value
-	 * in case of errors/warnings
-	 */
-	public function getSystemInfo($allowAllDatabases = false) {
-		$databases = $this->getSupportedDatabases($allowAllDatabases);
-
-		$dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
-
-		$errors = [];
-
-		// Create data directory to test whether the .htaccess works
-		// Notice that this is not necessarily the same data directory as the one
-		// that will effectively be used.
-		if (!file_exists($dataDir)) {
-			@mkdir($dataDir);
-		}
-		$htAccessWorking = true;
-		if (is_dir($dataDir) && is_writable($dataDir)) {
-			// Protect data directory here, so we can test if the protection is working
-			self::protectDataDirectory();
-
-			try {
-				$util = new \OC_Util();
-				$htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
-			} catch (\OC\HintException $e) {
-				$errors[] = [
-					'error' => $e->getMessage(),
-					'hint' => $e->getHint(),
-				];
-				$htAccessWorking = false;
-			}
-		}
-
-		if (\OC_Util::runningOnMac()) {
-			$errors[] = [
-				'error' => $this->l10n->t(
-					'Mac OS X is not supported and %s will not work properly on this platform. ' .
-					'Use it at your own risk! ',
-					[$this->defaults->getName()]
-				),
-				'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),
-			];
-		}
-
-		if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
-			$errors[] = [
-				'error' => $this->l10n->t(
-					'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
-					'This will lead to problems with files over 4 GB and is highly discouraged.',
-					[$this->defaults->getName()]
-				),
-				'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.'),
-			];
-		}
-
-		return [
-			'hasSQLite' => isset($databases['sqlite']),
-			'hasMySQL' => isset($databases['mysql']),
-			'hasPostgreSQL' => isset($databases['pgsql']),
-			'hasOracle' => isset($databases['oci']),
-			'databases' => $databases,
-			'directory' => $dataDir,
-			'htaccessWorking' => $htAccessWorking,
-			'errors' => $errors,
-		];
-	}
-
-	/**
-	 * @param $options
-	 * @return array
-	 */
-	public function install($options) {
-		$l = $this->l10n;
-
-		$error = [];
-		$dbType = $options['dbtype'];
-
-		if (empty($options['adminlogin'])) {
-			$error[] = $l->t('Set an admin username.');
-		}
-		if (empty($options['adminpass'])) {
-			$error[] = $l->t('Set an admin password.');
-		}
-		if (empty($options['directory'])) {
-			$options['directory'] = \OC::$SERVERROOT . "/data";
-		}
-
-		if (!isset(self::$dbSetupClasses[$dbType])) {
-			$dbType = 'sqlite';
-		}
-
-		$username = htmlspecialchars_decode($options['adminlogin']);
-		$password = htmlspecialchars_decode($options['adminpass']);
-		$dataDir = htmlspecialchars_decode($options['directory']);
-
-		$class = self::$dbSetupClasses[$dbType];
-		/** @var \OC\Setup\AbstractDatabase $dbSetup */
-		$dbSetup = new $class($l, $this->config, $this->logger, $this->random);
-		$error = array_merge($error, $dbSetup->validate($options));
-
-		// validate the data directory
-		if ((!is_dir($dataDir) && !mkdir($dataDir)) || !is_writable($dataDir)) {
-			$error[] = $l->t("Can't create or write into the data directory %s", [$dataDir]);
-		}
-
-		if (!empty($error)) {
-			return $error;
-		}
-
-		$request = \OC::$server->getRequest();
-
-		//no errors, good
-		if (isset($options['trusted_domains'])
-			&& is_array($options['trusted_domains'])) {
-			$trustedDomains = $options['trusted_domains'];
-		} else {
-			$trustedDomains = [$request->getInsecureServerHost()];
-		}
-
-		//use sqlite3 when available, otherwise sqlite2 will be used.
-		if ($dbType === 'sqlite' && class_exists('SQLite3')) {
-			$dbType = 'sqlite3';
-		}
-
-		//generate a random salt that is used to salt the local user passwords
-		$salt = $this->random->generate(30);
-		// generate a secret
-		$secret = $this->random->generate(48);
-
-		//write the config file
-		$newConfigValues = [
-			'passwordsalt' => $salt,
-			'secret' => $secret,
-			'trusted_domains' => $trustedDomains,
-			'datadirectory' => $dataDir,
-			'dbtype' => $dbType,
-			'version' => implode('.', \OCP\Util::getVersion()),
-		];
-
-		if ($this->config->getValue('overwrite.cli.url', null) === null) {
-			$newConfigValues['overwrite.cli.url'] = $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT;
-		}
-
-		$this->config->setValues($newConfigValues);
-
-		$dbSetup->initialize($options);
-		try {
-			$dbSetup->setupDatabase($username);
-		} catch (\OC\DatabaseSetupException $e) {
-			$error[] = [
-				'error' => $e->getMessage(),
-				'hint' => $e->getHint(),
-			];
-			return $error;
-		} catch (Exception $e) {
-			$error[] = [
-				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
-				'hint' => '',
-			];
-			return $error;
-		}
-		try {
-			// apply necessary migrations
-			$dbSetup->runMigrations();
-		} catch (Exception $e) {
-			$error[] = [
-				'error' => 'Error while trying to initialise the database: ' . $e->getMessage(),
-				'hint' => '',
-			];
-			return $error;
-		}
-
-		//create the user and group
-		$user = null;
-		try {
-			$user = \OC::$server->getUserManager()->createUser($username, $password);
-			if (!$user) {
-				$error[] = "User <$username> could not be created.";
-			}
-		} catch (Exception $exception) {
-			$error[] = $exception->getMessage();
-		}
-
-		if (empty($error)) {
-			$config = \OC::$server->getConfig();
-			$config->setAppValue('core', 'installedat', microtime(true));
-			$config->setAppValue('core', 'lastupdatedat', microtime(true));
-			$config->setAppValue('core', 'vendor', $this->getVendor());
-
-			$group = \OC::$server->getGroupManager()->createGroup('admin');
-			if ($group instanceof IGroup) {
-				$group->addUser($user);
-			}
-
-			// Install shipped apps and specified app bundles
-			Installer::installShippedApps();
-			$bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
-			$defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
-			foreach ($defaultInstallationBundles as $bundle) {
-				try {
-					$this->installer->installAppBundle($bundle);
-				} catch (Exception $e) {
-				}
-			}
-
-			// create empty file in data dir, so we can later find
-			// out that this is indeed an ownCloud data directory
-			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
-
-			// Update .htaccess files
-			self::updateHtaccess();
-			self::protectDataDirectory();
-
-			self::installBackgroundJobs();
-
-			//and we are done
-			$config->setSystemValue('installed', true);
-
-			// Create a session token for the newly created user
-			// The token provider requires a working db, so it's not injected on setup
-			/* @var $userSession User\Session */
-			$userSession = \OC::$server->getUserSession();
-			$defaultTokenProvider = \OC::$server->query(DefaultTokenProvider::class);
-			$userSession->setTokenProvider($defaultTokenProvider);
-			$userSession->login($username, $password);
-			$userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
-
-			$session = $userSession->getSession();
-			$session->set('last-password-confirm', \OC::$server->query(ITimeFactory::class)->getTime());
-
-			// Set email for admin
-			if (!empty($options['adminemail'])) {
-				$config->setUserValue($user->getUID(), 'settings', 'email', $options['adminemail']);
-			}
-		}
-
-		return $error;
-	}
-
-	public static function installBackgroundJobs() {
-		$jobList = \OC::$server->getJobList();
-		$jobList->add(DefaultTokenCleanupJob::class);
-		$jobList->add(Rotate::class);
-		$jobList->add(BackgroundCleanupJob::class);
-	}
-
-	/**
-	 * @return string Absolute path to htaccess
-	 */
-	private function pathToHtaccess() {
-		return \OC::$SERVERROOT . '/.htaccess';
-	}
-
-	/**
-	 * Find webroot from config
-	 *
-	 * @param SystemConfig $config
-	 * @return string
-	 * @throws InvalidArgumentException when invalid value for overwrite.cli.url
-	 */
-	private static function findWebRoot(SystemConfig $config): string {
-		// For CLI read the value from overwrite.cli.url
-		if (\OC::$CLI) {
-			$webRoot = $config->getValue('overwrite.cli.url', '');
-			if ($webRoot === '') {
-				throw new InvalidArgumentException('overwrite.cli.url is empty');
-			}
-			if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
-				throw new InvalidArgumentException('invalid value for overwrite.cli.url');
-			}
-			$webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/');
-		} else {
-			$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
-		}
-
-		return $webRoot;
-	}
-
-	/**
-	 * Append the correct ErrorDocument path for Apache hosts
-	 *
-	 * @return bool True when success, False otherwise
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public static function updateHtaccess() {
-		$config = \OC::$server->getSystemConfig();
-
-		try {
-			$webRoot = self::findWebRoot($config);
-		} catch (InvalidArgumentException $e) {
-			return false;
-		}
-
-		$setupHelper = new \OC\Setup(
-			$config,
-			\OC::$server->getIniWrapper(),
-			\OC::$server->getL10N('lib'),
-			\OC::$server->query(Defaults::class),
-			\OC::$server->getLogger(),
-			\OC::$server->getSecureRandom(),
-			\OC::$server->query(Installer::class)
-		);
-
-		$htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
-		$content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
-		$htaccessContent = explode($content, $htaccessContent, 2)[0];
-
-		//custom 403 error page
-		$content .= "\nErrorDocument 403 " . $webRoot . '/';
-
-		//custom 404 error page
-		$content .= "\nErrorDocument 404 " . $webRoot . '/';
-
-		// Add rewrite rules if the RewriteBase is configured
-		$rewriteBase = $config->getValue('htaccess.RewriteBase', '');
-		if ($rewriteBase !== '') {
-			$content .= "\n<IfModule mod_rewrite.c>";
-			$content .= "\n  Options -MultiViews";
-			$content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg|map|webm|mp4)$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/robots.txt";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
-			$content .= "\n  RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
-			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteBase " . $rewriteBase;
-			$content .= "\n  <IfModule mod_env.c>";
-			$content .= "\n    SetEnv front_controller_active true";
-			$content .= "\n    <IfModule mod_dir.c>";
-			$content .= "\n      DirectorySlash off";
-			$content .= "\n    </IfModule>";
-			$content .= "\n  </IfModule>";
-			$content .= "\n</IfModule>";
-		}
-
-		if ($content !== '') {
-			//suppress errors in case we don't have permissions for it
-			return (bool)@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent . $content . "\n");
-		}
-
-		return false;
-	}
-
-	public static function protectDataDirectory() {
-		//Require all denied
-		$now = date('Y-m-d H:i:s');
-		$content = "# Generated by Nextcloud on $now\n";
-		$content .= "# Section for Apache 2.4 to 2.6\n";
-		$content .= "<IfModule mod_authz_core.c>\n";
-		$content .= "  Require all denied\n";
-		$content .= "</IfModule>\n";
-		$content .= "<IfModule mod_access_compat.c>\n";
-		$content .= "  Order Allow,Deny\n";
-		$content .= "  Deny from all\n";
-		$content .= "  Satisfy All\n";
-		$content .= "</IfModule>\n\n";
-		$content .= "# Section for Apache 2.2\n";
-		$content .= "<IfModule !mod_authz_core.c>\n";
-		$content .= "  <IfModule !mod_access_compat.c>\n";
-		$content .= "    <IfModule mod_authz_host.c>\n";
-		$content .= "      Order Allow,Deny\n";
-		$content .= "      Deny from all\n";
-		$content .= "    </IfModule>\n";
-		$content .= "    Satisfy All\n";
-		$content .= "  </IfModule>\n";
-		$content .= "</IfModule>\n\n";
-		$content .= "# Section for Apache 2.2 to 2.6\n";
-		$content .= "<IfModule mod_autoindex.c>\n";
-		$content .= "  IndexIgnore *\n";
-		$content .= "</IfModule>";
-
-		$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		file_put_contents($baseDir . '/.htaccess', $content);
-		file_put_contents($baseDir . '/index.html', '');
-	}
-
-	/**
-	 * Return vendor from which this version was published
-	 *
-	 * @return string Get the vendor
-	 *
-	 * Copy of \OC\Updater::getVendor()
-	 */
-	private function getVendor() {
-		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
-		/** @var string $vendor */
-		return (string)$vendor;
-	}
+    /** @var SystemConfig */
+    protected $config;
+    /** @var IniGetWrapper */
+    protected $iniWrapper;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var Defaults */
+    protected $defaults;
+    /** @var ILogger */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
+    /** @var Installer */
+    protected $installer;
+
+    /**
+     * @param SystemConfig $config
+     * @param IniGetWrapper $iniWrapper
+     * @param IL10N $l10n
+     * @param Defaults $defaults
+     * @param ILogger $logger
+     * @param ISecureRandom $random
+     * @param Installer $installer
+     */
+    public function __construct(
+        SystemConfig $config,
+        IniGetWrapper $iniWrapper,
+        IL10N $l10n,
+        Defaults $defaults,
+        ILogger $logger,
+        ISecureRandom $random,
+        Installer $installer
+    ) {
+        $this->config = $config;
+        $this->iniWrapper = $iniWrapper;
+        $this->l10n = $l10n;
+        $this->defaults = $defaults;
+        $this->logger = $logger;
+        $this->random = $random;
+        $this->installer = $installer;
+    }
+
+    static protected $dbSetupClasses = [
+        'mysql' => \OC\Setup\MySQL::class,
+        'pgsql' => \OC\Setup\PostgreSQL::class,
+        'oci' => \OC\Setup\OCI::class,
+        'sqlite' => \OC\Setup\Sqlite::class,
+        'sqlite3' => \OC\Setup\Sqlite::class,
+    ];
+
+    /**
+     * Wrapper around the "class_exists" PHP function to be able to mock it
+     *
+     * @param string $name
+     * @return bool
+     */
+    protected function class_exists($name) {
+        return class_exists($name);
+    }
+
+    /**
+     * Wrapper around the "is_callable" PHP function to be able to mock it
+     *
+     * @param string $name
+     * @return bool
+     */
+    protected function is_callable($name) {
+        return is_callable($name);
+    }
+
+    /**
+     * Wrapper around \PDO::getAvailableDrivers
+     *
+     * @return array
+     */
+    protected function getAvailableDbDriversForPdo() {
+        return \PDO::getAvailableDrivers();
+    }
+
+    /**
+     * Get the available and supported databases of this instance
+     *
+     * @param bool $allowAllDatabases
+     * @return array
+     * @throws Exception
+     */
+    public function getSupportedDatabases($allowAllDatabases = false) {
+        $availableDatabases = [
+            'sqlite' => [
+                'type' => 'pdo',
+                'call' => 'sqlite',
+                'name' => 'SQLite',
+            ],
+            'mysql' => [
+                'type' => 'pdo',
+                'call' => 'mysql',
+                'name' => 'MySQL/MariaDB',
+            ],
+            'pgsql' => [
+                'type' => 'pdo',
+                'call' => 'pgsql',
+                'name' => 'PostgreSQL',
+            ],
+            'oci' => [
+                'type' => 'function',
+                'call' => 'oci_connect',
+                'name' => 'Oracle',
+            ],
+        ];
+        if ($allowAllDatabases) {
+            $configuredDatabases = array_keys($availableDatabases);
+        } else {
+            $configuredDatabases = $this->config->getValue('supportedDatabases',
+                ['sqlite', 'mysql', 'pgsql']);
+        }
+        if (!is_array($configuredDatabases)) {
+            throw new Exception('Supported databases are not properly configured.');
+        }
+
+        $supportedDatabases = [];
+
+        foreach ($configuredDatabases as $database) {
+            if (array_key_exists($database, $availableDatabases)) {
+                $working = false;
+                $type = $availableDatabases[$database]['type'];
+                $call = $availableDatabases[$database]['call'];
+
+                if ($type === 'function') {
+                    $working = $this->is_callable($call);
+                } elseif ($type === 'pdo') {
+                    $working = in_array($call, $this->getAvailableDbDriversForPdo(), true);
+                }
+                if ($working) {
+                    $supportedDatabases[$database] = $availableDatabases[$database]['name'];
+                }
+            }
+        }
+
+        return $supportedDatabases;
+    }
+
+    /**
+     * Gathers system information like database type and does
+     * a few system checks.
+     *
+     * @return array of system info, including an "errors" value
+     * in case of errors/warnings
+     */
+    public function getSystemInfo($allowAllDatabases = false) {
+        $databases = $this->getSupportedDatabases($allowAllDatabases);
+
+        $dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
+
+        $errors = [];
+
+        // Create data directory to test whether the .htaccess works
+        // Notice that this is not necessarily the same data directory as the one
+        // that will effectively be used.
+        if (!file_exists($dataDir)) {
+            @mkdir($dataDir);
+        }
+        $htAccessWorking = true;
+        if (is_dir($dataDir) && is_writable($dataDir)) {
+            // Protect data directory here, so we can test if the protection is working
+            self::protectDataDirectory();
+
+            try {
+                $util = new \OC_Util();
+                $htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
+            } catch (\OC\HintException $e) {
+                $errors[] = [
+                    'error' => $e->getMessage(),
+                    'hint' => $e->getHint(),
+                ];
+                $htAccessWorking = false;
+            }
+        }
+
+        if (\OC_Util::runningOnMac()) {
+            $errors[] = [
+                'error' => $this->l10n->t(
+                    'Mac OS X is not supported and %s will not work properly on this platform. ' .
+                    'Use it at your own risk! ',
+                    [$this->defaults->getName()]
+                ),
+                'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),
+            ];
+        }
+
+        if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
+            $errors[] = [
+                'error' => $this->l10n->t(
+                    'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
+                    'This will lead to problems with files over 4 GB and is highly discouraged.',
+                    [$this->defaults->getName()]
+                ),
+                'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.'),
+            ];
+        }
+
+        return [
+            'hasSQLite' => isset($databases['sqlite']),
+            'hasMySQL' => isset($databases['mysql']),
+            'hasPostgreSQL' => isset($databases['pgsql']),
+            'hasOracle' => isset($databases['oci']),
+            'databases' => $databases,
+            'directory' => $dataDir,
+            'htaccessWorking' => $htAccessWorking,
+            'errors' => $errors,
+        ];
+    }
+
+    /**
+     * @param $options
+     * @return array
+     */
+    public function install($options) {
+        $l = $this->l10n;
+
+        $error = [];
+        $dbType = $options['dbtype'];
+
+        if (empty($options['adminlogin'])) {
+            $error[] = $l->t('Set an admin username.');
+        }
+        if (empty($options['adminpass'])) {
+            $error[] = $l->t('Set an admin password.');
+        }
+        if (empty($options['directory'])) {
+            $options['directory'] = \OC::$SERVERROOT . "/data";
+        }
+
+        if (!isset(self::$dbSetupClasses[$dbType])) {
+            $dbType = 'sqlite';
+        }
+
+        $username = htmlspecialchars_decode($options['adminlogin']);
+        $password = htmlspecialchars_decode($options['adminpass']);
+        $dataDir = htmlspecialchars_decode($options['directory']);
+
+        $class = self::$dbSetupClasses[$dbType];
+        /** @var \OC\Setup\AbstractDatabase $dbSetup */
+        $dbSetup = new $class($l, $this->config, $this->logger, $this->random);
+        $error = array_merge($error, $dbSetup->validate($options));
+
+        // validate the data directory
+        if ((!is_dir($dataDir) && !mkdir($dataDir)) || !is_writable($dataDir)) {
+            $error[] = $l->t("Can't create or write into the data directory %s", [$dataDir]);
+        }
+
+        if (!empty($error)) {
+            return $error;
+        }
+
+        $request = \OC::$server->getRequest();
+
+        //no errors, good
+        if (isset($options['trusted_domains'])
+            && is_array($options['trusted_domains'])) {
+            $trustedDomains = $options['trusted_domains'];
+        } else {
+            $trustedDomains = [$request->getInsecureServerHost()];
+        }
+
+        //use sqlite3 when available, otherwise sqlite2 will be used.
+        if ($dbType === 'sqlite' && class_exists('SQLite3')) {
+            $dbType = 'sqlite3';
+        }
+
+        //generate a random salt that is used to salt the local user passwords
+        $salt = $this->random->generate(30);
+        // generate a secret
+        $secret = $this->random->generate(48);
+
+        //write the config file
+        $newConfigValues = [
+            'passwordsalt' => $salt,
+            'secret' => $secret,
+            'trusted_domains' => $trustedDomains,
+            'datadirectory' => $dataDir,
+            'dbtype' => $dbType,
+            'version' => implode('.', \OCP\Util::getVersion()),
+        ];
+
+        if ($this->config->getValue('overwrite.cli.url', null) === null) {
+            $newConfigValues['overwrite.cli.url'] = $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT;
+        }
+
+        $this->config->setValues($newConfigValues);
+
+        $dbSetup->initialize($options);
+        try {
+            $dbSetup->setupDatabase($username);
+        } catch (\OC\DatabaseSetupException $e) {
+            $error[] = [
+                'error' => $e->getMessage(),
+                'hint' => $e->getHint(),
+            ];
+            return $error;
+        } catch (Exception $e) {
+            $error[] = [
+                'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+                'hint' => '',
+            ];
+            return $error;
+        }
+        try {
+            // apply necessary migrations
+            $dbSetup->runMigrations();
+        } catch (Exception $e) {
+            $error[] = [
+                'error' => 'Error while trying to initialise the database: ' . $e->getMessage(),
+                'hint' => '',
+            ];
+            return $error;
+        }
+
+        //create the user and group
+        $user = null;
+        try {
+            $user = \OC::$server->getUserManager()->createUser($username, $password);
+            if (!$user) {
+                $error[] = "User <$username> could not be created.";
+            }
+        } catch (Exception $exception) {
+            $error[] = $exception->getMessage();
+        }
+
+        if (empty($error)) {
+            $config = \OC::$server->getConfig();
+            $config->setAppValue('core', 'installedat', microtime(true));
+            $config->setAppValue('core', 'lastupdatedat', microtime(true));
+            $config->setAppValue('core', 'vendor', $this->getVendor());
+
+            $group = \OC::$server->getGroupManager()->createGroup('admin');
+            if ($group instanceof IGroup) {
+                $group->addUser($user);
+            }
+
+            // Install shipped apps and specified app bundles
+            Installer::installShippedApps();
+            $bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
+            $defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
+            foreach ($defaultInstallationBundles as $bundle) {
+                try {
+                    $this->installer->installAppBundle($bundle);
+                } catch (Exception $e) {
+                }
+            }
+
+            // create empty file in data dir, so we can later find
+            // out that this is indeed an ownCloud data directory
+            file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
+
+            // Update .htaccess files
+            self::updateHtaccess();
+            self::protectDataDirectory();
+
+            self::installBackgroundJobs();
+
+            //and we are done
+            $config->setSystemValue('installed', true);
+
+            // Create a session token for the newly created user
+            // The token provider requires a working db, so it's not injected on setup
+            /* @var $userSession User\Session */
+            $userSession = \OC::$server->getUserSession();
+            $defaultTokenProvider = \OC::$server->query(DefaultTokenProvider::class);
+            $userSession->setTokenProvider($defaultTokenProvider);
+            $userSession->login($username, $password);
+            $userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
+
+            $session = $userSession->getSession();
+            $session->set('last-password-confirm', \OC::$server->query(ITimeFactory::class)->getTime());
+
+            // Set email for admin
+            if (!empty($options['adminemail'])) {
+                $config->setUserValue($user->getUID(), 'settings', 'email', $options['adminemail']);
+            }
+        }
+
+        return $error;
+    }
+
+    public static function installBackgroundJobs() {
+        $jobList = \OC::$server->getJobList();
+        $jobList->add(DefaultTokenCleanupJob::class);
+        $jobList->add(Rotate::class);
+        $jobList->add(BackgroundCleanupJob::class);
+    }
+
+    /**
+     * @return string Absolute path to htaccess
+     */
+    private function pathToHtaccess() {
+        return \OC::$SERVERROOT . '/.htaccess';
+    }
+
+    /**
+     * Find webroot from config
+     *
+     * @param SystemConfig $config
+     * @return string
+     * @throws InvalidArgumentException when invalid value for overwrite.cli.url
+     */
+    private static function findWebRoot(SystemConfig $config): string {
+        // For CLI read the value from overwrite.cli.url
+        if (\OC::$CLI) {
+            $webRoot = $config->getValue('overwrite.cli.url', '');
+            if ($webRoot === '') {
+                throw new InvalidArgumentException('overwrite.cli.url is empty');
+            }
+            if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
+                throw new InvalidArgumentException('invalid value for overwrite.cli.url');
+            }
+            $webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/');
+        } else {
+            $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
+        }
+
+        return $webRoot;
+    }
+
+    /**
+     * Append the correct ErrorDocument path for Apache hosts
+     *
+     * @return bool True when success, False otherwise
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public static function updateHtaccess() {
+        $config = \OC::$server->getSystemConfig();
+
+        try {
+            $webRoot = self::findWebRoot($config);
+        } catch (InvalidArgumentException $e) {
+            return false;
+        }
+
+        $setupHelper = new \OC\Setup(
+            $config,
+            \OC::$server->getIniWrapper(),
+            \OC::$server->getL10N('lib'),
+            \OC::$server->query(Defaults::class),
+            \OC::$server->getLogger(),
+            \OC::$server->getSecureRandom(),
+            \OC::$server->query(Installer::class)
+        );
+
+        $htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
+        $content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
+        $htaccessContent = explode($content, $htaccessContent, 2)[0];
+
+        //custom 403 error page
+        $content .= "\nErrorDocument 403 " . $webRoot . '/';
+
+        //custom 404 error page
+        $content .= "\nErrorDocument 404 " . $webRoot . '/';
+
+        // Add rewrite rules if the RewriteBase is configured
+        $rewriteBase = $config->getValue('htaccess.RewriteBase', '');
+        if ($rewriteBase !== '') {
+            $content .= "\n<IfModule mod_rewrite.c>";
+            $content .= "\n  Options -MultiViews";
+            $content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg|map|webm|mp4)$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/robots.txt";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
+            $content .= "\n  RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
+            $content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteBase " . $rewriteBase;
+            $content .= "\n  <IfModule mod_env.c>";
+            $content .= "\n    SetEnv front_controller_active true";
+            $content .= "\n    <IfModule mod_dir.c>";
+            $content .= "\n      DirectorySlash off";
+            $content .= "\n    </IfModule>";
+            $content .= "\n  </IfModule>";
+            $content .= "\n</IfModule>";
+        }
+
+        if ($content !== '') {
+            //suppress errors in case we don't have permissions for it
+            return (bool)@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent . $content . "\n");
+        }
+
+        return false;
+    }
+
+    public static function protectDataDirectory() {
+        //Require all denied
+        $now = date('Y-m-d H:i:s');
+        $content = "# Generated by Nextcloud on $now\n";
+        $content .= "# Section for Apache 2.4 to 2.6\n";
+        $content .= "<IfModule mod_authz_core.c>\n";
+        $content .= "  Require all denied\n";
+        $content .= "</IfModule>\n";
+        $content .= "<IfModule mod_access_compat.c>\n";
+        $content .= "  Order Allow,Deny\n";
+        $content .= "  Deny from all\n";
+        $content .= "  Satisfy All\n";
+        $content .= "</IfModule>\n\n";
+        $content .= "# Section for Apache 2.2\n";
+        $content .= "<IfModule !mod_authz_core.c>\n";
+        $content .= "  <IfModule !mod_access_compat.c>\n";
+        $content .= "    <IfModule mod_authz_host.c>\n";
+        $content .= "      Order Allow,Deny\n";
+        $content .= "      Deny from all\n";
+        $content .= "    </IfModule>\n";
+        $content .= "    Satisfy All\n";
+        $content .= "  </IfModule>\n";
+        $content .= "</IfModule>\n\n";
+        $content .= "# Section for Apache 2.2 to 2.6\n";
+        $content .= "<IfModule mod_autoindex.c>\n";
+        $content .= "  IndexIgnore *\n";
+        $content .= "</IfModule>";
+
+        $baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        file_put_contents($baseDir . '/.htaccess', $content);
+        file_put_contents($baseDir . '/index.html', '');
+    }
+
+    /**
+     * Return vendor from which this version was published
+     *
+     * @return string Get the vendor
+     *
+     * Copy of \OC\Updater::getVendor()
+     */
+    private function getVendor() {
+        // this should really be a JSON file
+        require \OC::$SERVERROOT . '/version.php';
+        /** @var string $vendor */
+        return (string)$vendor;
+    }
 }

core/ajax/update.php

Indentation +180 added lines, -180 removed lines

@@ -34,7 +34,7 @@ 
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 
 require_once '../../lib/base.php';
@@ -48,190 +48,190 @@ 
 $eventSource->send('success', (string)$l->t('Preparing update'));
 
 class FeedBackHandler {
-	/** @var integer */
-	private $progressStateMax = 100;
-	/** @var integer */
-	private $progressStateStep = 0;
-	/** @var string */
-	private $currentStep;
-	/** @var \OCP\IEventSource */
-	private $eventSource;
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
-		$this->eventSource = $eventSource;
-		$this->l10n = $l10n;
-	}
-
-	public function handleRepairFeedback($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progressStateMax = $event->getArgument(0);
-				$this->progressStateStep = 0;
-				$this->currentStep = $event->getArgument(1);
-				break;
-			case '\OC\Repair::advance':
-				$this->progressStateStep += $event->getArgument(0);
-				$desc = $event->getArgument(1);
-				if (empty($desc)) {
-					$desc = $this->currentStep;
-				}
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progressStateMax = $this->progressStateStep;
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
-				break;
-			case '\OC\Repair::step':
-				$this->eventSource->send('success', (string)$this->l10n->t('Repair step:') . ' ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::info':
-				$this->eventSource->send('success', (string)$this->l10n->t('Repair info:') . ' ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair warning:') . ' ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair error:') . ' ' . $event->getArgument(0));
-				break;
-		}
-	}
+    /** @var integer */
+    private $progressStateMax = 100;
+    /** @var integer */
+    private $progressStateStep = 0;
+    /** @var string */
+    private $currentStep;
+    /** @var \OCP\IEventSource */
+    private $eventSource;
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
+        $this->eventSource = $eventSource;
+        $this->l10n = $l10n;
+    }
+
+    public function handleRepairFeedback($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progressStateMax = $event->getArgument(0);
+                $this->progressStateStep = 0;
+                $this->currentStep = $event->getArgument(1);
+                break;
+            case '\OC\Repair::advance':
+                $this->progressStateStep += $event->getArgument(0);
+                $desc = $event->getArgument(1);
+                if (empty($desc)) {
+                    $desc = $this->currentStep;
+                }
+                $this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progressStateMax = $this->progressStateStep;
+                $this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
+                break;
+            case '\OC\Repair::step':
+                $this->eventSource->send('success', (string)$this->l10n->t('Repair step:') . ' ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::info':
+                $this->eventSource->send('success', (string)$this->l10n->t('Repair info:') . ' ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::warning':
+                $this->eventSource->send('notice', (string)$this->l10n->t('Repair warning:') . ' ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->eventSource->send('notice', (string)$this->l10n->t('Repair error:') . ' ' . $event->getArgument(0));
+                break;
+        }
+    }
 }
 
 if (\OCP\Util::needUpgrade()) {
 
-	$config = \OC::$server->getSystemConfig();
-	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-		$eventSource->close();
-		exit();
-	}
-
-	// if a user is currently logged in, their session must be ignored to
-	// avoid side effects
-	\OC_User::setIncognitoMode(true);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-	$updater = new \OC\Updater(
-			$config,
-			\OC::$server->getIntegrityCodeChecker(),
-			$logger,
-			\OC::$server->query(\OC\Installer::class)
-	);
-	$incompatibleApps = [];
-
-	$dispatcher = \OC::$server->getEventDispatcher();
-	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$feedBack = new FeedBackHandler($eventSource, $l);
-	$dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
-
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updating database schema'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated database'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking updates of apps'));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated "%1$s" to %2$s', [$app, $version]));
-	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[]= $app;
-	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
-		$eventSource->send('failure', $message);
-		$eventSource->close();
-		$config->setSystemValue('maintenance', false);
-	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Set log level to debug'));
-	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Reset log level'));
-	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Starting code integrity check'));
-	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Finished code integrity check'));
-	});
-
-	try {
-		$updater->upgrade();
-	} catch (\Exception $e) {
-		\OC::$server->getLogger()->logException($e, [
-			'level' => ILogger::ERROR,
-			'app' => 'update',
-		]);
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
-		$eventSource->close();
-		exit();
-	}
-
-	$disabledApps = [];
-	foreach ($incompatibleApps as $app) {
-		$disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
-	}
-
-	if (!empty($disabledApps)) {
-		$eventSource->send('notice',
-			(string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
-	}
+    $config = \OC::$server->getSystemConfig();
+    if ($config->getValue('upgrade.disable-web', false)) {
+        $eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+        $eventSource->close();
+        exit();
+    }
+
+    // if a user is currently logged in, their session must be ignored to
+    // avoid side effects
+    \OC_User::setIncognitoMode(true);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+    $updater = new \OC\Updater(
+            $config,
+            \OC::$server->getIntegrityCodeChecker(),
+            $logger,
+            \OC::$server->query(\OC\Installer::class)
+    );
+    $incompatibleApps = [];
+
+    $dispatcher = \OC::$server->getEventDispatcher();
+    $dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $feedBack = new FeedBackHandler($eventSource, $l);
+    $dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
+
+    $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updating database schema'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updated database'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked database schema update'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking updates of apps'));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updated "%1$s" to %2$s', [$app, $version]));
+    });
+    $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
+        $incompatibleApps[]= $app;
+    });
+    $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+        $eventSource->send('failure', $message);
+        $eventSource->close();
+        $config->setSystemValue('maintenance', false);
+    });
+    $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Set log level to debug'));
+    });
+    $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Reset log level'));
+    });
+    $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Starting code integrity check'));
+    });
+    $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Finished code integrity check'));
+    });
+
+    try {
+        $updater->upgrade();
+    } catch (\Exception $e) {
+        \OC::$server->getLogger()->logException($e, [
+            'level' => ILogger::ERROR,
+            'app' => 'update',
+        ]);
+        $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+        $eventSource->close();
+        exit();
+    }
+
+    $disabledApps = [];
+    foreach ($incompatibleApps as $app) {
+        $disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
+    }
+
+    if (!empty($disabledApps)) {
+        $eventSource->send('notice',
+            (string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
+    }
 } else {
-	$eventSource->send('notice', (string)$l->t('Already up to date'));
+    $eventSource->send('notice', (string)$l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

core/Command/User/Report.php

Indentation +44 added lines, -44 removed lines

@@ -33,56 +33,56 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Report extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:report')
-			->setDescription('shows how many users have access');
-	}
+    protected function configure() {
+        $this
+            ->setName('user:report')
+            ->setDescription('shows how many users have access');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$table = new Table($output);
-		$table->setHeaders(['User Report', '']);
-		$userCountArray = $this->countUsers();
-		if(!empty($userCountArray)) {
-			$total = 0;
-			$rows = [];
-			foreach($userCountArray as $classname => $users) {
-				$total += $users;
-				$rows[] = [$classname, $users];
-			}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $table = new Table($output);
+        $table->setHeaders(['User Report', '']);
+        $userCountArray = $this->countUsers();
+        if(!empty($userCountArray)) {
+            $total = 0;
+            $rows = [];
+            foreach($userCountArray as $classname => $users) {
+                $total += $users;
+                $rows[] = [$classname, $users];
+            }
 
-			$rows[] = [' '];
-			$rows[] = ['total users', $total];
-		} else {
-			$rows[] = ['No backend enabled that supports user counting', ''];
-		}
+            $rows[] = [' '];
+            $rows[] = ['total users', $total];
+        } else {
+            $rows[] = ['No backend enabled that supports user counting', ''];
+        }
 
-		$userDirectoryCount = $this->countUserDirectories();
-		$rows[] = [' '];
-		$rows[] = ['user directories', $userDirectoryCount];
+        $userDirectoryCount = $this->countUserDirectories();
+        $rows[] = [' '];
+        $rows[] = ['user directories', $userDirectoryCount];
 
-		$table->setRows($rows);
-		$table->render();
-	}
+        $table->setRows($rows);
+        $table->render();
+    }
 
-	private function countUsers() {
-		return $this->userManager->countUsers();
-	}
+    private function countUsers() {
+        return $this->userManager->countUsers();
+    }
 
-	private function countUserDirectories() {
-		$dataview = new \OC\Files\View('/');
-		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
-		return count($userDirectories);
-	}
+    private function countUserDirectories() {
+        $dataview = new \OC\Files\View('/');
+        $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
+        return count($userDirectories);
+    }
 }