Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
65ce1454
Commit
65ce1454
authored
May 12, 2021
by
weixsun
Committed by
Stephane Nicoll
Jun 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow direct use of exposed WebSessionIdResolver bean
See gh-26437
parent
c52eabae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
4 deletions
+36
-4
WebFluxAutoConfiguration.java
.../autoconfigure/web/reactive/WebFluxAutoConfiguration.java
+9
-4
WebFluxAutoConfigurationTests.java
...configure/web/reactive/WebFluxAutoConfigurationTests.java
+27
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java
View file @
65ce1454
...
...
@@ -77,6 +77,7 @@ import org.springframework.web.server.i18n.FixedLocaleContextResolver;
import
org.springframework.web.server.i18n.LocaleContextResolver
;
import
org.springframework.web.server.session.CookieWebSessionIdResolver
;
import
org.springframework.web.server.session.DefaultWebSessionManager
;
import
org.springframework.web.server.session.WebSessionIdResolver
;
import
org.springframework.web.server.session.WebSessionManager
;
/**
...
...
@@ -307,12 +308,16 @@ public class WebFluxAutoConfiguration {
@Bean
@ConditionalOnMissingBean
(
name
=
WebHttpHandlerBuilder
.
WEB_SESSION_MANAGER_BEAN_NAME
)
public
WebSessionManager
webSessionManager
()
{
public
WebSessionManager
webSessionManager
(
ObjectProvider
<
WebSessionIdResolver
>
webSessionIdResolvers
)
{
DefaultWebSessionManager
webSessionManager
=
new
DefaultWebSessionManager
();
CookieWebSessionIdResolver
webSessionIdResolver
=
new
CookieWebSessionIdResolver
();
webSessionIdResolver
.
addCookieInitializer
((
cookie
)
->
cookie
if
(
webSessionIdResolvers
.
getIfAvailable
()
!=
null
)
{
webSessionManager
.
setSessionIdResolver
(
webSessionIdResolvers
.
getIfAvailable
());
return
webSessionManager
;
}
CookieWebSessionIdResolver
cookieWebSessionIdResolver
=
new
CookieWebSessionIdResolver
();
cookieWebSessionIdResolver
.
addCookieInitializer
((
cookie
)
->
cookie
.
sameSite
(
this
.
webFluxProperties
.
getSession
().
getCookie
().
getSameSite
().
attribute
()));
webSessionManager
.
setSessionIdResolver
(
w
ebSessionIdResolver
);
webSessionManager
.
setSessionIdResolver
(
cookieW
ebSessionIdResolver
);
return
webSessionManager
;
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
View file @
65ce1454
...
...
@@ -87,6 +87,8 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
import
org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver
;
import
org.springframework.web.server.i18n.FixedLocaleContextResolver
;
import
org.springframework.web.server.i18n.LocaleContextResolver
;
import
org.springframework.web.server.session.CookieWebSessionIdResolver
;
import
org.springframework.web.server.session.WebSessionIdResolver
;
import
org.springframework.web.server.session.WebSessionManager
;
import
org.springframework.web.util.pattern.PathPattern
;
...
...
@@ -562,6 +564,19 @@ class WebFluxAutoConfigurationTests {
HighPrecedenceConfigurer
.
class
,
WebFluxConfig
.
class
,
LowPrecedenceConfigurer
.
class
));
}
@Test
void
customWebSessionIdResolverShouldBeApplied
()
{
this
.
contextRunner
.
withUserConfiguration
(
CustomWebSessionIdResolvers
.
class
).
run
((
context
)
->
{
MockServerHttpRequest
request
=
MockServerHttpRequest
.
get
(
"/"
).
build
();
MockServerWebExchange
exchange
=
MockServerWebExchange
.
from
(
request
);
WebSessionManager
webSessionManager
=
context
.
getBean
(
WebSessionManager
.
class
);
WebSession
webSession
=
webSessionManager
.
getSession
(
exchange
).
block
();
webSession
.
start
();
exchange
.
getResponse
().
setComplete
().
block
();
assertThat
(
exchange
.
getResponse
().
getCookies
().
get
(
"JSESSIONID"
)).
isNotEmpty
();
});
}
@Test
void
customSameSteConfigurationShouldBeApplied
()
{
this
.
contextRunner
.
withPropertyValues
(
"spring.webflux.session.cookie.same-site:strict"
).
run
((
context
)
->
{
...
...
@@ -584,6 +599,18 @@ class WebFluxAutoConfigurationTests {
return
Collections
.
emptyMap
();
}
@Configuration
(
proxyBeanMethods
=
false
)
static
class
CustomWebSessionIdResolvers
{
@Bean
WebSessionIdResolver
webSessionIdResolver
()
{
CookieWebSessionIdResolver
resolver
=
new
CookieWebSessionIdResolver
();
resolver
.
setCookieName
(
"JSESSIONID"
);
return
resolver
;
}
}
@Configuration
(
proxyBeanMethods
=
false
)
static
class
CustomArgumentResolvers
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment