From 3f43ebcc0e31db523fa82a163374cebf2f577cde Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 27 Oct 2017 21:10:36 -0400
Subject: fix issues with subdomain routing in log UI (#358)

---
 src/SMAPI.Web/Framework/RewriteSubdomainRule.cs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Web/Framework/RewriteSubdomainRule.cs')

diff --git a/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs b/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs
index 5a56844f..cc183fe3 100644
--- a/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs
+++ b/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Rewrite;
 
 namespace StardewModdingAPI.Web.Framework
@@ -7,14 +10,29 @@ namespace StardewModdingAPI.Web.Framework
     /// <remarks>Derived from <a href="https://stackoverflow.com/a/44526747/262123" />.</remarks>
     internal class RewriteSubdomainRule : IRule
     {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The paths (excluding the hostname portion) to not rewrite.</summary>
+        public Regex[] ExceptPaths { get; set; }
+
+
+        /*********
+        ** Public methods
+        *********/
         /// <summary>Applies the rule. Implementations of ApplyRule should set the value for <see cref="RewriteContext.Result" /> (defaults to RuleResult.ContinueRules).</summary>
         /// <param name="context">The rewrite context.</param>
         public void ApplyRule(RewriteContext context)
         {
             context.Result = RuleResult.ContinueRules;
+            HttpRequest request = context.HttpContext.Request;
+
+            // check ignores
+            if (this.ExceptPaths?.Any(pattern => pattern.IsMatch(request.Path)) == true)
+                return;
 
             // get host parts
-            string host = context.HttpContext.Request.Host.Host;
+            string host = request.Host.Host;
             string[] parts = host.Split('.');
 
             // validate
@@ -24,7 +42,7 @@ namespace StardewModdingAPI.Web.Framework
                 return;
 
             // prepend to path
-            context.HttpContext.Request.Path = $"/{parts[0]}{context.HttpContext.Request.Path}";
+            request.Path = $"/{parts[0]}{request.Path}";
         }
     }
 }
-- 
cgit 


From c6d8333c7a28b752397e171540306ceccf74ca12 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 28 Oct 2017 11:53:54 -0400
Subject: improve criteria for subdomain rewriting (#358)

---
 src/SMAPI.Web/Framework/RewriteSubdomainRule.cs | 48 -------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 src/SMAPI.Web/Framework/RewriteSubdomainRule.cs

(limited to 'src/SMAPI.Web/Framework/RewriteSubdomainRule.cs')

diff --git a/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs b/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs
deleted file mode 100644
index cc183fe3..00000000
--- a/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Rewrite;
-
-namespace StardewModdingAPI.Web.Framework
-{
-    /// <summary>Rewrite requests to prepend the subdomain portion (if any) to the path.</summary>
-    /// <remarks>Derived from <a href="https://stackoverflow.com/a/44526747/262123" />.</remarks>
-    internal class RewriteSubdomainRule : IRule
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The paths (excluding the hostname portion) to not rewrite.</summary>
-        public Regex[] ExceptPaths { get; set; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Applies the rule. Implementations of ApplyRule should set the value for <see cref="RewriteContext.Result" /> (defaults to RuleResult.ContinueRules).</summary>
-        /// <param name="context">The rewrite context.</param>
-        public void ApplyRule(RewriteContext context)
-        {
-            context.Result = RuleResult.ContinueRules;
-            HttpRequest request = context.HttpContext.Request;
-
-            // check ignores
-            if (this.ExceptPaths?.Any(pattern => pattern.IsMatch(request.Path)) == true)
-                return;
-
-            // get host parts
-            string host = request.Host.Host;
-            string[] parts = host.Split('.');
-
-            // validate
-            if (parts.Length < 2)
-                return;
-            if (parts.Length < 3 && !"localhost".Equals(parts[1], StringComparison.InvariantCultureIgnoreCase))
-                return;
-
-            // prepend to path
-            request.Path = $"/{parts[0]}{request.Path}";
-        }
-    }
-}
-- 
cgit