drill-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (DRILL-5663) Drillbit fails to start when only keystore path is provided without keystore password.
Date Fri, 11 Aug 2017 23:25:01 GMT

    [ https://issues.apache.org/jira/browse/DRILL-5663?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16124260#comment-16124260
] 

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_r132800051
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/SSLConfig.java ---
    @@ -0,0 +1,77 @@
    +/*
    + * 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 com.typesafe.config.Config;
    +import org.apache.drill.common.exceptions.DrillException;
    +
    +public class SSLConfig {
    +
    +  private final String keystorePath;
    +
    +  private final String keystorePassword;
    +
    +  private final String truststorePath;
    +
    +  private final String truststorePassword;
    +
    +
    +  public SSLConfig(Config config) throws DrillException {
    +
    +    keystorePath = config.getString(ExecConstants.HTTP_KEYSTORE_PATH).trim();
    +
    +    keystorePassword = config.getString(ExecConstants.HTTP_KEYSTORE_PASSWORD).trim();
    +
    +    truststorePath = config.getString(ExecConstants.HTTP_TRUSTSTORE_PATH).trim();
    +
    +    truststorePassword = config.getString(ExecConstants.HTTP_TRUSTSTORE_PASSWORD).trim();
    +
    +    /*If keystorePath or keystorePassword is provided in the configuration file use that*/
    +    if (!keystorePath.isEmpty() || !keystorePassword.isEmpty()) {
    +      if (keystorePath.isEmpty()) {
    +        throw new DrillException(" *.ssl.keyStorePath in the configuration file is empty,
but *.ssl.keyStorePassword is set");
    +      }
    +      else if (keystorePassword.isEmpty()){
    +        throw new DrillException(" *.ssl.keyStorePassword in the configuration file is
empty, but *.ssl.keyStorePath is set ");
    +      }
    +
    +    }
    +  }
    +
    +  public boolean isSslValid() { return !keystorePath.isEmpty() && !keystorePassword.isEmpty();
}
    +
    +  public String getKeyStorePath() {
    +    return keystorePath;
    +  }
    +
    +  public String getKeyStorePassword() {
    +    return keystorePassword;
    +  }
    +
    +  public boolean hasTrustStorePath() { return !truststorePath.isEmpty(); }
    +
    +  public boolean hasTrustStorePassword() {return !truststorePassword.isEmpty(); }
    +
    +  public String getTrustStorePath() {
    +    return truststorePath;
    +  }
    +
    +  public String getTrustStorePassword() {
    +    return truststorePassword;
    +  }
    --- End diff --
    
    Very minor suggestion: these simple returns can also be one-liners like the "has" methods.


> 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)

Mime
View raw message