nextcloud / server

lib/private/Federation/CloudFederationNotification.php

Indentation +29 added lines, -29 removed lines

@@ -33,35 +33,35 @@
  * @since 14.0.0
  */
 class CloudFederationNotification implements ICloudFederationNotification {
-	private $message = [];
+    private $message = [];
 
-	/**
-	 * add a message to the notification
-	 *
-	 * @param string $notificationType (e.g. SHARE_ACCEPTED)
-	 * @param string $resourceType (e.g. file, calendar, contact,...)
-	 * @param string $providerId id of the share
-	 * @param array $notification payload of the notification
-	 *
-	 * @since 14.0.0
-	 */
-	public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
-		$this->message = [
-			'notificationType' => $notificationType,
-			'resourceType' => $resourceType,
-			'providerId' => $providerId,
-			'notification' => $notification,
-		];
-	}
+    /**
+     * add a message to the notification
+     *
+     * @param string $notificationType (e.g. SHARE_ACCEPTED)
+     * @param string $resourceType (e.g. file, calendar, contact,...)
+     * @param string $providerId id of the share
+     * @param array $notification payload of the notification
+     *
+     * @since 14.0.0
+     */
+    public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
+        $this->message = [
+            'notificationType' => $notificationType,
+            'resourceType' => $resourceType,
+            'providerId' => $providerId,
+            'notification' => $notification,
+        ];
+    }
 
-	/**
-	 * get message, ready to send out
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * get message, ready to send out
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 }

lib/private/Log/Rotate.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 	public function run($dummy) {
 		$systemConfig = \OC::$server->getSystemConfig();
-		$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+		$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log');
 
 		$this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 		if ($this->shouldRotateBySize()) {

Indentation +11 added lines, -11 removed lines

@@ -33,17 +33,17 @@
  * location and manage that with your own tools.
  */
 class Rotate extends \OCP\BackgroundJob\Job {
-	use RotationTrait;
+    use RotationTrait;
 
-	public function run($dummy) {
-		$systemConfig = \OC::$server->getSystemConfig();
-		$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+    public function run($dummy) {
+        $systemConfig = \OC::$server->getSystemConfig();
+        $this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
 
-		$this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
-		if ($this->shouldRotateBySize()) {
-			$rotatedFile = $this->rotate();
-			$msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
-			\OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);
-		}
-	}
+        $this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
+        if ($this->shouldRotateBySize()) {
+            $rotatedFile = $this->rotate();
+            $msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
+            \OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);
+        }
+    }
 }

lib/private/Security/FeaturePolicy/FeaturePolicy.php

Indentation +36 added lines, -36 removed lines

@@ -27,51 +27,51 @@
 namespace OC\Security\FeaturePolicy;
 
 class FeaturePolicy extends \OCP\AppFramework\Http\FeaturePolicy {
-	public function getAutoplayDomains(): array {
-		return $this->autoplayDomains;
-	}
+    public function getAutoplayDomains(): array {
+        return $this->autoplayDomains;
+    }
 
-	public function setAutoplayDomains(array $autoplayDomains): void {
-		$this->autoplayDomains = $autoplayDomains;
-	}
+    public function setAutoplayDomains(array $autoplayDomains): void {
+        $this->autoplayDomains = $autoplayDomains;
+    }
 
-	public function getCameraDomains(): array {
-		return $this->cameraDomains;
-	}
+    public function getCameraDomains(): array {
+        return $this->cameraDomains;
+    }
 
-	public function setCameraDomains(array $cameraDomains): void {
-		$this->cameraDomains = $cameraDomains;
-	}
+    public function setCameraDomains(array $cameraDomains): void {
+        $this->cameraDomains = $cameraDomains;
+    }
 
-	public function getFullscreenDomains(): array {
-		return $this->fullscreenDomains;
-	}
+    public function getFullscreenDomains(): array {
+        return $this->fullscreenDomains;
+    }
 
-	public function setFullscreenDomains(array $fullscreenDomains): void {
-		$this->fullscreenDomains = $fullscreenDomains;
-	}
+    public function setFullscreenDomains(array $fullscreenDomains): void {
+        $this->fullscreenDomains = $fullscreenDomains;
+    }
 
-	public function getGeolocationDomains(): array {
-		return $this->geolocationDomains;
-	}
+    public function getGeolocationDomains(): array {
+        return $this->geolocationDomains;
+    }
 
-	public function setGeolocationDomains(array $geolocationDomains): void {
-		$this->geolocationDomains = $geolocationDomains;
-	}
+    public function setGeolocationDomains(array $geolocationDomains): void {
+        $this->geolocationDomains = $geolocationDomains;
+    }
 
-	public function getMicrophoneDomains(): array {
-		return $this->microphoneDomains;
-	}
+    public function getMicrophoneDomains(): array {
+        return $this->microphoneDomains;
+    }
 
-	public function setMicrophoneDomains(array $microphoneDomains): void {
-		$this->microphoneDomains = $microphoneDomains;
-	}
+    public function setMicrophoneDomains(array $microphoneDomains): void {
+        $this->microphoneDomains = $microphoneDomains;
+    }
 
-	public function getPaymentDomains(): array {
-		return $this->paymentDomains;
-	}
+    public function getPaymentDomains(): array {
+        return $this->paymentDomains;
+    }
 
-	public function setPaymentDomains(array $paymentDomains): void {
-		$this->paymentDomains = $paymentDomains;
-	}
+    public function setPaymentDomains(array $paymentDomains): void {
+        $this->paymentDomains = $paymentDomains;
+    }
 }

