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

realm token precedence over conf token

Browse source
This commit is contained in:
Khalid Huseynov 2017-03-21 01:00:19 +09:00
parent 91cb537559
commit 941794fb7a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/model/UserTokenContainer.java
View file

@ -65,17 +65,16 @@ public class UserTokenContainer {
}
public String getUserToken(String principal) {
// Case of user use token instead of authentication.
//TODO(khalid): in case of hub realm, remote token should take precedence over default
if (!StringUtils.isBlank(defaultToken)) {
return defaultToken;
}
String token = userTokens.get(principal);
if (StringUtils.isBlank(token)) {
String ticket = UserSessionContainer.instance.getSession(principal);
try {
token = getDefaultZeppelinInstanceToken(ticket);
if (!StringUtils.isBlank(token)) {
if (StringUtils.isBlank(token)) {
if (!StringUtils.isBlank(defaultToken)) {
token = defaultToken;
}
} else {
userTokens.putIfAbsent(principal, token);
}
} catch (IOException e) {