nextcloud / passman

lib/Service/ShareService.php

Indentation +25 added lines, -25 removed lines

@@ -47,7 +47,7 @@ 
 		ShareRequestMapper $shareRequest,
 		CredentialMapper $credentials,
 		CredentialRevisionService $revisions,
-	    EncryptService $encryptService
+		EncryptService $encryptService
 	) {
 		$this->sharingACL = $sharingACL;
 		$this->shareRequest = $shareRequest;
@@ -200,31 +200,31 @@ 
 	}
 
 
-    /**
-     * Deletes a share request by the item ID
-     * @param ShareRequest $request
-     * @return \PDOStatement
-     */
+	/**
+	 * Deletes a share request by the item ID
+	 * @param ShareRequest $request
+	 * @return \PDOStatement
+	 */
 	public function cleanItemRequestsForUser(ShareRequest $request) {
 		return $this->shareRequest->cleanItemRequestsForUser($request->getItemId(), $request->getTargetUserId());
 	}
 
-    /**
-     * Get an share request by id
-     * @param $id
-     * @return ShareRequest
-     */
+	/**
+	 * Get an share request by id
+	 * @param $id
+	 * @return ShareRequest
+	 */
 	public function getShareRequestById($id) {
 		return $this->shareRequest->getShareRequestById($id);
 	}
 
-    /**
-     * Get an share request by $item_guid and $target_vault_guid
-     *
-     * @param $item_guid
-     * @param $target_vault_guid
-     * @return ShareRequest
-     */
+	/**
+	 * Get an share request by $item_guid and $target_vault_guid
+	 *
+	 * @param $item_guid
+	 * @param $target_vault_guid
+	 * @return ShareRequest
+	 */
 	public function getRequestByGuid($item_guid, $target_vault_guid) {
 		return $this->shareRequest->getRequestByItemAndVaultGuid($item_guid, $target_vault_guid);
 	}
@@ -284,11 +284,11 @@ 
 		return $this->sharingACL->deleteShareACL($ACL);
 	}
 
-    /**
-     * Updates the given ACL entry
-     * @param SharingACL $sharingACL
-     * @return SharingACL
-     */
+	/**
+	 * Updates the given ACL entry
+	 * @param SharingACL $sharingACL
+	 * @return SharingACL
+	 */
 	public function updateCredentialACL(SharingACL $sharingACL) {
 		return $this->sharingACL->updateCredentialACL($sharingACL);
 	}
@@ -310,6 +310,6 @@ 
 
 
 	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
-	    return $this->shareRequest->updatePendingRequestPermissions($item_guid, $user_id, $permissions);
-    }
+		return $this->shareRequest->updatePendingRequestPermissions($item_guid, $user_id, $permissions);
+	}
 }
\ No newline at end of file

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

lib/Service/EncryptService.php

Doc Comments +11 added lines, -6 removed lines

@@ -212,6 +212,10 @@ 
 		return array($cipherKey, $macKey, $iv);
 	}
 
+	/**
+	 * @param string $a
+	 * @param string $b
+	 */
 	protected function hash_equals($a, $b) {
 		$key = openssl_random_pseudo_bytes(128);
 		return hash_hmac('sha512', $a, $key) === hash_hmac('sha512', $b, $key);
@@ -249,7 +253,7 @@ 
 	/**
 	 * Pad the data with a random char chosen by the pad amount.
 	 *
-	 * @param $data
+	 * @param string $data
 	 * @return string
 	 */
 	protected function pad($data) {
@@ -265,8 +269,8 @@ 
 	/**
 	 * Unpad the the data
 	 *
-	 * @param $data
-	 * @return bool|string
+	 * @param string $data
+	 * @return false|string
 	 */
 	protected function unpad($data) {
 		$length = $this->getKeySize();
@@ -283,7 +287,7 @@ 
 	 * Encrypt a credential
 	 *
 	 * @param Credential|array $credential the credential to decrypt
-	 * @return Credential|array
+	 * @return string
 	 */
 	public function decryptCredential($credential) {
 		return $this->handleCredential($credential, 'decrypt');
@@ -304,6 +308,7 @@ 
 	 * Handles the encryption / decryption of a credential
 	 *
 	 * @param Credential|array $credential the credential to encrypt
+	 * @param string $op
 	 * @return Credential|array
 	 * @throws \Exception
 	 */
@@ -347,7 +352,7 @@ 
 	/**
 	 * Decrypt a file
 	 *
-	 * @param  File|array $file
+	 * @param  File $file
 	 * @return File|array
 	 */
 
@@ -358,7 +363,7 @@ 
 	/**
 	 * Handles the encryption / decryption of a File
 	 *
-	 * @param File|array $credential the credential to encrypt
+	 * @param string $op
 	 * @return File|array
 	 * @throws \Exception
 	 */