[ELY-2774] Also make it possible to get the KeyStore type and location.

wildfly-security · Jun 27, 2024 · a5cea70 · a5cea70
1 parent 4119a7e
commit a5cea70
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/tests/common/src/test/java/org/wildfly/security/ssl/test/util/CAGenerationTool.java b/tests/common/src/test/java/org/wildfly/security/ssl/test/util/CAGenerationTool.java
@@ -144,6 +144,10 @@ public KeyStore getBeetlesKeyStore() {
         return loadKeyStore(new File(workingDir, BEETLES_STORE));
     }
 
+    public String getKeyStoreType() {
+        return KEYSTORE_TYPE;
+    }
+
     /**
      * @deprecated Use {@link CommonIdentity#getCertificate()} instead.
      */
@@ -364,8 +368,12 @@ private static KeyStore createEmptyKeyStore() {
         }
     }
 
+    File getKeyStoreFile(Identity identity) {
+        return new File(workingDir, identity.getKeyStoreName());
+    }
+
     KeyStore loadKeyStore(final Identity identity) {
-        return loadKeyStore(new File(workingDir, identity.getKeyStoreName()));
+        return loadKeyStore(getKeyStoreFile(identity));
     }
 
     static KeyStore loadKeyStore(final File location) {

diff --git a/tests/common/src/test/java/org/wildfly/security/ssl/test/util/CommonIdentity.java b/tests/common/src/test/java/org/wildfly/security/ssl/test/util/CommonIdentity.java
@@ -16,6 +16,7 @@
 
 package org.wildfly.security.ssl.test.util;
 
+import java.io.File;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -42,8 +43,14 @@ public X509Certificate getCertificate() {
         return certificate;
     }
 
+    public String getKeyStoreType() {
+        return caGenerationTool.getKeyStoreType();
+    }
+
     public abstract KeyStore loadKeyStore();
 
+    public abstract File getKeyStoreFile();
+
     public X509ExtendedKeyManager createKeyManager() {
         caGenerationTool.assertNotClosed();
 

diff --git a/tests/common/src/test/java/org/wildfly/security/ssl/test/util/CustomIdentity.java b/tests/common/src/test/java/org/wildfly/security/ssl/test/util/CustomIdentity.java
@@ -34,4 +34,9 @@ public KeyStore loadKeyStore() {
         return CAGenerationTool.loadKeyStore(keyStoreFile);
     }
 
+    @Override
+    public File getKeyStoreFile() {
+        return keyStoreFile;
+    }
+
 }
diff --git a/tests/common/src/test/java/org/wildfly/security/ssl/test/util/DefinedIdentity.java b/tests/common/src/test/java/org/wildfly/security/ssl/test/util/DefinedIdentity.java
@@ -16,6 +16,7 @@
 
 package org.wildfly.security.ssl.test.util;
 
+import java.io.File;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 
@@ -38,4 +39,9 @@ public KeyStore loadKeyStore() {
         return caGenerationTool.loadKeyStore(identity);
     }
 
+    @Override
+    public File getKeyStoreFile() {
+        return caGenerationTool.getKeyStoreFile(identity);
+    }
+
 }