From 6c5851f5568daaa3656d280e64880fb80569e0f9 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Date: Thu, 2 Dec 2021 10:01:23 +0100
Subject: [PATCH] v9: Remove install endpoint as valid endpoint  (#11710)

* Remove installer endpoint from valid candidates

* Removed unrelevant change
---
 .../Install/InstallController.cs                    |  2 ++
 .../IgnoreFromNotFoundSelectorPolicyAttribute.cs    | 13 +++++++++++++
 .../Routing/NotFoundSelectorPolicy.cs               | 11 ++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 src/Umbraco.Web.Common/Attributes/IgnoreFromNotFoundSelectorPolicyAttribute.cs

diff --git a/src/Umbraco.Web.BackOffice/Install/InstallController.cs b/src/Umbraco.Web.BackOffice/Install/InstallController.cs
index ca29a508c4..a773a6f5a1 100644
--- a/src/Umbraco.Web.BackOffice/Install/InstallController.cs
+++ b/src/Umbraco.Web.BackOffice/Install/InstallController.cs
@@ -13,6 +13,7 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.WebAssets;
 using Umbraco.Cms.Infrastructure.Install;
+using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Filters;
 using Umbraco.Extensions;
 
@@ -101,6 +102,7 @@ namespace Umbraco.Cms.Web.BackOffice.Install
         /// </summary>
         /// <returns></returns>
         [HttpGet]
+        [IgnoreFromNotFoundSelectorPolicy]
         public ActionResult Redirect()
         {
             var uri = HttpContext.Request.GetEncodedUrl();
diff --git a/src/Umbraco.Web.Common/Attributes/IgnoreFromNotFoundSelectorPolicyAttribute.cs b/src/Umbraco.Web.Common/Attributes/IgnoreFromNotFoundSelectorPolicyAttribute.cs
new file mode 100644
index 0000000000..8fad2b6c6b
--- /dev/null
+++ b/src/Umbraco.Web.Common/Attributes/IgnoreFromNotFoundSelectorPolicyAttribute.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Umbraco.Cms.Web.Common.Attributes
+{
+    /// <summary>
+    /// When applied to an api controller it will be routed to the /Umbraco/BackOffice prefix route so we can determine if it
+    /// is a back office route or not.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class IgnoreFromNotFoundSelectorPolicyAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs b/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs
index dbc06175fd..871ae75d33 100644
--- a/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs
+++ b/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Matching;
 using Umbraco.Cms.Core.Routing;
+using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Common.Routing;
 
@@ -35,7 +36,7 @@ namespace Umbraco.Cms.Web.Website.Routing
                 // return the endpoint for the RenderController.Index action.
                 ControllerActionDescriptor descriptor = x.Metadata?.GetMetadata<ControllerActionDescriptor>();
                 return descriptor?.ControllerTypeInfo == typeof(RenderController)
-                    && descriptor?.ActionName == nameof(RenderController.Index);
+                       && descriptor?.ActionName == nameof(RenderController.Index);
             });
             return e;
         }
@@ -45,7 +46,7 @@ namespace Umbraco.Cms.Web.Website.Routing
         public bool AppliesToEndpoints(IReadOnlyList<Endpoint> endpoints)
         {
             // Don't apply this filter to any endpoint group that is a controller route
-            // i.e. only dynamic routes.            
+            // i.e. only dynamic routes.
             foreach (Endpoint endpoint in endpoints)
             {
                 ControllerAttribute controller = endpoint.Metadata?.GetMetadata<ControllerAttribute>();
@@ -80,11 +81,15 @@ namespace Umbraco.Cms.Web.Website.Routing
         {
             for (int i = 0; i < candidates.Count; i++)
             {
-                if (candidates.IsValidCandidate(i))
+                // We have to check if candidates needs to be ignored here
+                // So we dont return false when all endpoints are invalid
+                if (candidates.IsValidCandidate(i) &&
+                    candidates[i].Endpoint.Metadata.GetMetadata<IgnoreFromNotFoundSelectorPolicyAttribute>() is null)
                 {
                     return false;
                 }
             }
+
             return true;
         }
     }