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/EncryptService.php

Braces +3 added lines, -1 removed lines

@@ -272,7 +272,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;
 		}

lib/Service/CredentialRevisionService.php

Braces +5 added lines, -5 removed lines

@@ -61,9 +61,9 @@ 
 	 * @param null $user_id
 	 * @return CredentialRevision[]
 	 */
-	public function getRevisions($credential_id, $user_id = null){
+	public function getRevisions($credential_id, $user_id = null) {
 		$result = $this->credentialRevisionMapper->getRevisions($credential_id, $user_id);
-		foreach ($result as $index => $revision){
+		foreach ($result as $index => $revision) {
 			$c = json_decode(base64_decode($revision->getCredentialData()), true);
 			$result[$index] = $revision->jsonSerialize();
 			$result[$index]['credential_data'] = $this->encryptService->decryptCredential($c);
@@ -77,7 +77,7 @@ 
 	 * @param null $user_id
 	 * @return CredentialRevision
 	 */
-	public function getRevision($credential_id, $user_id = null){
+	public function getRevision($credential_id, $user_id = null) {
 		$revision = $this->credentialRevisionMapper->getRevision($credential_id, $user_id);
 		$c = json_decode(base64_decode($revision->getCredentialData()), true);
 		$revision->setCredentialData($this->encryptService->decryptCredential($c));
@@ -90,7 +90,7 @@ 
 	 * @param $user_id
 	 * @return CredentialRevision
 	 */
-	public function deleteRevision($revision_id, $user_id){
+	public function deleteRevision($revision_id, $user_id) {
 		return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id);
 	}
 
@@ -99,7 +99,7 @@ 
 	 * @param CredentialRevision $credentialRevision
 	 * @return CredentialRevision
 	 */
-	public function updateRevision(CredentialRevision $credentialRevision){
+	public function updateRevision(CredentialRevision $credentialRevision) {
 		$credential_data = $credentialRevision->getCredentialData();
 		$credential_data = json_decode(base64_decode($credential_data), true);
 		$credential_data = base64_encode(json_encode($this->encryptService->encryptCredential($credential_data)));

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

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