Skip to content

AKV Provider | Add new HSM endpoints #750

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
cheenamalhotra merged 3 commits into from
Oct 13, 2020
Merged

AKV Provider | Add new HSM endpoints #750

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
aa7f7b5
AKV Provider | Add new HSM endpoints
cheenamalhotra Oct 7, 2020
2709480
Merge branch 'master' into akvendpoints
cheenamalhotra Oct 8, 2020
0041eea
Merge branch 'master' into akvendpoints
cheenamalhotra Oct 8, 2020
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
9 changes: 6 additions & 3 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 @@ -24,8 +24,12 @@ internal static class Constants
@"vault.azure.net", // default
@"vault.azure.cn", // Azure China
@"vault.usgovcloudapi.net", // US Government
@"vault.microsoftazure.de" // Azure Germany
};
@"vault.microsoftazure.de", // Azure Germany
@"managedhsm.azure.net", // public HSM vault
@"managedhsm.azure.cn", // Azure China HSM vault
@"managedhsm.usgovcloudapi.net", // US Government HSM vault
@"managedhsm.microsoftazure.de" // Azure Germany HSM vault
};

/// <summary>
/// Always Encrypted Param names for exec handling
Expand All @@ -34,6 +38,5 @@ internal static class Constants
internal const string AeParamEncryptionAlgorithm = "encryptionAlgorithm";
internal const string AeParamMasterKeyPath = "masterKeyPath";
internal const string AeParamEncryptedCek = "encryptedColumnEncryptionKey";

}
}
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void NullAKVKeyPath()
public void InvalidCertificatePath()
{
string dummyPath = @"https://www.microsoft.com";
string errorMessage = $@"Invalid Azure Key Vault key path specified: '{dummyPath}'. Valid trusted endpoints: vault.azure.net, vault.azure.cn, vault.usgovcloudapi.net, vault.microsoftazure.de.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
string errorMessage = $@"Invalid Azure Key Vault key path specified: '{dummyPath}'. Valid trusted endpoints: vault.azure.net, vault.azure.cn, vault.usgovcloudapi.net, vault.microsoftazure.de, managedhsm.azure.net, managedhsm.azure.cn, managedhsm.usgovcloudapi.net, managedhsm.microsoftazure.de.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";

Exception ex1 = Assert.Throws<ArgumentException>(() => fixture.AkvStoreProvider.EncryptColumnEncryptionKey(dummyPath, MasterKeyEncAlgo, cek));
Assert.Matches(errorMessage, ex1.Message);
Expand Down