Skip to content

Commit 82194f4

Browse files
vpavicbclozel
authored andcommitted
Set SameSite default to Lax
Issue: SPR-16418
1 parent 0def164 commit 82194f4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

spring-web/src/main/java/org/springframework/web/server/session/CookieWebSessionIdResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private ResponseCookie initSessionCookie(
125125
.maxAge(maxAge)
126126
.httpOnly(true)
127127
.secure("https".equalsIgnoreCase(exchange.getRequest().getURI().getScheme()))
128-
.sameSite("Strict");
128+
.sameSite("Lax");
129129

130130
if (this.cookieInitializer != null) {
131131
this.cookieInitializer.accept(cookieBuilder);

spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public void setSessionId() {
4444
assertEquals(1, cookies.size());
4545
ResponseCookie cookie = cookies.getFirst(this.resolver.getCookieName());
4646
assertNotNull(cookie);
47-
assertEquals("SESSION=123; Path=/; Secure; HttpOnly; SameSite=Strict", cookie.toString());
47+
assertEquals("SESSION=123; Path=/; Secure; HttpOnly; SameSite=Lax", cookie.toString());
4848
}
4949

5050
@Test
5151
public void cookieInitializer() {
5252
this.resolver.addCookieInitializer(builder -> builder.domain("example.org"));
53-
this.resolver.addCookieInitializer(builder -> builder.sameSite("Lax"));
53+
this.resolver.addCookieInitializer(builder -> builder.sameSite("Strict"));
5454
this.resolver.addCookieInitializer(builder -> builder.secure(false));
5555

5656
MockServerHttpRequest request = MockServerHttpRequest.get("https://example.org/path").build();
@@ -61,7 +61,7 @@ public void cookieInitializer() {
6161
assertEquals(1, cookies.size());
6262
ResponseCookie cookie = cookies.getFirst(this.resolver.getCookieName());
6363
assertNotNull(cookie);
64-
assertEquals("SESSION=123; Path=/; Domain=example.org; HttpOnly; SameSite=Lax", cookie.toString());
64+
assertEquals("SESSION=123; Path=/; Domain=example.org; HttpOnly; SameSite=Strict", cookie.toString());
6565
}
6666

6767
}

0 commit comments

Comments
 (0)