nextcloud / passman

lib/Db/CredentialRevisionMapper.php

Indentation +10 added lines, -10 removed lines

@@ -30,11 +30,11 @@ 
 	public function getRevisions($credential_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
 			'WHERE `credential_id` = ?';
-        $params = [$credential_id];
-        if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
-            $params[] = $user_id;
-        }
+		$params = [$credential_id];
+		if ($user_id !== null) {
+			$sql.= ' and `user_id` = ? ';
+			$params[] = $user_id;
+		}
 		return $this->findEntities($sql, $params);
 	}
 
@@ -46,11 +46,11 @@ 
 	public function getRevision($revision_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
 			'WHERE `id` = ?';
-        $params = [$revision_id];
-        if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
-            $params[] = $user_id;
-        }
+		$params = [$revision_id];
+		if ($user_id !== null) {
+			$sql.= ' and `user_id` = ? ';
+			$params[] = $user_id;
+		}
 		return $this->findEntity($sql, $params);
 	}
 

lib/Db/ShareRequestMapper.php

Indentation +91 added lines, -91 removed lines

@@ -15,120 +15,120 @@
 use OCP\IDBConnection;
 
 class ShareRequestMapper extends Mapper {
-    const TABLE_NAME = 'passman_share_request';
-
-    public function __construct(IDBConnection $db, Utils $utils) {
-        parent::__construct($db, self::TABLE_NAME);
-        $this->utils = $utils;
-    }
-
-    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 getRequestsByItemGuid($item_guid){
-        $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){
+	const TABLE_NAME = 'passman_share_request';
+
+	public function __construct(IDBConnection $db, Utils $utils) {
+		parent::__construct($db, self::TABLE_NAME);
+		$this->utils = $utils;
+	}
+
+	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 getRequestsByItemGuid($item_guid){
+		$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 = "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
+	 */
 	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/ShareRequest.php

Indentation +50 added lines, -50 removed lines

@@ -37,58 +37,58 @@
 
 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');
+	}
 
-    /**
-     * 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->getTargetUserId(),
-            '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->getTargetUserId(),
+			'vault_guid' => $this->getTargetVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending'   => true,
+		];
+	}
 }
\ No newline at end of file

lib/Db/CredentialRevision.php

Indentation +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	protected $userId;
 	protected $created;
 	protected $credentialData;
-    protected $editedBy;
+	protected $editedBy;
 
 
 	public function __construct() {
@@ -56,7 +56,7 @@ 
 			'guid' => $this->getGuid(),
 			'created' => $this->getCreated(),
 			'credential_data' => json_decode(base64_decode($this->getCredentialData())),
-            'edited_by' => $this->getEditedBy(),
+			'edited_by' => $this->getEditedBy(),
 		];
 	}
 }
\ No newline at end of file

lib/Utility/NotFoundJSONResponse.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
 
 class NotFoundJSONResponse extends JSONResponse {
 
-    /**
-     * Creates a new json response with a not found status code.
-     * @param array $response_data
-     */
-    public function __construct($response_data = []) {
-        parent::__construct($response_data, Http::STATUS_NOT_FOUND);
-    }
+	/**
+	 * Creates a new json response with a not found status code.
+	 * @param array $response_data
+	 */
+	public function __construct($response_data = []) {
+		parent::__construct($response_data, Http::STATUS_NOT_FOUND);
+	}
 }
\ No newline at end of file

lib/Utility/PermissionEntity.php

Indentation +33 added lines, -33 removed lines

@@ -13,40 +13,40 @@
 use OCP\AppFramework\Db\Entity;
 
 class PermissionEntity extends Entity {
-    CONST READ  =   0b00000001;
-    CONST WRITE =   0b00000010;
-    CONST FILES =   0b00000100;
-    CONST HISTORY = 0b00001000;
-    CONST OWNER =   0b10000000;
+	CONST READ  =   0b00000001;
+	CONST WRITE =   0b00000010;
+	CONST FILES =   0b00000100;
+	CONST HISTORY = 0b00001000;
+	CONST OWNER =   0b10000000;
 
-    /**
-     * Checks wether a user matches one or more permissions at once
-     * @param $permission
-     * @return bool
-     */
-    public function hasPermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp & $permission;
-        return $tmp == $permission;
-    }
+	/**
+	 * Checks wether a user matches one or more permissions at once
+	 * @param $permission
+	 * @return bool
+	 */
+	public function hasPermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp & $permission;
+		return $tmp == $permission;
+	}
 
