[ZEPPELIN-5934] Check notebook folder permissions before allowing to rename, remove or restore it #4624
Conversation
|
Sorry, I made this PR on top of 0.10.1 version, and it seems like something has been changed in this filed in master branch since then. |
|
Issues in my last comment were resolved in the latest commit. |
| try { | ||
| NoteManager.Folder folder = notebook.getFolder("/" + folderPath); | ||
| if (!checkFolderPermission(folder, Permission.OWNER, Message.OP.MOVE_FOLDER_TO_TRASH, context, callback)) { | ||
| return; |
There was a problem hiding this comment.
before returning, shouldn't we call callback.onFailure?
| permission, noteInfo.getNoteName(), | ||
| allowed, | ||
| context.getAutheInfo().getUser(), context.getUserAndRoles()); | ||
| callback.onFailure(new ForbiddenException(errorMsg), context); |
There was a problem hiding this comment.
Oh, I see this code but we'd better move this code outside of this method because it's only adopted when failure. I think it would be good to make it clear the purpose of this method and callbak.onFailure doesn't seem to be the purpose of this method.
|
BTW, there are no tests for the features. Could you please add tests for your feature? |
| @@ -376,7 +381,7 @@ private NoteNode getNoteNode(String notePath) throws IOException { | |||
| return noteNode; | |||
| } | |||
|
|
|||
| private Folder getFolder(String folderPath) throws IOException { | |||
| public Folder getFolder(String folderPath) throws IOException { | |||
There was a problem hiding this comment.
I don't think it's a good idea to give the folder object to the outside. Do you see a way to do the permissions check in the NoteManager class?
Currently there are already some checks in the NoteManager class.
What is this PR for?
Users who are able to see notes in some directory can rename, move to trash and remove from trash that directory without being owner or having write permissions for notes in that directory.
This is resolved in first commit.
Secondly, after renaming directory to the name of already existing directory, old notes in target directory become unaccessible (in fact those notes are removed in file system, but still visible in UI as they are present in NoteManager registry).
This addresses 2nd point in ZEPPELIN-5333.
Fixed in 2nd commit.
What type of PR is it?
Improvement
What is the Jira issue?
How should this be tested?
NotebookServiceTestor inNoteManagerTestto cover multi-user scenarios.