1.3.10

* wip

* .

* .

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.10 (23 December 2020)
+- [#555](https://github.com/WireMock-Net/WireMock.Net/pull/555) - Add more tests for Proxy with Authorization [feature] contributed by [StefH](https://github.com/StefH)
+- [#561](https://github.com/WireMock-Net/WireMock.Net/pull/561) - Do not save "admin" mappings when running in Proxy - mode contributed by [StefH](https://github.com/StefH)
+- [#559](https://github.com/WireMock-Net/WireMock.Net/issues/559) - WireMock Setting 'SaveMappingToFile' raising cast object to type error [bug]
+
 # 1.3.9 (08 December 2020)
 - [#550](https://github.com/WireMock-Net/WireMock.Net/pull/550) - WithProxy(...) also use all proxy settings [bug] contributed by [StefH](https://github.com/StefH)
 - [#551](https://github.com/WireMock-Net/WireMock.Net/pull/551) - Add obsolete warning: CSharpCodeMatcher will be moved to a separate NuGet package 'WireMock.Net.Matchers.CSharpCode' [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.3.9</VersionPrefix>
+    <VersionPrefix>1.3.10</VersionPrefix>
     <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.3.9
+GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.3.10

examples/WireMock.Net.Console.Proxy.NETCoreApp2/Program.cs

@@ -3,6 +3,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using WireMock.Logging;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -14,9 +15,6 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
     {
         static void Main(string[] args)
         {
-            RunTestDifferentPort().Wait(20000); // prints "1"
-            RunTestDifferentPort().Wait(20000); // prints "1"
-
             var server = WireMockServer.Start(new WireMockServerSettings
             {
                 Urls = new[] { "http://localhost:9091", "https://localhost:9443" },
@@ -29,34 +27,18 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
                     SaveMapping = true,
                     SaveMappingToFile = false,
                     ExcludedHeaders = new[] { "dnt", "Content-Length" }
-                }
+                },
+                Logger= new WireMockConsoleLogger()
             });
 
-            server.LogEntriesChanged += (sender, eventRecordArgs) =>
-            {
-                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
-            };
+            //server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            //{
+            //    System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
+            //};
 
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();
         }
-
-        private static async Task RunTestDifferentPort()
-        {
-            var server = WireMockServer.Start();
-
-            server.Given(Request.Create().WithPath("/").UsingGet())
-                .RespondWith(Response.Create().WithStatusCode(200).WithBody("Hello"));
-
-            Thread.Sleep(1000);
-
-            var response = await new HttpClient().GetAsync(server.Urls[0]);
-            response.EnsureSuccessStatusCode();
-
-            System.Console.WriteLine("RunTestDifferentPort - server.LogEntries.Count() = " + server.LogEntries.Count());
-
-            server.Stop();
-        }
     }
 }

examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -132,18 +132,21 @@ namespace WireMock.Owin
 
                 var responseBuilder = targetMapping.Provider as Response;
 
-                if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMapping == true)
+                if (!targetMapping.IsAdminInterface)
                 {
-                    _options.Mappings.TryAdd(targetMapping.Guid, targetMapping);
-                }
+                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMapping == true)
+                    {
+                        _options.Mappings.TryAdd(targetMapping.Guid, targetMapping);
+                    }
 
-                if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true)
-                {
-                    var matcherMapper = new MatcherMapper(targetMapping.Settings);
-                    var mappingConverter = new MappingConverter(matcherMapper);
-                    var mappingToFileSaver = new MappingToFileSaver(targetMapping.Settings, mappingConverter);
+                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true)
+                    {
+                        var matcherMapper = new MatcherMapper(targetMapping.Settings);
+                        var mappingConverter = new MappingConverter(matcherMapper);
+                        var mappingToFileSaver = new MappingToFileSaver(targetMapping.Settings, mappingConverter);
 
-                    mappingToFileSaver.SaveMappingToFile(targetMapping);
+                        mappingToFileSaver.SaveMappingToFile(targetMapping);
+                    }
                 }
 
                 if (targetMapping.Scenario != null)

src/WireMock.Net/RequestBuilders/Request.cs

@@ -55,6 +55,16 @@ namespace WireMock.RequestBuilders
             return _requestMatchers.OfType<T>().FirstOrDefault();
         }
 
+        /// <summary>
+        /// Gets the request message matcher.
+        /// </summary>
+        /// <typeparam name="T">Type of IRequestMatcher</typeparam>
+        /// <returns>A RequestMatcher</returns>
+        public T GetRequestMessageMatcher<T>(Func<T, bool> func) where T : IRequestMatcher
+        {
+            return _requestMatchers.OfType<T>().FirstOrDefault(func);
+        }
+
         /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(IStringMatcher[])"/>
         public IRequestBuilder WithClientIP(params IStringMatcher[] matchers)
         {

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -25,7 +25,7 @@ namespace WireMock.Settings
         string SaveMappingForStatusCodePattern { get; set; }
 
         /// <summary>
-        /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+        /// Save the mapping for each request/response to a .json mapping file.
         /// </summary>
         bool SaveMappingToFile { get; set; }
 

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs

@@ -1,6 +1,5 @@
-using FluentAssertions;
-using Moq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using FluentAssertions;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;

test/WireMock.Net.Tests/WireMockServer.Proxy.cs

@@ -6,13 +6,16 @@ using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
+using Moq;
 using NFluent;
 using WireMock.Admin.Mappings;
+using WireMock.Handlers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Util;
 using Xunit;
 
 namespace WireMock.Net.Tests
@@ -50,6 +53,69 @@ namespace WireMock.Net.Tests
             Check.That(server.LogEntries).HasSize(1);
         }
 
