From b87e6d4a38ac648bf353210cebf709381d80b0d8 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Fri, 30 Jun 2023 12:57:13 -0400
Subject: [PATCH] [SG-497] Prevent registering health check on self hosted
 (#3058)

* Prevent registering health check on self hosted

* Fixed linting issues

* Allow endpoint only when it is not self-hosted

* Fixed linting issues
---
 src/Api/Startup.cs                             | 18 ++++++++++++------
 .../Utilities/ServiceCollectionExtensions.cs   | 13 +++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index c73175d01a..6070a91b29 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -136,7 +136,10 @@ public class Startup
         services.AddCoreLocalizationServices();
 
         //health check
-        services.AddHealthChecks(globalSettings);
+        if (!globalSettings.SelfHosted)
+        {
+            services.AddHealthChecks(globalSettings);
+        }
 
 #if OSS
         services.AddOosServices();
@@ -215,12 +218,15 @@ public class Startup
         {
             endpoints.MapDefaultControllerRoute();
 
-            endpoints.MapHealthChecks("/healthz");
-
-            endpoints.MapHealthChecks("/healthz/extended", new HealthCheckOptions
+            if (!globalSettings.SelfHosted)
             {
-                ResponseWriter = HealthCheckServiceExtensions.WriteResponse
-            });
+                endpoints.MapHealthChecks("/healthz");
+
+                endpoints.MapHealthChecks("/healthz/extended", new HealthCheckOptions
+                {
+                    ResponseWriter = HealthCheckServiceExtensions.WriteResponse
+                });
+            }
         });
 
         // Add Swagger
diff --git a/src/Api/Utilities/ServiceCollectionExtensions.cs b/src/Api/Utilities/ServiceCollectionExtensions.cs
index 1be9d54e19..af7fa0116f 100644
--- a/src/Api/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Api/Utilities/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 using Bit.Core.IdentityServer;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
 using Bit.SharedWeb.Health;
 using Microsoft.OpenApi.Models;
 
@@ -80,35 +81,35 @@ public static class ServiceCollectionExtensions
 
             builder.AddUrlGroup(identityUri, "identity");
 
-            if (!string.IsNullOrEmpty(globalSettings.SqlServer.ConnectionString))
+            if (CoreHelpers.SettingHasValue(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);
             }
 
-            if (!string.IsNullOrEmpty(globalSettings.Storage.ConnectionString))
+            if (CoreHelpers.SettingHasValue(globalSettings.Storage.ConnectionString))
             {
                 builder.AddAzureQueueStorage(globalSettings.Storage.ConnectionString, name: "storage_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,
                     name: "notifications_queue");
             }
 
-            if (!string.IsNullOrEmpty(globalSettings.ServiceBus.ConnectionString))
+            if (CoreHelpers.SettingHasValue(globalSettings.ServiceBus.ConnectionString))
             {
                 builder.AddAzureServiceBusTopic(_ => globalSettings.ServiceBus.ConnectionString,
                     _ => globalSettings.ServiceBus.ApplicationCacheTopicName, name: "service_bus");
             }
 
-            if (!string.IsNullOrEmpty(globalSettings.Mail.SendGridApiKey))
+            if (CoreHelpers.SettingHasValue(globalSettings.Mail.SendGridApiKey))
             {
                 builder.AddSendGrid(globalSettings.Mail.SendGridApiKey);
             }