Skip to content

Fix MSI deserialization for empty Guid values #34136

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 1 commit into from
Feb 14, 2023
Merged

Fix MSI deserialization for empty Guid values #34136

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
2 changes: 2 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- Fixed `ManagedServiceIdentity` deserialization when services return empty string for `principalId` or `tenantId`.

### Other Changes

## 1.4.0 (2023-02-10)
Expand Down
14 changes: 7 additions & 7 deletions ...er/Azure.ResourceManager/src/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal static void Write(Utf8JsonWriter writer, ManagedServiceIdentity model,
JsonSerializer.Serialize(writer, model.ManagedServiceIdentityType, options);
if (Optional.IsCollectionDefined(model.UserAssignedIdentities))
{
writer.WritePropertyName("userAssignedIdentities");
writer.WritePropertyName("userAssignedIdentities"u8);
writer.WriteStartObject();
foreach (var item in model.UserAssignedIdentities)
{
Expand All @@ -48,32 +48,32 @@ internal static ManagedServiceIdentity DeserializeManagedServiceIdentity(JsonEle
Optional<IDictionary<ResourceIdentifier, UserAssignedIdentity>> userAssignedIdentities = default;
foreach (var property in element.EnumerateObject())
{
if (property.NameEquals("principalId"))
if (property.NameEquals("principalId"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
if (property.Value.ValueKind == JsonValueKind.Null || property.Value.GetString().Length == 0)
{
property.ThrowNonNullablePropertyIsNull();
continue;
}
principalId = property.Value.GetGuid();
continue;
}
if (property.NameEquals("tenantId"))
if (property.NameEquals("tenantId"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
if (property.Value.ValueKind == JsonValueKind.Null || property.Value.GetString().Length == 0)
{
property.ThrowNonNullablePropertyIsNull();
continue;
}
tenantId = property.Value.GetGuid();
continue;
}
if (property.NameEquals("type"))
if (property.NameEquals("type"u8))
{
type = JsonSerializer.Deserialize<ManagedServiceIdentityType>("{"+property.ToString()+"}", options);
continue;
}
if (property.NameEquals("userAssignedIdentities"))
if (property.NameEquals("userAssignedIdentities"u8))
{
if (property.Value.ValueKind == JsonValueKind.Null)
{
Expand Down
12 changes: 12 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager/tests/Unit/ManagedServiceIdentityTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ public void TestDeserializerInvalidType()
Assert.AreEqual("77563a98-c9d9-4f7b-a7af-592d21fa2153", user.Values.First().PrincipalId.ToString());
}

[TestCase]
public void TestDeserializerNoneWithEmptyStringIds()
{
var identityJsonProperty = DeserializerHelper("NoneEmptyStringIds.json");
#if DEBUG
Assert.Throws<JsonException>(delegate { ManagedServiceIdentity.DeserializeManagedServiceIdentity(identityJsonProperty.Value); });
#else
ManagedServiceIdentity back = ManagedServiceIdentity.DeserializeManagedServiceIdentity(identityJsonProperty.Value);
Assert.AreEqual(ManagedServiceIdentityType.None, back.ManagedServiceIdentityType);
#endif
}

[TestCase]
public void TestDeserializerValidInnerExtraField()
{
Expand Down
8 changes: 8 additions & 0 deletions ...ourcemanager/Azure.ResourceManager/tests/Unit/TestAssets/Identity/NoneEmptyStringIds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"identity": {
"principalId": "",
"tenantId": "",
"type": "None"
}
}