-    /**
-     * Adds the given permission or permissions set to the user current permissions
-     * @param $permission
-     */
-    public function addPermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp | $permission;
-        $this->setPermissions($tmp);
-    }
+	/**
+	 * Adds the given permission or permissions set to the user current permissions
+	 * @param $permission
+	 */
+	public function addPermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp | $permission;
+		$this->setPermissions($tmp);
+	}
 
-    /**
-     * Takes the given permission or permissions out from the user
-     * @param $permission
-     */
-    public function removePermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp & ~$permission;
-        $this->setPermissions($tmp);
-    }
+	/**
+	 * Takes the given permission or permissions out from the user
+	 * @param $permission
+	 */
+	public function removePermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp & ~$permission;
+		$this->setPermissions($tmp);
+	}
 }
\ No newline at end of file

lib/Utility/Utils.php

Indentation +8 added lines, -8 removed lines

@@ -12,10 +12,10 @@ 
 namespace OCA\Passman\Utility;
 
 class Utils {
-    /**
-     * Gets the unix epoch UTC timestamp
-     * @return int
-     */
+	/**
+	 * Gets the unix epoch UTC timestamp
+	 * @return int
+	 */
 	public static function getTime() {
 		return (new \DateTime())->getTimestamp();
 	}
@@ -27,10 +27,10 @@ 
 		return $secs . substr($millisecs, 2, 6);
 	}
 
-    /**
-     * Generates a Globally Unique ID
-     * @return string
-     */
+	/**
+	 * Generates a Globally Unique ID
+	 * @return string
+	 */
 	public static function GUID() {
 		if (function_exists('com_create_guid') === true)
 		{

appinfo/routes.php

Indentation +13 added lines, -13 removed lines

@@ -52,19 +52,19 @@
 		//Sharing stuff
 		['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'],
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
-        ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
-        ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
-        ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
-        ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
-        ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
-        ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
-        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
-        ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
-        ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
-        ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
-        ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
+		['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
+		['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
+		['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
+		['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
+		['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
+		['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
+		['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
+		['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
+		['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
+		['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
+		['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
 
 		//Internal API
 		['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'],

controller/credentialcontroller.php

Indentation +19 added lines, -19 removed lines

@@ -255,26 +255,26 @@
 	 * @NoAdminRequired
 	 */
 	public function getRevision($credential_guid) {
-	    try {
-            $credential = $this->credentialService->getCredentialByGUID($credential_guid);
-        }
-        catch (DoesNotExistException $ex){
-            return new NotFoundJSONResponse();
-        }
+		try {
+			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
+		}
+		catch (DoesNotExistException $ex){
+			return new NotFoundJSONResponse();
+		}
 
-        // If the request was made by the owner of the credential
-        if ($this->userId === $credential->getUserId()) {
-            $result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
-        }
-        else {
-            $acl = $this->sharingService->getACL($this->userId, $credential_guid);
-            if ($acl->hasPermission(SharingACL::HISTORY)){
-                $result = $this->credentialRevisionService->getRevisions($credential->getId());
-            }
-            else {
-                return new NotFoundJSONResponse();
-            }
-        }
+		// If the request was made by the owner of the credential
+		if ($this->userId === $credential->getUserId()) {
+			$result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
+		}
+		else {
+			$acl = $this->sharingService->getACL($this->userId, $credential_guid);
+			if ($acl->hasPermission(SharingACL::HISTORY)){
+				$result = $this->credentialRevisionService->getRevisions($credential->getId());
+			}
+			else {
+				return new NotFoundJSONResponse();
+			}
+		}
 
 		return new JSONResponse($result);
 	}