-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ZEPPELIN-1690] - ZeppelinHubNotebookRepo multy user handling #1635
Closed
anthonycorbacho
wants to merge
15
commits into
apache:master
from
anthonycorbacho:feat/ZeppelinHubRepoMultiUser
Closed
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
0729f51
Add zeppelinhub session container
anthonycorbacho 7a0c959
Add zeppelinhub user session to userSession container after login thr…
anthonycorbacho e3e5a15
Add userTiket in AuthenticationInfo on OnMessage method in notebookSe…
anthonycorbacho 67051a0
Add ZeppelinHub instance model
anthonycorbacho 5931ab6
Fix check style
anthonycorbacho a8aeb51
add comment in zeppelinhubRealm about saving user session in a single…
anthonycorbacho 3fbfcfa
Add new login on how user can get his token at runtime
anthonycorbacho 674fb93
Refactor ZeppelinHub rest API handler
anthonycorbacho 25f6215
pass user token to zeppelinhub rest api handler
anthonycorbacho dbb8ebd
Fix test
anthonycorbacho e884203
Refactor :: remove 'async' on every http call
anthonycorbacho edb9e8c
Desactivate ws :: we will need to refactor this part
anthonycorbacho aef6e00
Fix check style
anthonycorbacho d8989aa
Handle invalid subject
anthonycorbacho d9e0036
Move code location
anthonycorbacho File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...n-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/model/Instance.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.zeppelin.notebook.repo.zeppelinhub.model; | ||
|
||
/** | ||
* ZeppelinHub Instance structure. | ||
* | ||
*/ | ||
public class Instance { | ||
public int id; | ||
public String name; | ||
public String token; | ||
} |
54 changes: 54 additions & 0 deletions
54
...c/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/model/UserSessionContainer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.zeppelin.notebook.repo.zeppelinhub.model; | ||
|
||
import java.util.Map; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
|
||
import org.apache.commons.lang.StringUtils; | ||
|
||
/** | ||
* Simple and yet dummy container for zeppelinhub session. | ||
* | ||
*/ | ||
public class UserSessionContainer { | ||
private static class Entity { | ||
public final String userSession; | ||
|
||
Entity(String userSession) { | ||
this.userSession = userSession; | ||
} | ||
} | ||
|
||
private Map<String, Entity> sessions = new ConcurrentHashMap<>(); | ||
|
||
public static final UserSessionContainer instance = new UserSessionContainer(); | ||
|
||
public synchronized String getSession(String principal) { | ||
Entity entry = sessions.get(principal); | ||
if (entry == null) { | ||
return StringUtils.EMPTY; | ||
} | ||
return entry.userSession; | ||
} | ||
|
||
public synchronized String setSession(String principal, String userSession) { | ||
Entity entry = new Entity(userSession); | ||
sessions.put(principal, entry); | ||
return entry.userSession; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think this
setSession
should go few lines above, right aftercatch
statement, since there'sbroadcastReloadedNoteList
called afterwards that will require