nextcloud / passman

lib/Db/SharingACLMapper.php

Indentation +56 added lines, -56 removed lines

@@ -16,68 +16,68 @@
 use OCA\Passman\Utility\Utils;
 
 class SharingACLMapper extends Mapper {
-    const TABLE_NAME = '*PREFIX*passman_sharing_acl';
+	const TABLE_NAME = '*PREFIX*passman_sharing_acl';
 
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'passman_sharing_acl');
-    }
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'passman_sharing_acl');
+	}
 
-    public function createACLEntry(SharingACL $acl){
-        return $this->insert($acl);
-    }
+	public function createACLEntry(SharingACL $acl){
+		return $this->insert($acl);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_guid
-     * @return SharingACL[]
-     */
-    public function getVaultEntries($user_id, $vault_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
-        return $this->findEntities($q, [$user_id, $vault_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_guid
+	 * @return SharingACL[]
+	 */
+	public function getVaultEntries($user_id, $vault_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+		return $this->findEntities($q, [$user_id, $vault_guid]);
+	}
 
-    /**
-     * Gets the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function getItemACL($user_id, $item_guid) {
-        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
-        $filter = [$item_guid];
-        if ($user_id === null){
-            $q .= 'user_id is null';
-        }
-        else {
-            $q .= 'user_id = ? ';
-            $filter[] = $user_id;
-        }
-        return $this->findEntity($q, $filter);
-    }
+	/**
+	 * Gets the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function getItemACL($user_id, $item_guid) {
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
+		$filter = [$item_guid];
+		if ($user_id === null){
+			$q .= 'user_id is null';
+		}
+		else {
+			$q .= 'user_id = ? ';
+			$filter[] = $user_id;
+		}
+		return $this->findEntity($q, $filter);
+	}
 
-    /**
-     * Update the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function updateCredentialACL(SharingACL $sharingACL) {
-        return $this->update($sharingACL);
-    }
+	/**
+	 * Update the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function updateCredentialACL(SharingACL $sharingACL) {
+		return $this->update($sharingACL);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_id
-     * @return SharingACL[]
-     */
-    public function getCredentialAclList($item_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
-        return $this->findEntities($q, [$item_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_id
+	 * @return SharingACL[]
+	 */
+	public function getCredentialAclList($item_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+		return $this->findEntities($q, [$item_guid]);
+	}
 
-    public function deleteShareACL(SharingACL $ACL){
-    	return $this->delete($ACL);
+	public function deleteShareACL(SharingACL $ACL){
+		return $this->delete($ACL);
 	}
 }
\ No newline at end of file

lib/Db/ShareRequest.php

Indentation +50 added lines, -50 removed lines

@@ -37,60 +37,60 @@
 
 class ShareRequest extends PermissionEntity implements \JsonSerializable {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $targetUserId,
-        $targetVaultId,
-        $targetVaultGuid,
-        $sharedKey,
-        $permissions,
-        $created,
+	protected
+		$itemId,
+		$itemGuid,
+		$targetUserId,
+		$targetVaultId,
+		$targetVaultGuid,
+		$sharedKey,
+		$permissions,
+		$created,
 		$fromUserId;
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('vaultId', 'integer');
-        $this->addType('permissions', 'integer');
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('vaultId', 'integer');
+		$this->addType('permissions', 'integer');
 		$this->addType('created', 'integer');
 		$this->addType('targetVaultId', 'integer');
-    }
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'req_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'target_user_id' => $this->getTargetUserId(),
-            'target_vault_id' => $this->getTargetVaultId(),
-            'target_vault_guid' => $this->getTargetVaultGuid(),
-            'from_user_id' => $this->getFromUserId(),
-            'shared_key' => $this->getSharedKey(),
-            'permissions' => $this->getPermissions(),
-            'created' => $this->getCreated(),
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'req_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'target_user_id' => $this->getTargetUserId(),
+			'target_vault_id' => $this->getTargetVaultId(),
+			'target_vault_guid' => $this->getTargetVaultGuid(),
+			'from_user_id' => $this->getFromUserId(),
+			'shared_key' => $this->getSharedKey(),
+			'permissions' => $this->getPermissions(),
+			'created' => $this->getCreated(),
+		];
+	}
 
-    function asACLJson(){
-        return [
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getTargetUserId(),
-            'created' => $this->getCreated(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getTargetVaultId(),
-            'vault_guid' => $this->getTargetVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending'   => true,
-        ];
-    }
+	function asACLJson(){
+		return [
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getTargetUserId(),
+			'created' => $this->getCreated(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getTargetVaultId(),
+			'vault_guid' => $this->getTargetVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending'   => true,
+		];
+	}
 }
\ No newline at end of file

lib/Db/ShareRequestMapper.php

Indentation +91 added lines, -91 removed lines

@@ -16,122 +16,122 @@
 use OCP\IDBConnection;
 
 class ShareRequestMapper extends Mapper {
-    const TABLE_NAME = 'passman_share_request';
-
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, self::TABLE_NAME);
-    }
-
-    public function createRequest(ShareRequest $request){
-        return $this->insert($request);
-    }
-
-    /**
-     * Obtains a request by the given item and vault GUID pair
-     * @param $item_guid
-     * @param $target_vault_guid
-     * @return ShareRequest
-     */
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
-        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
-        return $this->findEntity($q, [$item_guid, $target_vault_guid]);
-    }
-
-    /**
-     * Get shared items for the given item_guid
-     * @param $item_guid
-     * @return ShareRequest[]
-     */
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
-    		$this->db->executeQuery("SET sql_mode = '';");
+	const TABLE_NAME = 'passman_share_request';
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, self::TABLE_NAME);
+	}
+
+	public function createRequest(ShareRequest $request){
+		return $this->insert($request);
+	}
+
+	/**
+	 * Obtains a request by the given item and vault GUID pair
+	 * @param $item_guid
+	 * @param $target_vault_guid
+	 * @return ShareRequest
+	 */
+	public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
+		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
+		return $this->findEntity($q, [$item_guid, $target_vault_guid]);
+	}
+
+	/**
+	 * Get shared items for the given item_guid
+	 * @param $item_guid
+	 * @return ShareRequest[]
+	 */
+	public function getRequestsByItemGuidGroupedByUser($item_guid){
+		if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+			$this->db->executeQuery("SET sql_mode = '';");
 		}
-        $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
-        return $this->findEntities($q, [$item_guid]);
-    }
-
-    /**
-     * Deletes all pending requests for the given user to the given item
-     * @param $item_id          The item ID
-     * @param $target_user_id   The target user
-     * @return \PDOStatement    The result of running the db query
-     */
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
+		$q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
+		return $this->findEntities($q, [$item_guid]);
+	}
+
+	/**
+	 * Deletes all pending requests for the given user to the given item
+	 * @param $item_id          The item ID
+	 * @param $target_user_id   The target user
+	 * @return \PDOStatement    The result of running the db query
+	 */
+	public function cleanItemRequestsForUser($item_id, $target_user_id){
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
 		$this->execute($q, [$item_id, $target_user_id]);
-        return $this->execute($q, [$item_id, $target_user_id]);
-    }
-
-    /**
-     * Obtains all pending share requests for the given user ID
-     * @param $user_id
-     * @return ShareRequest[]
-     */
-    public function getUserPendingRequests($user_id){
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
-        return $this->findEntities($q, [$user_id]);
-    }
-
-    /**
-     * Deletes the given share request
-     * @param ShareRequest $shareRequest    Request to delete
-     * @return ShareRequest                 The deleted request
-     */
-    public function deleteShareRequest(ShareRequest $shareRequest){
-    	return $this->delete($shareRequest);
+		return $this->execute($q, [$item_id, $target_user_id]);
+	}
+
+	/**
+	 * Obtains all pending share requests for the given user ID
+	 * @param $user_id
+	 * @return ShareRequest[]
+	 */
+	public function getUserPendingRequests($user_id){
+		$q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
+		return $this->findEntities($q, [$user_id]);
 	}
 
