Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Jan Bartel 2016-09-08 14:26:45 +10:00
parent f703d2ad38 09da3248e5
commit 3bb9fe86d3
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -322,27 +322,7 @@ public class Response implements HttpServletResponse
buf.append(";Comment="); buf.append(";Comment=");
quoteOnlyOrAppend(buf,comment,isQuoteNeededForCookie(comment)); quoteOnlyOrAppend(buf,comment,isQuoteNeededForCookie(comment));
} }
// remove any existing set-cookie fields of same name
Iterator<HttpField> i=_fields.iterator();
while (i.hasNext())
{
HttpField field=i.next();
if (field.getHeader()==HttpHeader.SET_COOKIE)
{
String val = field.getValue();
if (val!=null && val.startsWith(name_equals))
{
//existing cookie has same name, does it also match domain and path?
if (((!has_domain && !val.contains("Domain")) || (has_domain && val.contains(domain))) &&
((!has_path && !val.contains("Path")) || (has_path && val.contains(path))))
{
i.remove();
}
}
}
}
// add the set cookie // add the set cookie
_fields.add(HttpHeader.SET_COOKIE, buf.toString()); _fields.add(HttpHeader.SET_COOKIE, buf.toString());

20
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
View File

@ -867,12 +867,12 @@ public class ResponseTest
assertEquals("minimal=value",fields.get("Set-Cookie")); assertEquals("minimal=value",fields.get("Set-Cookie"));
fields.clear(); fields.clear();
//test cookies with same name, domain and path, only 1 allowed //test cookies with same name, domain and path
response.addSetCookie("everything","wrong","domain","path",0,"to be replaced",true,true,0); response.addSetCookie("everything","something","domain","path",0,"noncomment",true,true,0);
response.addSetCookie("everything","value","domain","path",0,"comment",true,true,0); response.addSetCookie("everything","value","domain","path",0,"comment",true,true,0);
assertEquals("everything=value;Version=1;Path=path;Domain=domain;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=comment",fields.get("Set-Cookie"));
Enumeration<String> e =fields.getValues("Set-Cookie"); Enumeration<String> e =fields.getValues("Set-Cookie");
assertTrue(e.hasMoreElements()); assertTrue(e.hasMoreElements());
assertEquals("everything=something;Version=1;Path=path;Domain=domain;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=noncomment",e.nextElement());
assertEquals("everything=value;Version=1;Path=path;Domain=domain;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=comment",e.nextElement()); assertEquals("everything=value;Version=1;Path=path;Domain=domain;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=comment",e.nextElement());
assertFalse(e.hasMoreElements()); assertFalse(e.hasMoreElements());
assertEquals("Thu, 01 Jan 1970 00:00:00 GMT",fields.get("Expires")); assertEquals("Thu, 01 Jan 1970 00:00:00 GMT",fields.get("Expires"));
@ -929,6 +929,7 @@ public class ResponseTest
response.addSetCookie("everything","value","","",0,"comment",true,true,0); response.addSetCookie("everything","value","","",0,"comment",true,true,0);
e =fields.getValues("Set-Cookie"); e =fields.getValues("Set-Cookie");
assertTrue(e.hasMoreElements()); assertTrue(e.hasMoreElements());
assertEquals("everything=other;Version=1;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=blah",e.nextElement());
assertEquals("everything=value;Version=1;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=comment",e.nextElement()); assertEquals("everything=value;Version=1;Expires=Thu, 01-Jan-1970 00:00:00 GMT;Max-Age=0;Secure;HttpOnly;Comment=comment",e.nextElement());
assertFalse(e.hasMoreElements()); assertFalse(e.hasMoreElements());
@ -953,16 +954,17 @@ public class ResponseTest
fields.clear(); fields.clear();
response.addSetCookie("name","value","domain",null,-1,null,false,false,-1); response.addSetCookie("name","value","domain",null,-1,null,false,false,-1);
response.addSetCookie("name","other","domain",null,-1,null,false,false,-1); response.addSetCookie("name","other","domain",null,-1,null,false,false,-1);
assertEquals("name=other;Domain=domain",fields.get("Set-Cookie"));
response.addSetCookie("name","more","domain",null,-1,null,false,false,-1); response.addSetCookie("name","more","domain",null,-1,null,false,false,-1);
assertEquals("name=more;Domain=domain",fields.get("Set-Cookie")); e = fields.getValues("Set-Cookie");
assertTrue(e.hasMoreElements());
assertThat(e.nextElement(), Matchers.startsWith("name=value"));
assertThat(e.nextElement(), Matchers.startsWith("name=other"));
assertThat(e.nextElement(), Matchers.startsWith("name=more"));
response.addSetCookie("foo","bar","domain",null,-1,null,false,false,-1); response.addSetCookie("foo","bar","domain",null,-1,null,false,false,-1);
response.addSetCookie("foo","bob","domain",null,-1,null,false,false,-1); response.addSetCookie("foo","bob","domain",null,-1,null,false,false,-1);
assertEquals("name=more;Domain=domain",fields.get("Set-Cookie")); assertThat(fields.get("Set-Cookie"), Matchers.startsWith("name=value"));
e=fields.getValues("Set-Cookie");
assertEquals("name=more;Domain=domain",e.nextElement());
assertEquals("foo=bob;Domain=domain",e.nextElement());
fields.clear(); fields.clear();
response.addSetCookie("name","value%=",null,null,-1,null,false,false,0); response.addSetCookie("name","value%=",null,null,-1,null,false,false,0);