nextcloud / server

lib/private/Security/Hasher.php

Spacing +5 added lines, -5 removed lines

@@ -96,14 +96,14 @@ 
 		$alg = $this->getPrefferedAlgorithm();
 
 		if (\defined('PASSWORD_ARGON2ID') && $alg === PASSWORD_ARGON2ID) {
-			return 3 . '|' . password_hash($message, PASSWORD_ARGON2ID, $this->options);
+			return 3.'|'.password_hash($message, PASSWORD_ARGON2ID, $this->options);
 		}
 
 		if (\defined('PASSWORD_ARGON2I') && $alg === PASSWORD_ARGON2I) {
-			return 2 . '|' . password_hash($message, PASSWORD_ARGON2I, $this->options);
+			return 2.'|'.password_hash($message, PASSWORD_ARGON2I, $this->options);
 		}
 
-		return 1 . '|' . password_hash($message, PASSWORD_BCRYPT, $this->options);
+		return 1.'|'.password_hash($message, PASSWORD_BCRYPT, $this->options);
 	}
 
 	/**
@@ -114,8 +114,8 @@ 
 	protected function splitHash(string $prefixedHash) {
 		$explodedString = explode('|', $prefixedHash, 2);
 		if (\count($explodedString) === 2) {
-			if ((int)$explodedString[0] > 0) {
-				return ['version' => (int)$explodedString[0], 'hash' => $explodedString[1]];
+			if ((int) $explodedString[0] > 0) {
+				return ['version' => (int) $explodedString[0], 'hash' => $explodedString[1]];
 			}
 		}
 

Indentation +164 added lines, -164 removed lines

@@ -51,168 +51,168 @@
  * @package OC\Security
  */
 class Hasher implements IHasher {
-	/** @var IConfig */
-	private $config;
-	/** @var array Options passed to password_hash and password_needs_rehash */
-	private $options = [];
-	/** @var string Salt used for legacy passwords */
-	private $legacySalt = null;
-
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-
-		if (\defined('PASSWORD_ARGON2ID') || \defined('PASSWORD_ARGON2I')) {
-			// password_hash fails, when the minimum values are undershot.
-			// In this case, apply minimum.
-			$this->options['threads'] = max($this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS), 1);
-			// The minimum memory cost is 8 KiB per thread.
-			$this->options['memory_cost'] = max($this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST), $this->options['threads'] * 8);
-			$this->options['time_cost'] = max($this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_TIME_COST), 1);
-		}
-
-		$hashingCost = $this->config->getSystemValue('hashingCost', null);
-		if (!\is_null($hashingCost)) {
-			$this->options['cost'] = $hashingCost;
-		}
-	}
-
-	/**
-	 * Hashes a message using PHP's `password_hash` functionality.
-	 * Please note that the size of the returned string is not guaranteed
-	 * and can be up to 255 characters.
-	 *
-	 * @param string $message Message to generate hash from
-	 * @return string Hash of the message with appended version parameter
-	 */
-	public function hash(string $message): string {
-		$alg = $this->getPrefferedAlgorithm();
-
-		if (\defined('PASSWORD_ARGON2ID') && $alg === PASSWORD_ARGON2ID) {
-			return 3 . '|' . password_hash($message, PASSWORD_ARGON2ID, $this->options);
-		}
-
-		if (\defined('PASSWORD_ARGON2I') && $alg === PASSWORD_ARGON2I) {
-			return 2 . '|' . password_hash($message, PASSWORD_ARGON2I, $this->options);
-		}
-
-		return 1 . '|' . password_hash($message, PASSWORD_BCRYPT, $this->options);
-	}
-
-	/**
-	 * Get the version and hash from a prefixedHash
-	 * @param string $prefixedHash
-	 * @return null|array Null if the hash is not prefixed, otherwise array('version' => 1, 'hash' => 'foo')
-	 */
-	protected function splitHash(string $prefixedHash) {
-		$explodedString = explode('|', $prefixedHash, 2);
-		if (\count($explodedString) === 2) {
-			if ((int)$explodedString[0] > 0) {
-				return ['version' => (int)$explodedString[0], 'hash' => $explodedString[1]];
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Verify legacy hashes
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash
-	 * @return bool Whether $hash is a valid hash of $message
-	 */
-	protected function legacyHashVerify($message, $hash, &$newHash = null): bool {
-		if (empty($this->legacySalt)) {
-			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
-		}
-
-		// Verify whether it matches a legacy PHPass or SHA1 string
-		$hashLength = \strlen($hash);
-		if (($hashLength === 60 && password_verify($message.$this->legacySalt, $hash)) ||
-			($hashLength === 40 && hash_equals($hash, sha1($message)))) {
-			$newHash = $this->hash($message);
-			return true;
-		}
-
-		// Verify whether it matches a legacy PHPass or SHA1 string
-		// Retry with empty passwordsalt for cases where it was not set
-		$hashLength = \strlen($hash);
-		if (($hashLength === 60 && password_verify($message, $hash)) ||
-			($hashLength === 40 && hash_equals($hash, sha1($message)))) {
-			$newHash = $this->hash($message);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Verify V1 (blowfish) hashes
-	 * Verify V2 (argon2i) hashes
-	 * Verify V3 (argon2id) hashes
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 */
-	protected function verifyHash(string $message, string $hash, &$newHash = null): bool {
-		if (password_verify($message, $hash)) {
-			if ($this->needsRehash($hash)) {
-				$newHash = $this->hash($message);
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool {
-		$splittedHash = $this->splitHash($hash);
-
-		if (isset($splittedHash['version'])) {
-			switch ($splittedHash['version']) {
-				case 3:
-				case 2:
-				case 1:
-					return $this->verifyHash($message, $splittedHash['hash'], $newHash);
-			}
-		} else {
-			return $this->legacyHashVerify($message, $hash, $newHash);
-		}
-
-		return false;
-	}
-
-	private function needsRehash(string $hash): bool {
-		$algorithm = $this->getPrefferedAlgorithm();
-
-		return password_needs_rehash($hash, $algorithm, $this->options);
-	}
-
-	private function getPrefferedAlgorithm() {
-		$default = PASSWORD_BCRYPT;
-		if (\defined('PASSWORD_ARGON2I')) {
-			$default = PASSWORD_ARGON2I;
-		}
-
-		if (\defined('PASSWORD_ARGON2ID')) {
-			$default = PASSWORD_ARGON2ID;
-		}
-
-		// Check if we should use PASSWORD_DEFAULT
-		if ($this->config->getSystemValue('hashing_default_password', false) === true) {
-			$default = PASSWORD_DEFAULT;
-		}
-
-		return $default;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var array Options passed to password_hash and password_needs_rehash */
+    private $options = [];
+    /** @var string Salt used for legacy passwords */
+    private $legacySalt = null;
+
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+
+        if (\defined('PASSWORD_ARGON2ID') || \defined('PASSWORD_ARGON2I')) {
+            // password_hash fails, when the minimum values are undershot.
+            // In this case, apply minimum.
+            $this->options['threads'] = max($this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS), 1);
+            // The minimum memory cost is 8 KiB per thread.
+            $this->options['memory_cost'] = max($this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST), $this->options['threads'] * 8);
+            $this->options['time_cost'] = max($this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_TIME_COST), 1);
+        }
+
+        $hashingCost = $this->config->getSystemValue('hashingCost', null);
+        if (!\is_null($hashingCost)) {
+            $this->options['cost'] = $hashingCost;
+        }
+    }
+
+    /**
+     * Hashes a message using PHP's `password_hash` functionality.
+     * Please note that the size of the returned string is not guaranteed
+     * and can be up to 255 characters.
+     *
+     * @param string $message Message to generate hash from
+     * @return string Hash of the message with appended version parameter
+     */
+    public function hash(string $message): string {
+        $alg = $this->getPrefferedAlgorithm();
+
+        if (\defined('PASSWORD_ARGON2ID') && $alg === PASSWORD_ARGON2ID) {
+            return 3 . '|' . password_hash($message, PASSWORD_ARGON2ID, $this->options);
+        }
+
+        if (\defined('PASSWORD_ARGON2I') && $alg === PASSWORD_ARGON2I) {
+            return 2 . '|' . password_hash($message, PASSWORD_ARGON2I, $this->options);
+        }
+
+        return 1 . '|' . password_hash($message, PASSWORD_BCRYPT, $this->options);
+    }
+
+    /**
+     * Get the version and hash from a prefixedHash
+     * @param string $prefixedHash
+     * @return null|array Null if the hash is not prefixed, otherwise array('version' => 1, 'hash' => 'foo')
+     */
+    protected function splitHash(string $prefixedHash) {
+        $explodedString = explode('|', $prefixedHash, 2);
+        if (\count($explodedString) === 2) {
+            if ((int)$explodedString[0] > 0) {
+                return ['version' => (int)$explodedString[0], 'hash' => $explodedString[1]];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Verify legacy hashes
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash
+     * @return bool Whether $hash is a valid hash of $message
+     */
+    protected function legacyHashVerify($message, $hash, &$newHash = null): bool {
+        if (empty($this->legacySalt)) {
+            $this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
+        }
+
+        // Verify whether it matches a legacy PHPass or SHA1 string
+        $hashLength = \strlen($hash);
+        if (($hashLength === 60 && password_verify($message.$this->legacySalt, $hash)) ||
+            ($hashLength === 40 && hash_equals($hash, sha1($message)))) {
+            $newHash = $this->hash($message);
+            return true;
+        }
+
+        // Verify whether it matches a legacy PHPass or SHA1 string
+        // Retry with empty passwordsalt for cases where it was not set
+        $hashLength = \strlen($hash);
+        if (($hashLength === 60 && password_verify($message, $hash)) ||
+            ($hashLength === 40 && hash_equals($hash, sha1($message)))) {
+            $newHash = $this->hash($message);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Verify V1 (blowfish) hashes
+     * Verify V2 (argon2i) hashes
+     * Verify V3 (argon2id) hashes
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     */
+    protected function verifyHash(string $message, string $hash, &$newHash = null): bool {
+        if (password_verify($message, $hash)) {
+            if ($this->needsRehash($hash)) {
+                $newHash = $this->hash($message);
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     */
+    public function verify(string $message, string $hash, &$newHash = null): bool {
+        $splittedHash = $this->splitHash($hash);
+
+        if (isset($splittedHash['version'])) {
+            switch ($splittedHash['version']) {
+                case 3:
+                case 2:
+                case 1:
+                    return $this->verifyHash($message, $splittedHash['hash'], $newHash);
+            }
+        } else {
+            return $this->legacyHashVerify($message, $hash, $newHash);
+        }
+
+        return false;
+    }
+
+    private function needsRehash(string $hash): bool {
+        $algorithm = $this->getPrefferedAlgorithm();
+
+        return password_needs_rehash($hash, $algorithm, $this->options);
+    }
+
+    private function getPrefferedAlgorithm() {
+        $default = PASSWORD_BCRYPT;
+        if (\defined('PASSWORD_ARGON2I')) {
+            $default = PASSWORD_ARGON2I;
+        }
+
+        if (\defined('PASSWORD_ARGON2ID')) {
+            $default = PASSWORD_ARGON2ID;
+        }
+
+        // Check if we should use PASSWORD_DEFAULT
+        if ($this->config->getSystemValue('hashing_default_password', false) === true) {
+            $default = PASSWORD_DEFAULT;
+        }
+
+        return $default;
+    }
 }

lib/private/Command/QueueBus.php

Indentation +40 added lines, -40 removed lines

@@ -27,48 +27,48 @@
 use OCP\Command\ICommand;
 
 class QueueBus implements IBus {
-	/**
-	 * @var ICommand[]|callable[]
-	 */
-	private $queue = [];
+    /**
+     * @var ICommand[]|callable[]
+     */
+    private $queue = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		$this->queue[] = $command;
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        $this->queue[] = $command;
+    }
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			// ensure the command can be serialized
-			$serialized = serialize($command);
-			if (strlen($serialized) > 4000) {
-				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
-			}
-			$unserialized = unserialize($serialized);
-			$unserialized->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            // ensure the command can be serialized
+            $serialized = serialize($command);
+            if (strlen($serialized) > 4000) {
+                throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
+            }
+            $unserialized = unserialize($serialized);
+            $unserialized->handle();
+        } else {
+            $command();
+        }
+    }
 
-	public function run() {
-		while ($command = array_shift($this->queue)) {
-			$this->runCommand($command);
-		}
-	}
+    public function run() {
+        while ($command = array_shift($this->queue)) {
+            $this->runCommand($command);
+        }
+    }
 }

lib/private/NavigationManager.php

Spacing +3 added lines, -3 removed lines

@@ -120,7 +120,7 @@ 
 
 		$result = $this->entries;
 		if ($type !== 'all') {
-			$result = array_filter($this->entries, function ($entry) use ($type) {
+			$result = array_filter($this->entries, function($entry) use ($type) {
 				return $entry['type'] === $type;
 			});
 		}
@@ -135,7 +135,7 @@ 
 	 * @return array
 	 */
 	private function proceedNavigation(array $list): array {
-		uasort($list, function ($a, $b) {
+		uasort($list, function($a, $b) {
 			if (isset($a['order']) && isset($b['order'])) {
 				return ($a['order'] < $b['order']) ? -1 : 1;
 			} elseif (isset($a['order']) || isset($b['order'])) {
@@ -288,7 +288,7 @@ 
 					continue;
 				}
 				$l = $this->l10nFac->get($app);
-				$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
+				$id = $nav['id'] ?? $app.($key === 0 ? '' : $key);
 				$order = isset($nav['order']) ? $nav['order'] : 100;
 				$type = isset($nav['type']) ? $nav['type'] : 'link';
 				$route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';

Indentation +314 added lines, -314 removed lines

@@ -46,318 +46,318 @@
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
-	protected $activeEntry;
-	protected $unreadCounters = [];
-
-	/** @var bool */
-	protected $init = false;
-	/** @var IAppManager|AppManager */
-	protected $appManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFac;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager|Manager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IAppManager $appManager,
-						 IURLGenerator $urlGenerator,
-						 IFactory $l10nFac,
-						 IUserSession $userSession,
-						 IGroupManager $groupManager,
-						 IConfig $config) {
-		$this->appManager = $appManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFac = $l10nFac;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function add($entry) {
-		if ($entry instanceof \Closure) {
-			$this->closureEntries[] = $entry;
-			return;
-		}
-
-		$entry['active'] = false;
-		if (!isset($entry['icon'])) {
-			$entry['icon'] = '';
-		}
-		if (!isset($entry['classes'])) {
-			$entry['classes'] = '';
-		}
-		if (!isset($entry['type'])) {
-			$entry['type'] = 'link';
-		}
-
-		$id = $entry['id'];
-		$entry['unread'] = isset($this->unreadCounters[$id]) ? $this->unreadCounters[$id] : 0;
-
-		$this->entries[$id] = $entry;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getAll(string $type = 'link'): array {
-		$this->init();
-		foreach ($this->closureEntries as $c) {
-			$this->add($c());
-		}
-		$this->closureEntries = [];
-
-		$result = $this->entries;
-		if ($type !== 'all') {
-			$result = array_filter($this->entries, function ($entry) use ($type) {
-				return $entry['type'] === $type;
-			});
-		}
-
-		return $this->proceedNavigation($result);
-	}
-
-	/**
-	 * Sort navigation entries by order, name and set active flag
-	 *
-	 * @param array $list
-	 * @return array
-	 */
-	private function proceedNavigation(array $list): array {
-		uasort($list, function ($a, $b) {
-			if (isset($a['order']) && isset($b['order'])) {
-				return ($a['order'] < $b['order']) ? -1 : 1;
-			} elseif (isset($a['order']) || isset($b['order'])) {
-				return isset($a['order']) ? -1 : 1;
-			} else {
-				return ($a['name'] < $b['name']) ? -1 : 1;
-			}
-		});
-
-		$activeApp = $this->getActiveEntry();
-		if ($activeApp !== null) {
-			foreach ($list as $index => &$navEntry) {
-				if ($navEntry['id'] == $activeApp) {
-					$navEntry['active'] = true;
-				} else {
-					$navEntry['active'] = false;
-				}
-			}
-			unset($navEntry);
-		}
-
-		return $list;
-	}
-
-
-	/**
-	 * removes all the entries
-	 */
-	public function clear($loadDefaultLinks = true) {
-		$this->entries = [];
-		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setActiveEntry($id) {
-		$this->activeEntry = $id;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getActiveEntry() {
-		return $this->activeEntry;
-	}
-
-	private function init() {
-		if ($this->init) {
-			return;
-		}
-		$this->init = true;
-
-		$l = $this->l10nFac->get('lib');
-		if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
-			$this->add([
-				'type' => 'settings',
-				'id' => 'help',
-				'order' => 99998,
-				'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
-				'name' => $l->t('Help'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
-			]);
-		}
-
-		if ($this->userSession->isLoggedIn()) {
-			// Accessibility settings
-			if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
-				$this->add([
-					'type' => 'settings',
-					'id' => 'accessibility_settings',
-					'order' => 2,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
-					'name' => $l->t('Appearance and accessibility'),
-					'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
-				]);
-			}
-			if ($this->isAdmin()) {
-				// App management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_apps',
-					'order' => 5,
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
-					'name' => $l->t('Apps'),
-				]);
-
-				// Personal settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'settings',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-					'name' => $l->t('Personal settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
-				]);
-
-				// Admin settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'admin_settings',
-					'order' => 4,
-					'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
-					'name' => $l->t('Administration settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			} else {
-				// Personal settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'settings',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-					'name' => $l->t('Settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			}
-
-			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if ($logoutUrl !== '') {
-				// Logout
-				$this->add([
-					'type' => 'settings',
-					'id' => 'logout',
-					'order' => 99999,
-					'href' => $logoutUrl,
-					'name' => $l->t('Log out'),
-					'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
-				]);
-			}
-
-			if ($this->isSubadmin()) {
-				// User management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_users',
-					'order' => 6,
-					'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
-					'name' => $l->t('Users'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
-				]);
-			}
-		}
-
-		if ($this->appManager === 'null') {
-			return;
-		}
-
-		if ($this->userSession->isLoggedIn()) {
-			$apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
-		} else {
-			$apps = $this->appManager->getInstalledApps();
-		}
-
-		foreach ($apps as $app) {
-			if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
-				continue;
-			}
-
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['navigations']['navigation'])) {
-				continue;
-			}
-			foreach ($info['navigations']['navigation'] as $key => $nav) {
-				if (!isset($nav['name'])) {
-					continue;
-				}
-				if (!isset($nav['route'])) {
-					continue;
-				}
-				$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
-				if ($role === 'admin' && !$this->isAdmin()) {
-					continue;
-				}
-				$l = $this->l10nFac->get($app);
-				$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
-				$order = isset($nav['order']) ? $nav['order'] : 100;
-				$type = isset($nav['type']) ? $nav['type'] : 'link';
-				$route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
-				$icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
-				foreach ([$icon, "$app.svg"] as $i) {
-					try {
-						$icon = $this->urlGenerator->imagePath($app, $i);
-						break;
-					} catch (\RuntimeException $ex) {
-						// no icon? - ignore it then
-					}
-				}
-				if ($icon === null) {
-					$icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
-				}
-
-				$this->add([
-					'id' => $id,
-					'order' => $order,
-					'href' => $route,
-					'icon' => $icon,
-					'type' => $type,
-					'name' => $l->t($nav['name']),
-				]);
-			}
-		}
-	}
-
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
-
-	private function isSubadmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->getSubAdmin()->isSubAdmin($user);
-		}
-		return false;
-	}
-
-	public function setUnreadCounter(string $id, int $unreadCounter): void {
-		$this->unreadCounters[$id] = $unreadCounter;
-	}
+    protected $entries = [];
+    protected $closureEntries = [];
+    protected $activeEntry;
+    protected $unreadCounters = [];
+
+    /** @var bool */
+    protected $init = false;
+    /** @var IAppManager|AppManager */
+    protected $appManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFac;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager|Manager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(IAppManager $appManager,
+                            IURLGenerator $urlGenerator,
+                            IFactory $l10nFac,
+                            IUserSession $userSession,
+                            IGroupManager $groupManager,
+                            IConfig $config) {
+        $this->appManager = $appManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFac = $l10nFac;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function add($entry) {
+        if ($entry instanceof \Closure) {
+            $this->closureEntries[] = $entry;
+            return;
+        }
+
+        $entry['active'] = false;
+        if (!isset($entry['icon'])) {
+            $entry['icon'] = '';
+        }
+        if (!isset($entry['classes'])) {
+            $entry['classes'] = '';
+        }
+        if (!isset($entry['type'])) {
+            $entry['type'] = 'link';
+        }
+
+        $id = $entry['id'];
+        $entry['unread'] = isset($this->unreadCounters[$id]) ? $this->unreadCounters[$id] : 0;
+
+        $this->entries[$id] = $entry;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAll(string $type = 'link'): array {
+        $this->init();
+        foreach ($this->closureEntries as $c) {
+            $this->add($c());
+        }
+        $this->closureEntries = [];
+
+        $result = $this->entries;
+        if ($type !== 'all') {
+            $result = array_filter($this->entries, function ($entry) use ($type) {
+                return $entry['type'] === $type;
+            });
+        }
+
+        return $this->proceedNavigation($result);
+    }
+
+    /**
+     * Sort navigation entries by order, name and set active flag
+     *
+     * @param array $list
+     * @return array
+     */
+    private function proceedNavigation(array $list): array {
+        uasort($list, function ($a, $b) {
+            if (isset($a['order']) && isset($b['order'])) {
+                return ($a['order'] < $b['order']) ? -1 : 1;
+            } elseif (isset($a['order']) || isset($b['order'])) {
+                return isset($a['order']) ? -1 : 1;
+            } else {
+                return ($a['name'] < $b['name']) ? -1 : 1;
+            }
+        });
+
+        $activeApp = $this->getActiveEntry();
+        if ($activeApp !== null) {
+            foreach ($list as $index => &$navEntry) {
+                if ($navEntry['id'] == $activeApp) {
+                    $navEntry['active'] = true;
+                } else {
+                    $navEntry['active'] = false;
+                }
+            }
+            unset($navEntry);
+        }
+
+        return $list;
+    }
+
+
+    /**
+     * removes all the entries
+     */
+    public function clear($loadDefaultLinks = true) {
+        $this->entries = [];
+        $this->closureEntries = [];
+        $this->init = !$loadDefaultLinks;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setActiveEntry($id) {
+        $this->activeEntry = $id;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getActiveEntry() {
+        return $this->activeEntry;
+    }
+
+    private function init() {
+        if ($this->init) {
+            return;
+        }
+        $this->init = true;
+
+        $l = $this->l10nFac->get('lib');
+        if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
+            $this->add([
+                'type' => 'settings',
+                'id' => 'help',
+                'order' => 99998,
+                'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
+                'name' => $l->t('Help'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
+            ]);
+        }
+
+        if ($this->userSession->isLoggedIn()) {
+            // Accessibility settings
+            if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'accessibility_settings',
+                    'order' => 2,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
+                    'name' => $l->t('Appearance and accessibility'),
+                    'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
+                ]);
+            }
+            if ($this->isAdmin()) {
+                // App management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_apps',
+                    'order' => 5,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+                    'name' => $l->t('Apps'),
+                ]);
+
+                // Personal settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'settings',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                    'name' => $l->t('Personal settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
+                ]);
+
+                // Admin settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'admin_settings',
+                    'order' => 4,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
+                    'name' => $l->t('Administration settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+                ]);
+            } else {
+                // Personal settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'settings',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                    'name' => $l->t('Settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+                ]);
+            }
+
+            $logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
+            if ($logoutUrl !== '') {
+                // Logout
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'logout',
+                    'order' => 99999,
+                    'href' => $logoutUrl,
+                    'name' => $l->t('Log out'),
+                    'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
+                ]);
+            }
+
+            if ($this->isSubadmin()) {
+                // User management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_users',
+                    'order' => 6,
+                    'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
+                    'name' => $l->t('Users'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
+                ]);
+            }
+        }
+
+        if ($this->appManager === 'null') {
+            return;
+        }
+
+        if ($this->userSession->isLoggedIn()) {
+            $apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
+        } else {
+            $apps = $this->appManager->getInstalledApps();
+        }
+
+        foreach ($apps as $app) {
+            if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
+                continue;
+            }
+
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['navigations']['navigation'])) {
+                continue;
+            }
+            foreach ($info['navigations']['navigation'] as $key => $nav) {
+                if (!isset($nav['name'])) {
+                    continue;
+                }
+                if (!isset($nav['route'])) {
+                    continue;
+                }
+                $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
+                if ($role === 'admin' && !$this->isAdmin()) {
+                    continue;
+                }
+                $l = $this->l10nFac->get($app);
+                $id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
+                $order = isset($nav['order']) ? $nav['order'] : 100;
+                $type = isset($nav['type']) ? $nav['type'] : 'link';
+                $route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
+                $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
+                foreach ([$icon, "$app.svg"] as $i) {
+                    try {
+                        $icon = $this->urlGenerator->imagePath($app, $i);
+                        break;
+                    } catch (\RuntimeException $ex) {
+                        // no icon? - ignore it then
+                    }
+                }
+                if ($icon === null) {
+                    $icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
+                }
+
+                $this->add([
+                    'id' => $id,
+                    'order' => $order,
+                    'href' => $route,
+                    'icon' => $icon,
+                    'type' => $type,
+                    'name' => $l->t($nav['name']),
+                ]);
+            }
+        }
+    }
+
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
+
+    private function isSubadmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->getSubAdmin()->isSubAdmin($user);
+        }
+        return false;
+    }
+
+    public function setUnreadCounter(string $id, int $unreadCounter): void {
+        $this->unreadCounters[$id] = $unreadCounter;
+    }
 }

