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

Correctly format cookies. This fix some bug which lead to expiring of cookies to not work. See #426

Browse Source
This commit is contained in:
norman 2012-07-04 15:20:47 +02:00 committed by Trustin Lee
parent 8595d85e4a
commit ae2906de1e
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codec-http/src/main/java/io/netty/handler/codec/http/ClientCookieEncoder.java
View File

@ -109,6 +109,7 @@ public final class ClientCookieEncoder {
} }
buf.setCharAt(buf.length() - 1, (char) HttpConstants.DOUBLE_QUOTE); buf.setCharAt(buf.length() - 1, (char) HttpConstants.DOUBLE_QUOTE);
buf.append((char) HttpConstants.SEMICOLON); buf.append((char) HttpConstants.SEMICOLON);
buf.append((char) HttpConstants.SP);
} }
} }
} }

5
codec-http/src/main/java/io/netty/handler/codec/http/CookieEncoderUtil.java
View File

@ -20,7 +20,7 @@ final class CookieEncoderUtil {
static String stripTrailingSeparator(StringBuilder buf) { static String stripTrailingSeparator(StringBuilder buf) {
if (buf.length() > 0) { if (buf.length() > 0) {
buf.setLength(buf.length() - 1); buf.setLength(buf.length() - 2);
} }
return buf.toString(); return buf.toString();
} }
@ -51,6 +51,7 @@ final class CookieEncoderUtil {
sb.append((char) HttpConstants.EQUALS); sb.append((char) HttpConstants.EQUALS);
sb.append(val); sb.append(val);
sb.append((char) HttpConstants.SEMICOLON); sb.append((char) HttpConstants.SEMICOLON);
sb.append((char) HttpConstants.SP);
} }
static void addQuoted(StringBuilder sb, String name, String val) { static void addQuoted(StringBuilder sb, String name, String val) {
@ -64,6 +65,7 @@ final class CookieEncoderUtil {
sb.append(val.replace("\\", "\\\\").replace("\"", "\\\"")); sb.append(val.replace("\\", "\\\\").replace("\"", "\\\""));
sb.append((char) HttpConstants.DOUBLE_QUOTE); sb.append((char) HttpConstants.DOUBLE_QUOTE);
sb.append((char) HttpConstants.SEMICOLON); sb.append((char) HttpConstants.SEMICOLON);
sb.append((char) HttpConstants.SP);
} }
static void add(StringBuilder sb, String name, long val) { static void add(StringBuilder sb, String name, long val) {
@ -71,6 +73,7 @@ final class CookieEncoderUtil {
sb.append((char) HttpConstants.EQUALS); sb.append((char) HttpConstants.EQUALS);
sb.append(val); sb.append(val);
sb.append((char) HttpConstants.SEMICOLON); sb.append((char) HttpConstants.SEMICOLON);
sb.append((char) HttpConstants.SP);
} }
private CookieEncoderUtil() { private CookieEncoderUtil() {

4
codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java
View File

@ -83,10 +83,12 @@ public final class ServerCookieEncoder {
if (cookie.isSecure()) { if (cookie.isSecure()) {
buf.append(CookieHeaderNames.SECURE); buf.append(CookieHeaderNames.SECURE);
buf.append((char) HttpConstants.SEMICOLON); buf.append((char) HttpConstants.SEMICOLON);
buf.append((char) HttpConstants.SP);
} }
if (cookie.isHttpOnly()) { if (cookie.isHttpOnly()) {
buf.append(CookieHeaderNames.HTTPONLY); buf.append(CookieHeaderNames.HTTPONLY);
buf.append((char) HttpConstants.SEMICOLON); buf.append((char) HttpConstants.SEMICOLON);
buf.append((char) HttpConstants.SP);
} }
if (cookie.getVersion() >= 1) { if (cookie.getVersion() >= 1) {
if (cookie.getComment() != null) { if (cookie.getComment() != null) {
@ -109,10 +111,12 @@ public final class ServerCookieEncoder {
} }
buf.setCharAt(buf.length() - 1, (char) HttpConstants.DOUBLE_QUOTE); buf.setCharAt(buf.length() - 1, (char) HttpConstants.DOUBLE_QUOTE);
buf.append((char) HttpConstants.SEMICOLON); buf.append((char) HttpConstants.SEMICOLON);
buf.append((char) HttpConstants.SP);
} }
if (cookie.isDiscard()) { if (cookie.isDiscard()) {
buf.append(CookieHeaderNames.DISCARD); buf.append(CookieHeaderNames.DISCARD);
buf.append((char) HttpConstants.SEMICOLON); buf.append((char) HttpConstants.SEMICOLON);
buf.append((char) HttpConstants.SP);
} }
} }

12
codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java
View File

@ -26,7 +26,7 @@ import org.junit.Test;
public class CookieEncoderTest { public class CookieEncoderTest {
@Test @Test
public void testEncodingSingleCookieV0() { public void testEncodingSingleCookieV0() {
String result = "myCookie=myValue;Expires=XXX;Path=/apathsomewhere;Domain=.adomainsomewhere;Secure"; String result = "myCookie=myValue; Expires=XXX; Path=/apathsomewhere; Domain=.adomainsomewhere; Secure";
DateFormat df = new HttpHeaderDateFormat(); DateFormat df = new HttpHeaderDateFormat();
Cookie cookie = new DefaultCookie("myCookie", "myValue"); Cookie cookie = new DefaultCookie("myCookie", "myValue");
cookie.setComment("this is a Comment"); cookie.setComment("this is a Comment");
@ -58,7 +58,7 @@ public class CookieEncoderTest {
@Test @Test
public void testEncodingSingleCookieV1() { public void testEncodingSingleCookieV1() {
String result = "myCookie=myValue;Max-Age=50;Path=\"/apathsomewhere\";Domain=.adomainsomewhere;Secure;Comment=\"this is a Comment\";Version=1"; String result = "myCookie=myValue; Max-Age=50; Path=\"/apathsomewhere\"; Domain=.adomainsomewhere; Secure; Comment=\"this is a Comment\"; Version=1";
Cookie cookie = new DefaultCookie("myCookie", "myValue"); Cookie cookie = new DefaultCookie("myCookie", "myValue");
cookie.setVersion(1); cookie.setVersion(1);
cookie.setComment("this is a Comment"); cookie.setComment("this is a Comment");
@ -72,7 +72,7 @@ public class CookieEncoderTest {
@Test @Test
public void testEncodingSingleCookieV2() { public void testEncodingSingleCookieV2() {
String result = "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 result = "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";
Cookie cookie = new DefaultCookie("myCookie", "myValue"); Cookie cookie = new DefaultCookie("myCookie", "myValue");
cookie.setVersion(1); cookie.setVersion(1);
cookie.setComment("this is a Comment"); cookie.setComment("this is a Comment");
@ -89,9 +89,9 @@ public class CookieEncoderTest {
@Test @Test
public void testEncodingMultipleClientCookies() { public void testEncodingMultipleClientCookies() {
String c1 = "$Version=1;myCookie=myValue;$Path=\"/apathsomewhere\";$Domain=.adomainsomewhere;$Port=\"80,8080\";"; String c1 = "$Version=1; myCookie=myValue; $Path=\"/apathsomewhere\"; $Domain=.adomainsomewhere; $Port=\"80,8080\"; ";
String c2 = "$Version=1;myCookie2=myValue2;$Path=\"/anotherpathsomewhere\";$Domain=.anotherdomainsomewhere;"; String c2 = "$Version=1; myCookie2=myValue2; $Path=\"/anotherpathsomewhere\"; $Domain=.anotherdomainsomewhere; ";
String c3 = "$Version=1;myCookie3=myValue3"; String c3 = "$Version=1; myCookie3=myValue3";
Cookie cookie = new DefaultCookie("myCookie", "myValue"); Cookie cookie = new DefaultCookie("myCookie", "myValue");
cookie.setVersion(1); cookie.setVersion(1);
cookie.setComment("this is a Comment"); cookie.setComment("this is a Comment");