nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-07 12:42:24 -05:00
Code

Remove X509ChainCustomization activation code

Browse Source
This commit is contained in:
Justin Baur 2025-05-06 13:39:10 -04:00
parent 05e58cb9e4
commit b1efa88c6d
No known key found for this signature in database
11 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitwarden_license/src/Scim/Startup.cs
View File

@ -89,9 +89,6 @@ public class Startup
services.AddScimGroupQueries();
services.AddScimUserQueries();
services.AddScimUserCommands();
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

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

@ -86,9 +86,6 @@ public class Startup
// TODO: Remove when OrganizationUser methods are moved out of OrganizationService, this noop dependency should
// TODO: no longer be required - see PM-1880
services.AddScoped<IServiceAccountRepository, NoopServiceAccountRepository>();
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Admin/Startup.cs
View File

@ -129,9 +129,6 @@ public class Startup
services.AddHostedService<HostedServices.AzureQueueMailHostedService>();
}
}
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Api/Startup.cs
View File

@ -234,9 +234,6 @@ public class Startup
{
services.AddSingleton<ISlackService, NoopSlackService>();
}
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Billing/Startup.cs
View File

@ -131,9 +131,6 @@ public class Startup
// Swagger
services.AddEndpointsApiExplorer();
services.AddSwaggerGen();
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Events/Startup.cs
View File

@ -152,9 +152,6 @@ public class Startup
globalSettings,
globalSettings.EventLogging.RabbitMq.WebhookQueueName));
}
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/EventsProcessor/Startup.cs
View File

@ -82,9 +82,6 @@ public class Startup
globalSettings.EventLogging.AzureServiceBus.WebhookSubscriptionName));
}
services.AddHostedService<AzureQueueHostedService>();
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Icons/Startup.cs
View File

@ -47,9 +47,6 @@ public class Startup
// Mvc
services.AddMvc();
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Identity/Startup.cs
View File

@ -163,9 +163,6 @@ public class Startup
{
client.BaseAddress = new Uri(globalSettings.BaseServiceUri.InternalSso);
});
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

3
src/Notifications/Startup.cs
View File

@ -76,9 +76,6 @@ public class Startup
services.AddHostedService<AzureQueueHostedService>();
}
}
// This should be registered last because it customizes the primary http message handler and we want it to win.
services.AddX509ChainCustomization();
}
public void Configure(

27
util/Setup/Program.cs
View File

@ -1,11 +1,7 @@
using System.Globalization;
using System.Net.Http.Json;
using Bit.Core.Settings;
using Bit.Migrator;
using Bit.Setup.Enums;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace Bit.Setup;
@ -289,29 +285,8 @@ public class Program
url = $"{installationUrl}/installations/";
}
var config = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string>
{
// Setup uses a different default location for the location of the CA certificates.
["X509ChainOptions:AdditionalCustomTrustCertificatesDirectory"] = "/bitwarden/ca-certificates",
})
// Still allow customization through environment variables though
.AddEnvironmentVariables()
.Build();
// We need to get an HttpClient that has been configured with custom trust certificates.
var httpClient = new ServiceCollection()
.AddX509ChainCustomization()
.AddSingleton<IConfiguration>(config)
// Setup is always ran for self hosted, so it's fine to hard code this to true and allow chain customization
.AddSingleton(new GlobalSettings { SelfHosted = true })
.AddLogging()
.AddSingleton<IHostEnvironment>(new SetupHostEnvironment())
.BuildServiceProvider()
.GetRequiredService<IHttpClientFactory>()
.CreateClient();
var response = httpClient.GetAsync(url + _context.Install.InstallationId).GetAwaiter().GetResult();
var response = new HttpClient().GetAsync(url + _context.Install.InstallationId).GetAwaiter().GetResult();
if (!response.IsSuccessStatusCode)
{