Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 00:24:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Refactor encryptable models

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2024-03-09 13:43:27 +01:00
parent d17b50183a
commit 522badaa2e
4 changed files with 106 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/SP/DataModel/EncryptedModel.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -24,9 +24,10 @@
namespace SP\DataModel;
use ReflectionClass;
use SP\Domain\Common\Attributes\Encryptable;
use SP\Domain\Core\Crypt\CryptInterface;
use SP\Domain\Core\Exceptions\CryptException;
use SP\Domain\Core\Exceptions\NoSuchPropertyException;
/**
* Trait EncryptedModel
@@ -36,53 +37,70 @@ trait EncryptedModel
protected ?string $key = null;
/**
* @param string $key
* Encrypt the encryptable property and returns a new object with the encrypted property and key
*
* @param string $password
* @param CryptInterface $crypt
* @param string $property
*
* @return EncryptedModel
* @throws CryptException
* @throws NoSuchPropertyException
*/
public function encrypt(string $key, CryptInterface $crypt, string $property = 'data'): static
public function encrypt(string $password, CryptInterface $crypt): static
{
if (property_exists($this, $property)) {
if ($this->{$property} === null) {
return $this;
$reflectionClass = new ReflectionClass($this);
foreach ($reflectionClass->getAttributes(Encryptable::class) as $attribute) {
/** @var Encryptable $instance */
$instance = $attribute->newInstance();
$data = $this->{$instance->getDataProperty()};
if ($data !== null) {
return $this->mutate([
$instance->getKeyProperty() => $crypt->makeSecuredKey($password),
$instance->getDataProperty() => $crypt->encrypt(
$data,
$this->{$instance->getKeyProperty()},
$password
)
]);
}
$this->key = $crypt->makeSecuredKey($key);
$this->{$property} = $crypt->encrypt($this->{$property}, $this->key, $key);
return $this;
}
throw new NoSuchPropertyException($property);
return $this;
}
/**
* @param string $key
* Decrypt the encryptable property and returns a new object with the decryped property and key
*
* @param string $password
* @param CryptInterface $crypt
* @param string $property
*
* @return EncryptedModel
* @throws CryptException
* @throws NoSuchPropertyException
*/
public function decrypt(string $key, CryptInterface $crypt, string $property = 'data'): static
public function decrypt(string $password, CryptInterface $crypt): static
{
if (property_exists($this, $property) && !empty($this->key)) {
if ($this->{$property} === null) {
return $this;
$reflectionClass = new ReflectionClass($this);
foreach ($reflectionClass->getAttributes(Encryptable::class) as $attribute) {
/** @var Encryptable $instance */
$instance = $attribute->newInstance();
$data = $this->{$instance->getDataProperty()};
if ($data !== null) {
return $this->mutate([
$instance->getDataProperty() => $crypt->decrypt(
$data,
$this->{$instance->getKeyProperty()},
$password
)
]);
}
$this->{$property} = $crypt->decrypt($this->{$property}, $this->key, $key);
return $this;
}
throw new NoSuchPropertyException($property);
return $this;
}
public function getKey(): ?string