nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

[PM-3777[PM-3633] Update minimum KDF iterations when creating new User record (#3687)

Browse Source 
* Updated minimum iterations on new Users to the default.

* Fixed test I missed.
This commit is contained in:
Todd Martin 2024-01-25 10:59:53 -05:00 committed by GitHub
parent bac06763f5
commit 2763345e9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs
View File

@ -38,7 +38,7 @@ public class RegisterRequestModel : IValidatableObject, ICaptchaProtectedModel
Email = Email, Email = Email,
MasterPasswordHint = MasterPasswordHint, MasterPasswordHint = MasterPasswordHint,
Kdf = Kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), Kdf = Kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256),
KdfIterations = KdfIterations.GetValueOrDefault(5000), KdfIterations = KdfIterations.GetValueOrDefault(AuthConstants.PBKDF2_ITERATIONS.Default),
KdfMemory = KdfMemory, KdfMemory = KdfMemory,
KdfParallelism = KdfParallelism KdfParallelism = KdfParallelism
}; };

2
src/Core/Entities/User.cs
View File

@ -55,7 +55,7 @@ public class User : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscri
[MaxLength(30)] [MaxLength(30)]
public string ApiKey { get; set; } public string ApiKey { get; set; }
public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256; public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256;
public int KdfIterations { get; set; } = 5000; public int KdfIterations { get; set; } = AuthConstants.PBKDF2_ITERATIONS.Default;
public int? KdfMemory { get; set; } public int? KdfMemory { get; set; }
public int? KdfParallelism { get; set; } public int? KdfParallelism { get; set; }
public DateTime CreationDate { get; set; } = DateTime.UtcNow; public DateTime CreationDate { get; set; } = DateTime.UtcNow;

2
test/Api.Test/Auth/Controllers/AccountsControllerTests.cs
View File

@ -129,7 +129,7 @@ public class AccountsControllerTests : IDisposable
var userKdfInfo = new UserKdfInformation var userKdfInfo = new UserKdfInformation
{ {
Kdf = KdfType.PBKDF2_SHA256, Kdf = KdfType.PBKDF2_SHA256,
KdfIterations = 5000 KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default
}; };
_userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(Task.FromResult(userKdfInfo)); _userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(Task.FromResult(userKdfInfo));

3
test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
View File

@ -1,4 +1,5 @@
using System.Text.Json; using System.Text.Json;
using Bit.Core;
using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Enums; using Bit.Core.AdminConsole.Enums;
using Bit.Core.AdminConsole.Repositories; using Bit.Core.AdminConsole.Repositories;
@ -67,7 +68,7 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
var kdf = AssertHelper.AssertJsonProperty(root, "Kdf", JsonValueKind.Number).GetInt32(); var kdf = AssertHelper.AssertJsonProperty(root, "Kdf", JsonValueKind.Number).GetInt32();
Assert.Equal(0, kdf); Assert.Equal(0, kdf);
var kdfIterations = AssertHelper.AssertJsonProperty(root, "KdfIterations", JsonValueKind.Number).GetInt32(); var kdfIterations = AssertHelper.AssertJsonProperty(root, "KdfIterations", JsonValueKind.Number).GetInt32();
Assert.Equal(5000, kdfIterations); Assert.Equal(AuthConstants.PBKDF2_ITERATIONS.Default, kdfIterations);
AssertUserDecryptionOptions(root); AssertUserDecryptionOptions(root);
} }

2
test/Identity.Test/Controllers/AccountsControllerTests.cs
View File

@ -58,7 +58,7 @@ public class AccountsControllerTests : IDisposable
var userKdfInfo = new UserKdfInformation var userKdfInfo = new UserKdfInformation
{ {
Kdf = KdfType.PBKDF2_SHA256, Kdf = KdfType.PBKDF2_SHA256,
KdfIterations = 5000 KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default
}; };
_userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(Task.FromResult(userKdfInfo)); _userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(Task.FromResult(userKdfInfo));