Merge pull request #2390 from telefonicaid/task/fix_trustore

fix trustore
telefonicaid · Jun 27, 2024 · 45972de · 45972de
2 parents f2f771d + 919869b
commit 45972de
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/mongo/MongoBackendImpl.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/mongo/MongoBackendImpl.java
@@ -613,21 +613,15 @@ private MongoDatabase getDatabase(String dbName) {
             if (sslEnabled) {
                 try {
                     KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-                    KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
                     if ((sslKeystorePathFile != null) && !sslKeystorePathFile.isEmpty()) {
-                        try (InputStream keyStoreStream = new FileInputStream(sslKeystorePathFile)) {
+                        InputStream keyStoreStream = new FileInputStream(sslKeystorePathFile);
                         keyStore.load(keyStoreStream, sslKeystorePassword.toCharArray());
-                        }
                     } else {
                         keyStore.load(null);
                     }
                     if ((sslTruststorePathFile != null) && !sslTruststorePathFile.isEmpty()) {
-                        try (InputStream trustStoreStream = new FileInputStream(sslTruststorePathFile)) {
-                            trustStore.load(trustStoreStream, sslTruststorePassword.toCharArray());
-                            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                            X509Certificate caCert = (X509Certificate) cf.generateCertificate(trustStoreStream);
-                            keyStore.setCertificateEntry("caCert", caCert);
-                        }
+                        InputStream trustStoreStream = new FileInputStream(sslTruststorePathFile);
+                        keyStore.load(trustStoreStream, sslTruststorePassword.toCharArray());
                     }
                     TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
                     trustManagerFactory.init(keyStore);