mirror of
https://github.com/bitwarden/server.git
synced 2025-07-07 02:52:50 -05:00
[PS-2267] Add KdfMemory and KDFParallelism fields (#2583)
* Add KdfMemory and KDFParallelism fields * Revise argon2 support This pull request makes the new attribues for argon2, kdfMemory and kdfParallelism optional. Furthermore it adds checks for the argon2 parametrs and improves the database migration script. * Add validation for argon2 in RegisterRequestModel * update validation messages * update sql scripts * register data protection with migration factories * add ef migrations * update kdf option validation * adjust validation * Centralize and Test KDF Validation Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Kyle Spearrin <kyle.spearrin@gmail.com> Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
This commit is contained in:
@ -67,6 +67,7 @@
|
||||
<Folder Include="dbo\Functions\" />
|
||||
<Folder Include="dbo\Stored Procedures\" />
|
||||
<Folder Include="dbo\User Defined Types\" />
|
||||
<Folder Include="dbo\Stored Procedures\ApiKey\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Build Include="dbo\Functions\CipherDetails.sql" />
|
||||
@ -437,4 +438,4 @@
|
||||
<Build Include="SecretsManager\dbo\Views\ApiKeyDetailsView.sql" />
|
||||
<Build Include="SecretsManager\dbo\Views\ApiKeyView.sql" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
@ -27,6 +27,8 @@
|
||||
@LicenseKey VARCHAR(100),
|
||||
@Kdf TINYINT,
|
||||
@KdfIterations INT,
|
||||
@KdfMemory INT = NULL,
|
||||
@KdfParallelism INT = NULL,
|
||||
@CreationDate DATETIME2(7),
|
||||
@RevisionDate DATETIME2(7),
|
||||
@ApiKey VARCHAR(30),
|
||||
@ -78,7 +80,9 @@ BEGIN
|
||||
[FailedLoginCount],
|
||||
[LastFailedLoginDate],
|
||||
[UnknownDeviceVerificationEnabled],
|
||||
[AvatarColor]
|
||||
[AvatarColor],
|
||||
[KdfMemory],
|
||||
[KdfParallelism]
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@ -118,6 +122,8 @@ BEGIN
|
||||
@FailedLoginCount,
|
||||
@LastFailedLoginDate,
|
||||
@UnknownDeviceVerificationEnabled,
|
||||
@AvatarColor
|
||||
@AvatarColor,
|
||||
@KdfMemory,
|
||||
@KdfParallelism
|
||||
)
|
||||
END
|
||||
|
@ -7,6 +7,8 @@ BEGIN
|
||||
SELECT
|
||||
[Kdf],
|
||||
[KdfIterations]
|
||||
[KdfMemory],
|
||||
[KdfParallelism]
|
||||
FROM
|
||||
[dbo].[User]
|
||||
WHERE
|
||||
|
@ -27,6 +27,8 @@
|
||||
@LicenseKey VARCHAR(100),
|
||||
@Kdf TINYINT,
|
||||
@KdfIterations INT,
|
||||
@KdfMemory INT = NULL,
|
||||
@KdfParallelism INT = NULL,
|
||||
@CreationDate DATETIME2(7),
|
||||
@RevisionDate DATETIME2(7),
|
||||
@ApiKey VARCHAR(30),
|
||||
@ -70,6 +72,8 @@ BEGIN
|
||||
[LicenseKey] = @LicenseKey,
|
||||
[Kdf] = @Kdf,
|
||||
[KdfIterations] = @KdfIterations,
|
||||
[KdfMemory] = @KdfMemory,
|
||||
[KdfParallelism] = @KdfParallelism,
|
||||
[CreationDate] = @CreationDate,
|
||||
[RevisionDate] = @RevisionDate,
|
||||
[ApiKey] = @ApiKey,
|
||||
|
@ -27,6 +27,8 @@
|
||||
[LicenseKey] VARCHAR (100) NULL,
|
||||
[Kdf] TINYINT NOT NULL,
|
||||
[KdfIterations] INT NOT NULL,
|
||||
[KdfMemory] INT NULL,
|
||||
[KdfParallelism] INT NULL,
|
||||
[CreationDate] DATETIME2 (7) NOT NULL,
|
||||
[RevisionDate] DATETIME2 (7) NOT NULL,
|
||||
[ApiKey] VARCHAR (30) NOT NULL,
|
||||
|
Reference in New Issue
Block a user