lib/private/Collaboration/Collaborators/MailPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 						$emailAddressType = $emailAddressData['type'];
 					}
 					if (isset($contact['FN'])) {
-						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
+						$displayName = $contact['FN'].' ('.$emailAddress.')';
 					}
 					$exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
 

Indentation +223 added lines, -223 removed lines

@@ -41,251 +41,251 @@
 use OCP\Mail\IMailer;
 
 class MailPlugin implements ISearchPlugin {
-	/* @var bool */
-	protected $shareWithGroupOnly;
-	/* @var bool */
-	protected $shareeEnumeration;
-	/* @var bool */
-	protected $shareeEnumerationInGroupOnly;
-	/* @var bool */
-	protected $shareeEnumerationPhone;
-	/* @var bool */
-	protected $shareeEnumerationFullMatch;
-	/* @var bool */
-	protected $shareeEnumerationFullMatchEmail;
+    /* @var bool */
+    protected $shareWithGroupOnly;
+    /* @var bool */
+    protected $shareeEnumeration;
+    /* @var bool */
+    protected $shareeEnumerationInGroupOnly;
+    /* @var bool */
+    protected $shareeEnumerationPhone;
+    /* @var bool */
+    protected $shareeEnumerationFullMatch;
+    /* @var bool */
+    protected $shareeEnumerationFullMatchEmail;
 
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var KnownUserService */
-	private $knownUserService;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMailer */
-	private $mailer;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var KnownUserService */
+    private $knownUserService;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IMailer */
+    private $mailer;
 
-	public function __construct(IManager $contactsManager,
-								ICloudIdManager $cloudIdManager,
-								IConfig $config,
-								IGroupManager $groupManager,
-								KnownUserService $knownUserService,
-								IUserSession $userSession,
-								IMailer $mailer) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->knownUserService = $knownUserService;
-		$this->userSession = $userSession;
-		$this->mailer = $mailer;
+    public function __construct(IManager $contactsManager,
+                                ICloudIdManager $cloudIdManager,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                KnownUserService $knownUserService,
+                                IUserSession $userSession,
+                                IMailer $mailer) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->knownUserService = $knownUserService;
+        $this->userSession = $userSession;
+        $this->mailer = $mailer;
 
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
-		$this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
-		$this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
-	}
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
+        $this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
+        $this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		if ($this->shareeEnumerationFullMatch && !$this->shareeEnumerationFullMatchEmail) {
-			return false;
-		}
+    /**
+     * {@inheritdoc}
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        if ($this->shareeEnumerationFullMatch && !$this->shareeEnumerationFullMatchEmail) {
+            return false;
+        }
 
-		// Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
-		$result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
-		if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
-			return $this->search($matches[1], $limit, $offset, $searchResult);
-		}
+        // Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
+        $result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
+        if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
+            return $this->search($matches[1], $limit, $offset, $searchResult);
+        }
 
-		$currentUserId = $this->userSession->getUser()->getUID();
+        $currentUserId = $this->userSession->getUser()->getUID();
 
-		$result = $userResults = ['wide' => [], 'exact' => []];
-		$userType = new SearchResultType('users');
-		$emailType = new SearchResultType('emails');
+        $result = $userResults = ['wide' => [], 'exact' => []];
+        $userType = new SearchResultType('users');
+        $emailType = new SearchResultType('emails');
 
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search(
-			$search,
-			['EMAIL', 'FN'],
-			[
-				'limit' => $limit,
-				'offset' => $offset,
-				'enumeration' => (bool) $this->shareeEnumeration,
-				'fullmatch' => (bool) $this->shareeEnumerationFullMatch,
-			]
-		);
-		$lowerSearch = strtolower($search);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['EMAIL'])) {
-				$emailAddresses = $contact['EMAIL'];
-				if (\is_string($emailAddresses)) {
-					$emailAddresses = [$emailAddresses];
-				}
-				foreach ($emailAddresses as $type => $emailAddress) {
-					$displayName = $emailAddress;
-					$emailAddressType = null;
-					if (\is_array($emailAddress)) {
-						$emailAddressData = $emailAddress;
-						$emailAddress = $emailAddressData['value'];
-						$emailAddressType = $emailAddressData['type'];
-					}
-					if (isset($contact['FN'])) {
-						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
-					}
-					$exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search(
+            $search,
+            ['EMAIL', 'FN'],
+            [
+                'limit' => $limit,
+                'offset' => $offset,
+                'enumeration' => (bool) $this->shareeEnumeration,
+                'fullmatch' => (bool) $this->shareeEnumerationFullMatch,
+            ]
+        );
+        $lowerSearch = strtolower($search);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['EMAIL'])) {
+                $emailAddresses = $contact['EMAIL'];
+                if (\is_string($emailAddresses)) {
+                    $emailAddresses = [$emailAddresses];
+                }
+                foreach ($emailAddresses as $type => $emailAddress) {
+                    $displayName = $emailAddress;
+                    $emailAddressType = null;
+                    if (\is_array($emailAddress)) {
+                        $emailAddressData = $emailAddress;
+                        $emailAddress = $emailAddressData['value'];
+                        $emailAddressType = $emailAddressData['type'];
+                    }
+                    if (isset($contact['FN'])) {
+                        $displayName = $contact['FN'] . ' (' . $emailAddress . ')';
+                    }
+                    $exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
 
-					if (isset($contact['isLocalSystemBook'])) {
-						if ($this->shareWithGroupOnly) {
-							/*
+                    if (isset($contact['isLocalSystemBook'])) {
+                        if ($this->shareWithGroupOnly) {
+                            /*
 							 * Check if the user may share with the user associated with the e-mail of the just found contact
 							 */
