Restricted ResponseHeaders (#126)

* Fix for issue #118

* Adding test cases for fix #118

* Moved the namespace in using block for fix #118

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.0.3.16 (15 April 2018)
+
+ - [#125](https://github.com/WireMock-Net/WireMock.Net/pull/125) - Change listen from loopback to any ip address for dotnetcore2.0 apps contributed by ([SubjectiveReality](https://github.com/SubjectiveReality))
+ - [#124](https://github.com/WireMock-Net/WireMock.Net/issues/124) - Issue: Unable to get host to listen on ips other than 127.0.0.1 using StandAloneApp
+ - [#121](https://github.com/WireMock-Net/WireMock.Net/pull/121) - Fix for issue #118 contributed by ([raghavendrabankapur](https://github.com/raghavendrabankapur)) +fix
+ - [#118](https://github.com/WireMock-Net/WireMock.Net/issues/118) - Not reading the response from a file when mappings are placed in json file
+
+Commits: 7bd63a0baf...1bcdfe31ab
+
+
 # 1.0.3.15 (05 April 2018)
 
  - [#117](https://github.com/WireMock-Net/WireMock.Net/pull/117) - Respect start timeout setting and expose exception from server startup contributed by Evan Liang ([evanlwj](https://github.com/evanlwj))

GitReleaseNotes.txt

@@ -1,5 +1,5 @@
 https://github.com/GitTools/GitReleaseNotes
 
-GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.15
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.16
 
 GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

WireMock.Net Solution.sln

@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		GitReleaseNotes.txt = GitReleaseNotes.txt
 		README.md = README.md
 		ReSharper_WireMock.DotSettings = ReSharper_WireMock.DotSettings
+		WireMock.Net Solution.sln.DotSettings = WireMock.Net Solution.sln.DotSettings
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}"

WireMock.Net Solution.sln.DotSettings

@@ -1,3 +1,11 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TE/@EntryIndexedValue">TE</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TSV/@EntryIndexedValue">TSV</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
+</wpf:ResourceDictionary>

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.3.15</Version>
+    <Version>1.0.3.16</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -76,13 +76,13 @@ namespace WireMock.Owin
                     foreach (string url in _urls.Where(u => u.StartsWith("http://", StringComparison.OrdinalIgnoreCase)))
                     {
                         PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
-                        options.Listen(System.Net.IPAddress.Loopback, port);
+                        options.Listen(System.Net.IPAddress.Any, port);
                     }
 
                     foreach (string url in _urls.Where(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
                     {
                         PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
-                        options.Listen(System.Net.IPAddress.Loopback, port, listenOptions =>
+                        options.Listen(System.Net.IPAddress.Any, port, listenOptions =>
                         {
                             listenOptions.UseHttps(PublicCertificateHelper.GetX509Certificate2());
                         });

src/WireMock.Net/Owin/OwinResponseMapper.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using WireMock.Http;
 using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
@@ -21,17 +22,27 @@ 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
+        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
 #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 }
+            { HttpKnownHeaderNames.Accept, null },
+            { HttpKnownHeaderNames.Connection, null },
+            { HttpKnownHeaderNames.ContentLength, null },
+            { HttpKnownHeaderNames.ContentType, (r, v) => r.ContentType = v.FirstOrDefault() },
+            { HttpKnownHeaderNames.Date, null },
+            { HttpKnownHeaderNames.Expect, null },
+            { HttpKnownHeaderNames.Host, null },
+            { HttpKnownHeaderNames.IfModifiedSince, null },
+            { HttpKnownHeaderNames.KeepAlive, null },
+            { HttpKnownHeaderNames.Range, null },
+            { HttpKnownHeaderNames.Referer, null },
+            { HttpKnownHeaderNames.TransferEncoding, null },
+            { HttpKnownHeaderNames.UserAgent, null },
+            { HttpKnownHeaderNames.ProxyConnection, null },
+            { HttpKnownHeaderNames.WWWAuthenticate, null }
         };
 
         /// <summary>

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -31,9 +31,6 @@ namespace WireMock.ResponseBuilders
         /// <summary>
         /// Gets a value indicating whether [use transformer].
         /// </summary>
-        /// <value>
-        ///   <c>true</c> if [use transformer]; otherwise, <c>false</c>.
-        /// </value>
         public bool UseTransformer { get; private set; }
 
         /// <summary>
@@ -258,7 +255,7 @@ namespace WireMock.ResponseBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyAsJson(object, Encoding, bool)"/>
+        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyAsJson(object, Encoding, bool?)"/>
         public IResponseBuilder WithBodyAsJson(object body, Encoding encoding = null, bool? indented = null)
         {
             Check.NotNull(body, nameof(body));

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -745,6 +745,11 @@ namespace WireMock.Server
                 responseBuilder = responseBuilder.WithBodyFromBase64(responseModel.BodyFromBase64, ToEncoding(responseModel.BodyEncoding));
             }
 
+            else if (responseModel.BodyAsFile != null)
+            {
+                responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile);
+            }
+
             if (responseModel.UseTransformer)
             {
                 responseBuilder = responseBuilder.WithTransformer();

src/WireMock.Net/Util/JsonUtils.cs

@@ -11,8 +11,7 @@ namespace WireMock.Util
                 return default(T);
             }
 
-            var token = value as JToken;
-            return token == null ? default(T) : token.ToObject<T>();
+            return !(value is JToken token) ? default(T) : token.ToObject<T>();
         }
     }
 }

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.3.15</Version>
+    <Version>1.0.3.16</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -11,6 +11,7 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using Xunit;
+using Newtonsoft.Json;
 
 namespace WireMock.Net.Tests
 {
@@ -76,6 +77,34 @@ namespace WireMock.Net.Tests
             Check.That(mappings.First().Title).IsNullOrEmpty();
         }
 
+        [Fact]
+        public void FluentMockServer_ReadStaticMapping_WithResponseBodyFromFile()
+        {
+            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d87";
+
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
+            string json = File.ReadAllText(folder);
+
+            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "ResponseBodyFiles", "responsebody.json");
+
+            dynamic jsonObj = JsonConvert.DeserializeObject(json);
+            jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;
+
+            string output = JsonConvert.SerializeObject(jsonObj, Formatting.Indented);
+            File.WriteAllText(folder, output);
+
+            _server = FluentMockServer.Start();
+            _server.ReadStaticMappingAndAddOrUpdate(folder);
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+
+            Check.That(mappings.First().RequestMatcher).IsNotNull();
+            Check.That(mappings.First().Provider).IsNotNull();
+            Check.That(mappings.First().Guid).Equals(Guid.Parse(guid));
+            Check.That(mappings.First().Title).IsNullOrEmpty();
+        }
+
         [Fact]
         public void FluentMockServer_ReadStaticMappings()
         {
@@ -85,7 +114,7 @@ namespace WireMock.Net.Tests
             _server.ReadStaticMappings(folder);
 
             var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(2);
+            Check.That(mappings).HasSize(3);
         }
 
         [Fact]
@@ -516,6 +545,24 @@ namespace WireMock.Net.Tests
             Check.That(response).IsEqualTo("/fooBar");
         }
 
+        [Fact]
+        public async Task FluentMockServer_Should_IgnoreRestrictedHeader()
+        {
+            // Assign
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/head").UsingHead())
+                .RespondWith(Response.Create().WithHeader("Content-Length", "1024"));
+
+            var request = new HttpRequestMessage(HttpMethod.Head, "http://localhost:" + _server.Ports[0] + "/head");
+
+            // Act
+            var response = await new HttpClient().SendAsync(request);
+
+            // Assert
+            Check.That(response.Content.Headers.GetValues("Content-Length")).ContainsExactly("0");
+        }
+
         public void Dispose()
         {
             _server?.Stop();

test/WireMock.Net.Tests/ResponseBodyFiles/responsebody.json

@@ -0,0 +1,3 @@
+{
+  "test": "test"
+}

test/WireMock.Net.Tests/ResponseTests.cs

@@ -0,0 +1,26 @@
+using System;
+using NFluent;
+using WireMock.ResponseBuilders;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public class ResponseTests
+    {
+        private const string ClientIp = "::1";
+
+        [Fact]
+        public async void Response_Create_WithHeader_ContentLength()
+        {
+            // Assign
+            var requestMock = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp);
+            IResponseBuilder builder = Response.Create().WithHeader("Content-Length", "1024");
+
+            // Act
+            var response = await builder.ProvideResponseAsync(requestMock);
+
+            // Assert
+            Check.That(response.Headers["Content-Length"].ToString()).Equals("1024");
+        }
+    }
+}

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -31,9 +31,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="ResponseBodyFiles\responsebody.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d86.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d87.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="__admin\mappings\documentdb_root.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

test/WireMock.Net.Tests/__admin/mappings/00000002-ee28-4f29-ae63-1ac9b0802d87.json

@@ -0,0 +1,24 @@
+{
+  "Guid": "00000002-ee28-4f29-ae63-1ac9b0802d87",
+  "Priority": 0,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "ExactMatcher",
+          "Pattern": "/response/staticfile"
+        }
+      ]
+    },
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyAsFile": "responsebody.json",
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}