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

set conf token for anonymous

Browse source
This commit is contained in:
Khalid Huseynov 2017-03-21 02:37:19 +09:00
parent 941794fb7a
commit c24b8a1662
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,13 @@ public class UserTokenContainer {
}
public String getUserToken(String principal) {
if (StringUtils.isBlank(principal) || "anonymous".equals(principal)) {
if (StringUtils.isBlank(defaultToken)) {
return StringUtils.EMPTY;
} else {
return defaultToken;
}
}
String token = userTokens.get(principal);
if (StringUtils.isBlank(token)) {
String ticket = UserSessionContainer.instance.getSession(principal);

9
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
View file

@ -281,11 +281,8 @@ public class ZeppelinClient {
if (!isActionable(zeppelinMsg.op)) {
return;
}
if (StringUtils.isEmpty(zeppelinMsg.principal) || zeppelinMsg.principal == "anonymous") {
token = StringUtils.EMPTY;
} else {
token = UserTokenContainer.instance.getUserToken(zeppelinMsg.principal);
}
token = UserTokenContainer.instance.getUserToken(zeppelinMsg.principal);
Client client = Client.getInstance();
if (client == null) {
LOG.warn("Client isn't initialized yet");
@ -295,7 +292,7 @@ public class ZeppelinClient {
if (StringUtils.isEmpty(token)) {
relayToAllZeppelinHub(hubMsg, noteId);
} else {
client.relayToZeppelinHub(hubMsg.serialize(), zeppelinMsg.ticket);
client.relayToZeppelinHub(hubMsg.serialize(), token);
}
}