starred/WireMock.Net-wiremock
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-03-18 15:23:47 +01:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Add ClientIP to RequestMessage / RequestLog (#46)

Browse Source
This commit is contained in:
Stef Heyenrath
2017-09-18 20:01:38 +02:00
parent f776911ef8
commit 139ea77888
22 changed files with 414 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/WireMock.Net/Server/FluentMockServer.Admin.cs
View File

@@ -377,6 +377,7 @@ namespace WireMock.Server
Request = new LogRequestModel
{
DateTime = logEntry.RequestMessage.DateTime,
ClientIP = logEntry.RequestMessage.ClientIP,
Path = logEntry.RequestMessage.Path,
AbsoluteUrl = logEntry.RequestMessage.Url,
Query = logEntry.RequestMessage.Query,
@@ -451,6 +452,23 @@ namespace WireMock.Server
{
IRequestBuilder requestBuilder = Request.Create();
if (requestModel.ClientIP != null)
{
string clientIP = requestModel.ClientIP as string;
if (clientIP != null)
{
requestBuilder = requestBuilder.WithClientIP(clientIP);
}
else
{
var clientIPModel = JsonUtils.ParseJTokenToObject<ClientIPModel>(requestModel.ClientIP);
if (clientIPModel?.Matchers != null)
{
requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MappingConverter.Map).ToArray());
}
}
}
if (requestModel.Path != null)
{
string path = requestModel.Path as string;