nextcloud / server

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

Indentation +49 added lines, -49 removed lines

@@ -30,59 +30,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() {
-		$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() {
+        $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($value) {
-		$this->session->set('requesttoken', $value);
-	}
+    /**
+     * Set the valid current token to $value.
+     *
+     * @param string $value
+     */
+    public function setToken($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() {
-		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() {
+        return $this->session->exists('requesttoken');
+    }
 }

lib/private/Security/CSRF/CsrfTokenManager.php

Indentation +66 added lines, -66 removed lines

@@ -30,78 +30,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() {
-		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() {
+        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() {
-		$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() {
+        $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) {
-		if(!$this->sessionStorage->hasToken()) {
-			return false;
-		}
+    /**
+     * Verifies whether the provided token is valid.
+     *
+     * @param CsrfToken $token
+     * @return bool
+     */
+    public function isTokenValid(CsrfToken $token) {
+        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/CSRF/CsrfTokenGenerator.php

Indentation +17 added lines, -17 removed lines

@@ -31,23 +31,23 @@
  * @package OC\Security\CSRF
  */
 class CsrfTokenGenerator {
-	/** @var ISecureRandom  */
-	private $random;
+    /** @var ISecureRandom  */
+    private $random;
 
-	/**
-	 * @param ISecureRandom $random
-	 */
-	public function __construct(ISecureRandom $random) {
-		$this->random = $random;
-	}
+    /**
+     * @param ISecureRandom $random
+     */
+    public function __construct(ISecureRandom $random) {
+        $this->random = $random;
+    }
 
-	/**
-	 * Generate a new CSRF token.
-	 *
-	 * @param int $length Length of the token in characters.
-	 * @return string
-	 */
-	public function generateToken($length = 32) {
-		return $this->random->generate($length);
-	}
+    /**
+     * Generate a new CSRF token.
+     *
+     * @param int $length Length of the token in characters.
+     * @return string
+     */
+    public function generateToken($length = 32) {
+        return $this->random->generate($length);
+    }
 }

lib/private/Security/Crypto.php

Indentation +88 added lines, -88 removed lines

@@ -43,93 +43,93 @@
  * @package OC\Security
  */
 class Crypto implements ICrypto {
-	/** @var AES $cipher */
-	private $cipher;
-	/** @var int */
-	private $ivLength = 16;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $random;
-
-	/**
-	 * @param IConfig $config
-	 * @param ISecureRandom $random
-	 */
-	function __construct(IConfig $config, ISecureRandom $random) {
-		$this->cipher = new AES();
-		$this->config = $config;
-		$this->random = $random;
-	}
-
-	/**
-	 * @param string $message The message to authenticate
-	 * @param string $password Password to use (defaults to `secret` in config.php)
-	 * @return string Calculated HMAC
-	 */
-	public function calculateHMAC($message, $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');
-
-		$hash = new Hash('sha512');
-		$hash->setKey($password);
-		return $hash->hash($message);
-	}
-
-	/**
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
-	 * @param string $plaintext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string Authenticated ciphertext
-	 */
-	public function encrypt($plaintext, $password = '') {
-		if($password === '') {
-			$password = $this->config->getSystemValue('secret');
-		}
-		$this->cipher->setPassword($password);
-
-		$iv = $this->random->generate($this->ivLength);
-		$this->cipher->setIV($iv);
-
-		$ciphertext = bin2hex($this->cipher->encrypt($plaintext));
-		$hmac = bin2hex($this->calculateHMAC($ciphertext.$iv, $password));
-
-		return $ciphertext.'|'.$iv.'|'.$hmac;
-	}
-
-	/**
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
-	 * @param string $authenticatedCiphertext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string plaintext
-	 * @throws \Exception If the HMAC does not match
-	 */
-	public function decrypt($authenticatedCiphertext, $password = '') {
-		if($password === '') {
-			$password = $this->config->getSystemValue('secret');
-		}
-		$this->cipher->setPassword($password);
-
-		$parts = explode('|', $authenticatedCiphertext);
-		if(sizeof($parts) !== 3) {
-			throw new \Exception('Authenticated ciphertext could not be decoded.');
-		}
-
-		$ciphertext = hex2bin($parts[0]);
-		$iv = $parts[1];
-		$hmac = hex2bin($parts[2]);
-
-		$this->cipher->setIV($iv);
-
-		if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
-			throw new \Exception('HMAC does not match.');
-		}
-
-		return $this->cipher->decrypt($ciphertext);
-	}
+    /** @var AES $cipher */
+    private $cipher;
+    /** @var int */
+    private $ivLength = 16;
+    /** @var IConfig */
+    private $config;
+    /** @var ISecureRandom */
+    private $random;
+
+    /**
+     * @param IConfig $config
+     * @param ISecureRandom $random
+     */
+    function __construct(IConfig $config, ISecureRandom $random) {
+        $this->cipher = new AES();
+        $this->config = $config;
+        $this->random = $random;
+    }
+
+    /**
+     * @param string $message The message to authenticate
+     * @param string $password Password to use (defaults to `secret` in config.php)
+     * @return string Calculated HMAC
+     */
+    public function calculateHMAC($message, $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');
+
+        $hash = new Hash('sha512');
+        $hash->setKey($password);
+        return $hash->hash($message);
+    }
+
+    /**
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
+     * @param string $plaintext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string Authenticated ciphertext
+     */
+    public function encrypt($plaintext, $password = '') {
+        if($password === '') {
+            $password = $this->config->getSystemValue('secret');
+        }
+        $this->cipher->setPassword($password);
+
+        $iv = $this->random->generate($this->ivLength);
+        $this->cipher->setIV($iv);
+
+        $ciphertext = bin2hex($this->cipher->encrypt($plaintext));
+        $hmac = bin2hex($this->calculateHMAC($ciphertext.$iv, $password));
+
+        return $ciphertext.'|'.$iv.'|'.$hmac;
+    }
+
+    /**
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
+     * @param string $authenticatedCiphertext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string plaintext
+     * @throws \Exception If the HMAC does not match
+     */
+    public function decrypt($authenticatedCiphertext, $password = '') {
+        if($password === '') {
+            $password = $this->config->getSystemValue('secret');
+        }
+        $this->cipher->setPassword($password);
+
+        $parts = explode('|', $authenticatedCiphertext);
+        if(sizeof($parts) !== 3) {
+            throw new \Exception('Authenticated ciphertext could not be decoded.');
+        }
+
+        $ciphertext = hex2bin($parts[0]);
+        $iv = $parts[1];
+        $hmac = hex2bin($parts[2]);
+
+        $this->cipher->setIV($iv);
+
+        if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
+            throw new \Exception('HMAC does not match.');
+        }
+
+        return $this->cipher->decrypt($ciphertext);
+    }
 
 }

lib/private/Security/SecureRandom.php

Indentation +44 added lines, -44 removed lines

@@ -37,51 +37,51 @@
  * @package OC\Security
  */
 class SecureRandom implements ISecureRandom {
-	/**
-	 * Convenience method to get a low strength random number generator.
-	 *
-	 * Low Strength should be used anywhere that random strings are needed
-	 * in a non-cryptographical setting. They are not strong enough to be
-	 * used as keys or salts. They are however useful for one-time use tokens.
-	 *
-	 * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
-	 * @return $this
-	 */
-	public function getLowStrengthGenerator() {
-		return $this;
-	}
+    /**
+     * Convenience method to get a low strength random number generator.
+     *
+     * Low Strength should be used anywhere that random strings are needed
+     * in a non-cryptographical setting. They are not strong enough to be
+     * used as keys or salts. They are however useful for one-time use tokens.
+     *
+     * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
+     * @return $this
+     */
+    public function getLowStrengthGenerator() {
+        return $this;
+    }
 
-	/**
-	 * Convenience method to get a medium strength random number generator.
-	 *
-	 * Medium Strength should be used for most needs of a cryptographic nature.
-	 * They are strong enough to be used as keys and salts. However, they do
-	 * take some time and resources to generate, so they should not be over-used
-	 *
-	 * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
-	 * @return $this
-	 */
-	public function getMediumStrengthGenerator() {
-		return $this;
-	}
+    /**
+     * Convenience method to get a medium strength random number generator.
+     *
+     * Medium Strength should be used for most needs of a cryptographic nature.
+     * They are strong enough to be used as keys and salts. However, they do
+     * take some time and resources to generate, so they should not be over-used
+     *
+     * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
+     * @return $this
+     */
+    public function getMediumStrengthGenerator() {
+        return $this;
+    }
 
-	/**
-	 * Generate a random string of specified length.
-	 * @param int $length The length of the generated string
-	 * @param string $characters An optional list of characters to use if no character list is
-	 * 							specified all valid base64 characters are used.
-	 * @return string
-	 */
-	public function generate($length,
-							 $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') {
-		$maxCharIndex = strlen($characters) - 1;
-		$randomString = '';
+    /**
+     * Generate a random string of specified length.
+     * @param int $length The length of the generated string
+     * @param string $characters An optional list of characters to use if no character list is
+     * 							specified all valid base64 characters are used.
+     * @return string
+     */
+    public function generate($length,
+                                $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') {
+        $maxCharIndex = strlen($characters) - 1;
+        $randomString = '';
 
-		while($length > 0) {
-			$randomNumber = \random_int(0, $maxCharIndex);
-			$randomString .= $characters[$randomNumber];
-			$length--;
-		}
-		return $randomString;
-	}
+        while($length > 0) {
+            $randomNumber = \random_int(0, $maxCharIndex);
+            $randomString .= $characters[$randomNumber];
+            $length--;
+        }
+        return $randomString;
+    }
 }

lib/private/Security/Certificate.php

Indentation +100 added lines, -100 removed lines

@@ -27,104 +27,104 @@
 use OCP\ICertificate;
 
 class Certificate implements ICertificate {
-	protected $name;
-
-	protected $commonName;
-
-	protected $organization;
-
-	protected $serial;
-
-	protected $issueDate;
-
-	protected $expireDate;
-
-	protected $issuerName;
-
-	protected $issuerOrganization;
-
-	/**
-	 * @param string $data base64 encoded certificate
-	 * @param string $name
-	 * @throws \Exception If the certificate could not get parsed
-	 */
-	public function __construct($data, $name) {
-		$this->name = $name;
-		$gmt = new \DateTimeZone('GMT');
-
-		// If string starts with "file://" ignore the certificate
-		$query = 'file://';
-		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)) {
-			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->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
-		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getCommonName() {
-		return $this->commonName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getOrganization() {
-		return $this->organization;
-	}
-
-	/**
-	 * @return \DateTime
-	 */
-	public function getIssueDate() {
-		return $this->issueDate;
-	}
-
-	/**
-	 * @return \DateTime
-	 */
-	public function getExpireDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isExpired() {
-		$now = new \DateTime();
-		return $this->issueDate > $now or $now > $this->expireDate;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getIssuerName() {
-		return $this->issuerName;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getIssuerOrganization() {
-		return $this->issuerOrganization;
-	}
+    protected $name;
+
+    protected $commonName;
+
+    protected $organization;
+
+    protected $serial;
+
+    protected $issueDate;
+
+    protected $expireDate;
+
+    protected $issuerName;
+
+    protected $issuerOrganization;
+
+    /**
+     * @param string $data base64 encoded certificate
+     * @param string $name
+     * @throws \Exception If the certificate could not get parsed
+     */
+    public function __construct($data, $name) {
+        $this->name = $name;
+        $gmt = new \DateTimeZone('GMT');
+
+        // If string starts with "file://" ignore the certificate
+        $query = 'file://';
+        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)) {
+            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->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
+        $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getCommonName() {
+        return $this->commonName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrganization() {
+        return $this->organization;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getIssueDate() {
+        return $this->issueDate;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getExpireDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExpired() {
+        $now = new \DateTime();
+        return $this->issueDate > $now or $now > $this->expireDate;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getIssuerName() {
+        return $this->issuerName;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getIssuerOrganization() {
+        return $this->issuerOrganization;
+    }
 }

lib/private/Security/IdentityProof/Signer.php

Indentation +66 added lines, -66 removed lines

@@ -26,76 +26,76 @@
 use OCP\IUserManager;
 
 class Signer {
-	/** @var Manager */
-	private $keyManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IUserManager */
-	private $userManager;
+    /** @var Manager */
+    private $keyManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IUserManager */
+    private $userManager;
 
-	/**
-	 * @param Manager $keyManager
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(Manager $keyManager,
-								ITimeFactory $timeFactory,
-								IUserManager $userManager) {
-		$this->keyManager = $keyManager;
-		$this->timeFactory = $timeFactory;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param Manager $keyManager
+     * @param ITimeFactory $timeFactory
+     * @param IUserManager $userManager
+     */
+    public function __construct(Manager $keyManager,
+                                ITimeFactory $timeFactory,
+                                IUserManager $userManager) {
+        $this->keyManager = $keyManager;
+        $this->timeFactory = $timeFactory;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Returns a signed blob for $data
-	 *
-	 * @param string $type
-	 * @param array $data
-	 * @param IUser $user
-	 * @return array ['message', 'signature']
-	 */
-	public function sign($type, array $data, IUser $user) {
-		$privateKey = $this->keyManager->getKey($user)->getPrivate();
-		$data = [
-			'data' => $data,
-			'type' => $type,
-			'signer' => $user->getCloudId(),
-			'timestamp' => $this->timeFactory->getTime(),
-		];
-		openssl_sign(json_encode($data), $signature, $privateKey, OPENSSL_ALGO_SHA512);
+    /**
+     * Returns a signed blob for $data
+     *
+     * @param string $type
+     * @param array $data
+     * @param IUser $user
+     * @return array ['message', 'signature']
+     */
+    public function sign($type, array $data, IUser $user) {
+        $privateKey = $this->keyManager->getKey($user)->getPrivate();
+        $data = [
+            'data' => $data,
+            'type' => $type,
+            'signer' => $user->getCloudId(),
+            'timestamp' => $this->timeFactory->getTime(),
+        ];
+        openssl_sign(json_encode($data), $signature, $privateKey, OPENSSL_ALGO_SHA512);
 
-		return [
-			'message' => $data,
-			'signature' => base64_encode($signature),
-		];
-	}
+        return [
+            'message' => $data,
+            'signature' => base64_encode($signature),
+        ];
+    }
 
-	/**
-	 * Whether the data is signed properly
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	public function verify(array $data) {
-		if(isset($data['message'])
-			&& isset($data['signature'])
-			&& isset($data['message']['signer'])
-		) {
-			$location = strrpos($data['message']['signer'], '@');
-			$userId = substr($data['message']['signer'], 0, $location);
+    /**
+     * Whether the data is signed properly
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function verify(array $data) {
+        if(isset($data['message'])
+            && isset($data['signature'])
+            && isset($data['message']['signer'])
+        ) {
+            $location = strrpos($data['message']['signer'], '@');
+            $userId = substr($data['message']['signer'], 0, $location);
 
-			$user = $this->userManager->get($userId);
-			if($user !== null) {
-				$key = $this->keyManager->getKey($user);
-				return (bool)openssl_verify(
-					json_encode($data['message']),
-					base64_decode($data['signature']),
-					$key->getPublic(),
-					OPENSSL_ALGO_SHA512
-				);
-			}
-		}
+            $user = $this->userManager->get($userId);
+            if($user !== null) {
+                $key = $this->keyManager->getKey($user);
+                return (bool)openssl_verify(
+                    json_encode($data['message']),
+                    base64_decode($data['signature']),
+                    $key->getPublic(),
+                    OPENSSL_ALGO_SHA512
+                );
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/Security/IdentityProof/Key.php

Indentation +18 added lines, -18 removed lines

@@ -22,25 +22,25 @@
 namespace OC\Security\IdentityProof;
 
 class Key {
-	/** @var string */
-	private $publicKey;
-	/** @var string */
-	private $privateKey;
+    /** @var string */
+    private $publicKey;
+    /** @var string */
+    private $privateKey;
 
-	/**
-	 * @param string $publicKey
-	 * @param string $privateKey
-	 */
-	public function __construct($publicKey, $privateKey) {
-		$this->publicKey = $publicKey;
-		$this->privateKey = $privateKey;
-	}
+    /**
+     * @param string $publicKey
+     * @param string $privateKey
+     */
+    public function __construct($publicKey, $privateKey) {
+        $this->publicKey = $publicKey;
+        $this->privateKey = $privateKey;
+    }
 
-	public function getPrivate() {
-		return $this->privateKey;
-	}
+    public function getPrivate() {
+        return $this->privateKey;
+    }
 
-	public function getPublic() {
-		return $this->publicKey;
-	}
+    public function getPublic() {
+        return $this->publicKey;
+    }
 }

lib/private/Security/IdentityProof/Manager.php

Indentation +70 added lines, -70 removed lines

@@ -26,83 +26,83 @@
 use OCP\Security\ICrypto;
 
 class Manager {
-	/** @var IAppData */
-	private $appData;
-	/** @var ICrypto */
-	private $crypto;
+    /** @var IAppData */
+    private $appData;
+    /** @var ICrypto */
+    private $crypto;
 
-	/**
-	 * @param IAppData $appData
-	 * @param ICrypto $crypto
-	 */
-	public function __construct(IAppData $appData,
-								ICrypto $crypto) {
-		$this->appData = $appData;
-		$this->crypto = $crypto;
-	}
+    /**
+     * @param IAppData $appData
+     * @param ICrypto $crypto
+     */
+    public function __construct(IAppData $appData,
+                                ICrypto $crypto) {
+        $this->appData = $appData;
+        $this->crypto = $crypto;
+    }
 
-	/**
-	 * Calls the openssl functions to generate a public and private key.
-	 * In a separate function for unit testing purposes.
-	 *
-	 * @return array [$publicKey, $privateKey]
-	 */
-	protected function generateKeyPair() {
-		$config = [
-			'digest_alg' => 'sha512',
-			'private_key_bits' => 2048,
-		];
+    /**
+     * Calls the openssl functions to generate a public and private key.
+     * In a separate function for unit testing purposes.
+     *
+     * @return array [$publicKey, $privateKey]
+     */
+    protected function generateKeyPair() {
+        $config = [
+            'digest_alg' => 'sha512',
+            'private_key_bits' => 2048,
+        ];
 
-		// Generate new key
-		$res = openssl_pkey_new($config);
-		openssl_pkey_export($res, $privateKey);
+        // Generate new key
+        $res = openssl_pkey_new($config);
+        openssl_pkey_export($res, $privateKey);
 
-		// Extract the public key from $res to $pubKey
-		$publicKey = openssl_pkey_get_details($res);
-		$publicKey = $publicKey['key'];
+        // Extract the public key from $res to $pubKey
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
 
-		return [$publicKey, $privateKey];
-	}
+        return [$publicKey, $privateKey];
+    }
 
-	/**
-	 * Generate a key for $user
-	 * Note: If a key already exists it will be overwritten
-	 *
-	 * @param IUser $user
-	 * @return Key
-	 */
-	protected function generateKey(IUser $user) {
-		list($publicKey, $privateKey) = $this->generateKeyPair();
+    /**
+     * Generate a key for $user
+     * Note: If a key already exists it will be overwritten
+     *
+     * @param IUser $user
+     * @return Key
+     */
+    protected function generateKey(IUser $user) {
+        list($publicKey, $privateKey) = $this->generateKeyPair();
 
-		// Write the private and public key to the disk
-		try {
-			$this->appData->newFolder($user->getUID());
-		} catch (\Exception $e) {}
-		$folder = $this->appData->getFolder($user->getUID());
-		$folder->newFile('private')
-			->putContent($this->crypto->encrypt($privateKey));
-		$folder->newFile('public')
-			->putContent($publicKey);
+        // Write the private and public key to the disk
+        try {
+            $this->appData->newFolder($user->getUID());
+        } catch (\Exception $e) {}
+        $folder = $this->appData->getFolder($user->getUID());
+        $folder->newFile('private')
+            ->putContent($this->crypto->encrypt($privateKey));
+        $folder->newFile('public')
+            ->putContent($publicKey);
 
-		return new Key($publicKey, $privateKey);
-	}
+        return new Key($publicKey, $privateKey);
+    }
 
-	/**
-	 * Get public and private key for $user
-	 *
-	 * @param IUser $user
-	 * @return Key
-	 */
-	public function getKey(IUser $user) {
-		try {
-			$folder = $this->appData->getFolder($user->getUID());
-			$privateKey = $this->crypto->decrypt(
-				$folder->getFile('private')->getContent()
-			);
-			$publicKey = $folder->getFile('public')->getContent();
-			return new Key($publicKey, $privateKey);
-		} catch (\Exception $e) {
-			return $this->generateKey($user);
-		}
-	}
+    /**
+     * Get public and private key for $user
+     *
+     * @param IUser $user
+     * @return Key
+     */
+    public function getKey(IUser $user) {
+        try {
+            $folder = $this->appData->getFolder($user->getUID());
+            $privateKey = $this->crypto->decrypt(
+                $folder->getFile('private')->getContent()
+            );
+            $publicKey = $folder->getFile('public')->getContent();
+            return new Key($publicKey, $privateKey);
+        } catch (\Exception $e) {
+            return $this->generateKey($user);
+        }
+    }
 }