Skip to content

Sanitize JSON output before parsing in ClientAppValidator #147

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
sellakumaran merged 1 commit into from
Jan 9, 2026
Merged

Sanitize JSON output before parsing in ClientAppValidator #147

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
22 changes: 15 additions & 7 deletions src/Microsoft.Agents.A365.DevTools.Cli/Services/ClientAppValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.Agents.A365.DevTools.Cli.Constants;
using Microsoft.Agents.A365.DevTools.Cli.Exceptions;
using Microsoft.Agents.A365.DevTools.Cli.Helpers;
using Microsoft.Agents.A365.DevTools.Cli.Services.Helpers;
using Microsoft.Extensions.Logging;
using System.Text.Json;
using System.Text.Json.Nodes;
Expand Down Expand Up @@ -168,7 +169,8 @@ public async Task EnsureRedirectUrisAsync(
return;
}

var response = JsonNode.Parse(appCheckResult.StandardOutput);
var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(appCheckResult.StandardOutput);
var response = JsonNode.Parse(sanitizedOutput);
var apps = response?["value"]?.AsArray();

if (apps == null || apps.Count == 0)
Expand Down Expand Up @@ -307,7 +309,8 @@ public async Task EnsureRedirectUrisAsync(
}
}

var appResponse = JsonNode.Parse(appCheckResult.StandardOutput);
var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(appCheckResult.StandardOutput);
var appResponse = JsonNode.Parse(sanitizedOutput);
var apps = appResponse?["value"]?.AsArray();

if (apps == null || apps.Count == 0)
Expand Down Expand Up @@ -409,7 +412,8 @@ private async Task<Dictionary<string, string>> ResolvePermissionIdsAsync(string
return permissionNameToIdMap;
}

var graphSpResponse = JsonNode.Parse(graphSpResult.StandardOutput);
var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(graphSpResult.StandardOutput);
var graphSpResponse = JsonNode.Parse(sanitizedOutput);
var graphSps = graphSpResponse?["value"]?.AsArray();

if (graphSps == null || graphSps.Count == 0)
Expand Down Expand Up @@ -470,7 +474,8 @@ private async Task<HashSet<string>> GetConsentedPermissionsAsync(string clientAp
return consentedPermissions;
}

var spResponse = JsonNode.Parse(spCheckResult.StandardOutput);
var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(spCheckResult.StandardOutput);
var spResponse = JsonNode.Parse(sanitizedOutput);
var servicePrincipals = spResponse?["value"]?.AsArray();

if (servicePrincipals == null || servicePrincipals.Count == 0)
Expand Down Expand Up @@ -499,7 +504,8 @@ private async Task<HashSet<string>> GetConsentedPermissionsAsync(string clientAp
return consentedPermissions;
}

var grantsResponse = JsonNode.Parse(grantsResult.StandardOutput);
var sanitizedGrantsOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(grantsResult.StandardOutput);
var grantsResponse = JsonNode.Parse(sanitizedGrantsOutput);
var grants = grantsResponse?["value"]?.AsArray();

if (grants == null || grants.Count == 0)
Expand Down Expand Up @@ -549,7 +555,8 @@ private async Task<bool> ValidateAdminConsentAsync(string clientAppId, string gr
return true; // Best-effort check - will be verified during first interactive authentication
}

var spResponse = JsonNode.Parse(spCheckResult.StandardOutput);
var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(spCheckResult.StandardOutput);
var spResponse = JsonNode.Parse(sanitizedOutput);
var servicePrincipals = spResponse?["value"]?.AsArray();

if (servicePrincipals == null || servicePrincipals.Count == 0)
Expand Down Expand Up @@ -579,7 +586,8 @@ private async Task<bool> ValidateAdminConsentAsync(string clientAppId, string gr
return true; // Best-effort check
}

var grantsResponse = JsonNode.Parse(grantsCheckResult.StandardOutput);
var sanitizedGrantsOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(grantsCheckResult.StandardOutput);
var grantsResponse = JsonNode.Parse(sanitizedGrantsOutput);
var grants = grantsResponse?["value"]?.AsArray();

if (grants == null || grants.Count == 0)
Expand Down
Loading