mirror of
https://github.com/bitwarden/server.git
synced 2024-11-26 12:55:17 +01:00
cb1ba50ce2
* 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>
66 lines
2.6 KiB
C#
66 lines
2.6 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
using Bit.Api.Models.Request.Accounts;
|
|
using Bit.Core.Enums;
|
|
using Xunit;
|
|
|
|
namespace Bit.Api.Test.Models.Request.Accounts;
|
|
|
|
public class KdfRequestModelTests
|
|
{
|
|
[Theory]
|
|
[InlineData(KdfType.PBKDF2_SHA256, 1_000_000, null, null)] // Somewhere in the middle
|
|
[InlineData(KdfType.PBKDF2_SHA256, 5000, null, null)] // Right on the lower boundary
|
|
[InlineData(KdfType.PBKDF2_SHA256, 2_000_000, null, null)] // Right on the upper boundary
|
|
[InlineData(KdfType.Argon2id, 10, 500, 8)] // Somewhere in the middle
|
|
[InlineData(KdfType.Argon2id, 1, 15, 1)] // Right on the lower boundary
|
|
[InlineData(KdfType.Argon2id, 5000, 1024, 16)] // Right on the upper boundary
|
|
public void Validate_IsValid(KdfType kdfType, int? kdfIterations, int? kdfMemory, int? kdfParallelism)
|
|
{
|
|
var model = new KdfRequestModel
|
|
{
|
|
Kdf = kdfType,
|
|
KdfIterations = kdfIterations,
|
|
KdfMemory = kdfMemory,
|
|
KdfParallelism = kdfParallelism,
|
|
Key = "TEST",
|
|
NewMasterPasswordHash = "TEST",
|
|
};
|
|
|
|
var results = Validate(model);
|
|
Assert.Empty(results);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(null, 350_000, null, null, 1)] // Although KdfType is nullable, it's marked as [Required]
|
|
[InlineData(KdfType.PBKDF2_SHA256, 1000, null, null, 1)] // Too few iterations
|
|
[InlineData(KdfType.PBKDF2_SHA256, 2_000_001, null, null, 1)] // Too many iterations
|
|
[InlineData(KdfType.Argon2id, 0, 30, 8, 1)] // Iterations must be greater than 0
|
|
[InlineData(KdfType.Argon2id, 10, 14, 8, 1)] // Too little memory
|
|
[InlineData(KdfType.Argon2id, 10, 14, 0, 1)] // Too small of a parallelism value
|
|
[InlineData(KdfType.Argon2id, 10, 1025, 8, 1)] // Too much memory
|
|
[InlineData(KdfType.Argon2id, 10, 512, 17, 1)] // Too big of a parallelism value
|
|
public void Validate_Fails(KdfType? kdfType, int? kdfIterations, int? kdfMemory, int? kdfParallelism, int expectedFailures)
|
|
{
|
|
var model = new KdfRequestModel
|
|
{
|
|
Kdf = kdfType,
|
|
KdfIterations = kdfIterations,
|
|
KdfMemory = kdfMemory,
|
|
KdfParallelism = kdfParallelism,
|
|
Key = "TEST",
|
|
NewMasterPasswordHash = "TEST",
|
|
};
|
|
|
|
var results = Validate(model);
|
|
Assert.NotEmpty(results);
|
|
Assert.Equal(expectedFailures, results.Count);
|
|
}
|
|
|
|
public static List<ValidationResult> Validate(KdfRequestModel model)
|
|
{
|
|
var results = new List<ValidationResult>();
|
|
Validator.TryValidateObject(model, new ValidationContext(model), results);
|
|
return results;
|
|
}
|
|
}
|