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

[SG-497] Prevent registering health check on self hosted (#3058)

Browse Source 
* Prevent registering health check on self hosted

* Fixed linting issues

* Allow endpoint only when it is not self-hosted

* Fixed linting issues
This commit is contained in:
SmithThe4th 2023-06-30 12:57:13 -04:00 committed by GitHub
parent c2b429c6de
commit b87e6d4a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Api/Startup.cs
View File

@ -136,7 +136,10 @@ public class Startup
services.AddCoreLocalizationServices(); services.AddCoreLocalizationServices();
//health check //health check
services.AddHealthChecks(globalSettings); if (!globalSettings.SelfHosted)
{
services.AddHealthChecks(globalSettings);
}
#if OSS #if OSS
services.AddOosServices(); services.AddOosServices();
@ -215,12 +218,15 @@ public class Startup
{ {
endpoints.MapDefaultControllerRoute(); endpoints.MapDefaultControllerRoute();
endpoints.MapHealthChecks("/healthz"); if (!globalSettings.SelfHosted)
endpoints.MapHealthChecks("/healthz/extended", new HealthCheckOptions
{ {
ResponseWriter = HealthCheckServiceExtensions.WriteResponse endpoints.MapHealthChecks("/healthz");
});
endpoints.MapHealthChecks("/healthz/extended", new HealthCheckOptions
{
ResponseWriter = HealthCheckServiceExtensions.WriteResponse
});
}
}); });
// Add Swagger // Add Swagger

13
src/Api/Utilities/ServiceCollectionExtensions.cs
View File

@ -1,5 +1,6 @@
using Bit.Core.IdentityServer; using Bit.Core.IdentityServer;
using Bit.Core.Settings; using Bit.Core.Settings;
using Bit.Core.Utilities;
using Bit.SharedWeb.Health; using Bit.SharedWeb.Health;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
@ -80,35 +81,35 @@ public static class ServiceCollectionExtensions
builder.AddUrlGroup(identityUri, "identity"); builder.AddUrlGroup(identityUri, "identity");
if (!string.IsNullOrEmpty(globalSettings.SqlServer.ConnectionString)) if (CoreHelpers.SettingHasValue(globalSettings.SqlServer.ConnectionString))
{ {
builder.AddSqlServer(globalSettings.SqlServer.ConnectionString); builder.AddSqlServer(globalSettings.SqlServer.ConnectionString);
} }
if (!string.IsNullOrEmpty(globalSettings.Redis.ConnectionString)) if (CoreHelpers.SettingHasValue(globalSettings.Redis.ConnectionString))
{ {
builder.AddRedis(globalSettings.Redis.ConnectionString); builder.AddRedis(globalSettings.Redis.ConnectionString);
} }
if (!string.IsNullOrEmpty(globalSettings.Storage.ConnectionString)) if (CoreHelpers.SettingHasValue(globalSettings.Storage.ConnectionString))
{ {
builder.AddAzureQueueStorage(globalSettings.Storage.ConnectionString, name: "storage_queue") builder.AddAzureQueueStorage(globalSettings.Storage.ConnectionString, name: "storage_queue")
.AddAzureQueueStorage(globalSettings.Events.ConnectionString, name: "events_queue"); .AddAzureQueueStorage(globalSettings.Events.ConnectionString, name: "events_queue");
} }
if (!string.IsNullOrEmpty(globalSettings.Notifications.ConnectionString)) if (CoreHelpers.SettingHasValue(globalSettings.Notifications.ConnectionString))
{ {
builder.AddAzureQueueStorage(globalSettings.Notifications.ConnectionString, builder.AddAzureQueueStorage(globalSettings.Notifications.ConnectionString,
name: "notifications_queue"); name: "notifications_queue");
} }
if (!string.IsNullOrEmpty(globalSettings.ServiceBus.ConnectionString)) if (CoreHelpers.SettingHasValue(globalSettings.ServiceBus.ConnectionString))
{ {
builder.AddAzureServiceBusTopic(_ => globalSettings.ServiceBus.ConnectionString, builder.AddAzureServiceBusTopic(_ => globalSettings.ServiceBus.ConnectionString,
_ => globalSettings.ServiceBus.ApplicationCacheTopicName, name: "service_bus"); _ => globalSettings.ServiceBus.ApplicationCacheTopicName, name: "service_bus");
} }
if (!string.IsNullOrEmpty(globalSettings.Mail.SendGridApiKey)) if (CoreHelpers.SettingHasValue(globalSettings.Mail.SendGridApiKey))
{ {
builder.AddSendGrid(globalSettings.Mail.SendGridApiKey); builder.AddSendGrid(globalSettings.Mail.SendGridApiKey);
} }