Issue-4336 - Umlaut characters in URL cause module setting error (#4337)

* Issue-4336 - Umlaut characters module settings fix * Issue-4336 - UTs provided for AdvancedUrlRewriter * Issue-4336 - Namespace fix * Issue-4336 - Parallel execution UTs are handled
dnnsoftware · Nov 28, 2020 · b2452bb · b2452bb
1 parent 2fccd9d
commit b2452bb
Show file tree

Hide file tree

Showing 3 changed files with 416 additions and 0 deletions.
diff --git a/DNN Platform/Library/Entities/Urls/AdvancedUrlRewriter.cs b/DNN Platform/Library/Entities/Urls/AdvancedUrlRewriter.cs
@@ -1848,6 +1848,7 @@ private static bool CheckForRedirects(
 
                                 if (!(bestFriendlyNoScheme == requestedPathNoScheme
                                       || bestFriendlyNoScheme == rawUrlWithHost
+                                      || HttpUtility.UrlDecode(bestFriendlyNoScheme) == rawUrlWithHost
                                       || bestFriendlyNoScheme == rawUrlWithHostNoScheme
                                       || bestFriendlyNoScheme == HttpUtility.UrlDecode(requestedPathNoScheme)
                                       || HttpUtility.UrlDecode(bestFriendlyNoScheme) == HttpUtility.UrlDecode(requestedPathNoScheme)

diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj
@@ -174,6 +174,7 @@
     <Compile Include="Entities\Portals\PortalSettingsTests.cs" />
     <Compile Include="Entities\Tabs\TabControllerTests.cs" />
     <Compile Include="Entities\Tabs\TabChangeTrackerTests.cs" />
+    <Compile Include="Entities\Urls\AdvancedUrlRewriterTests.cs" />
     <Compile Include="Entities\Urls\FriendlyUrlControllerTests.cs" />
     <Compile Include="Framework\ServicesFrameworkTests.cs" />
     <Compile Include="Framework\JavaScriptLibraries\JavaScriptTests.cs" />