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

Refactor WebAuthn IoC container (#1302)

Browse Source 
* Refactor WebAuthn IoC container

* Move to AddDefaultServices
This commit is contained in:
Oscar Hinton 2021-05-06 10:17:12 +02:00 committed by GitHub
parent 7cae9d5e47
commit cae204cb7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitwarden_license/src/Portal/Startup.cs
View File

@ -61,15 +61,6 @@ namespace Bit.Portal
services.AddDefaultServices(globalSettings); services.AddDefaultServices(globalSettings);
services.AddCoreLocalizationServices(); services.AddCoreLocalizationServices();
// Fido2
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
// Mvc // Mvc
services.AddControllersWithViews() services.AddControllersWithViews()
.AddViewAndDataAnnotationLocalization(); .AddViewAndDataAnnotationLocalization();

9
bitwarden_license/src/Sso/Startup.cs
View File

@ -59,15 +59,6 @@ namespace Bit.Sso
}); });
} }
// Fido2
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
// Authentication // Authentication
services.AddDistributedIdentityServices(globalSettings); services.AddDistributedIdentityServices(globalSettings);
services.AddAuthentication() services.AddAuthentication()

9
src/Admin/Startup.cs
View File

@ -66,15 +66,6 @@ namespace Bit.Admin
services.AddBaseServices(); services.AddBaseServices();
services.AddDefaultServices(globalSettings); services.AddDefaultServices(globalSettings);
// Fido2
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
// Mvc // Mvc
services.AddMvc(config => services.AddMvc(config =>
{ {

9
src/Api/Startup.cs
View File

@ -119,15 +119,6 @@ namespace Bit.Api
services.AddDefaultServices(globalSettings); services.AddDefaultServices(globalSettings);
services.AddCoreLocalizationServices(); services.AddCoreLocalizationServices();
// Fido2
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
// MVC // MVC
services.AddMvc(config => services.AddMvc(config =>
{ {

9
src/Billing/Startup.cs
View File

@ -49,15 +49,6 @@ namespace Bit.Billing
// Context // Context
services.AddScoped<ICurrentContext, CurrentContext>(); services.AddScoped<ICurrentContext, CurrentContext>();
// Fido2
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
// Identity // Identity
services.AddCustomIdentityServices(globalSettings); services.AddCustomIdentityServices(globalSettings);
//services.AddPasswordlessIdentityServices<ReadOnlyDatabaseIdentityUserStore>(globalSettings); //services.AddPasswordlessIdentityServices<ReadOnlyDatabaseIdentityUserStore>(globalSettings);

14
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -126,6 +126,9 @@ namespace Bit.Core.Utilities
public static void AddDefaultServices(this IServiceCollection services, GlobalSettings globalSettings) public static void AddDefaultServices(this IServiceCollection services, GlobalSettings globalSettings)
{ {
// Required for UserService
services.AddWebAuthn(globalSettings);
services.AddSingleton<IPaymentService, StripePaymentService>(); services.AddSingleton<IPaymentService, StripePaymentService>();
services.AddSingleton<IMailService, HandlebarsMailService>(); services.AddSingleton<IMailService, HandlebarsMailService>();
services.AddSingleton<ILicensingService, LicensingService>(); services.AddSingleton<ILicensingService, LicensingService>();
@ -535,5 +538,16 @@ namespace Bit.Core.Utilities
return services; return services;
} }
public static void AddWebAuthn(this IServiceCollection services, GlobalSettings globalSettings)
{
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
}
} }
} }

9
src/Identity/Startup.cs
View File

@ -56,15 +56,6 @@ namespace Bit.Identity
// Caching // Caching
services.AddMemoryCache(); services.AddMemoryCache();
// Fido2
services.AddFido2(options =>
{
options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
options.ServerName = "Bitwarden";
options.Origin = globalSettings.BaseServiceUri.Vault;
options.TimestampDriftTolerance = 300000;
});
// Mvc // Mvc
services.AddMvc(); services.AddMvc();