-    /**
-     * Gets a share request by it's unique incremental id
-     * @param $id
-     * @return ShareRequest
+	/**
+	 * Deletes the given share request
+	 * @param ShareRequest $shareRequest    Request to delete
+	 * @return ShareRequest                 The deleted request
+	 */
+	public function deleteShareRequest(ShareRequest $shareRequest){
+		return $this->delete($shareRequest);
+	}
+
+	/**
+	 * Gets a share request by it's unique incremental id
+	 * @param $id
+	 * @return ShareRequest
 	 * @throws DoesNotExistException
-     */
+	 */
 	public function getShareRequestById($id){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
 
-    /**
-     * Gets all share requests by a given item GUID
-     * @param $item_guid
-     * @return ShareRequest[]
-     */
+	/**
+	 * Gets all share requests by a given item GUID
+	 * @param $item_guid
+	 * @return ShareRequest[]
+	 */
 	public function getShareRequestsByItemGuid($item_guid){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
 
-    /**
-     * Updates the given share request,
-     * @param ShareRequest $shareRequest
-     * @return ShareRequest
-     */
+	/**
+	 * Updates the given share request,
+	 * @param ShareRequest $shareRequest
+	 * @return ShareRequest
+	 */
 	public function updateShareRequest(ShareRequest $shareRequest){
 		return $this->update($shareRequest);
 	}
 
-    /**
-     * Finds pending requests sent to the given user to the given item.
-     * @param $item_guid
-     * @param $user_id
-     * @return ShareRequest[]
-     */
+	/**
+	 * Finds pending requests sent to the given user to the given item.
+	 * @param $item_guid
+	 * @param $user_id
+	 * @return ShareRequest[]
+	 */
 	public function getPendingShareRequests($item_guid, $user_id){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
 		return $this->findEntities($q, [$item_guid, $user_id]);
 	}
 
-    /**
-     * Updates all pending requests with the given permissions
-     * @param $item_guid        The item for which to update the requests
-     * @param $user_id          The user for which to update the requests
-     * @param $permissions      The new permissions to apply
-     * @return \PDOStatement    The result of the operation
-     */
+	/**
+	 * Updates all pending requests with the given permissions
+	 * @param $item_guid        The item for which to update the requests
+	 * @param $user_id          The user for which to update the requests
+	 * @param $permissions      The new permissions to apply
+	 * @return \PDOStatement    The result of the operation
+	 */
 	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
-	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
-        return $this->execute($q, [$permissions, $item_guid, $user_id]);
-    }
+		$q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
+		return $this->execute($q, [$permissions, $item_guid, $user_id]);
+	}
 
 }
