[
https://issues.apache.org/jira/browse/DRILL-5663?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16124256#comment-16124256
]
ASF GitHub Bot commented on DRILL-5663:
---------------------------------------
Github user paul-rogers commented on a diff in the pull request:
https://github.com/apache/drill/pull/874#discussion_r132800512
--- Diff:
exec/java-exec/src/test/java/org/apache/drill/exec/TestSSLConfig.java ---
@@ -0,0 +1,108 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.drill.exec;
+
+
+import org.apache.drill.common.exceptions.DrillException;
+import org.apache.drill.test.ConfigBuilder;
+import org.junit.Test;
+import static junit.framework.TestCase.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TestSSLConfig {
+
+ @Test
+ public void testMissingKeystorePath() throws Exception {
+
+ ConfigBuilder config = new ConfigBuilder();
+ config.put(ExecConstants.HTTP_KEYSTORE_PATH, "");
+ config.put(ExecConstants.HTTP_KEYSTORE_PASSWORD, "root");
+ try {
+ SSLConfig sslv = new SSLConfig(config.build());
+ fail();
+ //Expected
+ } catch (Exception e) {
+ assertTrue(e instanceof DrillException);
+ }
+ }
+
+ @Test
+ public void testMissingKeystorePassword() throws Exception {
+
+ ConfigBuilder config = new ConfigBuilder();
+ config.put(ExecConstants.HTTP_KEYSTORE_PATH, "/root");
+ config.put(ExecConstants.HTTP_KEYSTORE_PASSWORD, "");
+ try {
+ SSLConfig sslv = new SSLConfig(config.build());
+ fail();
+ //Expected
+ } catch (Exception e) {
+ assertTrue(e instanceof DrillException);
+ }
+ }
+
+ @Test
+ public void testForKeystoreConfig() throws Exception {
+
+ ConfigBuilder config = new ConfigBuilder();
+ config.put(ExecConstants.HTTP_KEYSTORE_PATH, "/root");
+ config.put(ExecConstants.HTTP_KEYSTORE_PASSWORD, "root");
+ try {
+ SSLConfig sslv = new SSLConfig(config.build());
+ assertEquals("/root", sslv.getKeyStorePath());
+ assertEquals("root", sslv.getKeyStorePassword());
+ } catch (Exception e) {
+ fail();
+
+ }
+ }
+
+ @Test
+ public void testForBackwardCompatability() throws Exception {
+
+ ConfigBuilder config = new ConfigBuilder();
+ config.put("javax.net.ssl.keyStore", "/root");
+ config.put("javax.net.ssl.keyStorePassword", "root");
+ SSLConfig sslv = new SSLConfig(config.build());
+ assertEquals("/root",sslv.getKeyStorePath());
+ assertEquals("root", sslv.getKeyStorePassword());
+ }
+
+ @Test
+ public void testForTrustStore() throws Exception {
+
+ ConfigBuilder config = new ConfigBuilder();
+ config.put(ExecConstants.HTTP_TRUSTSTORE_PATH, "/root");
+ config.put(ExecConstants.HTTP_TRUSTSTORE_PASSWORD, "root");
+ SSLConfig sslv = new SSLConfig(config.build());
+ assertEquals(true, sslv.hasTrustStorePath());
+ assertEquals(true,sslv.hasTrustStorePassword());
+ assertEquals("/root",sslv.getTrustStorePath());
+ assertEquals("root",sslv.getTrustStorePassword());
+ }
+}
--- End diff --
Thanks for the tests!
Maybe delete the extra lines at the end of the file...
> Drillbit fails to start when only keystore path is provided without keystore
> password.
> --------------------------------------------------------------------------------------
>
> Key: DRILL-5663
> URL: https://issues.apache.org/jira/browse/DRILL-5663
> Project: Apache Drill
> Issue Type: Bug
> Reporter: Sorabh Hamirwasia
> Assignee: Sindhuri Ramanarayan Rayavaram
>
> When we configure keystore path without keystore password inside
> drill-override.conf for WebServer, then Drillbit fails to start. We should
> explicitly check for either both being present or both being absent. If any
> one of them is only present then throw startup exception for Drill.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
