[Statelessfilter-commits] SF.net SVN: statelessfilter:[95] trunk/stateless-cookie-plain

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

Revision: 95
          http://statelessfilter.svn.sourceforge.net/statelessfilter/?rev=95&view=rev
Author:   nricheton
Date:     2011-12-23 15:55:07 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
- Cleanup
- Support for X-Forwarded-For

Modified Paths:
--------------
    trunk/stateless-cookie-plain/pom.xml
    trunk/stateless-cookie-plain/src/main/java/net/sourceforge/statelessfilter/backend/plaincookie/PlainCookieBackend.java

Modified: trunk/stateless-cookie-plain/pom.xml
===================================================================
--- trunk/stateless-cookie-plain/pom.xml	2011-12-23 15:53:53 UTC (rev 94)
+++ trunk/stateless-cookie-plain/pom.xml	2011-12-23 15:55:07 UTC (rev 95)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>stateless-parent</artifactId>
 		<groupId>net.sourceforge.statelessfilter</groupId>
-		<version>0.9-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
   <artifactId>stateless-cookie-plain</artifactId>
@@ -15,9 +15,7 @@
   	<dependency>
   		<groupId>net.sourceforge.statelessfilter</groupId>
   		<artifactId>stateless-core</artifactId>
-  		<version>0.9-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
+  		<version>0.8.1-SNAPSHOT</version>
   	</dependency>
   	<dependency>
   		<groupId>javax.servlet</groupId>

Modified: trunk/stateless-cookie-plain/src/main/java/net/sourceforge/statelessfilter/backend/plaincookie/PlainCookieBackend.java
===================================================================
--- trunk/stateless-cookie-plain/src/main/java/net/sourceforge/statelessfilter/backend/plaincookie/PlainCookieBackend.java	2011-12-23 15:53:53 UTC (rev 94)
+++ trunk/stateless-cookie-plain/src/main/java/net/sourceforge/statelessfilter/backend/plaincookie/PlainCookieBackend.java	2011-12-23 15:55:07 UTC (rev 95)
@@ -22,6 +22,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
+import java.security.SignatureException;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
@@ -104,10 +105,10 @@
 	@Override
 	public ISessionData restore(HttpServletRequest request) {
 
-		byte[] data = getCookieData(request, null);
+		try {
+			byte[] data = getCookieData(request, null);
 
-		if (data != null) {
-			try {
+			if (data != null) {
 				InputStream inputStream = new ByteArrayInputStream(data);
 				if (compress) {
 					inputStream = new GZIPInputStream(inputStream);
@@ -117,48 +118,53 @@
 				CookieDataSupport s = (CookieDataSupport) ois.readObject();
 
 				if (s.isValid()
-						&& s.getRemoteAddress().equals(request.getRemoteAddr())) {
+						&& s.getRemoteAddress().equals(getFullRemoteAddr(request))) {
 					return s;
 				}
-			} catch (Exception e) {
-				logger.info(DESERIALIZE_ERROR, e);
 			}
+		} catch (Exception e) {
+			logger.info(DESERIALIZE_ERROR, e);
 		}
 
 		return null;
 	}
 
-
 	/**
-	 * @see net.sourceforge.statelessfilter.backend.support.CookieBackendSupport#save(net.sourceforge.statelessfilter.backend.ISessionData, java.util.List, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * @see net.sourceforge.statelessfilter.backend.support.CookieBackendSupport#save(net.sourceforge.statelessfilter.backend.ISessionData,
+	 *      java.util.List, javax.servlet.http.HttpServletRequest,
+	 *      javax.servlet.http.HttpServletResponse)
 	 */
 	@Override
-	public void save(ISessionData session,  List<String> dirtyAttributes, HttpServletRequest request,
-			HttpServletResponse response) throws IOException {
+	public void save(ISessionData session, List<String> dirtyAttributes,
+			HttpServletRequest request, HttpServletResponse response)
+			throws IOException {
+		try {
+			if (session != null) {
+				CookieDataSupport cookieData = new CookieDataSupport(session);
+				cookieData.setRemoteAddress(getFullRemoteAddr(request));
 
-		if (session != null) {
-			CookieDataSupport cookieData = new CookieDataSupport(session);
-			cookieData.setRemoteAddress(request.getRemoteAddr());
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				OutputStream outputStream = baos;
+				if (compress) {
+					outputStream = new GZIPOutputStream(outputStream);
+				}
 
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			OutputStream outputStream = baos;
-			if (compress) {
-				outputStream = new GZIPOutputStream(outputStream);
-			}
+				ObjectOutputStream oos = new ObjectOutputStream(outputStream);
+				oos.writeObject(cookieData);
+				oos.close();
+				outputStream.close();
+				baos.close();
 
-			ObjectOutputStream oos = new ObjectOutputStream(outputStream);
-			oos.writeObject(cookieData);
-			oos.close();
-			outputStream.close();
-			baos.close();
+				setCookieData(request, response, baos.toByteArray());
 
-			setCookieData(request, response, baos.toByteArray());
-
-			if (logger.isInfoEnabled()) {
-				logger.info("Cookie size : " + baos.toByteArray().length); //$NON-NLS-1$
+				if (logger.isInfoEnabled()) {
+					logger.info("Cookie size : " + baos.toByteArray().length); //$NON-NLS-1$
+				}
+			} else {
+				setCookieData(request, response, null);
 			}
-		} else {
-			setCookieData(request, response, null);
+		} catch (SignatureException e) {
+			throw new IOException(e);
 		}
 	}
 }

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