Merge pull request #537 from Orckestra/dev

Fix #535 Custom 404 page resolution does not take the language specified in URL
Orckestra · Jan 25, 2018 · c5bfe27 · c5bfe27
2 parents 146aa7c + 6a61f81
commit c5bfe27
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/Composite/Core/Routing/HostnameBindingsFacade.cs b/Composite/Core/Routing/HostnameBindingsFacade.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Web;
@@ -8,6 +8,7 @@
 using Composite.Core.WebClient;
 using Composite.Data;
 using Composite.Data.Types;
+using Composite.Plugins.Routing.Pages;
 
 namespace Composite.Core.Routing
 {
@@ -67,14 +68,14 @@ public static void Initialize()
 
         internal static IHostnameBinding GetBindingForCurrentRequest()
         {
-            var httpContext = HttpContext.Current;
-            if(httpContext == null)
-            {
-                return null;
-            }
+            return GetHostnameBinding(HttpContext.Current);
+        }
 
+        private static IHostnameBinding GetHostnameBinding(HttpContext httpContext)
+        {
+            if(httpContext == null) return null;
 
-            string host = HttpContext.Current.Request.Url.Host;
+            string host = httpContext.Request.Url.Host;
 
             // TODO: optimize?
             return DataFacade.GetData<IHostnameBinding>().AsEnumerable().FirstOrDefault(b => b.Hostname == host);
@@ -87,7 +88,7 @@ internal static IHostnameBinding GetAliasBinding(HttpContext httpContext)
                 return null;
             }
 
-            string hostname = HttpContext.Current.Request.Url.Host.ToLowerInvariant();
+            string hostname = httpContext.Request.Url.Host.ToLowerInvariant();
 
             foreach (var hostnameBinding in DataFacade.GetData<IHostnameBinding>(true).AsEnumerable())
             {
@@ -105,13 +106,13 @@ internal static IHostnameBinding GetAliasBinding(HttpContext httpContext)
 
         internal static bool IsPageNotFoundRequest()
         {
-            HttpContext context = HttpContext.Current;
+            var context = HttpContext.Current;
             if(context == null)
             {
                 return false;
             }
 
-            string customPageNotFoundUrl = HostnameBindingsFacade.GetCustomPageNotFoundUrl();
+            string customPageNotFoundUrl = GetCustomPageNotFoundUrl(context);
 
             if (customPageNotFoundUrl.IsNullOrEmpty())
             {
@@ -132,10 +133,15 @@ internal static bool IsPageNotFoundRequest()
                     || request.Url.PathAndQuery.StartsWith(customPageNotFoundUrl + "?");
         }
 
-        internal static string GetCustomPageNotFoundUrl()
+        internal static string GetCustomPageNotFoundUrl() => GetCustomPageNotFoundUrl(HttpContext.Current);
+
+
+        private static string GetCustomPageNotFoundUrl(HttpContext httpContext)
         {
-            var binding = GetBindingForCurrentRequest();
-            if(binding == null || string.IsNullOrEmpty(binding.PageNotFoundUrl))
+            if (httpContext == null) return null;
+
+            var binding = GetHostnameBinding(httpContext);
+            if(string.IsNullOrEmpty(binding?.PageNotFoundUrl))
             {
                 return null;
             }
@@ -144,10 +150,10 @@ internal static string GetCustomPageNotFoundUrl()
 
             var defaultCulture = DataLocalizationFacade.DefaultLocalizationCulture;
 
-            var pageUrlData = C1PageRoute.PageUrlData;
-            CultureInfo localeFromRequest = pageUrlData != null 
-                ? pageUrlData.LocalizationScope
-                : defaultCulture;
+            CultureInfo localeFromRequest =
+                C1PageRoute.PageUrlData?.LocalizationScope
+                ?? DefaultPageUrlProvider.GetCultureInfo(httpContext.Request.FilePath, binding, out _)
+                ?? defaultCulture;
 
             using (new DataConnection(localeFromRequest))
             {
@@ -171,7 +177,7 @@ internal static bool ServeCustomPageNotFoundPage(HttpContext httpContext)
         {
             string rawUrl = httpContext.Request.RawUrl;
 
-            string customPageNotFoundUrl = HostnameBindingsFacade.GetCustomPageNotFoundUrl();
+            string customPageNotFoundUrl = GetCustomPageNotFoundUrl(httpContext);
 
             if (string.IsNullOrEmpty(customPageNotFoundUrl))
             {
@@ -180,7 +186,7 @@ internal static bool ServeCustomPageNotFoundPage(HttpContext httpContext)
 
             if (rawUrl == customPageNotFoundUrl || httpContext.Request.Url.PathAndQuery == customPageNotFoundUrl)
             {
-                throw new HttpException(404, "'Page not found' wasn't handled. Url: '{0}'".FormatWith(rawUrl));
+                throw new HttpException(404, $"'Page not found' wasn't handled. Url: '{rawUrl}'");
             }
 
             if (HttpRuntime.UsingIntegratedPipeline && customPageNotFoundUrl.StartsWith("/"))

diff --git a/Composite/Plugins/Routing/Pages/DefaultPageUrlProvider.cs b/Composite/Plugins/Routing/Pages/DefaultPageUrlProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
@@ -598,7 +598,7 @@ private static string RemoveUrlMarkers(string filePath, UrlSpace urlSpace)
             return filePath;
         }
 
-        CultureInfo GetCultureInfo(string requestPath, IHostnameBinding hostnameBinding, out string pathWithoutLanguageAndAppRoot)
+        internal static CultureInfo GetCultureInfo(string requestPath, IHostnameBinding hostnameBinding, out string pathWithoutLanguageAndAppRoot)
         {
             int startIndex = requestPath.IndexOf('/', UrlUtils.PublicRootPath.Length) + 1;