[hive] branch master updated: HIVE-27271: Client connection to HS2 fails when transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL

[dengzh]

This is an automated email from the ASF dual-hosted git repository.

dengzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 36bd69ee10c HIVE-27271: Client connection to HS2 fails when 
transportMode=http, ssl=true, sslTrustStore specified without 
trustStorePassword in the JDBC URL
36bd69ee10c is described below

commit 36bd69ee10cce13ab42a750f0577f53f85f28ca7
Author: Venu Reddy <35334869+venureddy2...@users.noreply.github.com>
AuthorDate: Fri Apr 28 04:51:15 2023 +0530

    HIVE-27271: Client connection to HS2 fails when transportMode=http, 
ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL
    
    Closes #4262
---
 jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java 
b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
index fc7542754eb..3865d7b530c 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
@@ -803,7 +803,7 @@ public class HiveConnection implements java.sql.Connection {
           }
           sslTrustStore = KeyStore.getInstance(trustStoreType);
           try (FileInputStream fis = new FileInputStream(sslTrustStorePath)) {
-            sslTrustStore.load(fis, sslTrustStorePassword.toCharArray());
+            sslTrustStore.load(fis, sslTrustStorePassword != null ? 
sslTrustStorePassword.toCharArray() : null);
           }
           sslContext = SSLContexts.custom().loadTrustMaterial(sslTrustStore, 
null).build();
           socketFactory =
@@ -1035,7 +1035,7 @@ public class HiveConnection implements 
java.sql.Connection {
         + " Not configured for 2 way SSL connection");
       }
       try (FileInputStream fis = new FileInputStream(trustStorePath)) {
-        sslTrustStore.load(fis, trustStorePassword.toCharArray());
+        sslTrustStore.load(fis, trustStorePassword != null ? 
trustStorePassword.toCharArray() : null);
       }
       trustManagerFactory.init(sslTrustStore);
       SSLContext context = SSLContext.getInstance("TLS");