-							$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-							$found = false;
-							foreach ($userGroups as $userGroup) {
-								if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-									$found = true;
-									break;
-								}
-							}
-							if (!$found) {
-								continue;
-							}
-						}
-						if ($exactEmailMatch && $this->shareeEnumerationFullMatch) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
+                            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+                            $found = false;
+                            foreach ($userGroups as $userGroup) {
+                                if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                    $found = true;
+                                    break;
+                                }
+                            }
+                            if (!$found) {
+                                continue;
+                            }
+                        }
+                        if ($exactEmailMatch && $this->shareeEnumerationFullMatch) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
 
-							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$singleResult = [[
-									'label' => $displayName,
-									'uuid' => $contact['UID'] ?? $emailAddress,
-									'name' => $contact['FN'] ?? $displayName,
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+                            if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $singleResult = [[
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'] ?? $emailAddress,
+                                    'name' => $contact['FN'] ?? $displayName,
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                    'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
 
-								]];
-								$searchResult->addResultSet($userType, [], $singleResult);
-								$searchResult->markExactIdMatch($emailType);
-							}
-							return false;
-						}
+                                ]];
+                                $searchResult->addResultSet($userType, [], $singleResult);
+                                $searchResult->markExactIdMatch($emailType);
+                            }
+                            return false;
+                        }
 
