Skip to content

Address CodeQL alerts SM05137 and SM02184 in connect flow #132

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
mkrueger merged 2 commits into from
Jun 17, 2026
+4 −10
Merged

Address CodeQL alerts SM05137 and SM02184 in connect flow #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b334a23
Suppress CodeQL SM05137 on DefaultAzureCredential fallback
mkrueger Jun 16, 2026
bac5492
Remove redundant emulator cert-validation callback (SM02184)
mkrueger Jun 16, 2026
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
14 changes: 4 additions & 10 deletions CosmosDBShell/Azure.Data.Cosmos.Shell.Core/ShellInterpreter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ internal async Task ConnectAsync(string connectionString, string? loginHint = nu
{
WriteLine(MessageService.GetString("shell-connect-key-auth"));
var keyMode = mode ?? (isEmulator ? ConnectionMode.Gateway : ConnectionMode.Direct);
var keyOptions = CreateClientOptions(connectionString, keyMode);
var keyOptions = CreateClientOptions(keyMode);
client = new CosmosClient(connectionString, keyOptions);

AccountProperties keyProps;
Expand Down Expand Up @@ -700,7 +700,7 @@ internal async Task ConnectAsync(string connectionString, string? loginHint = nu

// Token-based auth paths
var requestedMode = mode ?? ConnectionMode.Direct;
var options = CreateClientOptions(connectionString, requestedMode);
var options = CreateClientOptions(requestedMode);

// Step 2: VisualStudioCodeCredential (when launched from VS Code extension)
if (client == null && useVSCodeCredential)
Expand Down Expand Up @@ -919,7 +919,7 @@ internal async Task ConnectAsync(string connectionString, string? loginHint = nu
dacOptions.AuthorityHost = authorityHostUri;
}

var dacCredential = new DefaultAzureCredential(dacOptions);
var dacCredential = new DefaultAzureCredential(dacOptions); // CodeQL [SM05137] Interactive developer CLI, not a hosted service: this is the last-resort fallback that adopts the developer's local identity (Azure CLI/azd, Visual Studio, env vars, or VM managed identity). No fixed service identity exists to pin to.
Comment thread
mkrueger marked this conversation as resolved.
client = new CosmosClient(endpoint, dacCredential, options);

try
Expand Down Expand Up @@ -1311,7 +1311,7 @@ protected virtual void Dispose(bool disposing)
return Console.ReadLine();
}

private static CosmosClientOptions CreateClientOptions(string connectionString, ConnectionMode requestedMode)
private static CosmosClientOptions CreateClientOptions(ConnectionMode requestedMode)
{
var options = new CosmosClientOptions
{
Expand All @@ -1327,12 +1327,6 @@ private static CosmosClientOptions CreateClientOptions(string connectionString,
},
};

// do not check certificates for emulator - work around on osx issue
if (ParsedDocDBConnectionString.IsLocalEmulatorEndpoint(connectionString))
{
options.ServerCertificateCustomValidationCallback = (cert, chain, errors) => true;
}

return options;
}

Expand Down
Loading