+        [Fact]
+        public async Task WireMockServer_Proxy_With_SaveMapping_Is_True_And_SaveMappingToFile_Is_False_Should_AddInternalMappingOnly()
+        {
+            // Assign
+            var settings = new WireMockServerSettings
+            {
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "http://www.google.com",
+                    SaveMapping = true,
+                    SaveMappingToFile = false
+                }
+            };
+            var server = WireMockServer.Start(settings);
+
+            // Act
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(server.Urls[0])
+            };
+            var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+
+            // Assert
+            server.Mappings.Should().HaveCount(2);
+        }
+
+        [Fact]
+        public async Task WireMockServer_Proxy_With_SaveMapping_Is_False_And_SaveMappingToFile_Is_True_ShouldSaveMappingToFile()
+        {
+            // Assign
+            var fileSystemHandlerMock = new Mock<IFileSystemHandler>();
+            fileSystemHandlerMock.Setup(f => f.GetMappingFolder()).Returns("m");
+
+            var settings = new WireMockServerSettings
+            {
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "http://www.google.com",
+                    SaveMapping = false,
+                    SaveMappingToFile = true
+                },
+                FileSystemHandler = fileSystemHandlerMock.Object
+            };
+            var server = WireMockServer.Start(settings);
+
+            // Act
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(server.Urls[0])
+            };
+            var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+
+            // Assert
+            server.Mappings.Should().HaveCount(1);
+
+            // Verify
+            fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+        }
+
         [Fact]
         public async Task WireMockServer_Proxy_Should_log_proxied_requests()
         {
@@ -75,8 +141,8 @@ namespace WireMock.Net.Tests
             await new HttpClient(httpClientHandler).SendAsync(requestMessage);
 
             // Assert
-            Check.That(server.Mappings).HasSize(2);
-            Check.That(server.LogEntries).HasSize(1);
+            server.Mappings.Should().HaveCount(2);
+            server.LogEntries.Should().HaveCount(1);
         }
 
         [Fact]
@@ -148,10 +214,56 @@ namespace WireMock.Net.Tests
 
             // check that new proxied mapping is added
             Check.That(server.Mappings).HasSize(2);
+        }
 
-            //var newMapping = _server.Mappings.First(m => m.Guid != guid);
-            //var matcher = ((Request)newMapping.RequestMatcher).GetRequestMessageMatchers<RequestMessageHeaderMatcher>().FirstOrDefault(m => m.Name == "bbb");
-            //Check.That(matcher).IsNotNull();
+        [Fact]
+        public async Task WireMockServer_Proxy_Should_preserve_Authorization_header_in_proxied_request()
+        {
+            // Assign
+            string path = $"/prx_{Guid.NewGuid()}";
+            var serverForProxyForwarding = WireMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
+                .RespondWith(Response.Create().WithCallback(x => new ResponseMessage
+                {
+                    BodyData = new BodyData
+                    {
+                        BodyAsString = x.Headers["Authorization"].ToString(),
+                        DetectedBodyType = Types.BodyType.String
+                    }
+                }));
+
+            var settings = new WireMockServerSettings
+            {
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = serverForProxyForwarding.Urls[0],
+                    SaveMapping = true,
+                    SaveMappingToFile = false
+                }
+            };
+            var server = WireMockServer.Start(settings);
+
+            // Act
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri($"{server.Urls[0]}{path}"),
+                Content = new StringContent("stringContent", Encoding.ASCII)
+            };
+            requestMessage.Headers.Authorization = new AuthenticationHeaderValue("BASIC", "test-A");
+            var result = await new HttpClient().SendAsync(requestMessage);
+
+            // Assert
+            (await result.Content.ReadAsStringAsync()).Should().Be("BASIC test-A");
+
+            var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
+            var authorizationHeader = receivedRequest.Headers["Authorization"].ToString().Should().Be("BASIC test-A");
+
+            server.Mappings.Should().HaveCount(2);
+            var authorizationRequestMessageHeaderMatcher = ((Request)server.Mappings.Single(m => !m.IsAdminInterface).RequestMatcher)
+                .GetRequestMessageMatcher<RequestMessageHeaderMatcher>(x => x.Matchers.Any(m => m.GetPatterns().Contains("BASIC test-A")));
+            authorizationRequestMessageHeaderMatcher.Should().NotBeNull();
         }
 
         [Fact]