Skip to content

Don't default to AzureMFA #2549

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
aasimkhan30 merged 3 commits into from
Dec 6, 2025
+29 −8
Merged

Don't default to AzureMFA #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
442a698
When parsing a connection string don't default to AzureMFA if the aut…
Dec 3, 2025
91c8692
Updating test, PR feedback
Benjin Dec 6, 2025
a205a9d
Merge branch 'main' into dev/allancascante/parse_connection_string_no…
Benjin Dec 6, 2025
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
21 changes: 18 additions & 3 deletions src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,15 +1750,30 @@ public ConnectionDetails ParseConnectionString(string connectionString)
{
SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);

string mappedAuthenticationType;
if (builder.IntegratedSecurity)
{
mappedAuthenticationType = "Integrated";
} else if (builder.Authentication == SqlAuthenticationMethod.ActiveDirectoryInteractive)
{
mappedAuthenticationType = "AzureMFA";
}
else if (builder.Authentication == SqlAuthenticationMethod.SqlPassword || builder.Authentication == SqlAuthenticationMethod.NotSpecified)
{
mappedAuthenticationType = "SqlLogin";
}
else
{
mappedAuthenticationType = builder.Authentication.ToString();
}

// Set defaults as per MSSQL connection property defaults, not SqlClient's Connection string buider defaults
ConnectionDetails details = new ConnectionDetails()
{
ApplicationIntent = defaultBuilder.ApplicationIntent != builder.ApplicationIntent ? builder.ApplicationIntent.ToString() : null,
ApplicationName = defaultBuilder.ApplicationName != builder.ApplicationName ? builder.ApplicationName : ApplicationName,
AttachDbFilename = defaultBuilder.AttachDBFilename != builder.AttachDBFilename ? builder.AttachDBFilename.ToString() : null,
AuthenticationType = builder.IntegratedSecurity ? "Integrated" :
((builder.Authentication == SqlAuthenticationMethod.SqlPassword || builder.Authentication == SqlAuthenticationMethod.NotSpecified)
? "SqlLogin" : "AzureMFA"),
AuthenticationType = mappedAuthenticationType,
ConnectRetryCount = defaultBuilder.ConnectRetryCount != builder.ConnectRetryCount ? builder.ConnectRetryCount : 1,
ConnectRetryInterval = defaultBuilder.ConnectRetryInterval != builder.ConnectRetryInterval ? builder.ConnectRetryInterval : 10,
ConnectTimeout = defaultBuilder.ConnectTimeout != builder.ConnectTimeout ? builder.ConnectTimeout : 30,
Expand Down
16 changes: 11 additions & 5 deletions test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,18 +1863,24 @@ public void ParseConnectionStringTest_AuthTypes()
details = service.ParseConnectionString(connectionString);
Assert.That(details.AuthenticationType, Is.EqualTo("Integrated"));

// AAD auth types boil down to AzureMFA
connectionString = "Server=tcp:{servername},1433;Initial Catalog={databasename};Authentication=ActiveDirectoryIntegrated;";
// AAD auth types
// ActiveDirectoryInteractive is mapped to to AzureMFA
connectionString = "Server=tcp:{servername},1433;Initial Catalog={databasename};Authentication=ActiveDirectoryInteractive;";
details = service.ParseConnectionString(connectionString);
Assert.That(details.AuthenticationType, Is.EqualTo("AzureMFA"));

connectionString = "Server=tcp:{servername},1433;Initial Catalog={databasename};Authentication=ActiveDirectoryInteractive;";
// Other AAD types are unchanged
connectionString = "Server=tcp:{servername},1433;Initial Catalog={databasename};Authentication=ActiveDirectoryIntegrated;";
details = service.ParseConnectionString(connectionString);
Assert.That(details.AuthenticationType, Is.EqualTo("AzureMFA"));
Assert.That(details.AuthenticationType, Is.EqualTo("ActiveDirectoryIntegrated"));

connectionString = "Server=tcp:{servername},1433;Initial Catalog={databasename};Authentication=ActiveDirectoryDefault;";
details = service.ParseConnectionString(connectionString);
Assert.That(details.AuthenticationType, Is.EqualTo("AzureMFA"));
Assert.That(details.AuthenticationType, Is.EqualTo("ActiveDirectoryDefault"));

// Invalid throws
connectionString = "Server=tcp:{servername},1433;Initial Catalog={databasename};Authentication=InvalidAuthType;";
Assert.Throws<ArgumentException>(() => service.ParseConnectionString(connectionString), "Invalid value for key 'authentication'.");
}

[Test]
Expand Down