User manager to properly handle authenticated users with no 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 0397cd4c47766cb9ac07e98aaadd72dcfde7c03a..31c773da8a57d7aed083dee5aad094b52ced4b59 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
@@ -761,7 +761,6 @@ public class UserManagerImpl implements IUserManager, IObjectReader,
 
     public void _printAAAServers(CommandInterpreter ci) {
         for (ServerConfig aaaServer : remoteServerConfigList.values()) {
 
     public void _printAAAServers(CommandInterpreter ci) {
         for (ServerConfig aaaServer : remoteServerConfigList.values()) {

-            String protocol = aaaServer.getProtocol();

             ci.println(aaaServer.getAddress() + "-" + aaaServer.getProtocol());
         }
     }
             ci.println(aaaServer.getAddress() + "-" + aaaServer.getProtocol());
         }
     }


@@ -867,9 +866,11 @@ public class UserManagerImpl implements IUserManager, IObjectReader,
 
         // First check in active users then in local configured users
         if (activeUsers.containsKey(username)) {
 
         // First check in active users then in local configured users
         if (activeUsers.containsKey(username)) {

-            roleName = activeUsers.get(username).getUserRoles().get(0);
+            List<String> roles = activeUsers.get(username).getUserRoles();
+            roleName = (roles == null || roles.isEmpty())? null : roles.get(0);

         } else if (localUserConfigList.containsKey(username)) {
         } else if (localUserConfigList.containsKey(username)) {

-            roleName = localUserConfigList.get(username).getRole();
+            UserConfig config = localUserConfigList.get(username);
+            roleName = (config == null)? null : config.getRole();

         }
 
         if (roleName == null) {
         }
 
         if (roleName == null) {