[ranger] branch master updated: RANGER-2649 : Unix user doesn't get 'Admin' role when set through assignment rules

[mehul]

This is an automated email from the ASF dual-hosted git repository.

mehul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 54fa50a  RANGER-2649 : Unix user doesn't get 'Admin' role when set 
through assignment rules
54fa50a is described below

commit 54fa50a3a4a170071ec7ca92ea0d25ad1e497c53
Author: Dhaval B. Shah <dhavalshah9...@gmail.com>
AuthorDate: Wed Nov 20 17:49:52 2019 +0530

    RANGER-2649 : Unix user doesn't get 'Admin' role when set through 
assignment rules
    
    Signed-off-by: Mehul Parikh <me...@apache.org>
---
 .../process/PolicyMgrUserGroupBuilder.java         | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git 
a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
 
b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
index c113ece..6a24213 100644
--- 
a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
+++ 
b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
@@ -965,23 +965,22 @@ public class PolicyMgrUserGroupBuilder implements 
UserGroupSink {
                }
                return ret;
        }
-
+       
        private XUserInfo addXUserInfo(String aUserName) {
-
-               XUserInfo xuserInfo = new XUserInfo();
-
-               xuserInfo.setName(aUserName);
-
-               xuserInfo.setDescription(aUserName + " - add from Unix box");
-
-               List<String> userRole = new ArrayList<>();
-               userRole.add("ROLE_USER");
-               xuserInfo.setUserRoleList(userRole);
-
-               usergroupInfo.setXuserInfo(xuserInfo);
-
-               return xuserInfo;
-       }
+                       XUserInfo xuserInfo = new XUserInfo();
+                       xuserInfo.setName(aUserName);
+                       xuserInfo.setDescription(aUserName + " - add from Unix 
box");
+                       List<String> roleList = new ArrayList<String>();
+                       if (userMap.containsKey(aUserName)) {
+                   roleList.add(userMap.get(aUserName));
+               }else{
+                       roleList.add("ROLE_USER");
+               }
+                       xuserInfo.setUserRoleList(roleList);
+                       usergroupInfo.setXuserInfo(xuserInfo);
+                       
+                       return xuserInfo;
+               }
 
 
        private XGroupInfo addXGroupInfo(String aGroupName) {