nextcloud / server

lib/private/Security/IdentityProof/Key.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
  *

Indentation +18 added lines, -18 removed lines

@@ -25,25 +25,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(string $publicKey, string $privateKey) {
-		$this->publicKey = $publicKey;
-		$this->privateKey = $privateKey;
-	}
+    /**
+     * @param string $publicKey
+     * @param string $privateKey
+     */
+    public function __construct(string $publicKey, string $privateKey) {
+        $this->publicKey = $publicKey;
+        $this->privateKey = $privateKey;
+    }
 
-	public function getPrivate(): string {
-		return $this->privateKey;
-	}
+    public function getPrivate(): string {
+        return $this->privateKey;
+    }
 
-	public function getPublic(): string {
-		return $this->publicKey;
-	}
+    public function getPublic(): string {
+        return $this->publicKey;
+    }
 }

lib/private/Security/IdentityProof/Manager.php

Indentation +110 added lines, -110 removed lines

@@ -33,116 +33,116 @@
 use OCP\Security\ICrypto;
 
 class Manager {
-	/** @var IAppData */
-	private $appData;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param Factory $appDataFactory
-	 * @param ICrypto $crypto
-	 * @param IConfig $config
-	 */
-	public function __construct(Factory $appDataFactory,
-								ICrypto $crypto,
-								IConfig $config
-	) {
-		$this->appData = $appDataFactory->get('identityproof');
-		$this->crypto = $crypto;
-		$this->config = $config;
-	}
-
-	/**
-	 * 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(): array {
-		$config = [
-			'digest_alg' => 'sha512',
-			'private_key_bits' => 2048,
-		];
-
-		// 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'];
-
-		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
-	 */
-	protected function generateKey(string $id): Key {
-		list($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
-	 */
-	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
-	 */
-	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);
-	}
+    /** @var IAppData */
+    private $appData;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param Factory $appDataFactory
+     * @param ICrypto $crypto
+     * @param IConfig $config
+     */
+    public function __construct(Factory $appDataFactory,
+                                ICrypto $crypto,
+                                IConfig $config
+    ) {
+        $this->appData = $appDataFactory->get('identityproof');
+        $this->crypto = $crypto;
+        $this->config = $config;
+    }
+
+    /**
+     * 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(): array {
+        $config = [
+            'digest_alg' => 'sha512',
+            'private_key_bits' => 2048,
+        ];
+
+        // 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'];
+
+        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
+     */
+    protected function generateKey(string $id): Key {
+        list($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
+     */
+    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
+     */
+    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);
+    }
 
 
 }

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
  *
@@ -127,7 +127,7 @@ 
 	 */
 	public function getKey(IUser $user): Key {
 		$uid = $user->getUID();
-		return $this->retrieveKey('user-' . $uid);
+		return $this->retrieveKey('user-'.$uid);
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 		if ($instanceId === null) {
 			throw new \RuntimeException('no instance id!');
 		}
-		return $this->retrieveKey('system-' . $instanceId);
+		return $this->retrieveKey('system-'.$instanceId);
 	}
 
 

lib/private/Security/IdentityProof/Signer.php

Indentation +66 added lines, -66 removed lines

@@ -30,76 +30,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(string $type, array $data, IUser $user): array {
-		$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(string $type, array $data, IUser $user): array {
+        $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): bool {
-		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): bool {
+        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;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
  *
@@ -81,7 +81,7 @@ 
 	 * @return bool
 	 */
 	public function verify(array $data): bool {
-		if(isset($data['message'])
+		if (isset($data['message'])
 			&& isset($data['signature'])
 			&& isset($data['message']['signer'])
 		) {
@@ -89,9 +89,9 @@ 
 			$userId = substr($data['message']['signer'], 0, $location);
 
 			$user = $this->userManager->get($userId);
-			if($user !== null) {
+			if ($user !== null) {
 				$key = $this->keyManager->getKey($user);
-				return (bool)openssl_verify(
+				return (bool) openssl_verify(
 					json_encode($data['message']),
 					base64_decode($data['signature']),
 					$key->getPublic(),