Github user paul-rogers commented on a diff in the pull request: https://github.com/apache/drill/pull/874#discussion_r130182809 --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java --- @@ -263,18 +272,17 @@ private ServerConnector createHttpsConnector() throws Exception { logger.info("Setting up HTTPS connector for web server"); final SslContextFactory sslContextFactory = new SslContextFactory(); + SSLConfig ssl = new SSLConfig(config); - if (config.hasPath(ExecConstants.HTTP_KEYSTORE_PATH) && - !Strings.isNullOrEmpty(config.getString(ExecConstants.HTTP_KEYSTORE_PATH))) { + if(ssl.isValid){ logger.info("Using configured SSL settings for web server"); - sslContextFactory.setKeyStorePath(config.getString(ExecConstants.HTTP_KEYSTORE_PATH)); - sslContextFactory.setKeyStorePassword(config.getString(ExecConstants.HTTP_KEYSTORE_PASSWORD)); - - // TrustStore and TrustStore password are optional - if (config.hasPath(ExecConstants.HTTP_TRUSTSTORE_PATH)) { - sslContextFactory.setTrustStorePath(config.getString(ExecConstants.HTTP_TRUSTSTORE_PATH)); - if (config.hasPath(ExecConstants.HTTP_TRUSTSTORE_PASSWORD)) { - sslContextFactory.setTrustStorePassword(config.getString(ExecConstants.HTTP_TRUSTSTORE_PASSWORD)); + + sslContextFactory.setKeyStorePath(ssl.getkeystorePath()); + sslContextFactory.setKeyStorePassword(ssl.getkeystorePassword()); + if(!ssl.gettruststorePath().isEmpty()){ --- End diff -- Better: `ssl.hasTrustStore()`
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---