Skip to content

AKV Trusted URL cleanup #3487

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
paulmedynski merged 2 commits into from
Jul 18, 2025
Merged

AKV Trusted URL cleanup #3487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f23617
- Removed unnecessary strings and console output from TrustedUrlsTest.
paulmedynski Jul 17, 2025
c821850
- Removed sensitive vault domains.
paulmedynski Jul 17, 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
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ internal static class Constants
"vault.azure.cn", // China
"vault.usgovcloudapi.net", // US Government
"vault.microsoftazure.de", // Azure Germany
"vault.cloudapi.microsoft.scloud", // USSec
"vault.cloudapi.eaglex.ic.gov", // USNat
"vault.sovcloud-api.fr", // France (Bleu)
"vault.sovcloud-api.de", // Germany (Delos)

Expand All @@ -26,8 +24,6 @@ internal static class Constants
"managedhsm.azure.cn",
"managedhsm.usgovcloudapi.net",
"managedhsm.microsoftazure.de",
"managedhsm.cloudapi.microsoft.scloud",
"managedhsm.cloudapi.eaglex.ic.gov",
"managedhsm.sovcloud-api.fr",
"managedhsm.sovcloud-api.de"
];
Expand Down
34 changes: 1 addition & 33 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TrustedUrlsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,6 @@ public TrustedUrlsTest()
System.Reflection.BindingFlags.Instance);
}

public const string InvalidVaultKeyPathErrorMessage =
@"Invalid Azure Key Vault key path specified: 'https://www.microsoft.com'. " +
"Valid trusted endpoints: " +
"vault.azure.net, " +
"vault.azure.cn, " +
"vault.usgovcloudapi.net, " +
"vault.microsoftazure.de, " +
"vault.cloudapi.microsoft.scloud, " +
"vault.cloudapi.eaglex.ic.gov, " +
"vault.sovcloud-api.fr, " +
"vault.sovcloud-api.de, " +
"managedhsm.azure.net, " +
"managedhsm.azure.cn, " +
"managedhsm.usgovcloudapi.net, " +
"managedhsm.microsoftazure.de, " +
"managedhsm.cloudapi.microsoft.scloud, " +
"managedhsm.cloudapi.eaglex.ic.gov, " +
"managedhsm.sovcloud-api.fr, " +
"managedhsm.sovcloud-api.de." +
@"\s+\(?Parameter (name: )?'?masterKeyPath('\))?";

private static string MakeUrl(string vault)
{
return $"https://{vault}/keys/dummykey/dummykeyid";
Expand All @@ -62,16 +41,12 @@ public static string MakeInvalidVaultErrorMessage(string url)
"vault.azure.cn, " +
"vault.usgovcloudapi.net, " +
"vault.microsoftazure.de, " +
"vault.cloudapi.microsoft.scloud, " +
"vault.cloudapi.eaglex.ic.gov, " +
"vault.sovcloud-api.fr, " +
"vault.sovcloud-api.de, " +
"managedhsm.azure.net, " +
"managedhsm.azure.cn, " +
"managedhsm.usgovcloudapi.net, " +
"managedhsm.microsoftazure.de, " +
"managedhsm.cloudapi.microsoft.scloud, " +
"managedhsm.cloudapi.eaglex.ic.gov, " +
"managedhsm.sovcloud-api.fr, " +
"managedhsm.sovcloud-api.de." +
@"\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
Expand All @@ -96,10 +71,7 @@ public void InvalidVaults(string vault)
// Unwrap the exception to get the actual ArgumentException thrown
var argEx = ex.InnerException as ArgumentException;
Assert.NotNull(argEx);
var expected = MakeInvalidVaultErrorMessage(url);
Console.WriteLine("Actual: " + argEx.Message);
Console.WriteLine("Expected: " + expected);
Assert.Matches(expected, argEx.Message);
Assert.Matches(MakeInvalidVaultErrorMessage(url), argEx.Message);
}
}

Expand All @@ -109,17 +81,13 @@ public void InvalidVaults(string vault)
[InlineData("vault.azure.cn")]
[InlineData("vault.usgovcloudapi.net")]
[InlineData("vault.microsoftazure.de")]
[InlineData("vault.cloudapi.microsoft.scloud")]
[InlineData("vault.cloudapi.eaglex.ic.gov")]
[InlineData("vault.sovcloud-api.fr")]
[InlineData("vault.sovcloud-api.de")]
// HSM vaults.
[InlineData("managedhsm.azure.net")]
[InlineData("managedhsm.azure.cn")]
[InlineData("managedhsm.usgovcloudapi.net")]
[InlineData("managedhsm.microsoftazure.de")]
[InlineData("managedhsm.cloudapi.microsoft.scloud")]
[InlineData("managedhsm.cloudapi.eaglex.ic.gov")]
[InlineData("managedhsm.sovcloud-api.fr")]
[InlineData("managedhsm.sovcloud-api.de")]
// Vaults with prefixes.
Expand Down
Loading