-						if ($this->shareeEnumeration) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
+                        if ($this->shareeEnumeration) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
 
-							$addToWide = !($this->shareeEnumerationInGroupOnly || $this->shareeEnumerationPhone);
-							if (!$addToWide && $this->shareeEnumerationPhone && $this->knownUserService->isKnownToUser($currentUserId, $contact['UID'])) {
-								$addToWide = true;
-							}
+                            $addToWide = !($this->shareeEnumerationInGroupOnly || $this->shareeEnumerationPhone);
+                            if (!$addToWide && $this->shareeEnumerationPhone && $this->knownUserService->isKnownToUser($currentUserId, $contact['UID'])) {
+                                $addToWide = true;
+                            }
 
-							if (!$addToWide && $this->shareeEnumerationInGroupOnly) {
-								$addToWide = false;
-								$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-								foreach ($userGroups as $userGroup) {
-									if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-										$addToWide = true;
-										break;
-									}
-								}
-							}
-							if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$userResults['wide'][] = [
-									'label' => $displayName,
-									'uuid' => $contact['UID'] ?? $emailAddress,
-									'name' => $contact['FN'] ?? $displayName,
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
-								];
-								continue;
-							}
-						}
-						continue;
-					}
+                            if (!$addToWide && $this->shareeEnumerationInGroupOnly) {
+                                $addToWide = false;
+                                $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+                                foreach ($userGroups as $userGroup) {
+                                    if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                        $addToWide = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $userResults['wide'][] = [
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'] ?? $emailAddress,
+                                    'name' => $contact['FN'] ?? $displayName,
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                    'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+                                ];
+                                continue;
+                            }
+                        }
+                        continue;
+                    }
 
