Skip to content

Minimize exceptions thrown from BodyKeySanitizer #8313

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

Merged
merged 2 commits into from
May 28, 2024
Merged

Minimize exceptions thrown from BodyKeySanitizer #8313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a964a3
dont attempt to parse bodys that aren't marked as json. avoid throwin…
scbedd May 21, 2024
d8e94f2
cleanup usings
scbedd May 21, 2024
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
28 changes: 15 additions & 13 deletions tools/test-proxy/Azure.Sdk.Tools.TestProxy/Sanitizers/BodyKeySanitizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Net;

namespace Azure.Sdk.Tools.TestProxy.Sanitizers
{
Expand Down Expand Up @@ -44,25 +43,28 @@ public BodyKeySanitizer(string jsonPath, string value = "Sanitized", string rege
public override string SanitizeTextBody(string contentType, string body)
{
bool sanitized = false;
JToken jsonO;
JToken jsonO = null;

try
if (contentType.ToLower().Contains("json"))
{
// Prevent default behavior where JSON.NET will convert DateTimeOffset
// into a DateTime.
if (!LegacyConvertJsonDateTokens)
try
{
jsonO = JsonConvert.DeserializeObject<JToken>(body, SerializerSettings);
// Prevent default behavior where JSON.NET will convert DateTimeOffset
// into a DateTime.
if (!LegacyConvertJsonDateTokens)
{
jsonO = JsonConvert.DeserializeObject<JToken>(body, SerializerSettings);
}
else
{
jsonO = JToken.Parse(body);
}
}
else
catch (JsonReaderException)
{
jsonO = JToken.Parse(body);
return body;
}
}
catch(JsonReaderException)
{
return body;
}

if (jsonO != null)
{
Expand Down