Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions JsonMasking.Tests/JsonMaskingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Nodes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace JsonMasking.Tests
Expand Down Expand Up @@ -334,6 +335,39 @@ public static void MaskFields_Should_Mask_Partial_With_Single_Field()
Assert.Equal(EXPECTED_VALUE, result.Replace("\r\n", "\n"));
}


[Fact]
public static void MaskFields_Should_Mask_With_Array()
{
// arrange
const string EXPECTED_VALUE = "[{\n \"Test\": \"1\",\n \"Card\": {\n \"Number\": \"462294*****9865\",\n \"Password\": \"somepass#here2\"\n }\n}]";

var blacklistPartialMock = BlacklistPartialMock.DefaultBlackListPartial;

var obj = new
{
Test = "1",
Card = new
{
Number = "4622943127049865",
Password = "somepass#here2"
}
};

var arr = new object[1] { obj };

var json = JsonSerializer.Serialize(arr, IndentedOptions);
string[] blacklist = { "*card.number" };
var mask = "----";

// act
var result = json.MaskFields(blacklist, mask, blacklistPartialMock);

// assert
Assert.True(JToken.DeepEquals(JToken.Parse(EXPECTED_VALUE), JToken.Parse(result)));
}


[Fact]
public static void MaskFields_Should_Mask_Partial_And_Completely_With_Single_Field()
{
Expand Down
18 changes: 8 additions & 10 deletions JsonMasking/JsonMasking.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,15 @@ public static string MaskFields(this string json, string[] blacklist, string mas
{
for (int i = 0; i < jsonArray.Count; i++)
{
MaskFieldsFromJsonNode(jsonArray[i], blacklist, mask, i.ToString());
JsonNode jsonNode = jsonArray[i];
MaskFieldsFromJsonNode(jsonNode, blacklist, mask, blacklistPartial, i.ToString());
}

return deserializedObject.ToString();
}

var jsonObject = deserializedObject.AsObject();

if (blacklistPartial != null)
{
MaskFieldsFromJsonNode(jsonObject, blacklist, mask, blacklistPartial, "");
}
else
{
MaskFieldsFromJsonNode(jsonObject, blacklist, mask, "");
}
MaskFieldsFromJsonNode(jsonObject, blacklist, mask, blacklistPartial, "");

return jsonObject.ToString();
}
Expand Down Expand Up @@ -126,6 +119,11 @@ private static void MaskFieldsFromJsonNode(JsonNode node, string[] blacklist, st
return; // abort recursive
}

if (blacklistPartial == null)
{
blacklistPartial = new Dictionary<string, Func<string, string>>();
}

if (node is JsonObject jsonObject)
{
var propertiesToMask = new List<(string key, string path)>();
Expand Down