You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2017/03/01 10:05:31 UTC
ranger git commit: RANGER-1409 : User role get deleted from table
when he tries to update his role to a restricted role
Repository: ranger
Updated Branches:
refs/heads/ranger-0.7 d18af7a94 -> bbaf1e7df
RANGER-1409 : User role get deleted from table when he tries to update his role to a restricted role
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/bbaf1e7d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/bbaf1e7d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/bbaf1e7d
Branch: refs/heads/ranger-0.7
Commit: bbaf1e7df65f5da68468b18bdefd3ebdca34bc7f
Parents: d18af7a
Author: pradeep <pr...@apache.org>
Authored: Fri Feb 24 12:18:17 2017 +0530
Committer: pradeep <pr...@apache.org>
Committed: Wed Mar 1 15:34:30 2017 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/ranger/biz/UserMgr.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/bbaf1e7d/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
index 6eabc89..be16f75 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
@@ -318,11 +318,14 @@ public class UserMgr {
if (rolesList == null || rolesList.size() == 0) {
return false;
}
- for (String userRole : rolesList) {
- if(!VALID_ROLE_LIST.contains(userRole.toUpperCase())){
- throw restErrorUtil.createRESTException("Invalid user role, please provide valid user role.",MessageEnums.INVALID_INPUT_DATA);
- }
- }
+ List<String> stringRolesList = new ArrayList<String>();
+ for (String userRole : rolesList) {
+ if(!VALID_ROLE_LIST.contains(userRole.toUpperCase())){
+ throw restErrorUtil.createRESTException("Invalid user role, please provide valid user role.",MessageEnums.INVALID_INPUT_DATA);
+ }
+ stringRolesList.add(userRole);
+ }
+ xUserMgr.checkAccessRoles(stringRolesList);
// Let's first delete old roles
List<XXPortalUserRole> gjUserRoles = daoManager.getXXPortalUserRole()
.findByUserId(userId);