Load default Java truststore for --use-system-truststore

trinodb · Dec 24, 2024 · ee3728f · ee3728f
1 parent 9c05d05
commit ee3728f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java b/client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java
@@ -357,8 +357,16 @@ else if (osName.contains("Mac")) {
             }
         }
 
-        KeyStore store = KeyStore.getInstance(systemStoreType.orElseGet(KeyStore::getDefaultType));
-        store.load(null, null);
+        KeyStore store;
+        if (systemStoreType.isPresent()) {
+            store = KeyStore.getInstance(systemStoreType.get());
+            store.load(null, null);
+        }
+        else {
+            // return null if trustStoreType isn't specified and osName is unknown
+            // trustManagerFactory.init(null) will try to load the default Java trustStore
+            store = null;
+        }
         return store;
     }