\ No newline at end of file

lib/Db/CredentialMapper.php

Indentation +16 added lines, -16 removed lines

@@ -73,20 +73,20 @@ 
 		return $this->findEntities($sql, [$timestamp]);
 	}
 
-    /**
+	/**
 	 * Get an credential by id.
 	 * Optional user id
-     * @param $credential_id
-     * @param null $user_id
-     * @return Credential
-     */
+	 * @param $credential_id
+	 * @param null $user_id
+	 * @return Credential
+	 */
 	public function getCredentialById($credential_id, $user_id = null){
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ?';
-        // If we want to check the owner, add it to the query
+		// If we want to check the owner, add it to the query
 		$params = [$credential_id];
-        if ($user_id !== null){
-        	$sql .= ' and `user_id` = ? ';
+		if ($user_id !== null){
+			$sql .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
 		return $this->findEntity($sql,$params);
@@ -176,18 +176,18 @@ 
 		$this->update($credential);
 	}
 
-    /**
-     * Finds a credential by the given guid
-     * @param $credential_guid
-     * @return Credential
-     */
+	/**
+	 * Finds a credential by the given guid
+	 * @param $credential_guid
+	 * @return Credential
+	 */
 	public function getCredentialByGUID($credential_guid, $user_id = null){
-	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
+		$q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
 		$params = [$credential_guid];
 		if ($user_id !== null){
 			$q .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
-        return $this->findEntity($q, $params);
-    }
+		return $this->findEntity($q, $params);
+	}
 }
\ No newline at end of file

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