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

Fix parsing Guid (#326)

Browse Source
This commit is contained in:
Stef Heyenrath
2019-08-20 19:22:25 +00:00
committed by GitHub
parent 4c74d1a4cc
commit 0edf858caa
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,7 +366,7 @@ namespace WireMock.Server
#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)
@@ -382,7 +382,7 @@ namespace WireMock.Server
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);
@@ -392,7 +392,7 @@ namespace WireMock.Server
private ResponseMessage MappingDelete(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminMappings.Length + 1));
Guid guid = ParseGuidFromRequestMessage(requestMessage);
if (DeleteMapping(guid))
{
@@ -401,6 +401,11 @@ namespace WireMock.Server
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
@@ -543,7 +548,7 @@ namespace WireMock.Server
#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)
@@ -559,7 +564,7 @@ namespace WireMock.Server
private ResponseMessage RequestDelete(RequestMessage requestMessage)
{
Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminRequests.Length + 1));
Guid guid = ParseGuidFromRequestMessage(requestMessage);
if (DeleteLogEntry(guid))
{