Fix for url encoded path + params (1.0.2.10) - #72

Fix for url encoded path + params (1.0.2.10)

WireMock.Net Solution.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+VisualStudioVersion = 15.0.27004.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -39,7 +39,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApplication", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.Console.NET452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

appveyor.yml

@@ -21,7 +21,6 @@ environment:
 before_build:
 - dotnet restore .\src\WireMock.Net\WireMock.Net.csproj
 - dotnet restore .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj
-- nuget restore .\examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj -PackagesDirectory packages
 
 build_script:
 # build WireMock.Net

examples/WireMock.Net.ConsoleApplication/MainApp.cs

@@ -21,6 +21,10 @@ namespace WireMock.Net.ConsoleApplication
                 Urls = new[] { url1, url2, url3 },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
+                //ProxyAndRecordSettings = new ProxyAndRecordSettings
+                //{
+                //    SaveMapping = true
+                //},
                 PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                 PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
             });
@@ -28,7 +32,22 @@ namespace WireMock.Net.ConsoleApplication
 
             server.SetBasicAuthentication("a", "b");
 
-            // server.AllowPartialMapping();
+            server.AllowPartialMapping();
+
+            // .WithHeader("Stef", "Stef")
+            //server
+            //    .Given(Request.Create().WithPath("*"))
+            //    .RespondWith(Response.Create()
+            //    .WithProxy("http://restcountries.eu"));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/navision/OData/Company('My Company')/School*", true))
+                    .WithParam("$filter", "(substringof(Code, 'WA')")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""odata""}"));
 
             server
                 .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.2.8</Version>
+    <Version>1.0.2.10</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs

@@ -30,12 +30,8 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
         /// </summary>
