Skip to content

Commit

Permalink
Add more test for jca integration test. (Azure#21523)
Browse files Browse the repository at this point in the history
  • Loading branch information
@han-gao
han-gao authored Jun 2, 2021
1 parent 665efa5 commit d4836d4
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 73 deletions.
6 changes: 6 additions & 0 deletions sdk/keyvault/azure-security-keyvault-jca/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@
<version>3.9.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.6.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
6 changes: 6 additions & 0 deletions sdk/keyvault/azure-security-test-keyvault-jca/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,11 @@
<version>5.3.7</version> <!-- {x-version-update;org.springframework:spring-core;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.6.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ...urity-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/AuthClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void testGetAuthorizationToken() throws Exception {
AuthClient authClient = new AuthClient();
String result = authClient.getAccessToken(
"https://management.azure.com/",
System.getProperty("azure.keyvault.aad-authentication-url"),
null,
tenantId,
clientId,
URLEncoder.encode(clientSecret, "UTF-8")
Expand Down
13 changes: 5 additions & 8 deletions ...-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultCertificatesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static com.azure.security.keyvault.jca.PropertyConvertorUtils.SYSTEM_PROPERTIES;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* The JUnit test for the KeyVaultCertificates.
Expand Down Expand Up @@ -53,12 +55,7 @@ public class KeyVaultCertificatesTest {

@BeforeAll
public static void setEnvironmentProperty() {
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(
Arrays.asList("AZURE_KEYVAULT_URI",
"AZURE_KEYVAULT_TENANT_ID",
"AZURE_KEYVAULT_CLIENT_ID",
"AZURE_KEYVAULT_CLIENT_SECRET")
);
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(SYSTEM_PROPERTIES);
KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
Security.addProvider(provider);
certificateName = System.getenv("AZURE_KEYVAULT_CERTIFICATE_NAME");
Expand Down
3 changes: 2 additions & 1 deletion ...y-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

@EnabledIfEnvironmentVariable(named = "AZURE_KEYVAULT_CERTIFICATE_NAME", matches = "myalias")
public class KeyVaultClientTest {
Expand All @@ -26,7 +27,7 @@ public static void setEnvironmentProperty() {

@Test
public void testGetAliases() {
assertNotNull(keyVaultClient.getAliases());
assertTrue(keyVaultClient.getAliases().contains(certificateName));
}

@Test
Expand Down
9 changes: 2 additions & 7 deletions ...t-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultJcaProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import java.security.KeyStore;
import java.security.Security;
import java.util.Arrays;

import static com.azure.security.keyvault.jca.PropertyConvertorUtils.SYSTEM_PROPERTIES;
import static org.junit.jupiter.api.Assertions.assertNotNull;

/**
Expand All @@ -26,12 +26,7 @@ public class KeyVaultJcaProviderTest {
*/
@Test
public void testGetCertificate() throws Exception {
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(
Arrays.asList("AZURE_KEYVAULT_URI",
"AZURE_KEYVAULT_TENANT_ID",
"AZURE_KEYVAULT_CLIENT_ID",
"AZURE_KEYVAULT_CLIENT_SECRET")
);
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(SYSTEM_PROPERTIES);
Security.addProvider(new KeyVaultJcaProvider());
KeyStore keystore = PropertyConvertorUtils.getKeyVaultKeyStore();
assertNotNull(keystore.getCertificate(System.getenv("AZURE_KEYVAULT_CERTIFICATE_NAME")));
Expand Down
9 changes: 2 additions & 7 deletions ...st-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultKeyManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import java.security.NoSuchAlgorithmException;
import java.security.Security;
import java.security.cert.CertificateException;
import java.util.Arrays;

import static com.azure.security.keyvault.jca.PropertyConvertorUtils.SYSTEM_PROPERTIES;
import static org.junit.jupiter.api.Assertions.assertNotNull;

@EnabledIfEnvironmentVariable(named = "AZURE_KEYVAULT_CERTIFICATE_NAME", matches = "myalias")
Expand All @@ -26,12 +26,7 @@ public class KeyVaultKeyManagerTest {
@BeforeAll
public static void setEnvironmentProperty() throws KeyStoreException, NoSuchAlgorithmException, IOException,
CertificateException {
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(
Arrays.asList("AZURE_KEYVAULT_URI",
"AZURE_KEYVAULT_TENANT_ID",
"AZURE_KEYVAULT_CLIENT_ID",
"AZURE_KEYVAULT_CLIENT_SECRET")
);
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(SYSTEM_PROPERTIES);
KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
Security.addProvider(provider);
KeyStore keyStore = PropertyConvertorUtils.getKeyVaultKeyStore();
Expand Down
16 changes: 8 additions & 8 deletions ...test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultKeyStoreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Base64;

import static org.junit.jupiter.api.Assertions.*;
import static com.azure.security.keyvault.jca.PropertyConvertorUtils.SYSTEM_PROPERTIES;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* The JUnit tests for the KeyVaultKeyStore class.
Expand Down Expand Up @@ -57,12 +61,7 @@ public class KeyVaultKeyStoreTest {

@BeforeAll
public static void setEnvironmentProperty() {
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(
Arrays.asList("AZURE_KEYVAULT_URI",
"AZURE_KEYVAULT_TENANT_ID",
"AZURE_KEYVAULT_CLIENT_ID",
"AZURE_KEYVAULT_CLIENT_SECRET")
);
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(SYSTEM_PROPERTIES);
keystore = new KeyVaultKeyStore();
KeyVaultLoadStoreParameter parameter = new KeyVaultLoadStoreParameter(
System.getenv("AZURE_KEYVAULT_URI"),
Expand Down Expand Up @@ -174,6 +173,7 @@ public void testRefreshEngineGetCertificate() throws Exception {

@Test
public void testNotRefreshEngineGetCertificate() throws Exception {
System.setProperty("azure.keyvault.jca.refresh-certificates-when-have-un-trust-certificate", "false");
KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
Security.addProvider(provider);
KeyStore ks = PropertyConvertorUtils.getKeyVaultKeyStore();
Expand Down
30 changes: 0 additions & 30 deletions ...ult-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameterTest.java
View file

This file was deleted.

16 changes: 7 additions & 9 deletions ...ity-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/ServerSocketTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,23 @@
import org.apache.http.ssl.PrivateKeyStrategy;
import org.apache.http.ssl.SSLContexts;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;

import javax.net.ssl.*;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.TrustManagerFactory;
import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
import java.security.KeyStore;
import java.security.Security;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Map;

import static com.azure.security.keyvault.jca.PropertyConvertorUtils.SYSTEM_PROPERTIES;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
Expand All @@ -52,12 +55,7 @@ public static void beforeEach() throws Exception {
*/
KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
Security.addProvider(provider);
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(
Arrays.asList("AZURE_KEYVAULT_URI",
"AZURE_KEYVAULT_TENANT_ID",
"AZURE_KEYVAULT_CLIENT_ID",
"AZURE_KEYVAULT_CLIENT_SECRET")
);
PropertyConvertorUtils.putEnvironmentPropertyToSystemProperty(SYSTEM_PROPERTIES);

/**
* - Create an Azure Key Vault specific instance of a KeyStore.
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/test-resources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"subjectName": {
"type": "string",
"defaultValue": "CN=contoso.com"
"defaultValue": "CN=mydomain.com"
},
"utcValue": {
"type": "string",
Expand Down Expand Up @@ -259,7 +259,7 @@

$policy = New-AzKeyVaultCertificatePolicy -SubjectName $subjectName -IssuerName Self -ValidityInMonths 12 -Verbose

Add-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName -CertificatePolicy $policy -Verbose
Add-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName -CertificatePolicy $policy -Verbose

$newCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName

Expand Down

0 comments on commit d4836d4

Please sign in to comment.