Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Parsing Guid in PUT Mapping #326

Merged
merged 1 commit into from
Aug 20, 2019
Merged

Fix Parsing Guid in PUT Mapping #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/WireMock.Net/Server/FluentMockServer.Admin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ private ResponseMessage SettingsUpdate(RequestMessage requestMessage)
#region Mapping/{guid}
private ResponseMessage MappingGet(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminMappings.Length + 1));
Guid guid = ParseGuidFromRequestMessage(requestMessage);
var mapping = Mappings.FirstOrDefault(m => !m.IsAdminInterface && m.Guid == guid);

if (mapping == null)
Expand All @@ -382,7 +382,7 @@ private ResponseMessage MappingGet(RequestMessage requestMessage)

private ResponseMessage MappingPut(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.TrimStart(AdminMappings.ToCharArray()));
Guid guid = ParseGuidFromRequestMessage(requestMessage);

var mappingModel = DeserializeObject<MappingModel>(requestMessage);
Guid? guidFromPut = DeserializeAndAddOrUpdateMapping(mappingModel, guid);
Expand All @@ -392,7 +392,7 @@ private ResponseMessage MappingPut(RequestMessage requestMessage)

private ResponseMessage MappingDelete(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminMappings.Length + 1));
Guid guid = ParseGuidFromRequestMessage(requestMessage);

if (DeleteMapping(guid))
{
Expand All @@ -401,6 +401,11 @@ private ResponseMessage MappingDelete(RequestMessage requestMessage)

return ResponseMessageBuilder.Create("Mapping not found", 404);
}

private Guid ParseGuidFromRequestMessage(RequestMessage requestMessage)
{
return Guid.Parse(requestMessage.Path.Substring(AdminMappings.Length + 1));
}
#endregion Mapping/{guid}

#region Mappings
Expand Down Expand Up @@ -543,7 +548,7 @@ private ResponseMessage MappingsDelete(RequestMessage requestMessage)
#region Request/{guid}
private ResponseMessage RequestGet(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminRequests.Length + 1));
Guid guid = ParseGuidFromRequestMessage(requestMessage);
var entry = LogEntries.FirstOrDefault(r => !r.RequestMessage.Path.StartsWith("/__admin/") && r.Guid == guid);

if (entry == null)
Expand All @@ -559,7 +564,7 @@ private ResponseMessage RequestGet(RequestMessage requestMessage)

private ResponseMessage RequestDelete(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminRequests.Length + 1));
Guid guid = ParseGuidFromRequestMessage(requestMessage);

if (DeleteLogEntry(guid))
{
Expand Down
37 changes: 34 additions & 3 deletions test/WireMock.Net.Tests/FluentMockServerAdminRestClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using Moq;
using NFluent;
using RestEase;
using System;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using Moq;
using NFluent;
using RestEase;
using WireMock.Admin.Mappings;
using WireMock.Admin.Settings;
using WireMock.Client;
Expand Down Expand Up @@ -57,6 +58,36 @@ public async Task IFluentMockServerAdmin_PutSettingsAsync()
Check.That(status.Status).Equals("Settings updated");
}

// https://github.com/WireMock-Net/WireMock.Net/issues/325
[Fact]
public async Task IFluentMockServerAdmin_PutMappingAsync()
{
// Arrange
var server = FluentMockServer.StartWithAdminInterface();
var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);

// Act
var model = new MappingModel
{
Request = new RequestModel { Path = "/1" },
Response = new ResponseModel { Body = "txt", StatusCode = 200 },
Priority = 500,
Title = "test"
};
var result = await api.PutMappingAsync(new Guid("a0000000-0000-0000-0000-000000000000"), model);

// Assert
Check.That(result).IsNotNull();
Check.That(result.Status).Equals("Mapping added or updated");
Check.That(result.Guid).IsNotNull();

var mapping = server.Mappings.Single(m => m.Priority == 500);
Check.That(mapping).IsNotNull();
Check.That(mapping.Title).Equals("test");

server.Stop();
}

[Fact]
public async Task IFluentMockServerAdmin_PostMappingAsync()
{
Expand Down