User manager to properly handle authenticated users with no authorization

Signed-off-by: Alessandro Boch <aboch@cisco.com>

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) {

diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp
index 7b0915ae1d00786782fb5660a46922f5a9e4faf7..d288969c0a4680091f53a4165122c37ed5079033 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp
@@ -41,7 +41,7 @@
        <div class="login-form">
          <div id="logo"></div>
            <fieldset>
        <div class="login-form">
          <div id="logo"></div>
            <fieldset>

-            <p>Authentication failed or session might have timed out.<p>
+            <p>Login failed or session might have timed out.<p>

             <p>Please go back to the login page and try again.</p>
             <br/>
              <button class="btn btn-primary" type="submit" value="Log In" >Go To Login Page</button>
             <p>Please go back to the login page and try again.</p>
             <br/>
              <button class="btn btn-primary" type="submit" value="Log In" >Go To Login Page</button>