You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by ah...@apache.org on 2017/01/03 07:03:53 UTC
zeppelin git commit: [ZEPPELIN-1875] permission dialog code is not
stable
Repository: zeppelin
Updated Branches:
refs/heads/master 355387a72 -> f83d012a2
[ZEPPELIN-1875] permission dialog code is not stable
### What is this PR for?
The code for the notification pop-up is not stable.
Sometime when response to slow for backend.
Then the permission box and the dialogue open together.
### What type of PR is it?
Bug Fix , Improvement
### Todos
- [x] changed method name (getBlockNotAuthenticatedUserErrorMsg)
- [x] permission dialog pop-up change logic.
- [x] added check logic for anonymous user in checkIfUserIsAnon method
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1875
### How should this be tested?
1. when you do have turn on the shiro and login and click to note permission button.
2. or turn off the shiro.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: cloverhearts <cl...@gmail.com>
Closes #1821 from cloverhearts/ZEPPELIN-PERMMIT-FIX and squashes the following commits:
3d542f2 [cloverhearts] fixed bug isAnanimous
4248c0b [cloverhearts] refix
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f83d012a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f83d012a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f83d012a
Branch: refs/heads/master
Commit: f83d012a20ff011d93a61092e46ed2321b50d395
Parents: 355387a
Author: cloverhearts <cl...@gmail.com>
Authored: Fri Dec 30 10:20:02 2016 -0800
Committer: ahyoungryu <ah...@apache.org>
Committed: Tue Jan 3 16:03:43 2017 +0900
----------------------------------------------------------------------
.../apache/zeppelin/rest/NotebookRestApi.java | 10 +--
.../src/app/notebook/notebook.controller.js | 65 ++++++++++----------
2 files changed, 37 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f83d012a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
index 64d65f4..7b02207 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
@@ -95,7 +95,7 @@ public class NotebookRestApi {
@ZeppelinApi
public Response getNotePermissions(@PathParam("noteId") String noteId) throws IOException {
- checkIfUserIsAnon(blockNotAuthenticatedUserError());
+ checkIfUserIsAnon(getBlockNotAuthenticatedUserErrorMsg());
checkIfUserCanRead(noteId,
"Insufficient privileges you cannot get the list of permissions for this note");
HashMap<String, Set<String>> permissionsMap = new HashMap<>();
@@ -113,8 +113,7 @@ public class NotebookRestApi {
"User belongs to: " + current.toString();
}
- private String blockNotAuthenticatedUserError() throws IOException {
- LOG.info("Anonymous user cannot set any permissions for this note.");
+ private String getBlockNotAuthenticatedUserErrorMsg() throws IOException {
return "Only authenticated user can set the permission.";
}
@@ -129,7 +128,8 @@ public class NotebookRestApi {
*/
private void checkIfUserIsAnon(String errorMsg) {
boolean isAuthenticated = SecurityUtils.isAuthenticated();
- if (!isAuthenticated) {
+ if (isAuthenticated && SecurityUtils.getPrincipal().equals("anonymous")) {
+ LOG.info("Anonymous user cannot set any permissions for this note.");
throw new ForbiddenException(errorMsg);
}
}
@@ -196,7 +196,7 @@ public class NotebookRestApi {
userAndRoles.add(principal);
userAndRoles.addAll(roles);
- checkIfUserIsAnon(blockNotAuthenticatedUserError());
+ checkIfUserIsAnon(getBlockNotAuthenticatedUserErrorMsg());
checkIfUserIsOwner(noteId,
ownerPermissionError(userAndRoles, notebookAuthorization.getOwners(noteId)));
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f83d012a/zeppelin-web/src/app/notebook/notebook.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index af91293..ade9d1d 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -92,31 +92,25 @@
};
$scope.blockAnonUsers = function() {
- var principal = $rootScope.ticket.principal;
- if (principal) {
- $scope.isAnonymous = principal === 'anonymous' ? true : false;
- if ($scope.isAnonymous) {
- var zeppelinVersion = $rootScope.zeppelinVersion;
- var url = 'https://zeppelin.apache.org/docs/' + zeppelinVersion + '/security/notebook_authorization.html';
- var content = 'Only authenticated user can set the permission.' +
- '<a data-toggle="tooltip" data-placement="top" title="Learn more" target="_blank" href=' + url + '>' +
- '<i class="icon-question" />' +
- '</a>';
- BootstrapDialog.show({
- closable: false,
- closeByBackdrop: false,
- closeByKeyboard: false,
- title: 'No permission',
- message: content,
- buttons: [{
- label: 'Close',
- action: function(dialog) {
- dialog.close();
- }
- }]
- });
- }
- }
+ var zeppelinVersion = $rootScope.zeppelinVersion;
+ var url = 'https://zeppelin.apache.org/docs/' + zeppelinVersion + '/security/notebook_authorization.html';
+ var content = 'Only authenticated user can set the permission.' +
+ '<a data-toggle="tooltip" data-placement="top" title="Learn more" target="_blank" href=' + url + '>' +
+ '<i class="icon-question" />' +
+ '</a>';
+ BootstrapDialog.show({
+ closable: false,
+ closeByBackdrop: false,
+ closeByKeyboard: false,
+ title: 'No permission',
+ message: content,
+ buttons: [{
+ label: 'Close',
+ action: function(dialog) {
+ dialog.close();
+ }
+ }]
+ });
};
/** Init the new controller */
@@ -782,15 +776,20 @@
};
$scope.togglePermissions = function() {
- $scope.blockAnonUsers();
- if ($scope.showPermissions) {
- $scope.closePermissions();
- angular.element('#selectOwners').select2({});
- angular.element('#selectReaders').select2({});
- angular.element('#selectWriters').select2({});
+ var principal = $rootScope.ticket.principal;
+ $scope.isAnonymous = principal === 'anonymous' ? true : false;
+ if (!!principal && $scope.isAnonymous) {
+ $scope.blockAnonUsers();
} else {
- $scope.openPermissions();
- $scope.closeSetting();
+ if ($scope.showPermissions) {
+ $scope.closePermissions();
+ angular.element('#selectOwners').select2({});
+ angular.element('#selectReaders').select2({});
+ angular.element('#selectWriters').select2({});
+ } else {
+ $scope.openPermissions();
+ $scope.closeSetting();
+ }
}
};