Skip to content

Authenticated user aware notebook storage layer #998

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.

Sign up for GitHub

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

Closed
khalidhuseynov wants to merge 25 commits into from
Closed

Authenticated user aware notebook storage layer #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1c29bee
change api for repo list
Jun 10, 2016
f66dc1b
modify all repo signatureswith list(subject)
Jun 10, 2016
8e7d8bd
propagate changes to list up
Jun 10, 2016
7d964c7
propagate list(subject) to tests
Jun 10, 2016
fb93e22
add subject to repo api for get
Jun 10, 2016
91fc500
modify all repo signatures with get(noteId, subject)
Jun 10, 2016
3ea544d
propagate changes up to Notebook
Jun 10, 2016
8fdaed3
propagate changes to tests
Jun 10, 2016
0a4a8d2
add subject to repo save api
Jun 11, 2016
b7b007a
add subject to all repo signatures
Jun 11, 2016
b5f88e2
propagate subject changes upstream
Jun 11, 2016
21f189d
propagate changes to save into tests
Jun 11, 2016
d0d7b98
add subject to repo remove api
Jun 11, 2016
232d1af
propagate remove(noteId, subject) to all repo signatures
Jun 11, 2016
91426af
propagate changes with remove upstream
Jun 11, 2016
bd0a290
propagate changes to tests
Jun 11, 2016
50ba14a
add subject to NotebookRepo api
Jun 11, 2016
a0ebd14
add subject to checkpoint signature of all repos
Jun 11, 2016
aa95537
propagate changes upstream
Jun 11, 2016
0bf40b3
propagate changes to tests
Jun 11, 2016
a69d04f
add descriptions to NotebookRepo interface
Jun 11, 2016
8b48577
fix test after master merge
Jun 14, 2016
bb57eae
address changes for job management pr after rebasing
Jun 15, 2016
f3bae60
fix checkstyle
Jun 17, 2016
b91e78a
propagate subject to versioning api
Jun 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ByteBufferInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.InputStream;
import java.nio.ByteBuffer;


