ISSUE: Some changes to Authorization

[controller.git] / opendaylight / usermanager / src / main / java / org / opendaylight / controller / usermanager / internal / UserManagerImpl.java

diff --git a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java
index 7147c0ac0f36edd5a647430d209458a36d44cc0e..0aad599222a69acbd4ecd22374fa4c7951426ffd 100644 (file)
--- a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java
+++ b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java
@@ -825,12 +825,20 @@ public class UserManagerImpl implements IUserManager, IObjectReader,
     @Override
     public UserLevel getUserLevel(String username) {
         // Returns the controller well-know user level for the passed user
     @Override
     public UserLevel getUserLevel(String username) {
         // Returns the controller well-know user level for the passed user

-        if (!activeUsers.containsKey(username)) {
-            return UserLevel.NOUSER;
-        }
+       String roleName = null;

 
 

+       // First check in active users then in local configured users
+        if (activeUsers.containsKey(username)) {
+               roleName = activeUsers.get(username).getUserRoles().get(0);
+        } else if (localUserConfigList.containsKey(username)) {
+               roleName = localUserConfigList.get(username).getRole();
+        }
+        
+        if (roleName == null) {
+               return UserLevel.NOUSER;
+        }
+        

         // For now only one role per user is allowed
         // For now only one role per user is allowed

-        String roleName = activeUsers.get(username).getUserRoles().get(0);

         if (roleName.equals(UserLevel.SYSTEMADMIN.toString())) {
             return UserLevel.SYSTEMADMIN;
         }
         if (roleName.equals(UserLevel.SYSTEMADMIN.toString())) {
             return UserLevel.SYSTEMADMIN;
         }


@@ -851,7 +859,6 @@ public class UserManagerImpl implements IUserManager, IObjectReader,
             }
         }
         return UserLevel.NOUSER;
             }
         }
         return UserLevel.NOUSER;

-

     }
 
     @Override
     }
 
     @Override