@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
| 58 | 58 | 'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20'; |
| 59 | 59 | $entities = $this->findEntities($sql, [$user_id, $vault_id]); |
| 60 | - $count = count($entities)-1; |
|
| 60 | + $count = count($entities) - 1; |
|
| 61 | 61 | $entities = array_splice($entities, rand(0, $count), 1); |
| 62 | 62 | return $entities; |
| 63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param $timestamp |
| 68 | 68 | * @return Credential[] |
| 69 | 69 | */ |
| 70 | - public function getExpiredCredentials($timestamp){ |
|
| 70 | + public function getExpiredCredentials($timestamp) { |
|
| 71 | 71 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
| 72 | 72 | 'WHERE `expire_time` > 0 AND `expire_time` < ?'; |
| 73 | 73 | return $this->findEntities($sql, [$timestamp]); |
@@ -80,16 +80,16 @@ discard block |
||
| 80 | 80 | * @param null $user_id |
| 81 | 81 | * @return Credential |
| 82 | 82 | */ |
| 83 | - public function getCredentialById($credential_id, $user_id = null){ |
|
| 83 | + public function getCredentialById($credential_id, $user_id = null) { |
|
| 84 | 84 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
| 85 | 85 | 'WHERE `id` = ?'; |
| 86 | 86 | // If we want to check the owner, add it to the query |
| 87 | 87 | $params = [$credential_id]; |
| 88 | - if ($user_id !== null){ |
|
| 88 | + if ($user_id !== null) { |
|
| 89 | 89 | $sql .= ' and `user_id` = ? '; |
| 90 | 90 | array_push($params, $user_id); |
| 91 | 91 | } |
| 92 | - return $this->findEntity($sql,$params); |
|
| 92 | + return $this->findEntity($sql, $params); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -97,10 +97,10 @@ discard block |
||
| 97 | 97 | * @param $credential_id |
| 98 | 98 | * @return Credential |
| 99 | 99 | */ |
| 100 | - public function getCredentialLabelById($credential_id){ |
|
| 100 | + public function getCredentialLabelById($credential_id) { |
|
| 101 | 101 | $sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' . |
| 102 | 102 | 'WHERE `id` = ? '; |
| 103 | - return $this->findEntity($sql,[$credential_id]); |
|
| 103 | + return $this->findEntity($sql, [$credential_id]); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @param $raw_credential |
| 109 | 109 | * @return Credential |
| 110 | 110 | */ |
| 111 | - public function create($raw_credential){ |
|
| 111 | + public function create($raw_credential) { |
|
| 112 | 112 | $credential = new Credential(); |
| 113 | 113 | |
| 114 | 114 | $credential->setGuid($this->utils->GUID()); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $credential->setCustomFields($raw_credential['custom_fields']); |
| 132 | 132 | $credential->setOtp($raw_credential['otp']); |
| 133 | 133 | $credential->setHidden($raw_credential['hidden']); |
| 134 | - if(isset($raw_credential['shared_key'])) { |
|
| 134 | + if (isset($raw_credential['shared_key'])) { |
|
| 135 | 135 | $credential->setSharedKey($raw_credential['shared_key']); |
| 136 | 136 | } |
| 137 | 137 | return parent::insert($credential); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @param $raw_credential array An array containing all the credential fields |
| 143 | 143 | * @return Credential The updated credential |
| 144 | 144 | */ |
| 145 | - public function updateCredential($raw_credential){ |
|
| 145 | + public function updateCredential($raw_credential) { |
|
| 146 | 146 | $original = $this->getCredentialByGUID($raw_credential['guid']); |
| 147 | 147 | $credential = new Credential(); |
| 148 | 148 | $credential->setId($original->getId()); |
@@ -166,17 +166,17 @@ discard block |
||
| 166 | 166 | $credential->setOtp($raw_credential['otp']); |
| 167 | 167 | $credential->setHidden($raw_credential['hidden']); |
| 168 | 168 | $credential->setDeleteTime($raw_credential['delete_time']); |
| 169 | - if(isset($raw_credential['shared_key'])) { |
|
| 169 | + if (isset($raw_credential['shared_key'])) { |
|
| 170 | 170 | $credential->setSharedKey($raw_credential['shared_key']); |
| 171 | 171 | } |
| 172 | 172 | return parent::update($credential); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - public function deleteCredential(Credential $credential){ |
|
| 175 | + public function deleteCredential(Credential $credential) { |
|
| 176 | 176 | return $this->delete($credential); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - public function upd(Credential $credential){ |
|
| 179 | + public function upd(Credential $credential) { |
|
| 180 | 180 | $this->update($credential); |
| 181 | 181 | } |
| 182 | 182 | |
@@ -185,10 +185,10 @@ discard block |
||
| 185 | 185 | * @param $credential_guid |
| 186 | 186 | * @return Credential |
| 187 | 187 | */ |
| 188 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
| 188 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
| 189 | 189 | $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? '; |
| 190 | 190 | $params = [$credential_guid]; |
| 191 | - if ($user_id !== null){ |
|
| 191 | + if ($user_id !== null) { |
|
| 192 | 192 | $q .= ' and `user_id` = ? '; |
| 193 | 193 | array_push($params, $user_id); |
| 194 | 194 | } |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | $setting = $settings->getAppSetting('server_side_encryption'); |
| 104 | 104 | $this->cipher = $setting['cipher']; |
| 105 | 105 | $this->mode = $setting['mode']; |
| 106 | - $this->rounds = (int)100; |
|
| 106 | + $this->rounds = (int) 100; |
|
| 107 | 107 | $this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', ''); |
| 108 | 108 | ini_set('memory_limit', '1024M'); |
| 109 | 109 | } |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | * @param null $user_id |
| 62 | 62 | * @return CredentialRevision[] |
| 63 | 63 | */ |
| 64 | - public function getRevisions($credential_id, $user_id = null){ |
|
| 64 | + public function getRevisions($credential_id, $user_id = null) { |
|
| 65 | 65 | $result = $this->credentialRevisionMapper->getRevisions($credential_id, $user_id); |
| 66 | - foreach ($result as $index => $revision){ |
|
| 66 | + foreach ($result as $index => $revision) { |
|
| 67 | 67 | $c = json_decode(base64_decode($revision->getCredentialData()), true); |
| 68 | 68 | $result[$index] = $revision->jsonSerialize(); |
| 69 | 69 | $result[$index]['credential_data'] = $this->encryptService->decryptCredential($c); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @param null $user_id |
| 78 | 78 | * @return CredentialRevision |
| 79 | 79 | */ |
| 80 | - public function getRevision($credential_id, $user_id = null){ |
|
| 80 | + public function getRevision($credential_id, $user_id = null) { |
|
| 81 | 81 | $revision = $this->credentialRevisionMapper->getRevision($credential_id, $user_id); |
| 82 | 82 | $c = json_decode(base64_decode($revision->getCredentialData()), true); |
| 83 | 83 | $revision->setCredentialData($this->encryptService->decryptCredential($c)); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * @param $user_id |
| 91 | 91 | * @return CredentialRevision |
| 92 | 92 | */ |
| 93 | - public function deleteRevision($revision_id, $user_id){ |
|
| 93 | + public function deleteRevision($revision_id, $user_id) { |
|
| 94 | 94 | return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id); |
| 95 | 95 | } |
| 96 | 96 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @param CredentialRevision $credentialRevision |
| 100 | 100 | * @return CredentialRevision |
| 101 | 101 | */ |
| 102 | - public function updateRevision(CredentialRevision $credentialRevision){ |
|
| 102 | + public function updateRevision(CredentialRevision $credentialRevision) { |
|
| 103 | 103 | $credential_data = $credentialRevision->getCredentialData(); |
| 104 | 104 | $credential_data = json_decode(base64_decode($credential_data), true); |
| 105 | 105 | $credential_data = base64_encode(json_encode($this->encryptService->encryptCredential($credential_data))); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @param Credential $credential |
| 84 | 84 | * @return \OCP\AppFramework\Db\Entity |
| 85 | 85 | */ |
| 86 | - public function deleteCredential(Credential $credential){ |
|
| 86 | + public function deleteCredential(Credential $credential) { |
|
| 87 | 87 | return $this->credentialMapper->deleteCredential($credential); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public function getCredentialsByVaultId($vault_id, $user_id) { |
| 97 | 97 | $credentials = $this->credentialMapper->getCredentialsByVaultId($vault_id, $user_id); |
| 98 | - foreach ($credentials as $index => $credential){ |
|
| 98 | + foreach ($credentials as $index => $credential) { |
|
| 99 | 99 | $credentials[$index] = $this->encryptService->decryptCredential($credential); |
| 100 | 100 | } |
| 101 | 101 | return $credentials; |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function getRandomCredentialByVaultId($vault_id, $user_id) { |
| 111 | 111 | $credentials = $this->credentialMapper->getRandomCredentialByVaultId($vault_id, $user_id); |
| 112 | - foreach ($credentials as $index => $credential){ |
|
| 112 | + foreach ($credentials as $index => $credential) { |
|
| 113 | 113 | $credentials[$index] = $this->encryptService->decryptCredential($credential); |
| 114 | 114 | } |
| 115 | 115 | return array_pop($credentials); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function getExpiredCredentials($timestamp) { |
| 124 | 124 | $credentials = $this->credentialMapper->getExpiredCredentials($timestamp); |
| 125 | - foreach ($credentials as $index => $credential){ |
|
| 125 | + foreach ($credentials as $index => $credential) { |
|
| 126 | 126 | $credentials[$index] = $this->encryptService->decryptCredential($credential); |
| 127 | 127 | } |
| 128 | 128 | return $credentials; |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | * @return Credential |
| 136 | 136 | * @throws DoesNotExistException |
| 137 | 137 | */ |
| 138 | - public function getCredentialById($credential_id, $user_id){ |
|
| 138 | + public function getCredentialById($credential_id, $user_id) { |
|
| 139 | 139 | $credential = $this->credentialMapper->getCredentialById($credential_id); |
| 140 | - if ($credential->getUserId() === $user_id){ |
|
| 140 | + if ($credential->getUserId() === $user_id) { |
|
| 141 | 141 | return $credential; |
| 142 | 142 | } |
| 143 | 143 | else { |
@@ -155,8 +155,8 @@ discard block |
||
| 155 | 155 | * @param $credential_id |
| 156 | 156 | * @return Credential |
| 157 | 157 | */ |
| 158 | - public function getCredentialLabelById($credential_id){ |
|
| 159 | - $credential = $this->credentialMapper->getCredentialLabelById($credential_id); |
|
| 158 | + public function getCredentialLabelById($credential_id) { |
|
| 159 | + $credential = $this->credentialMapper->getCredentialLabelById($credential_id); |
|
| 160 | 160 | return $this->encryptService->decryptCredential($credential); |
| 161 | 161 | } |
| 162 | 162 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @param null $user_id |
| 167 | 167 | * @return Credential |
| 168 | 168 | */ |
| 169 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
| 169 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
| 170 | 170 | $credential = $this->credentialMapper->getCredentialByGUID($credential_guid); |
| 171 | 171 | return $this->encryptService->decryptCredential($credential); |
| 172 | 172 | } |