Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add type property to hash algorithms to allow resolving union type implementation

Browse Source
This commit is contained in:
Jake Barnby
2022-10-11 12:27:03 +13:00
parent 575b882b30
commit fd8d4f4a1b
9 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/users.php
+1 -1
View File
@@ -63,7 +63,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
'status' => true,
'password' => (!empty($password)) ? ($hash === 'plaintext' ? Auth::passwordHash($password, $hash, $hashOptionsObject) : $password) : null,
'hash' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO : $hash,
'hashOptions' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO_OPTIONS : $hashOptions,
'hashOptions' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO_OPTIONS : $hashOptionsObject + ['type' => $hash],
'passwordUpdate' => (!empty($password)) ? DateTime::now() : null,
'registration' => DateTime::now(),
'reset' => false,
src/Appwrite/Auth/Auth.php
+1 -1
View File
@@ -29,7 +29,7 @@ class Auth
];
public const DEFAULT_ALGO = 'argon2';
public const DEFAULT_ALGO_OPTIONS = ['memoryCost' => 2048, 'timeCost' => 4, 'threads' => 3];
public const DEFAULT_ALGO_OPTIONS = ['type' => 'argon2', 'memoryCost' => 2048, 'timeCost' => 4, 'threads' => 3];
/**
* User Roles.
src/Appwrite/Utopia/Response/Model/AlgoArgon2.php
+6
View File
@@ -11,6 +11,12 @@ class AlgoArgon2 extends Model
{
// No options if imported. If hashed by Appwrite, following configuration is available:
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'argon2',
'example' => 'argon2',
])
->addRule('memoryCost', [
'type' => self::TYPE_INTEGER,
'description' => 'Memory used to compute hash.',
src/Appwrite/Utopia/Response/Model/AlgoBcrypt.php
+7
View File
@@ -10,6 +10,13 @@ class AlgoBcrypt extends Model
public function __construct()
{
// No options, because this can only be imported, and verifying doesnt require any configuration
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'bcrypt',
'example' => 'bcrypt',
]);
}
/**
src/Appwrite/Utopia/Response/Model/AlgoMd5.php
+8
View File
@@ -10,6 +10,14 @@ class AlgoMd5 extends Model
public function __construct()
{
// No options, because this can only be imported, and verifying doesnt require any configuration
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'md5',
'example' => 'md5',
]);
}
/**
src/Appwrite/Utopia/Response/Model/AlgoPhpass.php
+8
View File
@@ -10,6 +10,14 @@ class AlgoPhpass extends Model
public function __construct()
{
// No options, because this can only be imported, and verifying doesnt require any configuration
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'phpass',
'example' => 'phpass',
]);
}
/**
src/Appwrite/Utopia/Response/Model/AlgoScrypt.php
+6
View File
@@ -10,6 +10,12 @@ class AlgoScrypt extends Model
public function __construct()
{
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'scrypt',
'example' => 'scrypt',
])
->addRule('costCpu', [
'type' => self::TYPE_INTEGER,
'description' => 'CPU complexity of computed hash.',
src/Appwrite/Utopia/Response/Model/AlgoScryptModified.php
+6
View File
@@ -10,6 +10,12 @@ class AlgoScryptModified extends Model
public function __construct()
{
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'scryptMod',
'example' => 'scryptMod',
])
->addRule('salt', [
'type' => self::TYPE_STRING,
'description' => 'Salt used to compute hash.',
src/Appwrite/Utopia/Response/Model/AlgoSha.php
+8
View File
@@ -10,6 +10,14 @@ class AlgoSha extends Model
public function __construct()
{
// No options, because this can only be imported, and verifying doesnt require any configuration
$this
->addRule('type', [
'type' => self::TYPE_STRING,
'description' => 'Algo type.',
'default' => 'sha',
'example' => 'sha',
]);
}
/**