Merge branch 'master' into refactoring/sc

src/Squidex/Config/Web/WebExtensions.cs

@@ -115,6 +115,7 @@ namespace Squidex.Config.Web
             });
 
             app.UseMiddleware<EnforceHttpsMiddleware>();
+            app.UseMiddleware<CleanupHostMiddleware>();
         }
     }
 }

src/Squidex/Pipeline/CleanupHostMiddleware.cs

@@ -0,0 +1,44 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Squidex.Pipeline
+{
+    public class CleanupHostMiddleware
+    {
+        private readonly RequestDelegate next;
+
+        public CleanupHostMiddleware(RequestDelegate next)
+        {
+            this.next = next;
+        }
+
+        public Task Invoke(HttpContext context)
+        {
+            var request = context.Request;
+
+            if (request.Host.HasValue && (HasHttpsPort(request) || HasHttpPort(request)))
+            {
+                request.Host = new HostString(request.Host.Host);
+            }
+
+            return next(context);
+        }
+
+        private static bool HasHttpPort(HttpRequest request)
+        {
+            return request.Scheme == "http" && request.Host.Port == 80;
+        }
+
+        private static bool HasHttpsPort(HttpRequest request)
+        {
+            return request.Scheme == "https" && request.Host.Port == 443;
+        }
+    }
+}