From 2b9eaeee8a387f99edddebea55bda1795ab19fe7 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Tue, 9 Mar 2021 13:16:54 +0000
Subject: [PATCH] Fix for #9950 - HttpsCheck will now retry using the login
 background image if inital request returns 301/302. Excessvie Headers check
 will now check the root url instead of the backoffice

---
 .../Checks/Security/ExcessiveHeadersCheck.cs  |  4 ++--
 .../HealthCheck/Checks/Security/HttpsCheck.cs | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
index fd76b9d4869e..33cf89b2e4be 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
@@ -49,7 +49,7 @@ private HealthCheckStatus CheckForHeaders()
         {
             var message = string.Empty;
             var success = false;
-            var url = _runtime.ApplicationUrl;
+            var url = _runtime.ApplicationUrl.GetLeftPart(UriPartial.Authority);
 
             // Access the site home page and check for the headers
             var request = WebRequest.Create(url);
@@ -69,7 +69,7 @@ private HealthCheckStatus CheckForHeaders()
             }
             catch (Exception ex)
             {
-                message = _textService.Localize("healthcheck/httpsCheckInvalidUrl", new[] { url.ToString(), ex.Message });
+                message = _textService.Localize("healthcheck/healthCheckInvalidUrl", new[] { url.ToString(), ex.Message });
             }
 
             var actions = new List<HealthCheckAction>();
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
index 98f8a83c1dfc..83fafb79f8d5 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
 using Umbraco.Web.HealthCheck.Checks.Config;
@@ -21,14 +21,16 @@ public class HttpsCheck : HealthCheck
         private readonly ILocalizedTextService _textService;
         private readonly IRuntimeState _runtime;
         private readonly IGlobalSettings _globalSettings;
+        private readonly IContentSection _contentSection;
 
         private const string FixHttpsSettingAction = "fixHttpsSetting";
 
-        public HttpsCheck(ILocalizedTextService textService, IRuntimeState runtime, IGlobalSettings globalSettings)
+        public HttpsCheck(ILocalizedTextService textService, IRuntimeState runtime, IGlobalSettings globalSettings, IContentSection contentSection)
         {
             _textService = textService;
             _runtime = runtime;
             _globalSettings = globalSettings;
+            _contentSection = contentSection;
         }
 
         /// <summary>
@@ -65,12 +67,25 @@ private HealthCheckStatus CheckForValidCertificate()
             // Attempt to access the site over HTTPS to see if it HTTPS is supported
             // and a valid certificate has been configured
             var url = _runtime.ApplicationUrl.ToString().Replace("http:", "https:");
+
             var request = (HttpWebRequest) WebRequest.Create(url);
-            request.Method = "HEAD";
+            request.AllowAutoRedirect = false;
 
             try
             {
+
                 var response = (HttpWebResponse)request.GetResponse();
+
+                // Check for 301/302 as a external login provider such as UmbracoID might be in use
+                if (response.StatusCode == HttpStatusCode.Moved || response.StatusCode == HttpStatusCode.Redirect)
+                {
+                    // Reset request to use the static login background image
+                    var absoluteLoginBackgroundImage = $"{url}/{_contentSection.LoginBackgroundImage}";
+                    
+                    request = (HttpWebRequest)WebRequest.Create(absoluteLoginBackgroundImage);
+                    response = (HttpWebResponse)request.GetResponse();
+                }
+
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
                     // Got a valid response, check now for if certificate expiring within 14 days