nextcloud / server

lib/private/Security/TrustedDomainHelper.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 			return true;
 		}
 		// Reject misformed domains in any case
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
+		if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) {
 			return false;
 		}
 		// Match, allowing for * wildcards
@@ -89,7 +89,7 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
+			$regex = '/^'.join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))).'$/';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
  				return true;
  			}

lib/private/Security/Hasher.php

Spacing +10 added lines, -10 removed lines

@@ -62,7 +62,7 @@ 
 		$this->config = $config;
 
 		$hashingCost = $this->config->getSystemValue('hashingCost', null);
-		if(!is_null($hashingCost)) {
+		if (!is_null($hashingCost)) {
 			$this->options['cost'] = $hashingCost;
 		}
 	}
@@ -76,7 +76,7 @@ 
 	 * @return string Hash of the message with appended version parameter
 	 */
 	public function hash($message) {
-		return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
+		return $this->currentVersion.'|'.password_hash($message, PASSWORD_DEFAULT, $this->options);
 	}
 
 	/**
@@ -86,9 +86,9 @@ 
 	 */
 	protected function splitHash($prefixedHash) {
 		$explodedString = explode('|', $prefixedHash, 2);
-		if(sizeof($explodedString) === 2) {
-			if((int)$explodedString[0] > 0) {
-				return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
+		if (sizeof($explodedString) === 2) {
+			if ((int) $explodedString[0] > 0) {
+				return array('version' => (int) $explodedString[0], 'hash' => $explodedString[1]);
 			}
 		}
 
@@ -103,13 +103,13 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function legacyHashVerify($message, $hash, &$newHash = null) {
-		if(empty($this->legacySalt)) {
+		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) ||
+		if ($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
 			$hashLength === 40 && hash_equals($hash, sha1($message))) {
 			$newHash = $this->hash($message);
 			return true;
@@ -126,8 +126,8 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function verifyHashV1($message, $hash, &$newHash = null) {
-		if(password_verify($message, $hash)) {
-			if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
+		if (password_verify($message, $hash)) {
+			if (password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
 				$newHash = $this->hash($message);
 			}
 			return true;
@@ -145,7 +145,7 @@ 
 	public function verify($message, $hash, &$newHash = null) {
 		$splittedHash = $this->splitHash($hash);
 
-		if(isset($splittedHash['version'])) {
+		if (isset($splittedHash['version'])) {
 			switch ($splittedHash['version']) {
 				case 1:
 					return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);

lib/private/Security/CSRF/TokenStorage/SessionStorage.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 */
 	public function getToken() {
 		$token = $this->session->get('requesttoken');
-		if(empty($token)) {
+		if (empty($token)) {
 			throw new \Exception('Session does not contain a requesttoken');
 		}
 

lib/private/Security/Crypto.php

Spacing +6 added lines, -6 removed lines

@@ -68,12 +68,12 @@ 
 	 * @return string Calculated HMAC
 	 */
 	public function calculateHMAC($message, $password = '') {
-		if($password === '') {
+		if ($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}
 
 		// Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
-		$password = hash('sha512', $password . 'a');
+		$password = hash('sha512', $password.'a');
 
 		$hash = new Hash('sha512');
 		$hash->setKey($password);
@@ -87,7 +87,7 @@ 
 	 * @return string Authenticated ciphertext
 	 */
 	public function encrypt($plaintext, $password = '') {
-		if($password === '') {
+		if ($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}
 		$this->cipher->setPassword($password);
@@ -109,13 +109,13 @@ 
 	 * @throws \Exception If the HMAC does not match
 	 */
 	public function decrypt($authenticatedCiphertext, $password = '') {
-		if($password === '') {
+		if ($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}
 		$this->cipher->setPassword($password);
 
 		$parts = explode('|', $authenticatedCiphertext);
-		if(sizeof($parts) !== 3) {
+		if (sizeof($parts) !== 3) {
 			throw new \Exception('Authenticated ciphertext could not be decoded.');
 		}
 
@@ -125,7 +125,7 @@ 
 
 		$this->cipher->setIV($iv);
 
-		if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
+		if (!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
 			throw new \Exception('HMAC does not match.');
 		}
 

lib/private/Security/SecureRandom.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$maxCharIndex = strlen($characters) - 1;
 		$randomString = '';
 
-		while($length > 0) {
+		while ($length > 0) {
 			$randomNumber = \random_int(0, $maxCharIndex);
 			$randomString .= $characters[$randomNumber];
 			$length--;

lib/private/Security/Certificate.php

Spacing +4 added lines, -4 removed lines

@@ -54,19 +54,19 @@
 
 		// If string starts with "file://" ignore the certificate
 		$query = 'file://';
-		if(strtolower(substr($data, 0, strlen($query))) === $query) {
+		if (strtolower(substr($data, 0, strlen($query))) === $query) {
 			throw new \Exception('Certificate could not get parsed.');
 		}
 
 		$info = openssl_x509_parse($data);
-		if(!is_array($info)) {
+		if (!is_array($info)) {
 			throw new \Exception('Certificate could not get parsed.');
 		}
 
 		$this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
 		$this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
-		$this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
-		$this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
+		$this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt);
+		$this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt);
 		$this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
 		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
 	}

lib/private/Security/Bruteforce/Throttler.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 	private function getCutoff($expire) {
 		$d1 = new \DateTime();
 		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
 		return $d2->diff($d1);
 	}
 
@@ -154,7 +154,7 @@ 
 									$ip,
 									array $metadata = []) {
 		// No need to log if the bruteforce protection is disabled
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+		if ($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
 			return;
 		}
 
@@ -179,7 +179,7 @@ 
 
 		$qb = $this->db->getQueryBuilder();
 		$qb->insert('bruteforce_attempts');
-		foreach($values as $column => $value) {
+		foreach ($values as $column => $value) {
 			$qb->setValue($column, $qb->createNamedParameter($value));
 		}
 		$qb->execute();
@@ -215,7 +215,7 @@ 
 
 		$maxDelay = 30;
 		$firstDelay = 0.1;
-		if ($attempts > (8 * PHP_INT_SIZE - 1))  {
+		if ($attempts > (8 * PHP_INT_SIZE - 1)) {
 			// Don't ever overflow. Just assume the maxDelay time:s
 			$firstDelay = $maxDelay;
 		} else {

lib/private/TempManager.php

Spacing +7 added lines, -7 removed lines

@@ -65,13 +65,13 @@ 
 	 * @return string
 	 */
 	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
+		if ($postFix !== '') {
+			$postFix = '.'.ltrim($postFix, '.');
 			$postFix = str_replace(['\\', '/'], '', $postFix);
 			$absolutePath .= '-';
 		}
 
-		return $absolutePath . $postFix;
+		return $absolutePath.$postFix;
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 
 			// If a postfix got specified sanitize it and create a postfixed
 			// temporary file
-			if($postFix !== '') {
+			if ($postFix !== '') {
 				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
 				touch($fileNameWithPostfix);
 				chmod($fileNameWithPostfix, 0600);
@@ -127,11 +127,11 @@ 
 			$this->current[] = $uniqueFileName;
 
 			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+			$path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix);
 			mkdir($path, 0700);
 			$this->current[] = $path;
 
-			return $path . '/';
+			return $path.'/';
 		} else {
 			$this->log->warning(
 				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
@@ -190,7 +190,7 @@ 
 		if ($dh) {
 			while (($file = readdir($dh)) !== false) {
 				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
+					$path = $this->tmpBaseDir.'/'.$file;
 					$mtime = filemtime($path);
 					if ($mtime < $cutOfTime) {
 						$files[] = $path;

lib/private/DatabaseException.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	private $query;
 
 	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
-	public function __construct($message, $query = null){
+	public function __construct($message, $query = null) {
 		parent::__construct($message);
 		$this->query = $query;
 	}