1.0.6.1

CHANGELOG.md

@@ -1,8 +1,15 @@
+# 1.0.6.1 (10 January 2019)
+- [#247](https://github.com/WireMock-Net/WireMock.Net/pull/247) - Issue 225 improve logging in example for wire mock as windows service contributed by [paulssn](https://github.com/paulssn)
+- [#249](https://github.com/WireMock-Net/WireMock.Net/pull/249) - Fixed "Content-Type multipart/form-data" [bug] contributed by [StefH](https://github.com/StefH)
+- [#225](https://github.com/WireMock-Net/WireMock.Net/issues/225) - Feature: Improve logging in example for WireMock as Windows Service [feature]
+- [#238](https://github.com/WireMock-Net/WireMock.Net/issues/238) - Localhost and free port problem [question]
+- [#245](https://github.com/WireMock-Net/WireMock.Net/issues/245) - Not able to match XML request body using XPathMatcher pattern [question]
+- [#248](https://github.com/WireMock-Net/WireMock.Net/issues/248) - Content-Type multipart/form-data is not seen as byte[] anymore
+
 # 1.0.6 (15 December 2018)
 - [#242](https://github.com/WireMock-Net/WireMock.Net/pull/242) - Post multiple Mappings [feature] contributed by [StefH](https://github.com/StefH)
 - [#237](https://github.com/WireMock-Net/WireMock.Net/issues/237) - Port not released [question]
 - [#239](https://github.com/WireMock-Net/WireMock.Net/issues/239) - Not able to hit the mock server if AllowPartialMapping is not set to true [question]
-- [#240](https://github.com/WireMock-Net/WireMock.Net/issues/240) - How to submit mappings for multiple request, responses [feature]
 
 # 1.0.5 (07 December 2018)
 - [#236](https://github.com/WireMock-Net/WireMock.Net/pull/236) - Add Random Regex (using Fare) [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.6</VersionPrefix>
+    <VersionPrefix>1.0.6.1</VersionPrefix>
   </PropertyGroup>
 
   <Choose>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.6
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.6.1

examples/WireMock.Net.Service/Program.cs

@@ -1,6 +1,8 @@
-using System;
+using log4net.Config;
+using System;
+using System.IO;
 using System.ServiceProcess;
-using WireMock.Logging;
+using WireMock.Net.Service;
 using WireMock.Net.StandAlone;
 using WireMock.Server;
 using WireMock.Settings;
@@ -21,7 +23,7 @@ namespace Wiremock.Net.Service
 
             protected override void OnStart(string[] args)
             {
-                Start(new WireMockNullLogger());
+                Start();
             }
 
             protected override void OnStop()
@@ -35,6 +37,11 @@ namespace Wiremock.Net.Service
 
         static void Main(string[] args)
         {
+            //Setting the current directory explicitly is required if the application is running as Windows Service, 
+            //as the current directory of a Windows Service is %WinDir%\System32 per default.
+            Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
+            XmlConfigurator.ConfigureAndWatch(new FileInfo("log4net.config"));
+
             // running as service
             if (!Environment.UserInteractive)
             {
@@ -46,7 +53,7 @@ namespace Wiremock.Net.Service
             else
             {
                 // running as console app
-                Start(new WireMockConsoleLogger());
+                Start();
 
                 Console.WriteLine("Press any key to stop...");
                 Console.ReadKey(true);
@@ -55,14 +62,14 @@ namespace Wiremock.Net.Service
             }
         }
 
-        private static void Start(IWireMockLogger logger)
+        private static void Start()
         {
             _server = StandAloneApp.Start(new FluentMockServerSettings
             {
                 Urls = new[] { "http://*:9091/" },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
-                Logger = logger
+                Logger = new WireMockLog4NetLogger()
             });
         }
 

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -35,6 +35,9 @@
     <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
     </Reference>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
@@ -96,9 +99,13 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WireMockLog4NetLogger.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Service-Start.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

examples/WireMock.Net.Service/WireMockLog4NetLogger.cs

@@ -0,0 +1,39 @@
+using log4net;
+using Newtonsoft.Json;
+using Wiremock.Net.Service;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+
+namespace WireMock.Net.Service
+{
+    internal class WireMockLog4NetLogger : IWireMockLogger
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        public void Debug(string formatString, params object[] args)
+        {
+            Log.DebugFormat(formatString, args);
+        }
+
+        public void Info(string formatString, params object[] args)
+        {
+            Log.InfoFormat(formatString, args);
+        }
+
+        public void Warn(string formatString, params object[] args)
+        {
+            Log.WarnFormat(formatString, args);
+        }
+
+        public void Error(string formatString, params object[] args)
+        {
+            Log.ErrorFormat(formatString, args);
+        }
+
+        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+        {
+            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+            Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
+        }
+    }
+}

examples/WireMock.Net.Service/log4net.config

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <file value="log.txt" />
+      <appendToFile value="true" />
+      <rollingStyle value="Size" />
+      <maxSizeRollBackups value="10" />
+      <maximumFileSize value="10000KB" />
+      <staticLogFileName value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender" >
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+      <appender-ref ref="RollingLogFileAppender" />
+      <!--<appender-ref ref="EventLogAppender" /> --> <!-- comment in if needed -->
+    </root>
+  </log4net>
+</configuration>

examples/WireMock.Net.Service/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />

src/WireMock.Net/Util/BodyParser.cs

@@ -1,11 +1,11 @@
-using System;
+using JetBrains.Annotations;
+using MimeKit;
+using Newtonsoft.Json;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
-using MimeKit;
-using Newtonsoft.Json;
 using WireMock.Matchers;
 using WireMock.Validation;
 
@@ -28,6 +28,10 @@ namespace WireMock.Util
         */
         private static readonly string[] AllowedBodyParseMethods = { "PUT", "POST", "OPTIONS", "PATCH" };
 
+        private static readonly IStringMatcher[] MultipartContentTypesMatchers = {
+            new WildcardMatcher("multipart/*", true)
+        };
+
         private static readonly IStringMatcher[] JsonContentTypesMatchers = {
             new WildcardMatcher("application/json", true),
             new WildcardMatcher("application/vnd.*+json", true)
@@ -68,6 +72,11 @@ namespace WireMock.Util
                 return BodyType.Json;
             }
 
+            if (MultipartContentTypesMatchers.Any(matcher => MatchScores.IsPerfect(matcher.IsMatch(contentType.MimeType))))
+            {
+                return BodyType.MultiPart;
+            }
+
             return BodyType.Bytes;
         }
 
@@ -82,6 +91,12 @@ namespace WireMock.Util
                 DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(contentType)
             };
 
+            // In case of MultiPart: never try to read as String but keep as-is
+            if (data.DetectedBodyTypeFromContentType == BodyType.MultiPart)
+            {
+                return data;
+            }
+
             // Try to get the body as String
             try
             {

src/WireMock.Net/Util/BodyType.cs

@@ -28,6 +28,11 @@
         /// <summary>
         /// Body is a File
         /// </summary>
-        File
+        File,
+
+        /// <summary>
+        /// Body is a MultiPart
+        /// </summary>
+        MultiPart
     }
 }

test/WireMock.Net.Tests/Util/BodyParserTests.cs

@@ -1,7 +1,7 @@
-using System.IO;
+using NFluent;
+using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using NFluent;
 using WireMock.Util;
 using Xunit;
 
@@ -17,7 +17,7 @@ namespace WireMock.Net.Tests.Util
         [InlineData("application/vnd.test+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
         public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bodyAsJson, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            // Assign
+            // Arrange
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsJson));
 
             // Act
@@ -36,7 +36,7 @@ namespace WireMock.Net.Tests.Util
         [InlineData("something", "hello", BodyType.String, BodyType.Bytes)]
         public async Task BodyParser_Parse_ContentTypeString(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            // Assign
+            // Arrange
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
 
             // Act
@@ -50,11 +50,49 @@ namespace WireMock.Net.Tests.Util
             Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
         }
 
+        [Fact]
+        public async Task BodyParser_Parse_ContentTypeMultipart()
+        {
+            // Arrange
+            string contentType = "multipart/form-data";
+            string body = @"
+
+-----------------------------9051914041544843365972754266
+Content-Disposition: form-data; name=""text""
+
+text default
+-----------------------------9051914041544843365972754266
+Content-Disposition: form-data; name=""file1""; filename=""a.txt""
+Content-Type: text/plain
+
+Content of a txt
+
+-----------------------------9051914041544843365972754266
+Content-Disposition: form-data; name=""file2""; filename=""a.html""
+Content-Type: text/html
+
+<!DOCTYPE html><title>Content of a.html.</title>
+
+-----------------------------9051914041544843365972754266--";
+
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(body));
+
+            // Act
+            var result = await BodyParser.Parse(memoryStream, contentType);
+
+            // Assert
+            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
+            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
+            Check.That(result.BodyAsBytes).IsNotNull();
+            Check.That(result.BodyAsJson).IsNull();
+            Check.That(result.BodyAsString).IsNull();
+        }
+
         [Theory]
         [InlineData(null, "hello", BodyType.String, BodyType.Bytes)]
         public async Task BodyParser_Parse_ContentTypeIsNull(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            // Assign
+            // Arrange
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
 
             // Act