nextcloud / passman

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

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

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
 	 */

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