lib/private/Security/IdentityProof/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
 	 */
 	public function getKey(IUser $user): Key {
 		$uid = $user->getUID();
-		return $this->retrieveKey('user-' . $uid);
+		return $this->retrieveKey('user-'.$uid);
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 		if ($instanceId === null) {
 			throw new \RuntimeException('no instance id!');
 		}
-		return $this->retrieveKey('system-' . $instanceId);
+		return $this->retrieveKey('system-'.$instanceId);
 	}
 
 	private function logOpensslError(): void {
@@ -166,6 +166,6 @@ 
 		while ($error = openssl_error_string()) {
 			$errors[] = $error;
 		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+		$this->logger->critical('Something is wrong with your openssl setup: '.implode(', ', $errors));
 	}
 }

Indentation +130 added lines, -130 removed lines

@@ -37,134 +37,134 @@
 use Psr\Log\LoggerInterface;
 
 class Manager {
-	/** @var IAppData */
-	private $appData;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var IConfig */
-	private $config;
-	private LoggerInterface $logger;
-
-	public function __construct(Factory $appDataFactory,
-								ICrypto $crypto,
-								IConfig $config,
-								LoggerInterface $logger
-	) {
-		$this->appData = $appDataFactory->get('identityproof');
-		$this->crypto = $crypto;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Calls the openssl functions to generate a public and private key.
-	 * In a separate function for unit testing purposes.
-	 *
-	 * @return array [$publicKey, $privateKey]
-	 * @throws \RuntimeException
-	 */
-	protected function generateKeyPair(): array {
-		$config = [
-			'digest_alg' => 'sha512',
-			'private_key_bits' => 2048,
-		];
-
-		// Generate new key
-		$res = openssl_pkey_new($config);
-
-		if ($res === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('OpenSSL reported a problem');
-		}
-
-		if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('OpenSSL reported a problem');
-		}
-
-		// Extract the public key from $res to $pubKey
-		$publicKey = openssl_pkey_get_details($res);
-		$publicKey = $publicKey['key'];
-
-		return [$publicKey, $privateKey];
-	}
-
-	/**
-	 * Generate a key for a given ID
-	 * Note: If a key already exists it will be overwritten
-	 *
-	 * @param string $id key id
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	protected function generateKey(string $id): Key {
-		[$publicKey, $privateKey] = $this->generateKeyPair();
-
-		// Write the private and public key to the disk
-		try {
-			$this->appData->newFolder($id);
-		} catch (\Exception $e) {
-		}
-		$folder = $this->appData->getFolder($id);
-		$folder->newFile('private')
-			->putContent($this->crypto->encrypt($privateKey));
-		$folder->newFile('public')
-			->putContent($publicKey);
-
-		return new Key($publicKey, $privateKey);
-	}
-
-	/**
-	 * Get key for a specific id
-	 *
-	 * @param string $id
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	protected function retrieveKey(string $id): Key {
-		try {
-			$folder = $this->appData->getFolder($id);
-			$privateKey = $this->crypto->decrypt(
-				$folder->getFile('private')->getContent()
-			);
-			$publicKey = $folder->getFile('public')->getContent();
-			return new Key($publicKey, $privateKey);
-		} catch (\Exception $e) {
-			return $this->generateKey($id);
-		}
-	}
-
-	/**
-	 * Get public and private key for $user
-	 *
-	 * @param IUser $user
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	public function getKey(IUser $user): Key {
-		$uid = $user->getUID();
-		return $this->retrieveKey('user-' . $uid);
-	}
-
-	/**
-	 * Get instance wide public and private key
-	 *
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	public function getSystemKey(): Key {
-		$instanceId = $this->config->getSystemValue('instanceid', null);
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-		return $this->retrieveKey('system-' . $instanceId);
-	}
-
-	private function logOpensslError(): void {
-		$errors = [];
-		while ($error = openssl_error_string()) {
-			$errors[] = $error;
-		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
-	}
+    /** @var IAppData */
+    private $appData;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var IConfig */
+    private $config;
+    private LoggerInterface $logger;
+
+    public function __construct(Factory $appDataFactory,
+                                ICrypto $crypto,
+                                IConfig $config,
+                                LoggerInterface $logger
+    ) {
+        $this->appData = $appDataFactory->get('identityproof');
+        $this->crypto = $crypto;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Calls the openssl functions to generate a public and private key.
+     * In a separate function for unit testing purposes.
+     *
+     * @return array [$publicKey, $privateKey]
+     * @throws \RuntimeException
+     */
+    protected function generateKeyPair(): array {
+        $config = [
+            'digest_alg' => 'sha512',
+            'private_key_bits' => 2048,
+        ];
+
+        // Generate new key
+        $res = openssl_pkey_new($config);
+
+        if ($res === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('OpenSSL reported a problem');
+        }
+
+        if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('OpenSSL reported a problem');
+        }
+
+        // Extract the public key from $res to $pubKey
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
+
+        return [$publicKey, $privateKey];
+    }
+
+    /**
+     * Generate a key for a given ID
+     * Note: If a key already exists it will be overwritten
+     *
+     * @param string $id key id
+     * @return Key
+     * @throws \RuntimeException
+     */
+    protected function generateKey(string $id): Key {
+        [$publicKey, $privateKey] = $this->generateKeyPair();
+
+        // Write the private and public key to the disk
+        try {
+            $this->appData->newFolder($id);
+        } catch (\Exception $e) {
+        }
+        $folder = $this->appData->getFolder($id);
+        $folder->newFile('private')
+            ->putContent($this->crypto->encrypt($privateKey));
+        $folder->newFile('public')
+            ->putContent($publicKey);
+
+        return new Key($publicKey, $privateKey);
+    }
+
+    /**
+     * Get key for a specific id
+     *
+     * @param string $id
+     * @return Key
+     * @throws \RuntimeException
+     */
+    protected function retrieveKey(string $id): Key {
+        try {
+            $folder = $this->appData->getFolder($id);
+            $privateKey = $this->crypto->decrypt(
+                $folder->getFile('private')->getContent()
+            );
+            $publicKey = $folder->getFile('public')->getContent();
+            return new Key($publicKey, $privateKey);
+        } catch (\Exception $e) {
+            return $this->generateKey($id);
+        }
+    }
+
+    /**
+     * Get public and private key for $user
+     *
+     * @param IUser $user
+     * @return Key
+     * @throws \RuntimeException
+     */
+    public function getKey(IUser $user): Key {
+        $uid = $user->getUID();
+        return $this->retrieveKey('user-' . $uid);
+    }
+
+    /**
+     * Get instance wide public and private key
+     *
+     * @return Key
+     * @throws \RuntimeException
+     */
+    public function getSystemKey(): Key {
+        $instanceId = $this->config->getSystemValue('instanceid', null);
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+        return $this->retrieveKey('system-' . $instanceId);
+    }
+
+    private function logOpensslError(): void {
+        $errors = [];
+        while ($error = openssl_error_string()) {
+            $errors[] = $error;
+        }
+        $this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+    }
 }

