nextcloud / passman

lib/Service/CredentialService.php

Indentation +12 added lines, -12 removed lines

@@ -36,14 +36,14 @@ 
 class CredentialService {
 
 	private $credentialMapper;
-    private $sharingACL;
+	private $sharingACL;
 	private $encryptService;
 	private $server_key;
 
 	public function __construct(CredentialMapper $credentialMapper, SharingACLMapper $sharingACL, EncryptService $encryptService) {
 		$this->credentialMapper = $credentialMapper;
-        $this->sharingACL = $sharingACL;
-        $this->encryptService = $encryptService;
+		$this->sharingACL = $sharingACL;
+		$this->encryptService = $encryptService;
 		$this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', '');
 	}
 
@@ -136,18 +136,18 @@ 
 	 * @throws DoesNotExistException
 	 */
 	public function getCredentialById($credential_id, $user_id){
-        $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
-            return $credential;
-        }
-        else {
-            $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
-            if ($acl->hasPermission(SharingACL::READ)) {
+		$credential = $this->credentialMapper->getCredentialById($credential_id);
+		if ($credential->getUserId() === $user_id){
+			return $credential;
+		}
+		else {
+			$acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
+			if ($acl->hasPermission(SharingACL::READ)) {
 				return $this->encryptService->decryptCredential($credential);
 			} else {
 				throw new DoesNotExistException("Did expect one result but found none when executing");
 			}
-        }
+		}
 	}
 
 	/**
@@ -169,5 +169,5 @@ 
 	public function getCredentialByGUID($credential_guid, $user_id = null){
 		$credential = $this->credentialMapper->getCredentialByGUID($credential_guid);
 		return $this->encryptService->decryptCredential($credential);
-    }
+	}
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
 	 * @param Credential $credential
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -95,7 +95,7 @@ 
 	 */
 	public function getCredentialsByVaultId($vault_id, $user_id) {
 		$credentials = $this->credentialMapper->getCredentialsByVaultId($vault_id, $user_id);
-		foreach ($credentials as $index => $credential){
+		foreach ($credentials as $index => $credential) {
 			$credentials[$index] = $this->encryptService->decryptCredential($credential);
 		}
 		return $credentials;
@@ -109,7 +109,7 @@ 
 	 */
 	public function getRandomCredentialByVaultId($vault_id, $user_id) {
 		$credentials = $this->credentialMapper->getRandomCredentialByVaultId($vault_id, $user_id);
-		foreach ($credentials as $index => $credential){
+		foreach ($credentials as $index => $credential) {
 			$credentials[$index] = $this->encryptService->decryptCredential($credential);
 		}
 		return array_pop($credentials);
@@ -122,7 +122,7 @@ 
 	 */
 	public function getExpiredCredentials($timestamp) {
 		$credentials = $this->credentialMapper->getExpiredCredentials($timestamp);
-		foreach ($credentials as $index => $credential){
+		foreach ($credentials as $index => $credential) {
 			$credentials[$index] = $this->encryptService->decryptCredential($credential);
 		}
 		return $credentials;
@@ -135,9 +135,9 @@ 
 	 * @return Credential
 	 * @throws DoesNotExistException
 	 */
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
         }
         else {
@@ -155,8 +155,8 @@ 
 	 * @param $credential_id
 	 * @return Credential
 	 */
-	public function getCredentialLabelById($credential_id){
-		$credential =  $this->credentialMapper->getCredentialLabelById($credential_id);
+	public function getCredentialLabelById($credential_id) {
+		$credential = $this->credentialMapper->getCredentialLabelById($credential_id);
 		return $this->encryptService->decryptCredential($credential);
 	}
 
@@ -166,7 +166,7 @@ 
 	 * @param null $user_id
 	 * @return Credential
 	 */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 		$credential = $this->credentialMapper->getCredentialByGUID($credential_guid);
 		return $this->encryptService->decryptCredential($credential);
     }

Braces +9 added lines, -10 removed lines

@@ -83,7 +83,7 @@ 
 	 * @param Credential $credential
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -95,7 +95,7 @@ 
 	 */
 	public function getCredentialsByVaultId($vault_id, $user_id) {
 		$credentials = $this->credentialMapper->getCredentialsByVaultId($vault_id, $user_id);
-		foreach ($credentials as $index => $credential){
+		foreach ($credentials as $index => $credential) {
 			$credentials[$index] = $this->encryptService->decryptCredential($credential);
 		}
 		return $credentials;
@@ -109,7 +109,7 @@ 
 	 */
 	public function getRandomCredentialByVaultId($vault_id, $user_id) {
 		$credentials = $this->credentialMapper->getRandomCredentialByVaultId($vault_id, $user_id);
-		foreach ($credentials as $index => $credential){
+		foreach ($credentials as $index => $credential) {
 			$credentials[$index] = $this->encryptService->decryptCredential($credential);
 		}
 		return array_pop($credentials);
@@ -122,7 +122,7 @@ 
 	 */
 	public function getExpiredCredentials($timestamp) {
 		$credentials = $this->credentialMapper->getExpiredCredentials($timestamp);
-		foreach ($credentials as $index => $credential){
+		foreach ($credentials as $index => $credential) {
 			$credentials[$index] = $this->encryptService->decryptCredential($credential);
 		}
 		return $credentials;
@@ -135,12 +135,11 @@ 
 	 * @return Credential
 	 * @throws DoesNotExistException
 	 */
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
-        }
-        else {
+        } else {
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
             if ($acl->hasPermission(SharingACL::READ)) {
 				return $this->encryptService->decryptCredential($credential);
@@ -155,7 +154,7 @@ 
 	 * @param $credential_id
 	 * @return Credential
 	 */
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		$credential =  $this->credentialMapper->getCredentialLabelById($credential_id);
 		return $this->encryptService->decryptCredential($credential);
 	}
@@ -166,7 +165,7 @@ 
 	 * @param null $user_id
 	 * @return Credential
 	 */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 		$credential = $this->credentialMapper->getCredentialByGUID($credential_guid);
 		return $this->encryptService->decryptCredential($credential);
     }

lib/Service/EncryptService.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 		$setting = $settings->getAppSetting('server_side_encryption');
 		$this->cipher = $setting['cipher'];
 		$this->mode = $setting['mode'];
-		$this->rounds = (int)100;
+		$this->rounds = (int) 100;
 		$this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', '');
 	}
 
@@ -362,7 +362,7 @@ 
 	 * @return File|array
 	 * @throws \Exception
 	 */
-	private function handleFile($file, $op){
+	private function handleFile($file, $op) {
 		$service_function = ($op === 'encrypt') ? 'encrypt' : 'decrypt';
 		if ($file instanceof File) {
 			$userSuppliedKey = $file->getSize();

Braces +4 added lines, -2 removed lines

@@ -271,7 +271,9 @@ 
 	protected function unpad($data) {
 		$length = $this->getKeySize();
 		$last = ord($data[strlen($data) - 1]);
-		if ($last > $length) return false;
+		if ($last > $length) {
+			return false;
+		}
 		if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) {
 			return false;
 		}
@@ -362,7 +364,7 @@ 
 	 * @return File|array
 	 * @throws \Exception
 	 */
-	private function handleFile($file, $op){
+	private function handleFile($file, $op) {
 		$service_function = ($op === 'encrypt') ? 'encrypt' : 'decrypt';
 		if ($file instanceof File) {
 			$userSuppliedKey = $file->getSize();