-        /// <param name="key">
-        /// The key.
-        /// </param>
-        /// <param name="values">
-        /// The values.
-        /// </param>
+        /// <param name="key">The key.</param>
+        /// <param name="values">The values.</param>
         public RequestMessageParamMatcher([NotNull] string key, [CanBeNull] IEnumerable<string> values)
         {
             Check.NotNull(key, nameof(key));
@@ -51,17 +47,11 @@ namespace WireMock.Matchers.Request
         public RequestMessageParamMatcher([NotNull] params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
         {
             Check.NotNull(funcs, nameof(funcs));
+
             Funcs = funcs;
         }
 
-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
         public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
         {
             double score = IsMatch(requestMessage);
@@ -71,7 +61,9 @@ namespace WireMock.Matchers.Request
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.Query != null && Funcs.Any(f => f(requestMessage.Query)));
+            }
 
             List<string> values = requestMessage.GetParameter(Key);
 

src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs

@@ -25,10 +25,10 @@ namespace WireMock.Owin
 #endif
 
 #if NETSTANDARD
-    public RequestDelegate Next { get; private set; }
+        public RequestDelegate Next { get; }
 #endif
 
-    private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();
+        private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();
 
 #if !NETSTANDARD
         public override async Task Invoke(IOwinContext ctx)

src/WireMock.Net/Owin/OwinResponseMapper.cs

@@ -1,8 +1,10 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using WireMock.Http;
+using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -18,6 +20,19 @@ namespace WireMock.Owin
     {
         private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
 
+        // https://stackoverflow.com/questions/239725/cannot-set-some-http-headers-when-using-system-net-webrequest
+#if !NETSTANDARD
+        private static readonly IDictionary<string, Action<IOwinResponse, WireMockList<string>>> RestrictedResponseHeaders = new Dictionary<string, Action<IOwinResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+#else
+        private static readonly IDictionary<string, Action<HttpResponse, WireMockList<string>>> RestrictedResponseHeaders = new Dictionary<string, Action<HttpResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+#endif
+            { "Content-Length", null },
+            { "Content-Type", (r, v) => r.ContentType = v.FirstOrDefault() },
+            { "Keep-Alive", null },
+            { "Transfer-Encoding", null },
+            { "WWW-Authenticate", null }
+        };
+
         /// <summary>
         /// MapAsync ResponseMessage to OwinResponse
         /// </summary>
@@ -33,18 +48,22 @@ namespace WireMock.Owin
         {
             response.StatusCode = responseMessage.StatusCode;
 
-            if (responseMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
+            // Set headers
+            foreach (var pair in responseMessage.Headers)
             {
-                response.ContentType = responseMessage.Headers[HttpKnownHeaderNames.ContentType].FirstOrDefault();
-            }
-
-            var headers = responseMessage.Headers.Where(h => h.Key != HttpKnownHeaderNames.ContentType).ToList();
-
+                if (RestrictedResponseHeaders.ContainsKey(pair.Key))
+                {
+                    RestrictedResponseHeaders[pair.Key]?.Invoke(response, pair.Value);
+                }
+                else
+                {
 #if !NETSTANDARD
-            headers.ForEach(pair => response.Headers.AppendValues(pair.Key, pair.Value.ToArray()));
+                    response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
 #else
-            headers.ForEach(pair => response.Headers.Append(pair.Key, pair.Value.ToArray()));
+                    response.Headers.Append(pair.Key, pair.Value.ToArray());
 #endif
+                }
+            }
 
             if (responseMessage.Body == null && responseMessage.BodyAsBytes == null && responseMessage.BodyAsFile == null)
             {

src/WireMock.Net/RequestMessage.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using System.Net;
 using JetBrains.Annotations;
 using WireMock.Util;
 using WireMock.Validation;
-using System.Text;
 
 namespace WireMock
 {
@@ -53,6 +54,11 @@ namespace WireMock
         /// </summary>
         public IDictionary<string, WireMockList<string>> Query { get; }
 
+        /// <summary>
+        /// Gets the raw query.
+        /// </summary>
+        public string RawQuery { get; }
+
         /// <summary>
         /// Gets the bodyAsBytes.
         /// </summary>
@@ -110,7 +116,7 @@ namespace WireMock
             Host = url.Host;
             Port = url.Port;
             Origin = $"{url.Scheme}://{url.Host}:{url.Port}";
-            Path = url.AbsolutePath;
+            Path = WebUtility.UrlDecode(url.AbsolutePath);
             Method = method.ToLower();
             ClientIP = clientIP;
             BodyAsBytes = bodyAsBytes;
@@ -118,10 +124,11 @@ namespace WireMock
             BodyEncoding = bodyEncoding;
             Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
             Cookies = cookies;
-            Query = ParseQuery(url.Query);
+            RawQuery = WebUtility.UrlDecode(url.Query);
+            Query = ParseQuery(RawQuery);
         }
 
-        private IDictionary<string, WireMockList<string>> ParseQuery(string queryString)
+        private static IDictionary<string, WireMockList<string>> ParseQuery(string queryString)
         {
             if (string.IsNullOrEmpty(queryString))
             {
@@ -153,7 +160,7 @@ namespace WireMock
         }
 
         /// <summary>
-        /// The get a query parameter.
+        /// Get a query parameter.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <returns>The query parameter.</returns>

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -20,7 +20,7 @@ namespace WireMock.ResponseBuilders
     /// </summary>
     public class Response : IResponseBuilder
     {
-        private HttpClient httpClientForProxy;
+        private HttpClient _httpClientForProxy;
 
         /// <summary>
         /// The delay
@@ -274,35 +274,23 @@ namespace WireMock.ResponseBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with transformer.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IResponseBuilder"/>.
-        /// </returns>
+        /// <inheritdoc cref="ITransformResponseBuilder.WithTransformer"/>
         public IResponseBuilder WithTransformer()
         {
             UseTransformer = true;
             return this;
         }
 
-        /// <summary>
-        /// The with delay.
-        /// </summary>
-        /// <param name="delay">The TimeSpan to delay.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        /// <inheritdoc cref="IDelayResponseBuilder.WithDelay(TimeSpan)"/>
         public IResponseBuilder WithDelay(TimeSpan delay)
         {
             Check.Condition(delay, d => d > TimeSpan.Zero, nameof(delay));
+
             Delay = delay;
             return this;
         }
 
-        /// <summary>
-        /// The with delay.
-        /// </summary>
-        /// <param name="milliseconds">The milliseconds to delay.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        /// <inheritdoc cref="IDelayResponseBuilder.WithDelay(int)"/>
         public IResponseBuilder WithDelay(int milliseconds)
         {
             return WithDelay(TimeSpan.FromMilliseconds(milliseconds));
@@ -320,7 +308,7 @@ namespace WireMock.ResponseBuilders
 
             ProxyUrl = proxyUrl;
             X509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName;
-            httpClientForProxy = HttpClientHelper.CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
+            _httpClientForProxy = HttpClientHelper.CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
             return this;
         }
 
@@ -334,14 +322,17 @@ namespace WireMock.ResponseBuilders
             Check.NotNull(requestMessage, nameof(requestMessage));
 
             if (Delay != null)
+            {
                 await Task.Delay(Delay.Value);
+            }
 
-            if (ProxyUrl != null && httpClientForProxy != null)
+            if (ProxyUrl != null && _httpClientForProxy != null)
             {
                 var requestUri = new Uri(requestMessage.Url);
                 var proxyUri = new Uri(ProxyUrl);
                 var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
-                return await HttpClientHelper.SendAsync(httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);
+
+                return await HttpClientHelper.SendAsync(_httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);
             }
 
             if (UseTransformer)

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.2.8</Version>
+    <Version>1.0.2.10</Version>
     <Authors>Alexandre Victoor;Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>