diff --git a/src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs b/src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs index f023b488ce..6fa00f4679 100644 --- a/src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs +++ b/src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs @@ -38,7 +38,7 @@ public class RegisterRequestModel : IValidatableObject, ICaptchaProtectedModel Email = Email, MasterPasswordHint = MasterPasswordHint, Kdf = Kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), - KdfIterations = KdfIterations.GetValueOrDefault(5000), + KdfIterations = KdfIterations.GetValueOrDefault(AuthConstants.PBKDF2_ITERATIONS.Default), KdfMemory = KdfMemory, KdfParallelism = KdfParallelism }; diff --git a/src/Core/Entities/User.cs b/src/Core/Entities/User.cs index d10ab25f18..b0db21eb14 100644 --- a/src/Core/Entities/User.cs +++ b/src/Core/Entities/User.cs @@ -55,7 +55,7 @@ public class User : ITableObject, ISubscriber, IStorable, IStorableSubscri [MaxLength(30)] public string ApiKey { get; set; } 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? KdfParallelism { get; set; } public DateTime CreationDate { get; set; } = DateTime.UtcNow; diff --git a/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs b/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs index b19b11f159..0321b4f138 100644 --- a/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs +++ b/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs @@ -129,7 +129,7 @@ public class AccountsControllerTests : IDisposable var userKdfInfo = new UserKdfInformation { Kdf = KdfType.PBKDF2_SHA256, - KdfIterations = 5000 + KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default }; _userRepository.GetKdfInformationByEmailAsync(Arg.Any()).Returns(Task.FromResult(userKdfInfo)); diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs index e742a5d27b..2599559f38 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs @@ -1,4 +1,5 @@ using System.Text.Json; +using Bit.Core; using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Enums; using Bit.Core.AdminConsole.Repositories; @@ -67,7 +68,7 @@ public class IdentityServerTests : IClassFixture var kdf = AssertHelper.AssertJsonProperty(root, "Kdf", JsonValueKind.Number).GetInt32(); Assert.Equal(0, kdf); var kdfIterations = AssertHelper.AssertJsonProperty(root, "KdfIterations", JsonValueKind.Number).GetInt32(); - Assert.Equal(5000, kdfIterations); + Assert.Equal(AuthConstants.PBKDF2_ITERATIONS.Default, kdfIterations); AssertUserDecryptionOptions(root); } diff --git a/test/Identity.Test/Controllers/AccountsControllerTests.cs b/test/Identity.Test/Controllers/AccountsControllerTests.cs index a46bf38679..3775d8c635 100644 --- a/test/Identity.Test/Controllers/AccountsControllerTests.cs +++ b/test/Identity.Test/Controllers/AccountsControllerTests.cs @@ -58,7 +58,7 @@ public class AccountsControllerTests : IDisposable var userKdfInfo = new UserKdfInformation { Kdf = KdfType.PBKDF2_SHA256, - KdfIterations = 5000 + KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default }; _userRepository.GetKdfInformationByEmailAsync(Arg.Any()).Returns(Task.FromResult(userKdfInfo));