Author: ssmiweve
Date: 2009-03-03 11:03:12 +0100 (Tue, 03 Mar 2009)
New Revision: 7213

Modified:
   branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
Log:
Be a little more robust against ejb3-client calls

Modified: 
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
===================================================================
--- 
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java    
    2009-02-26 10:49:22 UTC (rev 7212)
+++ 
branches/2.18/war/src/main/java/no/sesat/search/http/filters/UserFilter.java    
    2009-03-03 10:03:12 UTC (rev 7213)
@@ -1,4 +1,4 @@
-/* Copyright (2007-2008) Schibsted Søk AS
+/* Copyright (2007-2009) Schibsted Søk AS
  * This file is part of SESAT.
  *
  *   SESAT is free software: you can redistribute it and/or modify
@@ -47,8 +47,9 @@
  * Responsible for Persistent User Login. Or "Remember Me" functionality. 
Based off
  * 
http://fishbowl.pastiche.org/2004/01/19/persistent_login_cookie_best_practice
  *
+ * The user's manual logging in with username and password
+ *  must be performed in a separate application that fronts to UserService.
  *
- *
  * @version <tt>$Id$</tt>
  */
 public final class UserFilter implements Filter {
@@ -201,11 +202,16 @@
                 // Updates the login cookie.
                 UserCookieUtil.setUserLoginCookie(response, 
user.getNextLoginKey());
             }
-        } catch (final InvalidTokenException e) {
-            // TODO: Give message to user?
+        } catch (InvalidTokenException e) {
+            // TODO: Give message to user? eg "You were logged out for 
security reasons"
             LOG.warn("Invalid token in login key: " + loginKey);
             datamodel.getUser().setUser(null);
             UserCookieUtil.setUserLoginCookieDefault(response);
+        } catch (Throwable e) {
+            // TODO: Give message to user?  eg "You were logged out for 
security reasons"
+            LOG.warn("Unknown throwable: " + e.getMessage());
+            datamodel.getUser().setUser(null);
+            UserCookieUtil.setUserLoginCookieDefault(response);
         }
     }
 

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to