-					if ($exactEmailMatch
-						|| (isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch)) {
-						if ($exactEmailMatch) {
-							$searchResult->markExactIdMatch($emailType);
-						}
-						$result['exact'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'] ?? $emailAddress,
-							'name' => $contact['FN'] ?? $displayName,
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'] ?? $emailAddress,
-							'name' => $contact['FN'] ?? $displayName,
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if ($exactEmailMatch
+                        || (isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch)) {
+                        if ($exactEmailMatch) {
+                            $searchResult->markExactIdMatch($emailType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'] ?? $emailAddress,
+                            'name' => $contact['FN'] ?? $displayName,
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'] ?? $emailAddress,
+                            'name' => $contact['FN'] ?? $displayName,
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		$reachedEnd = true;
-		if ($this->shareeEnumeration) {
-			$reachedEnd = (count($result['wide']) < $offset + $limit) &&
-				(count($userResults['wide']) < $offset + $limit);
+        $reachedEnd = true;
+        if ($this->shareeEnumeration) {
+            $reachedEnd = (count($result['wide']) < $offset + $limit) &&
+                (count($userResults['wide']) < $offset + $limit);
 
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-			$userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
-		}
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+            $userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
+        }
 
-		if (!$searchResult->hasExactIdMatch($emailType) && $this->mailer->validateMailAddress($search)) {
-			$result['exact'][] = [
-				'label' => $search,
-				'uuid' => $search,
-				'value' => [
-					'shareType' => IShare::TYPE_EMAIL,
-					'shareWith' => $search,
-				],
-			];
-		}
+        if (!$searchResult->hasExactIdMatch($emailType) && $this->mailer->validateMailAddress($search)) {
+            $result['exact'][] = [
+                'label' => $search,
+                'uuid' => $search,
+                'value' => [
+                    'shareType' => IShare::TYPE_EMAIL,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
 
-		if (!empty($userResults['wide'])) {
-			$searchResult->addResultSet($userType, $userResults['wide'], []);
-		}
-		$searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
+        if (!empty($userResults['wide'])) {
+            $searchResult->addResultSet($userType, $userResults['wide'], []);
+        }
+        $searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
 
-		return !$reachedEnd;
-	}
+        return !$reachedEnd;
+    }
 
-	public function isCurrentUser(ICloudId $cloud): bool {
-		$currentUser = $this->userSession->getUser();
-		return $currentUser instanceof IUser ? $currentUser->getUID() === $cloud->getUser() : false;
-	}
+    public function isCurrentUser(ICloudId $cloud): bool {
+        $currentUser = $this->userSession->getUser();
+        return $currentUser instanceof IUser ? $currentUser->getUID() === $cloud->getUser() : false;
+    }
 }

lib/private/OCS/Provider.php

Indentation +81 added lines, -81 removed lines

@@ -25,92 +25,92 @@
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if ($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if ($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('federation')) {
-			if (isset($services['FEDERATED_SHARING'])) {
-				$services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
-				$services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
-				$services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
-			} else {
-				$services['FEDERATED_SHARING'] = [
-					'version' => 1,
-					'endpoints' => [
-						'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
-						'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
-						'carddav-user' => 'system'
-					],
-				];
-			}
-		}
+        if ($this->appManager->isEnabledForUser('federation')) {
+            if (isset($services['FEDERATED_SHARING'])) {
+                $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
+                $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
+                $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
+            } else {
+                $services['FEDERATED_SHARING'] = [
+                    'version' => 1,
+                    'endpoints' => [
+                        'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
+                        'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
+                        'carddav-user' => 'system'
+                    ],
+                ];
+            }
+        }
 
-		if ($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if ($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if ($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

lib/private/Authentication/Exceptions/InvalidProviderException.php

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@
 use Throwable;
 
 class InvalidProviderException extends Exception {
-	public function __construct(string $providerId, Throwable $previous = null) {
-		parent::__construct("The provider '$providerId' does not exist'", 0, $previous);
-	}
+    public function __construct(string $providerId, Throwable $previous = null) {
+        parent::__construct("The provider '$providerId' does not exist'", 0, $previous);
+    }
 }

lib/private/DB/MissingIndexInformation.php

Indentation +10 added lines, -10 removed lines

@@ -28,16 +28,16 @@
 namespace OC\DB;
 
 class MissingIndexInformation {
-	private $listOfMissingIndexes = [];
+    private $listOfMissingIndexes = [];
 
-	public function addHintForMissingSubject(string $tableName, string $indexName) {
-		$this->listOfMissingIndexes[] = [
-			'tableName' => $tableName,
-			'indexName' => $indexName
-		];
-	}
+    public function addHintForMissingSubject(string $tableName, string $indexName) {
+        $this->listOfMissingIndexes[] = [
+            'tableName' => $tableName,
+            'indexName' => $indexName
+        ];
+    }
 
-	public function getListOfMissingIndexes(): array {
-		return $this->listOfMissingIndexes;
-	}
+    public function getListOfMissingIndexes(): array {
+        return $this->listOfMissingIndexes;
+    }
 }

lib/private/DB/MissingColumnInformation.php

Indentation +10 added lines, -10 removed lines

@@ -27,16 +27,16 @@
 namespace OC\DB;
 
 class MissingColumnInformation {
-	private $listOfMissingColumns = [];
+    private $listOfMissingColumns = [];
 
-	public function addHintForMissingColumn(string $tableName, string $columnName): void {
-		$this->listOfMissingColumns[] = [
-			'tableName' => $tableName,
-			'columnName' => $columnName,
-		];
-	}
+    public function addHintForMissingColumn(string $tableName, string $columnName): void {
+        $this->listOfMissingColumns[] = [
+            'tableName' => $tableName,
+            'columnName' => $columnName,
+        ];
+    }
 
-	public function getListOfMissingColumns(): array {
-		return $this->listOfMissingColumns;
-	}
+    public function getListOfMissingColumns(): array {
+        return $this->listOfMissingColumns;
+    }
 }

lib/private/Files/ObjectStore/S3Signature.php

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 		$request = $this->prepareRequest($request, $credentials);
 		$stringToSign = $this->createCanonicalizedString($request);
 		$auth = 'AWS '
-			. $credentials->getAccessKeyId() . ':'
+			. $credentials->getAccessKeyId().':'
 			. $this->signString($stringToSign, $credentials);
 
 		return $request->withHeader('Authorization', $auth);
@@ -148,11 +148,11 @@ 
 		RequestInterface $request,
 		$expires = null
 	) {
-		$buffer = $request->getMethod() . "\n";
+		$buffer = $request->getMethod()."\n";
 
 		// Add the interesting headers
 		foreach ($this->signableHeaders as $header) {
-			$buffer .= $request->getHeaderLine($header) . "\n";
+			$buffer .= $request->getHeaderLine($header)."\n";
 		}
 
 		$date = $expires ?: $request->getHeaderLine('date');
@@ -170,7 +170,7 @@ 
 			if (strpos($name, 'x-amz-') === 0) {
 				$value = implode(',', $header);
 				if (strlen($value) > 0) {
-					$headers[$name] = $name . ':' . $value;
+					$headers[$name] = $name.':'.$value;
 				}
 			}
 		}
@@ -181,7 +181,7 @@ 
 
 		ksort($headers);
 
-		return implode("\n", $headers) . "\n";
+		return implode("\n", $headers)."\n";
 	}
 
 	private function createCanonicalizedResource(RequestInterface $request) {
@@ -191,7 +191,7 @@ 
 		if ($data['bucket']) {
 			$buffer .= $data['bucket'];
 			if (!empty($data['key']) || !$data['path_style']) {
-				$buffer .= '/' . $data['key'];
+				$buffer .= '/'.$data['key'];
 			}
 		}
 

Indentation +184 added lines, -184 removed lines

@@ -35,188 +35,188 @@
  * Legacy Amazon S3 signature implementation
  */
 class S3Signature implements SignatureInterface {
-	/** @var array Query string values that must be signed */
-	private $signableQueryString = [
-		'acl', 'cors', 'delete', 'lifecycle', 'location', 'logging',
-		'notification', 'partNumber', 'policy', 'requestPayment',
-		'response-cache-control', 'response-content-disposition',
-		'response-content-encoding', 'response-content-language',
-		'response-content-type', 'response-expires', 'restore', 'tagging',
-		'torrent', 'uploadId', 'uploads', 'versionId', 'versioning',
-		'versions', 'website'
-	];
-
-	/** @var array Sorted headers that must be signed */
-	private $signableHeaders = ['Content-MD5', 'Content-Type'];
-
-	/** @var \Aws\S3\S3UriParser S3 URI parser */
-	private $parser;
-
-	public function __construct() {
-		$this->parser = new S3UriParser();
-		// Ensure that the signable query string parameters are sorted
-		sort($this->signableQueryString);
-	}
-
-	public function signRequest(
-		RequestInterface $request,
-		CredentialsInterface $credentials
-	) {
-		$request = $this->prepareRequest($request, $credentials);
-		$stringToSign = $this->createCanonicalizedString($request);
-		$auth = 'AWS '
-			. $credentials->getAccessKeyId() . ':'
-			. $this->signString($stringToSign, $credentials);
-
-		return $request->withHeader('Authorization', $auth);
-	}
-
-	public function presign(
-		RequestInterface $request,
-		CredentialsInterface $credentials,
-		$expires,
-		array $options = []
-	) {
-		$query = [];
-		// URL encoding already occurs in the URI template expansion. Undo that
-		// and encode using the same encoding as GET object, PUT object, etc.
-		$uri = $request->getUri();
-		$path = S3Client::encodeKey(rawurldecode($uri->getPath()));
-		$request = $request->withUri($uri->withPath($path));
-
-		// Make sure to handle temporary credentials
-		if ($token = $credentials->getSecurityToken()) {
-			$request = $request->withHeader('X-Amz-Security-Token', $token);
-			$query['X-Amz-Security-Token'] = $token;
-		}
-
-		if ($expires instanceof \DateTime) {
-			$expires = $expires->getTimestamp();
-		} elseif (!is_numeric($expires)) {
-			$expires = strtotime($expires);
-		}
-
-		// Set query params required for pre-signed URLs
-		$query['AWSAccessKeyId'] = $credentials->getAccessKeyId();
-		$query['Expires'] = $expires;
-		$query['Signature'] = $this->signString(
-			$this->createCanonicalizedString($request, $expires),
-			$credentials
-		);
-
-		// Move X-Amz-* headers to the query string
-		foreach ($request->getHeaders() as $name => $header) {
-			$name = strtolower($name);
-			if (strpos($name, 'x-amz-') === 0) {
-				$query[$name] = implode(',', $header);
-			}
-		}
-
-		$queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986);
-
-		return $request->withUri($request->getUri()->withQuery($queryString));
-	}
-
-	/**
-	 * @param RequestInterface     $request
-	 * @param CredentialsInterface $creds
-	 *
-	 * @return RequestInterface
-	 */
-	private function prepareRequest(
-		RequestInterface $request,
-		CredentialsInterface $creds
-	) {
-		$modify = [
-			'remove_headers' => ['X-Amz-Date'],
-			'set_headers' => ['Date' => gmdate(\DateTimeInterface::RFC2822)]
-		];
-
-		// Add the security token header if one is being used by the credentials
-		if ($token = $creds->getSecurityToken()) {
-			$modify['set_headers']['X-Amz-Security-Token'] = $token;
-		}
-
-		return Psr7\Utils::modifyRequest($request, $modify);
-	}
-
-	private function signString($string, CredentialsInterface $credentials) {
-		return base64_encode(
-			hash_hmac('sha1', $string, $credentials->getSecretKey(), true)
-		);
-	}
-
-	private function createCanonicalizedString(
-		RequestInterface $request,
-		$expires = null
-	) {
-		$buffer = $request->getMethod() . "\n";
-
-		// Add the interesting headers
-		foreach ($this->signableHeaders as $header) {
-			$buffer .= $request->getHeaderLine($header) . "\n";
-		}
-
-		$date = $expires ?: $request->getHeaderLine('date');
-		$buffer .= "{$date}\n"
-			. $this->createCanonicalizedAmzHeaders($request)
-			. $this->createCanonicalizedResource($request);
-
-		return $buffer;
-	}
-
-	private function createCanonicalizedAmzHeaders(RequestInterface $request) {
-		$headers = [];
-		foreach ($request->getHeaders() as $name => $header) {
-			$name = strtolower($name);
-			if (strpos($name, 'x-amz-') === 0) {
-				$value = implode(',', $header);
-				if (strlen($value) > 0) {
-					$headers[$name] = $name . ':' . $value;
-				}
-			}
-		}
-
-		if (!$headers) {
-			return '';
-		}
-
-		ksort($headers);
-
-		return implode("\n", $headers) . "\n";
-	}
-
-	private function createCanonicalizedResource(RequestInterface $request) {
-		$data = $this->parser->parse($request->getUri());
-		$buffer = '/';
-
-		if ($data['bucket']) {
-			$buffer .= $data['bucket'];
-			if (!empty($data['key']) || !$data['path_style']) {
-				$buffer .= '/' . $data['key'];
-			}
-		}
-
-		// Add sub resource parameters if present.
-		$query = $request->getUri()->getQuery();
-
-		if ($query) {
-			$params = Psr7\Query::parse($query);
-			$first = true;
-			foreach ($this->signableQueryString as $key) {
-				if (array_key_exists($key, $params)) {
-					$value = $params[$key];
-					$buffer .= $first ? '?' : '&';
-					$first = false;
-					$buffer .= $key;
-					// Don't add values for empty sub-resources
-					if (strlen($value)) {
-						$buffer .= "={$value}";
-					}
-				}
-			}
-		}
-
-		return $buffer;
-	}
+    /** @var array Query string values that must be signed */
+    private $signableQueryString = [
+        'acl', 'cors', 'delete', 'lifecycle', 'location', 'logging',
+        'notification', 'partNumber', 'policy', 'requestPayment',
+        'response-cache-control', 'response-content-disposition',
+        'response-content-encoding', 'response-content-language',
+        'response-content-type', 'response-expires', 'restore', 'tagging',
+        'torrent', 'uploadId', 'uploads', 'versionId', 'versioning',
+        'versions', 'website'
+    ];
+
+    /** @var array Sorted headers that must be signed */
+    private $signableHeaders = ['Content-MD5', 'Content-Type'];
+
+    /** @var \Aws\S3\S3UriParser S3 URI parser */
+    private $parser;
+
+    public function __construct() {
+        $this->parser = new S3UriParser();
+        // Ensure that the signable query string parameters are sorted
+        sort($this->signableQueryString);
+    }
+
+    public function signRequest(
+        RequestInterface $request,
+        CredentialsInterface $credentials
+    ) {
+        $request = $this->prepareRequest($request, $credentials);
+        $stringToSign = $this->createCanonicalizedString($request);
+        $auth = 'AWS '
+            . $credentials->getAccessKeyId() . ':'
+            . $this->signString($stringToSign, $credentials);
+
+        return $request->withHeader('Authorization', $auth);
+    }
+
+    public function presign(
+        RequestInterface $request,
+        CredentialsInterface $credentials,
+        $expires,
+        array $options = []
+    ) {
+        $query = [];
+        // URL encoding already occurs in the URI template expansion. Undo that
+        // and encode using the same encoding as GET object, PUT object, etc.
+        $uri = $request->getUri();
+        $path = S3Client::encodeKey(rawurldecode($uri->getPath()));
+        $request = $request->withUri($uri->withPath($path));
+
+        // Make sure to handle temporary credentials
+        if ($token = $credentials->getSecurityToken()) {
+            $request = $request->withHeader('X-Amz-Security-Token', $token);
+            $query['X-Amz-Security-Token'] = $token;
+        }
+
+        if ($expires instanceof \DateTime) {
+            $expires = $expires->getTimestamp();
+        } elseif (!is_numeric($expires)) {
+            $expires = strtotime($expires);
+        }
+
+        // Set query params required for pre-signed URLs
+        $query['AWSAccessKeyId'] = $credentials->getAccessKeyId();
+        $query['Expires'] = $expires;
+        $query['Signature'] = $this->signString(
+            $this->createCanonicalizedString($request, $expires),
+            $credentials
+        );
+
+        // Move X-Amz-* headers to the query string
+        foreach ($request->getHeaders() as $name => $header) {
+            $name = strtolower($name);
+            if (strpos($name, 'x-amz-') === 0) {
+                $query[$name] = implode(',', $header);
+            }
+        }
+
+        $queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986);
+
+        return $request->withUri($request->getUri()->withQuery($queryString));
+    }
+
+    /**
+     * @param RequestInterface     $request
+     * @param CredentialsInterface $creds
+     *
+     * @return RequestInterface
+     */
+    private function prepareRequest(
+        RequestInterface $request,
+        CredentialsInterface $creds
+    ) {
+        $modify = [
+            'remove_headers' => ['X-Amz-Date'],
+            'set_headers' => ['Date' => gmdate(\DateTimeInterface::RFC2822)]
+        ];
+
+        // Add the security token header if one is being used by the credentials
+        if ($token = $creds->getSecurityToken()) {
+            $modify['set_headers']['X-Amz-Security-Token'] = $token;
+        }
+
+        return Psr7\Utils::modifyRequest($request, $modify);
+    }
+
+    private function signString($string, CredentialsInterface $credentials) {
+        return base64_encode(
+            hash_hmac('sha1', $string, $credentials->getSecretKey(), true)
+        );
+    }
+
+    private function createCanonicalizedString(
+        RequestInterface $request,
+        $expires = null
+    ) {
+        $buffer = $request->getMethod() . "\n";
+
+        // Add the interesting headers
+        foreach ($this->signableHeaders as $header) {
+            $buffer .= $request->getHeaderLine($header) . "\n";
+        }
+
+        $date = $expires ?: $request->getHeaderLine('date');
+        $buffer .= "{$date}\n"
+            . $this->createCanonicalizedAmzHeaders($request)
+            . $this->createCanonicalizedResource($request);
+
+        return $buffer;
+    }
+
+    private function createCanonicalizedAmzHeaders(RequestInterface $request) {
+        $headers = [];
+        foreach ($request->getHeaders() as $name => $header) {
+            $name = strtolower($name);
+            if (strpos($name, 'x-amz-') === 0) {
+                $value = implode(',', $header);
+                if (strlen($value) > 0) {
+                    $headers[$name] = $name . ':' . $value;
+                }
+            }
+        }
+
+        if (!$headers) {
+            return '';
+        }
+
+        ksort($headers);
+
+        return implode("\n", $headers) . "\n";
+    }
+
+    private function createCanonicalizedResource(RequestInterface $request) {
+        $data = $this->parser->parse($request->getUri());
+        $buffer = '/';
+
+        if ($data['bucket']) {
+            $buffer .= $data['bucket'];
+            if (!empty($data['key']) || !$data['path_style']) {
+                $buffer .= '/' . $data['key'];
+            }
+        }
+
+        // Add sub resource parameters if present.
+        $query = $request->getUri()->getQuery();
+
+        if ($query) {
+            $params = Psr7\Query::parse($query);
+            $first = true;
+            foreach ($this->signableQueryString as $key) {
+                if (array_key_exists($key, $params)) {
+                    $value = $params[$key];
+                    $buffer .= $first ? '?' : '&';
+                    $first = false;
+                    $buffer .= $key;
+                    // Don't add values for empty sub-resources
+                    if (strlen($value)) {
+                        $buffer .= "={$value}";
+                    }
+                }
+            }
+        }
+
+        return $buffer;
+    }
 }