mirror of
https://github.com/bitwarden/server.git
synced 2024-11-24 12:35:25 +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>
44 lines
1.6 KiB
C#
44 lines
1.6 KiB
C#
using Bit.Core.Settings;
|
|
using Bit.Infrastructure.EntityFramework.Repositories;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.EntityFrameworkCore.Design;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
namespace Bit.PostgresMigrations;
|
|
|
|
public static class GlobalSettingsFactory
|
|
{
|
|
public static GlobalSettings GlobalSettings { get; } = new GlobalSettings();
|
|
static GlobalSettingsFactory()
|
|
{
|
|
// UserSecretsId here should match what is in Api.csproj
|
|
var configBuilder = new ConfigurationBuilder().AddUserSecrets("bitwarden-Api");
|
|
var Configuration = configBuilder.Build();
|
|
ConfigurationBinder.Bind(Configuration.GetSection("GlobalSettings"), GlobalSettings);
|
|
}
|
|
}
|
|
|
|
public class DatabaseContextFactory : IDesignTimeDbContextFactory<DatabaseContext>
|
|
{
|
|
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;
|
|
if (string.IsNullOrWhiteSpace(connectionString))
|
|
{
|
|
throw new Exception("No Postgres connection string found.");
|
|
}
|
|
optionsBuilder.UseNpgsql(
|
|
connectionString,
|
|
b => b.MigrationsAssembly("PostgresMigrations"))
|
|
.UseApplicationServiceProvider(serviceProvider);
|
|
return new DatabaseContext(optionsBuilder.Options);
|
|
}
|
|
}
|