From 3a241b546f4d96b3bd4083477e9308a37bcbb7c9 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 6 Nov 2019 16:17:41 +0000 Subject: [PATCH] Relax domain name checks in ResponseCookie Closes gh-23924 --- .../org/springframework/http/ResponseCookie.java | 2 +- .../springframework/http/ResponseCookieTests.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java index 4c88865eef5..2226b1db6fe 100644 --- a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java +++ b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java @@ -374,7 +374,7 @@ public final class ResponseCookie extends HttpCookie { } int char1 = domain.charAt(0); int charN = domain.charAt(domain.length() - 1); - if (char1 == '.' || char1 == '-' || charN == '.' || charN == '-') { + if (char1 == '-' || charN == '.' || charN == '-') { throw new IllegalArgumentException("Invalid first/last char in cookie domain: " + domain); } for (int i = 0, c = -1; i < domain.length(); i++) { diff --git a/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java b/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java index 5e812948464..d52c696f2e6 100644 --- a/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java +++ b/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java @@ -66,4 +66,19 @@ public class ResponseCookieTests { .hasMessageContaining("RFC2616 cookie value")); } + @Test + public void domainChecks() { + + Arrays.asList("abc", "abc.org", "abc-def.org", "abc3.org", ".abc.org") + .forEach(domain -> ResponseCookie.from("n", "v").domain(domain).build()); + + Arrays.asList("-abc.org", "abc.org.", "abc.org-", "-abc.org", "abc.org-") + .forEach(domain -> assertThatThrownBy(() -> ResponseCookie.from("n", "v").domain(domain).build()) + .hasMessageContaining("Invalid first/last char")); + + Arrays.asList("abc..org", "abc.-org", "abc-.org") + .forEach(domain -> assertThatThrownBy(() -> ResponseCookie.from("n", "v").domain(domain).build()) + .hasMessageContaining("invalid cookie domain char")); + } + }