You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/11/30 15:10:59 UTC
cxf git commit: [CXF-6693] Support for a $ char in
HttpHeaderImpl.getCookies
Repository: cxf
Updated Branches:
refs/heads/master 3b4f73a99 -> 5b0066f3f
[CXF-6693] Support for a $ char in HttpHeaderImpl.getCookies
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5b0066f3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5b0066f3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5b0066f3
Branch: refs/heads/master
Commit: 5b0066f3fc6ea92ad750f314bd5af456a095c04b
Parents: 3b4f73a
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Nov 30 14:10:43 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Nov 30 14:10:43 2015 +0000
----------------------------------------------------------------------
.../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 34 ++++++++++++++++----
.../cxf/jaxrs/impl/HttpHeadersImplTest.java | 23 +++++++++++--
2 files changed, 48 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b0066f3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index 4bcf4ff..3990af4 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -57,6 +57,10 @@ public class HttpHeadersImpl implements HttpHeaders {
private static final String COOKIE_SEPARATOR_CRLF = "crlf";
private static final String DEFAULT_SEPARATOR = ",";
private static final String DEFAULT_COOKIE_SEPARATOR = ";";
+ private static final String DOLLAR_CHAR = "$";
+ private static final String COOKIE_VERSION_PARAM = DOLLAR_CHAR + "Version";
+ private static final String COOKIE_PATH_PARAM = DOLLAR_CHAR + "Path";
+ private static final String COOKIE_DOMAIN_PARAM = DOLLAR_CHAR + "Domain";
private static final String COMPLEX_HEADER_EXPRESSION =
"(([\\w]+=\"[^\"]*\")|([\\w]+=[\\w]+)|([\\w]+))(;(([\\w]+=\"[^\"]*\")|([\\w]+=[\\w]+)|([\\w]+)))?";
@@ -110,9 +114,10 @@ public class HttpHeadersImpl implements HttpHeaders {
if (value == null) {
continue;
}
- List<String> cs = value.contains("$")
- ? Collections.singletonList(value)
- : getHeaderValues(HttpHeaders.COOKIE, value, getCookieSeparator());
+
+
+ List<String> cs = getHeaderValues(HttpHeaders.COOKIE, value,
+ getCookieSeparator(value));
for (String c : cs) {
Cookie cookie = Cookie.valueOf(c);
cl.put(cookie.getName(), cookie);
@@ -121,7 +126,22 @@ public class HttpHeadersImpl implements HttpHeaders {
return cl;
}
- private String getCookieSeparator() {
+ private String getCookieSeparator(String value) {
+ String separator = getCookieSeparatorFromProperty();
+ if (separator != null) {
+ return separator;
+ } else {
+ if (value.contains(DOLLAR_CHAR)
+ && (value.contains(COOKIE_VERSION_PARAM)
+ || value.contains(COOKIE_PATH_PARAM)
+ || value.contains(COOKIE_DOMAIN_PARAM))) {
+ return DEFAULT_SEPARATOR;
+ }
+
+ return DEFAULT_COOKIE_SEPARATOR;
+ }
+ }
+ private String getCookieSeparatorFromProperty() {
Object cookiePropValue = message.getContextualProperty(COOKIE_SEPARATOR_PROPERTY);
if (cookiePropValue != null) {
String separator = cookiePropValue.toString().trim();
@@ -133,9 +153,9 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return separator;
} else {
- return DEFAULT_COOKIE_SEPARATOR;
+ return null;
}
- }
+ }
public Locale getLanguage() {
List<String> values = getListValues(HttpHeaders.CONTENT_LANGUAGE);
@@ -212,7 +232,7 @@ public class HttpHeadersImpl implements HttpHeaders {
if (value == null) {
continue;
}
- String sep = HttpHeaders.COOKIE.equalsIgnoreCase(name) ? getCookieSeparator() : DEFAULT_SEPARATOR;
+ String sep = HttpHeaders.COOKIE.equalsIgnoreCase(name) ? getCookieSeparator(value) : DEFAULT_SEPARATOR;
ls.addAll(getHeaderValues(name, value, sep));
}
return ls;
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b0066f3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index c82af5d..314b87e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -396,12 +396,12 @@ public class HttpHeadersImplTest extends Assert {
Message m = new MessageImpl();
m.setExchange(new ExchangeImpl());
MetadataMap<String, String> headers = createHeaders();
- headers.putSingle(HttpHeaders.COOKIE, "a=b;c=d");
+ headers.putSingle(HttpHeaders.COOKIE, "a=$b;c=d");
m.put(Message.PROTOCOL_HEADERS, headers);
HttpHeaders h = new HttpHeadersImpl(m);
Map<String, Cookie> cookies = h.getCookies();
assertEquals(2, cookies.size());
- assertEquals("b", cookies.get("a").getValue());
+ assertEquals("$b", cookies.get("a").getValue());
assertEquals("d", cookies.get("c").getValue());
}
@@ -421,6 +421,25 @@ public class HttpHeadersImplTest extends Assert {
assertEquals(1, cookie.getVersion());
}
+ @Test
+ public void testGetCookiesWithAttributes() throws Exception {
+
+ Message m = new MessageImpl();
+ m.setExchange(new ExchangeImpl());
+ MetadataMap<String, String> headers = createHeaders();
+ headers.putSingle(HttpHeaders.COOKIE, "$Version=1;a=b, $Version=1;c=d");
+ m.put(Message.PROTOCOL_HEADERS, headers);
+ HttpHeaders h = new HttpHeadersImpl(m);
+ Map<String, Cookie> cookies = h.getCookies();
+ assertEquals(2, cookies.size());
+ Cookie cookieA = cookies.get("a");
+ assertEquals("b", cookieA.getValue());
+ assertEquals(1, cookieA.getVersion());
+ Cookie cookieC = cookies.get("c");
+ assertEquals("d", cookieC.getValue());
+ assertEquals(1, cookieA.getVersion());
+ }
+
@Test
public void testGetCookiesWithComma() throws Exception {