nextcloud / passman

lib/Service/ShareService.php

Braces +18 added lines, -6 removed lines

@@ -71,7 +71,9 @@ 
 	}
 
 	public function createACLEntry(SharingACL $acl) {
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
+		if ($acl->getCreated() === null) {
+			$acl->setCreated((new \DateTime())->getTimestamp());
+		}
 		return $this->sharingACL->createACLEntry($acl);
 	}
 
@@ -124,12 +126,16 @@ 
 		$return = [];
 		foreach ($entries as $entry) {
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
+			if (!$entry->hasPermission(SharingACL::READ)) {
+				continue;
+			}
 
 			$tmp = $entry->jsonSerialize();
 			$tmp['credential_data'] = $this->credential->getCredentialById($entry->getItemId())->jsonSerialize();
 
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+			if (!$entry->hasPermission(SharingACL::FILES)) {
+				unset($tmp['credential_data']['files']);
+			}
 			unset($tmp['credential_data']['shared_key']);
 			$return[] = $tmp;
 		}
@@ -150,12 +156,16 @@ 
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
 
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
+		if (!$acl->hasPermission(SharingACL::READ)) {
+			throw new DoesNotExistException("Item not found or wrong access level");
+		}
 
 		$tmp = $acl->jsonSerialize();
 		$tmp['credential_data'] = $this->credential->getCredentialById($acl->getItemId())->jsonSerialize();
 
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+		if (!$acl->hasPermission(SharingACL::FILES)) {
+			unset($tmp['credential_data']['files']);
+		}
 		unset($tmp['credential_data']['shared_key']);
 
 		return $tmp;
@@ -170,7 +180,9 @@ 
 	 */
 	public function getItemHistory($user_id, $item_guid) {
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
+			return [];
+		}
 
 		return $this->revisions->getRevisions($acl->getItemId());
 	}

lib/Service/EncryptService.php

Doc Comments +11 added lines, -5 removed lines

@@ -205,6 +205,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);
@@ -242,7 +246,7 @@ 
 	/**
 	 * Pad the data with a random char chosen by the pad amount.
 	 *
-	 * @param $data
+	 * @param string $data
 	 * @return string
 	 */
 	protected function pad($data) {
@@ -258,8 +262,8 @@ 
 	/**
 	 * Unpad the the data
 	 *
-	 * @param $data
-	 * @return bool|string
+	 * @param string $data
+	 * @return false|string
 	 */
 	protected function unpad($data) {
 		$length = $this->getKeySize();
@@ -276,7 +280,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');
@@ -297,6 +301,7 @@ 
 	 * Handles the encryption / decryption of a credential
 	 *
 	 * @param Credential|array $credential the credential to encrypt
+	 * @param string $op
 	 * @return Credential|array
 	 * @throws \Exception
 	 */
@@ -342,7 +347,7 @@ 
 	/**
 	 * Decrypt a file
 	 *
-	 * @param  File|array $file
+	 * @param  File $file
 	 * @return File|array
 	 */
 
@@ -354,6 +359,7 @@ 
 	 * Handles the encryption / decryption of a File
 	 *
 	 * @param File|array $file the credential to encrypt
+	 * @param string $op
 	 * @return File|array
 	 * @throws \Exception
 	 */

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	public function __construct(SettingsService $settings) {
 		$this->cipher = $settings->getAppSetting('server_side_encryption');
-		$this->rounds = (int)100;
+		$this->rounds = (int) 100;
 		$this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', '');
 	}
 
@@ -308,7 +308,7 @@ 
 			$userKey = (isset($sk)) ? $sk : $credential->getUserId();
 		}
 		
-		if(is_array($credential)){
+		if (is_array($credential)) {
 			$userSuppliedKey = $credential['label'];
 			$userKey = (isset($credential['shared_key'])) ? $credential['shared_key'] : $credential['user_id'];
 		}

Braces +4 added lines, -2 removed lines

@@ -264,7 +264,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;
 		}
@@ -308,7 +310,7 @@ 
 			$userKey = (isset($sk)) ? $sk : $credential->getUserId();
 		}
 		
-		if(is_array($credential)){
+		if(is_array($credential)) {
 			$userSuppliedKey = $credential['label'];
 			$userKey = (isset($credential['shared_key'])) ? $credential['shared_key'] : $credential['user_id'];
 		}