Skip to content
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

Jump to bottom

Service principal cert test update for internal pipelines #2440

Merged
merged 4 commits into from
Jun 6, 2024
Merged

Service principal cert test update for internal pipelines #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7791c1a
Updated entra auth service principal cert tests to use specific servi…
tkyc Jun 4, 2024
b8fb71e
Additional test update
tkyc Jun 4, 2024
93f5f61
Test update
tkyc Jun 5, 2024
17ccc10
Test update
tkyc Jun 5, 2024
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
12 changes: 6 additions & 6 deletions src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ public void testActiveDirectoryPasswordFailureOnSubsequentConnectionsWithInvalid
public void testAADServicePrincipalCertAuthFailureOnSubsequentConnectionsWithInvalidatedTokenCacheWithInvalidPassword() throws Exception {
// Should succeed on valid cert field values
String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication="
+ SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + applicationClientID
+ ";password=" + certificatePassword + ";clientCertificate=" + clientCertificate;
+ SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + servicePrincipalCertificateApplicationClientId
+ ";clientCertificate=" + clientCertificate;

// Should fail on invalid cert field values
String invalidPasswordUrl = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase
Expand Down Expand Up @@ -428,8 +428,8 @@ public void testAADServicePrincipalAuthWrong() {
public void testAADServicePrincipalCertAuth() {
// certificate from AKV has no password
String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication="
+ SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + applicationClientID
+ ";password=" + certificatePassword + ";clientCertificate=" + clientCertificate;
+ SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + servicePrincipalCertificateApplicationClientId
+ ";clientCertificate=" + clientCertificate;
String urlEncrypted = url + ";encrypt=false;trustServerCertificate=true;";

SQLServerDataSource ds = new SQLServerDataSource();
Expand All @@ -450,7 +450,7 @@ public void testAADServicePrincipalCertAuth() {
@Test
public void testAADServicePrincipalCertAuthWrong() {
String baseUrl = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication="
+ SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";userName=" + applicationClientID;
+ SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";userName=" + servicePrincipalCertificateApplicationClientId;

// no certificate provided.
String url = baseUrl;
Expand All @@ -469,7 +469,7 @@ public void testAADServicePrincipalCertAuthWrong() {
validateException(url, "R_readCertError");

// wrong certificate key or password
url = baseUrl + "password=" + azurePassword + ";clientCertificate=" + clientCertificate + ";clientKey=wrongKey;"
url = baseUrl + ";password=" + azurePassword + ";clientCertificate=" + clientCertificate + ";clientKey=wrongKey;"
+ "clientPassword=wrongPassword";
validateException(url, "R_readCertError");
}
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public abstract class AbstractTest {

protected static String applicationClientID = null;
protected static String applicationKey = null;
protected static String servicePrincipalCertificateApplicationClientId = null;
protected static String tenantID;
protected static String[] keyIDs = null;

Expand Down Expand Up @@ -162,6 +163,7 @@ public static void setup() throws Exception {
applicationClientID = getConfiguredProperty("applicationClientID");
applicationKey = getConfiguredProperty("applicationKey");
tenantID = getConfiguredProperty("tenantID");
servicePrincipalCertificateApplicationClientId = getConfiguredProperty("servicePrincipalCertificateApplicationClientId");

accessTokenClientId = getConfiguredProperty("accessTokenClientId");
accessTokenSecret = getConfiguredProperty("accessTokenSecret");
Expand Down
Loading