Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5DFDF200CD3 for ; Fri, 28 Jul 2017 22:59:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5C7DE16D7B8; Fri, 28 Jul 2017 20:59:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A2A4516D7B5 for ; Fri, 28 Jul 2017 22:59:30 +0200 (CEST) Received: (qmail 23995 invoked by uid 500); 28 Jul 2017 20:59:27 -0000 Mailing-List: contact dev-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@drill.apache.org Delivered-To: mailing list dev@drill.apache.org Received: (qmail 23387 invoked by uid 99); 28 Jul 2017 20:59:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2017 20:59:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16E56DFA44; Fri, 28 Jul 2017 20:59:27 +0000 (UTC) From: paul-rogers To: dev@drill.apache.org Reply-To: dev@drill.apache.org References: In-Reply-To: Subject: [GitHub] drill pull request #874: DRILL-5663: Drillbit fails to start when only keyst... Content-Type: text/plain Message-Id: <20170728205927.16E56DFA44@git1-us-west.apache.org> Date: Fri, 28 Jul 2017 20:59:27 +0000 (UTC) archived-at: Fri, 28 Jul 2017 20:59:31 -0000 Github user paul-rogers commented on a diff in the pull request: https://github.com/apache/drill/pull/874#discussion_r130184493 --- Diff: exec/java-exec/src/test/java/org/apache/drill/exec/TestSSLConfig.java --- @@ -0,0 +1,89 @@ +/** + * 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 + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * 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.config.DrillConfig; +import org.apache.drill.common.exceptions.DrillException; +import org.apache.drill.exec.ExecConstants; +import org.apache.drill.exec.SSLConfig; +import org.apache.drill.test.OperatorFixture; +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 firstTest() throws Exception { + + OperatorFixture.OperatorFixtureBuilder builder = OperatorFixture.builder(); + builder.configBuilder().put(ExecConstants.HTTP_KEYSTORE_PASSWORD, "root"); + builder.configBuilder().put(ExecConstants.HTTP_KEYSTORE_PATH, ""); + try (OperatorFixture fixture = builder.build()) { + DrillConfig config = fixture.config(); + try { + SSLConfig sslv = new SSLConfig(config); + fail(); + } catch (Exception e) { + assertTrue(e instanceof DrillException); + } + } + } + + @Test + public void secondTest() throws Exception { + + OperatorFixture.OperatorFixtureBuilder builder = OperatorFixture.builder(); + builder.configBuilder().put(ExecConstants.HTTP_KEYSTORE_PASSWORD, ""); + builder.configBuilder().put(ExecConstants.HTTP_KEYSTORE_PATH, "/root"); + try (OperatorFixture fixture = builder.build()) { + DrillConfig config = fixture.config(); + try { + SSLConfig sslv = new SSLConfig(config); + fail(); + } catch (Exception e) { + assertTrue(e instanceof DrillException); + } + } + } + + @Test + public void thirdTest() throws Exception { + + OperatorFixture.OperatorFixtureBuilder builder = OperatorFixture.builder(); + builder.configBuilder().put(ExecConstants.HTTP_KEYSTORE_PASSWORD, "root"); + builder.configBuilder().put(ExecConstants.HTTP_KEYSTORE_PATH, "/root"); + try (OperatorFixture fixture = builder.build()) { + DrillConfig config = fixture.config(); + SSLConfig sslv = new SSLConfig(config); + assertEquals("root", sslv.getkeystorePassword()); + assertEquals("/root", sslv.getkeystorePath()); + } + } +} --- End diff -- Do we need to test the trust store options? Are they subject to the same "neither or both" constraints? --- 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 infrastructure@apache.org or file a JIRA ticket with INFRA. ---