andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handles client-side cookie much better now

Browse Source
This commit is contained in:
Trustin Lee 2009-03-13 15:29:54 +00:00
parent 510a270cb4
commit b6cfc24127
3 changed files with 70 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/jboss/netty/example/http/HttpRequestHandler.java
View File

@ -23,6 +23,7 @@ package org.jboss.netty.example.http;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
@ -132,11 +133,11 @@ public class HttpRequestHandler extends SimpleChannelHandler {
String cookieString = request.getHeader(HttpHeaders.Names.COOKIE); String cookieString = request.getHeader(HttpHeaders.Names.COOKIE);
if (cookieString != null) { if (cookieString != null) {
CookieDecoder cookieDecoder = new CookieDecoder(); CookieDecoder cookieDecoder = new CookieDecoder();
Map<String, Cookie> cookies = cookieDecoder.decode(cookieString); Set<Cookie> cookies = cookieDecoder.decode(cookieString);
if(!cookies.isEmpty()) { if(!cookies.isEmpty()) {
// Reset the cookies if necessary. // Reset the cookies if necessary.
CookieEncoder cookieEncoder = new CookieEncoder(); CookieEncoder cookieEncoder = new CookieEncoder();
for (Cookie cookie : cookies.values()) { for (Cookie cookie : cookies) {
cookieEncoder.addCookie(cookie); cookieEncoder.addCookie(cookie);
} }
response.addHeader(HttpHeaders.Names.SET_COOKIE, cookieEncoder.encode()); response.addHeader(HttpHeaders.Names.SET_COOKIE, cookieEncoder.encode());

18
src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
View File

@ -22,10 +22,8 @@
package org.jboss.netty.handler.codec.http; package org.jboss.netty.handler.codec.http;
import java.text.ParseException; import java.text.ParseException;
import java.util.Map; import java.util.Set;
import java.util.TreeMap; import java.util.TreeSet;
import org.jboss.netty.util.CaseIgnoringComparator;
/** /**
* @author The Netty Project (netty-dev@lists.jboss.org) * @author The Netty Project (netty-dev@lists.jboss.org)
@ -54,10 +52,11 @@ public class CookieDecoder {
this.charset = charset; this.charset = charset;
} }
public Map<String, Cookie> decode(String header) { public Set<Cookie> decode(String header) {
Map<String, Cookie> cookies = new TreeMap<String, Cookie>(CaseIgnoringComparator.INSTANCE); Set<Cookie> cookies = new TreeSet<Cookie>();
String[] split = header.split(SEMICOLON); String[] split = header.split(SEMICOLON);
int version = 0; int version = 0;
boolean versionAtTheBeginning = false;
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
DefaultCookie theCookie; DefaultCookie theCookie;
String s = split[i]; String s = split[i];
@ -68,19 +67,21 @@ public class CookieDecoder {
// $Version is the only attribute that can come before the // $Version is the only attribute that can come before the
// actual cookie name-value pair. // actual cookie name-value pair.
if (name.equalsIgnoreCase(CookieHeaderNames.VERSION)) { if (!versionAtTheBeginning &&
name.equalsIgnoreCase(CookieHeaderNames.VERSION)) {
try { try {
version = Integer.parseInt(trimValue(cookie[1])); version = Integer.parseInt(trimValue(cookie[1]));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// Ignore. // Ignore.
} }
versionAtTheBeginning = true;
continue; continue;
} }
// If it's not a version attribute, it's the name-value pair. // If it's not a version attribute, it's the name-value pair.
value = QueryStringDecoder.decodeComponent(trimValue(cookie[1]), charset); value = QueryStringDecoder.decodeComponent(trimValue(cookie[1]), charset);
theCookie = new DefaultCookie(name, value); theCookie = new DefaultCookie(name, value);
cookies.put(name, theCookie); cookies.add(theCookie);
boolean discard = false; boolean discard = false;
boolean secure = false; boolean secure = false;
String comment = null; String comment = null;
@ -175,6 +176,7 @@ public class CookieDecoder {
} }
private String trimName(String name) { private String trimName(String name) {
name = name.trim();
if (name.startsWith("$")) { if (name.startsWith("$")) {
return name.substring(1); return name.substring(1);
} else { } else {

78
src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
View File

@ -24,7 +24,8 @@ package org.jboss.netty.handler.codec.http;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Iterator;
import java.util.Set;
import org.junit.Test; import org.junit.Test;
@ -41,9 +42,9 @@ public class CookieDecoderTest {
cookieString = cookieString.replace("XXX", new CookieDateFormat().format(new Date(System.currentTimeMillis() + 50000))); cookieString = cookieString.replace("XXX", new CookieDateFormat().format(new Date(System.currentTimeMillis() + 50000)));
CookieDecoder cookieDecoder = new CookieDecoder(); CookieDecoder cookieDecoder = new CookieDecoder();
Map<String, Cookie> cookieMap = cookieDecoder.decode(cookieString); Set<Cookie> cookies = cookieDecoder.decode(cookieString);
assertEquals(1, cookieMap.size()); assertEquals(1, cookies.size());
Cookie cookie = cookieMap.get("MyCookie"); Cookie cookie = cookies.iterator().next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue", cookie.getValue()); assertEquals("myValue", cookie.getValue());
assertNull(cookie.getComment()); assertNull(cookie.getComment());
@ -61,9 +62,9 @@ public class CookieDecoderTest {
public void testDecodingSingleCookieV0ExtraParamsIgnored() { public void testDecodingSingleCookieV0ExtraParamsIgnored() {
String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=0;commentURL=http://aurl.com;port=80,8080;discard;"; String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=0;commentURL=http://aurl.com;port=80,8080;discard;";
CookieDecoder cookieDecoder = new CookieDecoder(); CookieDecoder cookieDecoder = new CookieDecoder();
Map<String, Cookie> cookieMap = cookieDecoder.decode(cookieString); Set<Cookie> cookies = cookieDecoder.decode(cookieString);
assertEquals(1, cookieMap.size()); assertEquals(1, cookies.size());
Cookie cookie = cookieMap.get("MyCookie"); Cookie cookie = cookies.iterator().next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue", cookie.getValue()); assertEquals("myValue", cookie.getValue());
assertNull(cookie.getComment()); assertNull(cookie.getComment());
@ -80,9 +81,9 @@ public class CookieDecoderTest {
public void testDecodingSingleCookieV1() { public void testDecodingSingleCookieV1() {
String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;"; String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;";
CookieDecoder cookieDecoder = new CookieDecoder(); CookieDecoder cookieDecoder = new CookieDecoder();
Map<String, Cookie> cookieMap = cookieDecoder.decode(cookieString); Set<Cookie> cookies = cookieDecoder.decode(cookieString);
assertEquals(1, cookieMap.size()); assertEquals(1, cookies.size());
Cookie cookie = cookieMap.get("MyCookie"); Cookie cookie = cookies.iterator().next();
assertEquals("myValue", cookie.getValue()); assertEquals("myValue", cookie.getValue());
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("this is a comment", cookie.getComment()); assertEquals("this is a comment", cookie.getComment());
@ -100,9 +101,9 @@ public class CookieDecoderTest {
public void testDecodingSingleCookieV1ExtraParamsIgnored() { public void testDecodingSingleCookieV1ExtraParamsIgnored() {
String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;commentURL=http://aurl.com;port=80,8080;discard;"; String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;commentURL=http://aurl.com;port=80,8080;discard;";
CookieDecoder cookieDecoder = new CookieDecoder(); CookieDecoder cookieDecoder = new CookieDecoder();
Map<String, Cookie> cookieMap = cookieDecoder.decode(cookieString); Set<Cookie> cookies = cookieDecoder.decode(cookieString);
assertEquals(1, cookieMap.size()); assertEquals(1, cookies.size());
Cookie cookie = cookieMap.get("MyCookie"); Cookie cookie = cookies.iterator().next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue", cookie.getValue()); assertEquals("myValue", cookie.getValue());
assertEquals("this is a comment", cookie.getComment()); assertEquals("this is a comment", cookie.getComment());
@ -119,9 +120,9 @@ public class CookieDecoderTest {
public void testDecodingSingleCookieV2() { public void testDecodingSingleCookieV2() {
String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=2;commentURL=http://aurl.com;port=\"80,8080\";discard;"; String cookieString = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=2;commentURL=http://aurl.com;port=\"80,8080\";discard;";
CookieDecoder cookieDecoder = new CookieDecoder(); CookieDecoder cookieDecoder = new CookieDecoder();
Map<String, Cookie> cookieMap = cookieDecoder.decode(cookieString); Set<Cookie> cookies = cookieDecoder.decode(cookieString);
assertEquals(1, cookieMap.size()); assertEquals(1, cookies.size());
Cookie cookie = cookieMap.get("MyCookie"); Cookie cookie = cookies.iterator().next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue", cookie.getValue()); assertEquals("myValue", cookie.getValue());
assertEquals("this is a comment", cookie.getComment()); assertEquals("this is a comment", cookie.getComment());
@ -145,9 +146,10 @@ public class CookieDecoderTest {
String c3 = "myCookie3=myValue3;max-age=0;version=2;"; String c3 = "myCookie3=myValue3;max-age=0;version=2;";
CookieDecoder decoder = new CookieDecoder(); CookieDecoder decoder = new CookieDecoder();
Map<String, Cookie> cookieMap = decoder.decode(c1 + c2 + c3); Set<Cookie> cookies = decoder.decode(c1 + c2 + c3);
assertEquals(3, cookieMap.size()); assertEquals(3, cookies.size());
Cookie cookie = cookieMap.get("MyCookie"); Iterator<Cookie> it = cookies.iterator();
Cookie cookie = it.next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue", cookie.getValue()); assertEquals("myValue", cookie.getValue());
assertEquals("this is a comment", cookie.getComment()); assertEquals("this is a comment", cookie.getComment());
@ -161,7 +163,7 @@ public class CookieDecoderTest {
assertTrue(cookie.getPorts().contains(8080)); assertTrue(cookie.getPorts().contains(8080));
assertTrue(cookie.isSecure()); assertTrue(cookie.isSecure());
assertEquals(2, cookie.getVersion()); assertEquals(2, cookie.getVersion());
cookie = cookieMap.get("MyCookie2"); cookie = it.next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue2", cookie.getValue()); assertEquals("myValue2", cookie.getValue());
assertEquals("this is another comment", cookie.getComment()); assertEquals("this is another comment", cookie.getComment());
@ -173,7 +175,7 @@ public class CookieDecoderTest {
assertTrue(cookie.getPorts().isEmpty()); assertTrue(cookie.getPorts().isEmpty());
assertFalse(cookie.isSecure()); assertFalse(cookie.isSecure());
assertEquals(2, cookie.getVersion()); assertEquals(2, cookie.getVersion());
cookie = cookieMap.get("MyCookie3"); cookie = it.next();
assertNotNull(cookie); assertNotNull(cookie);
assertEquals("myValue3", cookie.getValue()); assertEquals("myValue3", cookie.getValue());
assertNull( cookie.getComment()); assertNull( cookie.getComment());
@ -186,4 +188,38 @@ public class CookieDecoderTest {
assertFalse(cookie.isSecure()); assertFalse(cookie.isSecure());
assertEquals(2, cookie.getVersion()); assertEquals(2, cookie.getVersion());
} }
@Test
public void testDecodingClientSideCookies() {
String source = "$Version=\"1\"; " +
"Part_Number=\"Riding_Rocket_0023\"; $Path=\"/acme/ammo\"; " +
"Part_Number=\"Rocket_Launcher_0001\"; $Path=\"/acme\"";
Set<Cookie> cookies = new CookieDecoder().decode(source);
Iterator<Cookie> it = cookies.iterator();
Cookie c;
c = it.next();
assertEquals(1, c.getVersion());
assertEquals("Part_Number", c.getName());
assertEquals("Rocket_Launcher_0001", c.getValue());
assertEquals("/acme", c.getPath());
assertNull(c.getComment());
assertNull(c.getCommentUrl());
assertNull(c.getDomain());
assertTrue(c.getPorts().isEmpty());
assertEquals(-1, c.getMaxAge());
c = it.next();
assertEquals(1, c.getVersion());
assertEquals("Part_Number", c.getName());
assertEquals("Riding_Rocket_0023", c.getValue());
assertEquals("/acme/ammo", c.getPath());
assertNull(c.getComment());
assertNull(c.getCommentUrl());
assertNull(c.getDomain());
assertTrue(c.getPorts().isEmpty());
assertEquals(-1, c.getMaxAge());
}
} }