mirror of
https://github.com/bitwarden/server.git
synced 2025-06-30 07:36:14 -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:
@ -3,6 +3,7 @@ using Bit.Infrastructure.EntityFramework.Repositories;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Design;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Bit.PostgresMigrations;
|
||||
|
||||
@ -22,6 +23,10 @@ public class DatabaseContextFactory : IDesignTimeDbContextFactory<DatabaseContex
|
||||
{
|
||||
public DatabaseContext CreateDbContext(string[] args)
|
||||
{
|
||||
var services = new ServiceCollection();
|
||||
services.AddDataProtection();
|
||||
var serviceProvider = services.BuildServiceProvider();
|
||||
|
||||
var globalSettings = GlobalSettingsFactory.GlobalSettings;
|
||||
var optionsBuilder = new DbContextOptionsBuilder<DatabaseContext>();
|
||||
var connectionString = globalSettings.PostgreSql?.ConnectionString;
|
||||
@ -31,7 +36,8 @@ public class DatabaseContextFactory : IDesignTimeDbContextFactory<DatabaseContex
|
||||
}
|
||||
optionsBuilder.UseNpgsql(
|
||||
connectionString,
|
||||
b => b.MigrationsAssembly("PostgresMigrations"));
|
||||
b => b.MigrationsAssembly("PostgresMigrations"))
|
||||
.UseApplicationServiceProvider(serviceProvider);
|
||||
return new DatabaseContext(optionsBuilder.Options);
|
||||
}
|
||||
}
|
||||
|
2121
util/PostgresMigrations/Migrations/20230124132215_KDFOptions.Designer.cs
generated
Normal file
2121
util/PostgresMigrations/Migrations/20230124132215_KDFOptions.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,35 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.PostgresMigrations.Migrations
|
||||
{
|
||||
public partial class KDFOptions : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "KdfMemory",
|
||||
table: "User",
|
||||
type: "integer",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "KdfParallelism",
|
||||
table: "User",
|
||||
type: "integer",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "KdfMemory",
|
||||
table: "User");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "KdfParallelism",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
}
|
@ -1388,6 +1388,12 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Property<int>("KdfIterations")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("KdfMemory")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("KdfParallelism")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("Key")
|
||||
.HasColumnType("text");
|
||||
|
||||
|
Reference in New Issue
Block a user