Re: [PR] HIVE-28778: Support Secure Zookeeper Access in Hive SecretManager [hive]

[via GitHub]

ayushtkn commented on code in PR #5657:
URL: https://github.com/apache/hive/pull/5657#discussion_r1975008673


##########
llap-common/src/java/org/apache/hadoop/hive/llap/security/SecretManager.java:
##########
@@ -267,10 +278,25 @@ public void close() {
   private static void checkRootAcls(Configuration conf, String path, String 
user) {
     int stime = conf.getInt(ZK_DTSM_ZK_SESSION_TIMEOUT, 
ZK_DTSM_ZK_SESSION_TIMEOUT_DEFAULT),
         ctime = conf.getInt(ZK_DTSM_ZK_CONNECTION_TIMEOUT, 
ZK_DTSM_ZK_CONNECTION_TIMEOUT_DEFAULT);
-    CuratorFramework zkClient = 
CuratorFrameworkFactory.builder().namespace(null)
-        .retryPolicy(new 
RetryOneTime(10)).sessionTimeoutMs(stime).connectionTimeoutMs(ctime)
-        .ensembleProvider(new 
FixedEnsembleProvider(conf.get(ZK_DTSM_ZK_CONNECTION_STRING)))
-        .build();
+
+    CuratorFramework zkClient = null;
+    if (HiveConf.getBoolVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_ENABLED)) {
+      ZooKeeperHiveHelper zkHiveHelper = 
ZooKeeperHiveHelper.builder().quorum(conf.get(ZK_DTSM_ZK_CONNECTION_STRING))
+              
.maxRetries(1).baseSleepTime(10).sessionTimeout(stime).connectionTimeout(ctime)
+              .sslEnabled(HiveConf.getBoolVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_ENABLED))
+              .keyStoreLocation(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_KEYSTORE_LOCATION))
+              .keyStorePassword(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_KEYSTORE_PASSWORD))
+              .trustStoreLocation(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_TRUSTSTORE_LOCATION))
+              .trustStorePassword(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_TRUSTSTORE_PASSWORD))
+              .build();
+      zkClient = zkHiveHelper.getNewZookeeperClient();

Review Comment:
   We can inline this
   ```
         zkClient = 
ZooKeeperHiveHelper.builder().quorum(conf.get(ZK_DTSM_ZK_CONNECTION_STRING))
                 
.maxRetries(1).baseSleepTime(10).sessionTimeout(stime).connectionTimeout(ctime)
                 .sslEnabled(HiveConf.getBoolVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_ENABLED))
                 .keyStoreLocation(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_KEYSTORE_LOCATION))
                 .keyStorePassword(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_KEYSTORE_PASSWORD))
                 .trustStoreLocation(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_TRUSTSTORE_LOCATION))
                 .trustStorePassword(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_TRUSTSTORE_PASSWORD))
                 .build().getNewZookeeperClient();
   ```
   
   we don't need to create ``ZooKeeperHiveHelper zkHiveHelper``



##########
llap-common/src/java/org/apache/hadoop/hive/llap/security/SecretManager.java:
##########
@@ -267,10 +278,25 @@ public void close() {
   private static void checkRootAcls(Configuration conf, String path, String 
user) {
     int stime = conf.getInt(ZK_DTSM_ZK_SESSION_TIMEOUT, 
ZK_DTSM_ZK_SESSION_TIMEOUT_DEFAULT),
         ctime = conf.getInt(ZK_DTSM_ZK_CONNECTION_TIMEOUT, 
ZK_DTSM_ZK_CONNECTION_TIMEOUT_DEFAULT);
-    CuratorFramework zkClient = 
CuratorFrameworkFactory.builder().namespace(null)
-        .retryPolicy(new 
RetryOneTime(10)).sessionTimeoutMs(stime).connectionTimeoutMs(ctime)
-        .ensembleProvider(new 
FixedEnsembleProvider(conf.get(ZK_DTSM_ZK_CONNECTION_STRING)))
-        .build();
+
+    CuratorFramework zkClient = null;
+    if (HiveConf.getBoolVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_ENABLED)) {
+      ZooKeeperHiveHelper zkHiveHelper = 
ZooKeeperHiveHelper.builder().quorum(conf.get(ZK_DTSM_ZK_CONNECTION_STRING))
+              
.maxRetries(1).baseSleepTime(10).sessionTimeout(stime).connectionTimeout(ctime)
+              .sslEnabled(HiveConf.getBoolVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_ENABLED))
+              .keyStoreLocation(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_KEYSTORE_LOCATION))
+              .keyStorePassword(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_KEYSTORE_PASSWORD))
+              .trustStoreLocation(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_TRUSTSTORE_LOCATION))
+              .trustStorePassword(HiveConf.getVar(conf, 
ConfVars.LLAP_ZKSM_ZK_CONNECTION_SSL_TRUSTSTORE_PASSWORD))
+              .build();
+      zkClient = zkHiveHelper.getNewZookeeperClient();
+    } else {
+      ZooKeeperHiveHelper zkHiveHelper = 
ZooKeeperHiveHelper.builder().quorum(conf.get(ZK_DTSM_ZK_CONNECTION_STRING))
+              
.maxRetries(1).baseSleepTime(10).sessionTimeout(stime).connectionTimeout(ctime)
+              .build();
+      zkClient = zkHiveHelper.getNewZookeeperClient();
+    }

Review Comment:
   same as above
   ```
         zkClient = 
ZooKeeperHiveHelper.builder().quorum(conf.get(ZK_DTSM_ZK_CONNECTION_STRING))
                 
.maxRetries(1).baseSleepTime(10).sessionTimeout(stime).connectionTimeout(ctime)
                 .build().getNewZookeeperClient();
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For additional commands, e-mail: gitbox-h...@hive.apache.org