[Statelessfilter-commits] SF.net SVN: statelessfilter:[118] trunk/stateless-cookie-aes/src/main/java/ net/sourceforge/statelessfilter/backend/aescookie/AESCookieBackend.java

[<nri...@us...>]

Revision: 118
          http://sourceforge.net/p/statelessfilter/code/118
Author:   nricheton
Date:     2013-10-24 10:17:04 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
trim

Modified Paths:
--------------
    trunk/stateless-cookie-aes/src/main/java/net/sourceforge/statelessfilter/backend/aescookie/AESCookieBackend.java

Modified: trunk/stateless-cookie-aes/src/main/java/net/sourceforge/statelessfilter/backend/aescookie/AESCookieBackend.java
===================================================================
--- trunk/stateless-cookie-aes/src/main/java/net/sourceforge/statelessfilter/backend/aescookie/AESCookieBackend.java	2013-10-24 09:21:39 UTC (rev 117)
+++ trunk/stateless-cookie-aes/src/main/java/net/sourceforge/statelessfilter/backend/aescookie/AESCookieBackend.java	2013-10-24 10:17:04 UTC (rev 118)
@@ -17,6 +17,7 @@
 
 import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
 import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang.StringUtils.trim;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -142,11 +143,11 @@
     @Override
     public void init(Map<String, String> config) throws Exception {
         super.init(config);
-        this.compress = Boolean.parseBoolean(defaultIfEmpty(config.get(PARAM_COMPRESS), "true"));
-        this.restrictIp = Boolean.parseBoolean(defaultIfEmpty(config.get(PARAM_RESTRICT_IP), "true"));
+        this.compress = Boolean.parseBoolean(defaultIfEmpty(trim(config.get(PARAM_COMPRESS)), "true"));
+        this.restrictIp = Boolean.parseBoolean(defaultIfEmpty(trim(config.get(PARAM_RESTRICT_IP)), "true"));
         this.signSecret = defaultIfEmpty(config.get(PARAM_SIGN_SECRET), UUID.randomUUID().toString());
-        this.sessionMaxTime = isEmpty(config.get(PARAM_SESSION_MAX_TIME)) ? null : Integer.parseInt(config
-                .get(PARAM_SESSION_MAX_TIME));
+        this.sessionMaxTime = isEmpty(config.get(PARAM_SESSION_MAX_TIME)) ? null : Integer.parseInt(trim(config
+                .get(PARAM_SESSION_MAX_TIME)));
         if (logger.isInfoEnabled()) {
             logger.info(
                     "Cookie name: '{}', compression: '{}', " + "session max time: '{}', restrict IP: '{}'", new Object[] { this.cookieName, this.compress, this.sessionMaxTime, this.restrictIp }); //$NON-NLS-1$
@@ -174,7 +175,6 @@
 
         try {
             byte[] data = getCookieData(request, null, true, this.signSecret);
-
             if (data != null) {
                 int index = ArrayUtils.indexOf(data, SEPARATOR.getBytes()[0]);
 
@@ -199,11 +199,14 @@
                         && (!StringUtils.equals(s.getRemoteAddress(), getFullRemoteAddr(request)) || StringUtils
                                 .isEmpty(s.getRemoteAddress()))) {
                     s.setValid(false);
+                    logger.warn("Invalid IP. Expected: " + s.getRemoteAddress() + ", current: "
+                            + getFullRemoteAddr(request));
                 }
 
                 if (sessionMaxTime != null
                         && System.currentTimeMillis() > s.getCreationTime() + sessionMaxTime.intValue() * 1000) {
                     s.setValid(false);
+                    logger.info("Session max time reached.");
                 }
 
                 if (s.isValid()) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.