Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit eb0dacf

Browse files
committed
#361 A simple TrustManager is now set for "simple" SSL
Required by Java >= 9
1 parent 388dd14 commit eb0dacf

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/main/java/com/marklogic/appdeployer/AppConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,13 @@ public TokenReplacer buildTokenReplacer() {
318318
public void setSimpleSslConfig() {
319319
setRestSslContext(SimpleX509TrustManager.newSSLContext());
320320
setRestSslHostnameVerifier(DatabaseClientFactory.SSLHostnameVerifier.ANY);
321+
setRestTrustManager(new SimpleX509TrustManager());
321322
}
322323

323324
public void setAppServicesSimpleSslConfig() {
324325
setAppServicesSslContext(SimpleX509TrustManager.newSSLContext());
325326
setAppServicesSslHostnameVerifier(DatabaseClientFactory.SSLHostnameVerifier.ANY);
327+
setAppServicesTrustManager(new SimpleX509TrustManager());
326328
}
327329

328330
/**

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ public void mostProperties() {
395395
assertEquals("appServicesCertPassword", config.getAppServicesCertPassword());
396396
assertEquals("appServicesExternalName", config.getAppServicesExternalName());
397397
assertNotNull(config.getAppServicesSslContext());
398+
assertNotNull("As of 3.15.0, a trust manager must be set in order for SSL to work on >= Java 9", config.getAppServicesTrustManager());
398399
assertEquals(DatabaseClientFactory.SSLHostnameVerifier.ANY, config.getAppServicesSslHostnameVerifier());
399400

400401
assertEquals("my-rest-server", config.getRestServerName());
@@ -418,6 +419,7 @@ public void mostProperties() {
418419

419420
assertNotNull(config.getRestSslContext());
420421
assertNotNull(config.getRestSslHostnameVerifier());
422+
assertNotNull("As of 3.15.0, a trust manager is set so that simple SSL works on >= Java 9", config.getRestTrustManager());
421423
assertEquals("my-content-db", config.getContentDatabaseName());
422424
assertEquals("my-test-db", config.getTestContentDatabaseName());
423425
assertEquals("my-modules", config.getModulesDatabaseName());

0 commit comments

Comments
 (0)