Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZEPPELIN-2367: Hive JDBC proxy user option should be avail even without kerberos

Browse source
This commit is contained in:
Prabhjyot Singh 2017-04-06 16:47:07 +05:30
parent d5b46987f0
commit 8999d93ae5
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
View file

@ -190,9 +190,6 @@ public class JDBCInterpreter extends Interpreter {
}
logger.debug("JDBC PropretiesMap: {}", basePropretiesMap);
if (!isEmpty(property.getProperty("zeppelin.jdbc.auth.type"))) {
JDBCSecurityImpl.createSecureConfiguration(property);
}
for (String propertyKey : basePropretiesMap.keySet()) {
propertyKeySqlCompleterMap.put(propertyKey, createSqlCompleter(null));
}
@ -370,6 +367,7 @@ public class JDBCInterpreter extends Interpreter {
} else {
UserGroupInformation.AuthenticationMethod authType = JDBCSecurityImpl.getAuthtype(property);
JDBCSecurityImpl.createSecureConfiguration(property, authType);
switch (authType) {
case KERBEROS:
if (user == null) {
@ -377,15 +375,7 @@ public class JDBCInterpreter extends Interpreter {
} else {
if (url.trim().startsWith("jdbc:hive")) {
StringBuilder connectionUrl = new StringBuilder(url);
Integer lastIndexOfUrl = connectionUrl.indexOf("?");
if (lastIndexOfUrl == -1) {
lastIndexOfUrl = connectionUrl.length();
}
boolean hasProxyUser = property.containsKey("hive.proxy.user");
if (!hasProxyUser || !property.getProperty("hive.proxy.user").equals("false")){
logger.debug("Using hive proxy user");
connectionUrl.insert(lastIndexOfUrl, ";hive.server2.proxy.user=" + user + ";");
}
checkAndAppendHiveProxyUser(connectionUrl, user);
connection = getConnectionFromPool(connectionUrl.toString(),
user, propertyKey, properties);
} else {
@ -421,13 +411,31 @@ public class JDBCInterpreter extends Interpreter {
break;
default:
connection = getConnectionFromPool(url, user, propertyKey, properties);
StringBuilder connectionUrl = new StringBuilder(url);
checkAndAppendHiveProxyUser(connectionUrl, user);
connection = getConnectionFromPool(connectionUrl.toString(),
user, propertyKey, properties);
}
}
propertyKeySqlCompleterMap.put(propertyKey, createSqlCompleter(connection));
return connection;
}
private void checkAndAppendHiveProxyUser(StringBuilder connectionUrl, String user) {
if (connectionUrl.toString().trim().startsWith("jdbc:hive")) {
Integer lastIndexOfUrl = connectionUrl.indexOf("?");
if (lastIndexOfUrl == -1) {
lastIndexOfUrl = connectionUrl.length();
}
if (user != null && !user.equals("anonymous") &&
!"false".equalsIgnoreCase(property.getProperty("hive.proxy.user"))) {
logger.debug("Using hive proxy user");
connectionUrl.insert(lastIndexOfUrl, ";hive.server2.proxy.user=" + user + ";");
}
}
}
private String getPassword(Properties properties) throws IOException {
if (isNotEmpty(properties.getProperty(PASSWORD_KEY))) {
return properties.getProperty(PASSWORD_KEY);

5
jdbc/src/main/java/org/apache/zeppelin/jdbc/security/JDBCSecurityImpl.java
View file

@ -38,9 +38,8 @@ public class JDBCSecurityImpl {
/***
* @param properties
*/
public static void createSecureConfiguration(Properties properties) {
AuthenticationMethod authType = getAuthtype(properties);
public static void createSecureConfiguration(Properties properties,
AuthenticationMethod authType) {
switch (authType) {
case KERBEROS:
Configuration conf = new