Replace FileHelper.getAbsoluteFilePathFromClassPath with ClassLoader.getResource for resource resolution and updated keystore file extensions to avoid double endings.

Signed-off-by: Iwan Igonin <iigonin@sternad.de>
Co-authored-by: Benny Goerzig <benny.goerzig@sap.com>
Co-authored-by: Karsten Schnitter <k.schnitter@sap.com>
Co-authored-by: Kai Sternad <k.sternad@sternad.de>

Author: 4 people

src/test/java/org/opensearch/security/InitializationIntegrationTests.java

@@ -140,7 +140,7 @@ public void testWhoAmI() throws Exception {
             true
         );
 
-        try (RestHighLevelClient restHighLevelClient = getRestClient(clusterInfo, "spock-keystore.jks", "truststore.jks")) {
+        try (RestHighLevelClient restHighLevelClient = getRestClient(clusterInfo, "spock-keystore", "truststore")) {
             Response whoAmIRes = restHighLevelClient.getLowLevelClient().performRequest(new Request("GET", "/_plugins/_security/whoami"));
             assertThat(200, is(whoAmIRes.getStatusLine().getStatusCode()));
             // Should be using HTTP/2 by default
@@ -170,8 +170,8 @@ public void testWhoAmIForceHttp1() throws Exception {
         try (
             RestHighLevelClient restHighLevelClient = getRestClient(
                 clusterInfo,
-                "spock-keystore.jks",
-                "truststore.jks",
+                "spock-keystore",
+                "truststore",
                 HttpVersionPolicy.FORCE_HTTP_1
             )
         ) {

src/test/java/org/opensearch/security/auditlog/compliance/ComplianceAuditlogTest.java

@@ -278,7 +278,7 @@ public void testInternalConfig() throws Exception {
             "audit"
         );
         final List<AuditMessage> messages = TestAuditlogImpl.doThenWaitForMessages(() -> {
-            try (RestHighLevelClient restHighLevelClient = getRestClient(clusterInfo, "kirk-keystore.jks", "truststore.jks")) {
+            try (RestHighLevelClient restHighLevelClient = getRestClient(clusterInfo, "kirk-keystore", "truststore")) {
                 for (IndexRequest ir : new DynamicSecurityConfig().setSecurityRoles("roles_2.yml").getDynamicConfig(getResourceFolder())) {
                     restHighLevelClient.index(ir, RequestOptions.DEFAULT);
                     GetResponse getDocumentResponse = restHighLevelClient.get(new GetRequest(ir.index(), ir.id()), RequestOptions.DEFAULT);

src/test/java/org/opensearch/security/system_indices/AbstractSystemIndicesTests.java

@@ -152,7 +152,7 @@ void createSnapshots() {
 
     RestHelper superAdminRestHelper() {
         RestHelper restHelper = restHelper();
-        restHelper.keystore = "kirk-keystore.jks";
+        restHelper.keystore = "kirk-keystore";
         restHelper.enableHTTPClientSSL = true;
         restHelper.trustHTTPServerCertificate = true;
         restHelper.sendAdminCertificate = true;

src/test/java/org/opensearch/security/test/DynamicSecurityConfig.java

@@ -152,7 +152,7 @@ public List<IndexRequest> getDynamicConfig(String folder) {
             );
         }
 
-        if (null != FileHelper.getAbsoluteFilePathFromClassPath(prefix + securityNodesDn)) {
+        if (DynamicSecurityConfig.class.getClassLoader().getResource(prefix + securityNodesDn) != null) {
             ret.add(
                 new IndexRequest(securityIndexName).id(CType.NODESDN.toLCString())
                     .setRefreshPolicy(RefreshPolicy.IMMEDIATE)
@@ -162,7 +162,7 @@ public List<IndexRequest> getDynamicConfig(String folder) {
         }
 
         final String allowlistYmlFile = prefix + securityAllowlist;
-        if (null != FileHelper.getAbsoluteFilePathFromClassPath(allowlistYmlFile)) {
+        if (DynamicSecurityConfig.class.getClassLoader().getResource(allowlistYmlFile) != null) {
             ret.add(
                 new IndexRequest(securityIndexName).id(CType.ALLOWLIST.toLCString())
                     .setRefreshPolicy(RefreshPolicy.IMMEDIATE)
@@ -171,7 +171,7 @@ public List<IndexRequest> getDynamicConfig(String folder) {
         }
 
         final String auditYmlFile = prefix + securityAudit;
-        if (null != FileHelper.getAbsoluteFilePathFromClassPath(auditYmlFile)) {
+        if (DynamicSecurityConfig.class.getClassLoader().getResource(auditYmlFile) != null) {
             ret.add(
                 new IndexRequest(securityIndexName).id(CType.AUDIT.toLCString())
                     .setRefreshPolicy(RefreshPolicy.IMMEDIATE)

src/test/java/org/opensearch/security/util/SettingsBasedSSLConfiguratorV4Test.java

@@ -228,7 +228,7 @@ public void testPemHostnameVerificationFailure() throws Exception {
 
         try (
             TestServer testServer = new TestServer(
-                "sslConfigurator/pem/truststore.jks",
+                "sslConfigurator/pem/truststore",
                 "sslConfigurator/pem/node-wrong-hostname-keystore",
                 "secret",
                 false
@@ -266,7 +266,7 @@ public void testPemHostnameVerificationOff() throws Exception {
 
         try (
             TestServer testServer = new TestServer(
-                "sslConfigurator/pem/truststore.jks",
+                "sslConfigurator/pem/truststore",
                 "sslConfigurator/pem/node-wrong-hostname-keystore",
                 "secret",
                 false