Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Fixes Issue #177 and prevents double slashes at the start of a path when redirecting to an absolute url #178

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes Issue #177 and prevents double slashes at the start of a path when redirecting to an absolute url #178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5289ec
Fixes Issue #177 and prevents double slashes at the start of a path w…
ProNotion Dec 19, 2017
c43ae98
Issue #177 Further fix to esure the path starts with a forward slash …
ProNotion Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Modules/UrlTrackerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static void UrlTrackerDo(string callingEventName, bool ignoreHttpStatusCode = fa
string fullRawUrl;
string previousFullRawUrlTest;
string fullRawUrlTest;
fullRawUrl = previousFullRawUrlTest = fullRawUrlTest = string.Format("{0}{1}{2}{3}", request.Url.Scheme, Uri.SchemeDelimiter, request.Url.Host, request.Url.AbsolutePath);
fullRawUrl = previousFullRawUrlTest = fullRawUrlTest = string.Format("{0}{1}{2}{3}", request.Url.Scheme, Uri.SchemeDelimiter, request.IsLocal ? request.Url.Authority : request.Url.Host, request.Url.AbsolutePath);

UrlTrackerDomain urlTrackerDomain;
do
Expand Down Expand Up @@ -353,8 +353,15 @@ static void UrlTrackerDo(string callingEventName, bool ignoreHttpStatusCode = fa
NameValueCollection newQueryString = HttpUtility.ParseQueryString(request.Url.Query);
if (redirectQueryString.HasKeys())
newQueryString = newQueryString.Merge(redirectQueryString);
string pathAndQuery = Uri.UnescapeDataString(redirectUri.PathAndQuery) + redirectUri.Fragment;
redirectUri = new Uri(string.Format("{0}{1}{2}{3}/{4}{5}", redirectUri.Scheme, Uri.SchemeDelimiter, redirectUri.Host, redirectUri.Port != 80 && UrlTrackerSettings.AppendPortNumber ? string.Concat(":", redirectUri.Port) : string.Empty, pathAndQuery.Contains('?') ? pathAndQuery.Substring(0, pathAndQuery.IndexOf('?')) : pathAndQuery.StartsWith("/") ? pathAndQuery.Substring(1) : pathAndQuery, newQueryString.HasKeys() ? string.Concat("?", newQueryString.ToQueryString()) : string.Empty));
string pathAndQuery = Uri.UnescapeDataString(redirectUri.PathAndQuery.EnsureStartsWith("/")) + redirectUri.Fragment;
// Determine if we need to include the port number
string port = redirectUri.Port != 80 && UrlTrackerSettings.AppendPortNumber ? string.Concat(":", redirectUri.Port) : string.Empty;
// Extract the Uri path without any querystring
string path = pathAndQuery.Contains('?') ? pathAndQuery.Substring(0, pathAndQuery.IndexOf('?')) : pathAndQuery.StartsWith("/") ? pathAndQuery.Substring(1) : pathAndQuery;
// Assemble the new querystring but only if there are key/values to pass through
string querystring = newQueryString.HasKeys() ? string.Concat("?", newQueryString.ToQueryString()) : string.Empty;

redirectUri = new Uri(string.Format("{0}{1}{2}{3}{4}{5}", redirectUri.Scheme, Uri.SchemeDelimiter, redirectUri.Host, port, path.EnsureStartsWith("/"), querystring));
}

if (redirectUri == new Uri(string.Format("{0}{1}{2}{3}/{4}", request.Url.Scheme, Uri.SchemeDelimiter, request.Url.Host, request.Url.Port != 80 && UrlTrackerSettings.AppendPortNumber ? string.Concat(":", request.Url.Port) : string.Empty, request.RawUrl.StartsWith("/") ? request.RawUrl.Substring(1) : request.RawUrl)))
Expand Down