From 0d8c6af44731579f20ecb6f00f1679d7e3fd721a Mon Sep 17 00:00:00 2001
From: Alessandro Boch <aboch@cisco.com>
Date: Mon, 6 May 2013 22:57:10 -0700
Subject: [PATCH] User manager to properly handle authenticated users with no
 authorization

Signed-off-by: Alessandro Boch <aboch@cisco.com>
---
 .../controller/usermanager/internal/UserManagerImpl.java   | 7 ++++---
 .../web/root/src/main/resources/WEB-INF/jsp/error.jsp      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

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 0397cd4c47..31c773da8a 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
@@ -761,7 +761,6 @@ public class UserManagerImpl implements IUserManager, IObjectReader,
 
     public void _printAAAServers(CommandInterpreter ci) {
         for (ServerConfig aaaServer : remoteServerConfigList.values()) {
-            String protocol = 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)) {
-            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)) {
-            roleName = localUserConfigList.get(username).getRole();
+            UserConfig config = localUserConfigList.get(username);
+            roleName = (config == null)? null : config.getRole();
         }
 
         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 7b0915ae1d..d288969c0a 100644
--- 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>
-            <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>
-- 
2.36.6