/**
* InputStream from bytebuffer
*/
Expand Down
4 changes: 4 additions & 0 deletions zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ public class AuthenticationInfo {

public AuthenticationInfo() {}

public AuthenticationInfo(String user) {
this.user = user;
}

/***
*
* @param user
Expand Down
47 changes: 31 additions & 16 deletions zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.apache.zeppelin.search.SearchService;
import org.apache.zeppelin.server.JsonResponse;
import org.apache.zeppelin.socket.NotebookServer;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.utils.SecurityUtils;
import org.quartz.CronExpression;
import org.slf4j.Logger;
Expand Down Expand Up @@ -158,7 +159,8 @@ public Response putNotePermissions(@PathParam("noteId") String noteId, String re
notebookAuthorization.getOwners(noteId),
notebookAuthorization.getReaders(noteId),
notebookAuthorization.getWriters(noteId));
note.persist();
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
note.persist(subject);
notebookServer.broadcastNote(note);
return new JsonResponse<>(Status.OK).build();
}
Expand Down Expand Up @@ -224,7 +226,8 @@ public Response bind(@PathParam("noteId") String noteId) {
@Path("/")
@ZeppelinApi
public Response getNotebookList() throws IOException {
List<Map<String, String>> notesInfo = notebookServer.generateNotebooksInfo(false);
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
List<Map<String, String>> notesInfo = notebookServer.generateNotebooksInfo(false, subject);
return new JsonResponse<>(Status.OK, "", notesInfo ).build();
}

Expand Down Expand Up @@ -266,7 +269,8 @@ public Response exportNoteBook(@PathParam("id") String noteId) throws IOExceptio
@Path("import")
@ZeppelinApi
public Response importNotebook(String req) throws IOException {
Note newNote = notebook.importNote(req, null);
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
Note newNote = notebook.importNote(req, null, subject);
return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build();
}

Expand All @@ -283,7 +287,8 @@ public Response createNote(String message) throws IOException {
LOG.info("Create new notebook by JSON {}" , message);
NewNotebookRequest request = gson.fromJson(message,
NewNotebookRequest.class);
Note note = notebook.createNote();
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
Note note = notebook.createNote(subject);
List<NewParagraphRequest> initialParagraphs = request.getParagraphs();
if (initialParagraphs != null) {
for (NewParagraphRequest paragraphRequest : initialParagraphs) {
Expand All @@ -297,10 +302,11 @@ public Response createNote(String message) throws IOException {
if (noteName.isEmpty()) {
noteName = "Note " + note.getId();
}

note.setName(noteName);
note.persist();
note.persist(subject);
notebookServer.broadcastNote(note);
notebookServer.broadcastNoteList();
notebookServer.broadcastNoteList(subject);
return new JsonResponse<>(Status.CREATED, "", note.getId() ).build();
}

Expand All @@ -315,13 +321,15 @@ public Response createNote(String message) throws IOException {
@ZeppelinApi
public Response deleteNote(@PathParam("notebookId") String notebookId) throws IOException {
LOG.info("Delete notebook {} ", notebookId);
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
if (!(notebookId.isEmpty())) {
Note note = notebook.getNote(notebookId);
if (note != null) {
notebook.removeNote(notebookId);
notebook.removeNote(notebookId, subject);
}
}
notebookServer.broadcastNoteList();

notebookServer.broadcastNoteList(subject);
return new JsonResponse<>(Status.OK, "").build();
}

Expand All @@ -340,9 +348,10 @@ public Response cloneNote(@PathParam("notebookId") String notebookId, String mes
NewNotebookRequest request = gson.fromJson(message,
NewNotebookRequest.class);
String newNoteName = request.getName();
Note newNote = notebook.cloneNote(notebookId, newNoteName);
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
Note newNote = notebook.cloneNote(notebookId, newNoteName, subject);
notebookServer.broadcastNote(newNote);
notebookServer.broadcastNoteList();
notebookServer.broadcastNoteList(subject);
return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build();
}

Expand Down Expand Up @@ -376,7 +385,8 @@ public Response insertParagraph(@PathParam("notebookId") String notebookId, Stri
p.setTitle(request.getTitle());
p.setText(request.getText());

note.persist();
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
note.persist(subject);
notebookServer.broadcastNote(note);
return new JsonResponse(Status.CREATED, "", p.getId()).build();
}
Expand Down Expand Up @@ -434,7 +444,8 @@ public Response moveParagraph(@PathParam("notebookId") String notebookId,
try {
note.moveParagraph(paragraphId, Integer.parseInt(newIndex), true);

note.persist();
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
note.persist(subject);
notebookServer.broadcastNote(note);
return new JsonResponse(Status.OK, "").build();
} catch (IndexOutOfBoundsException e) {
Expand Down Expand Up @@ -466,8 +477,9 @@ public Response deleteParagraph(@PathParam("notebookId") String notebookId,
return new JsonResponse(Status.NOT_FOUND, "paragraph not found.").build();
}

AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
note.removeParagraph(paragraphId);
note.persist();
note.persist(subject);
notebookServer.broadcastNote(note);

return new JsonResponse(Status.OK, "").build();
Expand Down Expand Up @@ -574,7 +586,8 @@ public Response runParagraph(@PathParam("notebookId") String notebookId,
Map<String, Object> paramsForUpdating = request.getParams();
if (paramsForUpdating != null) {
paragraph.settings.getParams().putAll(paramsForUpdating);
note.persist();
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
note.persist(subject);
}
}

Expand Down Expand Up @@ -700,7 +713,8 @@ public Response getCronJob(@PathParam("notebookId") String notebookId) throws
public Response getJobListforNotebook() throws IOException, IllegalArgumentException {
LOG.info("Get notebook jobs for job manager");

List<Map<String, Object>> notebookJobs = notebook.getJobListforNotebook(false, 0);
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
List<Map<String, Object>> notebookJobs = notebook.getJobListforNotebook(false, 0, subject);
Map<String, Object> response = new HashMap<>();

response.put("lastResponseUnixTime", System.currentTimeMillis());
Expand All @@ -724,7 +738,8 @@ public Response getUpdatedJobListforNotebook(
LOG.info("Get updated notebook jobs lastUpdateTime {}", lastUpdateUnixTime);

List<Map<String, Object>> notebookJobs;
notebookJobs = notebook.getJobListforNotebook(false, lastUpdateUnixTime);
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
notebookJobs = notebook.getJobListforNotebook(false, lastUpdateUnixTime, subject);
Map<String, Object> response = new HashMap<>();

response.put("lastResponseUnixTime", System.currentTimeMillis());
Expand Down
Loading