yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for invalid state in JsonBlockValueConverter when an unused layout has a nested array (#19363)

Browse Source 
* Fix for invalid state in JsonBlockValueConverter when an unused layout has a nested array

* Improved comments as suggested by copilot review, also fixed code style miss

* Added check for malformed JSON with more closing array tokens then opening tokens
This commit is contained in:
Karl-Johan Sjögren
2025-05-20 11:07:50 +02:00
committed by GitHub
parent ea8ec4e375
commit ec6a38e052
2 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Infrastructure/Serialization/JsonBlockValueConverter.cs
View File

@@ -189,9 +189,36 @@ public class JsonBlockValueConverter : JsonConverter<BlockValue>
else
{
// ignore this layout - forward the reader to the end of the array and look for the next one
while (reader.TokenType is not JsonTokenType.EndArray)
// Read past the current StartArray token before we start counting
_ = reader.Read();
// Keep track of the number of open arrays to ensure we find the correct EndArray token
var openCount = 0;
while (true)
{
reader.Read();
if (reader.TokenType is JsonTokenType.EndArray && openCount == 0)
{
break;
}
if (reader.TokenType is JsonTokenType.StartArray)
{
openCount++;
}
else if (reader.TokenType is JsonTokenType.EndArray)
{
openCount--;
if (openCount < 0)
{
throw new JsonException($"Malformed JSON: Encountered more closing array tokens than opening ones while processing block editor alias: {blockEditorAlias}.");
}
}
if (!reader.Read())
{
throw new JsonException($"Unexpected end of JSON while looking for the end of the layout items array for block editor alias: {blockEditorAlias}.");
}
}
}
}

29
tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonBlockValueConverterTests.cs
View File

@@ -441,4 +441,33 @@ public class JsonBlockValueConverterTests
Assert.AreEqual(settingsElementKey1, layoutItems.First().SettingsKey);
});
}
[Test]
public void Try_Deserialize_Unknown_Block_Layout_With_Nested_Array()
{
var json = """
{
"layout": {
"Umbraco.BlockGrid": [{
"contentUdi": "umb://element/1304E1DDAC87439684FE8A399231CB3D",
"rowSpan": 1,
"areas": [],
"columnSpan": 12
}
],
"Umbraco.BlockList": [{
"contentUdi": "umb://element/1304E1DDAC87439684FE8A399231CB3D"
}
],
"Some.Custom.BlockEditor": [{
"contentUdi": "umb://element/1304E1DDAC87439684FE8A399231CB3D"
}
]
}
}
""";
var serializer = new SystemTextJsonSerializer();
Assert.DoesNotThrow(() => serializer.Deserialize<BlockListValue>(json));
}
}