X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fusermanager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fusermanager%2Finternal%2FUserManagerImpl.java;h=0aad599222a69acbd4ecd22374fa4c7951426ffd;hp=7147c0ac0f36edd5a647430d209458a36d44cc0e;hb=7b5da62ba81e4bb33e245add85b1c32cf2e6c8a0;hpb=b7a34b47e39a9fe25617c9e536817858e58b2558 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 7147c0ac0f..0aad599222 100644 --- 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 - 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 - String roleName = activeUsers.get(username).getUserRoles().get(0); if (roleName.equals(UserLevel.SYSTEMADMIN.toString())) { return UserLevel.SYSTEMADMIN; } @@ -851,7 +859,6 @@ public class UserManagerImpl implements IUserManager, IObjectReader, } } return UserLevel.NOUSER; - } @Override