lib/private/Security/CSRF/CsrfToken.php

Indentation +38 added lines, -38 removed lines

@@ -36,46 +36,46 @@
  * @package OC\Security\CSRF
  */
 class CsrfToken {
-	/** @var string */
-	private $value;
-	/** @var string */
-	private $encryptedValue = '';
+    /** @var string */
+    private $value;
+    /** @var string */
+    private $encryptedValue = '';
 
-	/**
-	 * @param string $value Value of the token. Can be encrypted or not encrypted.
-	 */
-	public function __construct(string $value) {
-		$this->value = $value;
-	}
+    /**
+     * @param string $value Value of the token. Can be encrypted or not encrypted.
+     */
+    public function __construct(string $value) {
+        $this->value = $value;
+    }
 
-	/**
-	 * Encrypted value of the token. This is used to mitigate BREACH alike
-	 * vulnerabilities. For display measures do use this functionality.
-	 *
-	 * @return string
-	 */
-	public function getEncryptedValue(): string {
-		if ($this->encryptedValue === '') {
-			$sharedSecret = random_bytes(\strlen($this->value));
-			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
-		}
+    /**
+     * Encrypted value of the token. This is used to mitigate BREACH alike
+     * vulnerabilities. For display measures do use this functionality.
+     *
+     * @return string
+     */
+    public function getEncryptedValue(): string {
+        if ($this->encryptedValue === '') {
+            $sharedSecret = random_bytes(\strlen($this->value));
+            $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
+        }
 
-		return $this->encryptedValue;
-	}
+        return $this->encryptedValue;
+    }
 
-	/**
-	 * The unencrypted value of the token. Used for decrypting an already
-	 * encrypted token.
-	 *
-	 * @return string
-	 */
-	public function getDecryptedValue(): string {
-		$token = explode(':', $this->value);
-		if (\count($token) !== 2) {
-			return '';
-		}
-		$obfuscatedToken = $token[0];
-		$secret = $token[1];
-		return base64_decode($obfuscatedToken) ^ base64_decode($secret);
-	}
+    /**
+     * The unencrypted value of the token. Used for decrypting an already
+     * encrypted token.
+     *
+     * @return string
+     */
+    public function getDecryptedValue(): string {
+        $token = explode(':', $this->value);
+        if (\count($token) !== 2) {
+            return '';
+        }
+        $obfuscatedToken = $token[0];
+        $secret = $token[1];
+        return base64_decode($obfuscatedToken) ^ base64_decode($secret);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	public function getEncryptedValue(): string {
 		if ($this->encryptedValue === '') {
 			$sharedSecret = random_bytes(\strlen($this->value));
-			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
+			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret).':'.base64_encode($sharedSecret);
 		}
 
 		return $this->encryptedValue;

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

Indentation +49 added lines, -49 removed lines

@@ -35,59 +35,59 @@
  * @package OC\Security\CSRF\TokenStorage
  */
 class SessionStorage {
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/**
-	 * @param ISession $session
-	 */
-	public function __construct(ISession $session) {
-		$this->session = $session;
-	}
+    /**
+     * @param ISession $session
+     */
+    public function __construct(ISession $session) {
+        $this->session = $session;
+    }
 
-	/**
-	 * @param ISession $session
-	 */
-	public function setSession(ISession $session) {
-		$this->session = $session;
-	}
+    /**
+     * @param ISession $session
+     */
+    public function setSession(ISession $session) {
+        $this->session = $session;
+    }
 
-	/**
-	 * Returns the current token or throws an exception if none is found.
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getToken(): string {
-		$token = $this->session->get('requesttoken');
-		if (empty($token)) {
-			throw new \Exception('Session does not contain a requesttoken');
-		}
+    /**
+     * Returns the current token or throws an exception if none is found.
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getToken(): string {
+        $token = $this->session->get('requesttoken');
+        if (empty($token)) {
+            throw new \Exception('Session does not contain a requesttoken');
+        }
 
-		return $token;
-	}
+        return $token;
+    }
 
-	/**
-	 * Set the valid current token to $value.
-	 *
-	 * @param string $value
-	 */
-	public function setToken(string $value) {
-		$this->session->set('requesttoken', $value);
-	}
+    /**
+     * Set the valid current token to $value.
+     *
+     * @param string $value
+     */
+    public function setToken(string $value) {
+        $this->session->set('requesttoken', $value);
+    }
 
-	/**
-	 * Removes the current token.
-	 */
-	public function removeToken() {
-		$this->session->remove('requesttoken');
-	}
-	/**
-	 * Whether the storage has a storage.
-	 *
-	 * @return bool
-	 */
-	public function hasToken(): bool {
-		return $this->session->exists('requesttoken');
-	}
+    /**
+     * Removes the current token.
+     */
+    public function removeToken() {
+        $this->session->remove('requesttoken');
+    }
+    /**
+     * Whether the storage has a storage.
+     *
+     * @return bool
+     */
+    public function hasToken(): bool {
+        return $this->session->exists('requesttoken');
+    }
 }

lib/private/Security/CSRF/CsrfTokenManager.php

Indentation +66 added lines, -66 removed lines

@@ -34,78 +34,78 @@
  * @package OC\Security\CSRF
  */
 class CsrfTokenManager {
-	/** @var CsrfTokenGenerator */
-	private $tokenGenerator;
-	/** @var SessionStorage */
-	private $sessionStorage;
-	/** @var CsrfToken|null */
-	private $csrfToken = null;
+    /** @var CsrfTokenGenerator */
+    private $tokenGenerator;
+    /** @var SessionStorage */
+    private $sessionStorage;
+    /** @var CsrfToken|null */
+    private $csrfToken = null;
 
-	/**
-	 * @param CsrfTokenGenerator $tokenGenerator
-	 * @param SessionStorage $storageInterface
-	 */
-	public function __construct(CsrfTokenGenerator $tokenGenerator,
-								SessionStorage $storageInterface) {
-		$this->tokenGenerator = $tokenGenerator;
-		$this->sessionStorage = $storageInterface;
-	}
+    /**
+     * @param CsrfTokenGenerator $tokenGenerator
+     * @param SessionStorage $storageInterface
+     */
+    public function __construct(CsrfTokenGenerator $tokenGenerator,
+                                SessionStorage $storageInterface) {
+        $this->tokenGenerator = $tokenGenerator;
+        $this->sessionStorage = $storageInterface;
+    }
 
-	/**
-	 * Returns the current CSRF token, if none set it will create a new one.
-	 *
-	 * @return CsrfToken
-	 */
-	public function getToken(): CsrfToken {
-		if (!\is_null($this->csrfToken)) {
-			return $this->csrfToken;
-		}
+    /**
+     * Returns the current CSRF token, if none set it will create a new one.
+     *
+     * @return CsrfToken
+     */
+    public function getToken(): CsrfToken {
+        if (!\is_null($this->csrfToken)) {
+            return $this->csrfToken;
+        }
 
-		if ($this->sessionStorage->hasToken()) {
-			$value = $this->sessionStorage->getToken();
-		} else {
-			$value = $this->tokenGenerator->generateToken();
-			$this->sessionStorage->setToken($value);
-		}
+        if ($this->sessionStorage->hasToken()) {
+            $value = $this->sessionStorage->getToken();
+        } else {
+            $value = $this->tokenGenerator->generateToken();
+            $this->sessionStorage->setToken($value);
+        }
 
-		$this->csrfToken = new CsrfToken($value);
-		return $this->csrfToken;
-	}
+        $this->csrfToken = new CsrfToken($value);
+        return $this->csrfToken;
+    }
 
-	/**
-	 * Invalidates any current token and sets a new one.
-	 *
-	 * @return CsrfToken
-	 */
-	public function refreshToken(): CsrfToken {
-		$value = $this->tokenGenerator->generateToken();
-		$this->sessionStorage->setToken($value);
-		$this->csrfToken = new CsrfToken($value);
-		return $this->csrfToken;
-	}
+    /**
+     * Invalidates any current token and sets a new one.
+     *
+     * @return CsrfToken
+     */
+    public function refreshToken(): CsrfToken {
+        $value = $this->tokenGenerator->generateToken();
+        $this->sessionStorage->setToken($value);
+        $this->csrfToken = new CsrfToken($value);
+        return $this->csrfToken;
+    }
 
-	/**
-	 * Remove the current token from the storage.
-	 */
-	public function removeToken() {
-		$this->csrfToken = null;
-		$this->sessionStorage->removeToken();
-	}
+    /**
+     * Remove the current token from the storage.
+     */
+    public function removeToken() {
+        $this->csrfToken = null;
+        $this->sessionStorage->removeToken();
+    }
 
-	/**
-	 * Verifies whether the provided token is valid.
-	 *
-	 * @param CsrfToken $token
-	 * @return bool
-	 */
-	public function isTokenValid(CsrfToken $token): bool {
-		if (!$this->sessionStorage->hasToken()) {
-			return false;
-		}
+    /**
+     * Verifies whether the provided token is valid.
+     *
+     * @param CsrfToken $token
+     * @return bool
+     */
+    public function isTokenValid(CsrfToken $token): bool {
+        if (!$this->sessionStorage->hasToken()) {
+            return false;
+        }
 
-		return hash_equals(
-			$this->sessionStorage->getToken(),
-			$token->getDecryptedValue()
-		);
-	}
+        return hash_equals(
+            $this->sessionStorage->getToken(),
+            $token->getDecryptedValue()
+        );
+    }
 }

lib/private/Security/CSP/ContentSecurityPolicyManager.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	 */
 	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
 								  EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
-		foreach ((object)(array)$originalPolicy as $name => $value) {
+		foreach ((object) (array) $originalPolicy as $name => $value) {
 			$setter = 'set'.ucfirst($name);
 			if (\is_array($value)) {
 				$getter = 'get'.ucfirst($name);

Indentation +52 added lines, -52 removed lines

@@ -34,63 +34,63 @@
 use OCP\Security\IContentSecurityPolicyManager;
 
 class ContentSecurityPolicyManager implements IContentSecurityPolicyManager {
-	/** @var ContentSecurityPolicy[] */
-	private $policies = [];
+    /** @var ContentSecurityPolicy[] */
+    private $policies = [];
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	public function __construct(IEventDispatcher $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
+    public function __construct(IEventDispatcher $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
 
-	/** {@inheritdoc} */
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
-		$this->policies[] = $policy;
-	}
+    /** {@inheritdoc} */
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
+        $this->policies[] = $policy;
+    }
 
-	/**
-	 * Get the configured default policy. This is not in the public namespace
-	 * as it is only supposed to be used by core itself.
-	 *
-	 * @return ContentSecurityPolicy
-	 */
-	public function getDefaultPolicy(): ContentSecurityPolicy {
-		$event = new AddContentSecurityPolicyEvent($this);
-		$this->dispatcher->dispatchTyped($event);
+    /**
+     * Get the configured default policy. This is not in the public namespace
+     * as it is only supposed to be used by core itself.
+     *
+     * @return ContentSecurityPolicy
+     */
+    public function getDefaultPolicy(): ContentSecurityPolicy {
+        $event = new AddContentSecurityPolicyEvent($this);
+        $this->dispatcher->dispatchTyped($event);
 
-		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach ($this->policies as $policy) {
-			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
-		}
-		return $defaultPolicy;
-	}
+        $defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
+        foreach ($this->policies as $policy) {
+            $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
+        }
+        return $defaultPolicy;
+    }
 
-	/**
-	 * Merges the first given policy with the second one
-	 *
-	 * @param ContentSecurityPolicy $defaultPolicy
-	 * @param EmptyContentSecurityPolicy $originalPolicy
-	 * @return ContentSecurityPolicy
-	 */
-	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
-								  EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
-		foreach ((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set'.ucfirst($name);
-			if (\is_array($value)) {
-				$getter = 'get'.ucfirst($name);
-				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
-				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
-			} elseif (\is_bool($value)) {
-				$getter = 'is'.ucfirst($name);
-				$currentValue = $defaultPolicy->$getter();
-				// true wins over false
-				if ($value > $currentValue) {
-					$defaultPolicy->$setter($value);
-				}
-			}
-		}
+    /**
+     * Merges the first given policy with the second one
+     *
+     * @param ContentSecurityPolicy $defaultPolicy
+     * @param EmptyContentSecurityPolicy $originalPolicy
+     * @return ContentSecurityPolicy
+     */
+    public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
+                                    EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
+        foreach ((object)(array)$originalPolicy as $name => $value) {
+            $setter = 'set'.ucfirst($name);
+            if (\is_array($value)) {
+                $getter = 'get'.ucfirst($name);
+                $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
+                $defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
+            } elseif (\is_bool($value)) {
+                $getter = 'is'.ucfirst($name);
+                $currentValue = $defaultPolicy->$getter();
+                // true wins over false
+                if ($value > $currentValue) {
+                    $defaultPolicy->$setter($value);
+                }
+            }
+        }
 
-		return $defaultPolicy;
-	}
+        return $defaultPolicy;
+    }
 }

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;
+    }
 }