Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support cookies with Expires attribute but no Max-Age attribute in MockHttpServletResponse #26558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Support cookies with Expires attribute but no Max-Age attribute in MockHttpServletResponse #26558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66c9aba
Support for cookies with only an expires attribute (and not a max-age)
Feb 17, 2021
e1aa10e
Fix formatting to align with styleguide
Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,10 @@ private String getCookieHeader(Cookie cookie) {
buf.append("; Domain=").append(cookie.getDomain());
}
int maxAge = cookie.getMaxAge();
ZonedDateTime expires = (cookie instanceof MockCookie ? ((MockCookie) cookie).getExpires() : null);
if (maxAge >= 0) {
buf.append("; Max-Age=").append(maxAge);
buf.append("; Expires=");
ZonedDateTime expires = (cookie instanceof MockCookie ? ((MockCookie) cookie).getExpires() : null);
if (expires != null) {
buf.append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME));
}
Expand All @@ -387,6 +387,11 @@ private String getCookieHeader(Cookie cookie) {
buf.append(headers.getFirst(HttpHeaders.EXPIRES));
}
}
else if (expires != null) {
buf.append("; Expires=");
buf.append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME));
}


if (cookie.getSecure()) {
buf.append("; Secure");
Expand Down
11 changes: 11 additions & 0 deletions spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,17 @@ void addCookieHeaderWithZeroExpiresAttribute() {
assertThat(header).startsWith("SESSION=123; Path=/; Max-Age=100; Expires=");
}

/**
* @since 5.1.12
*/
@Test
void addCookieHeaderWithOnlyExpiresAttribute() {
String cookieValue = "SESSION=123; Path=/; Expires=Tue, 8 Oct 2019 19:50:00 GMT";
response.addHeader(SET_COOKIE, cookieValue);
assertNumCookies(1);
assertThat(response.getHeader(SET_COOKIE)).isEqualTo(cookieValue);
}

@Test
void addCookie() {
MockCookie mockCookie = new MockCookie("SESSION", "123");
Expand Down