Skip to content

Commit c41ccc0

Browse files
committed
feat: WebSocketRegistrator
1 parent f3508c8 commit c41ccc0

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3737

3838
<!-- used dependencies versions -->
39-
<spring-boot.version>3.0.0-RC1</spring-boot.version>
40-
<spring-cloud.version>2022.0.0-M5</spring-cloud.version>
39+
<spring-boot.version>3.0.0-RC2</spring-boot.version>
40+
<spring-cloud.version>2022.0.0-RC1</spring-cloud.version>
4141
<wiremock.version>2.34.0</wiremock.version>
4242
<hazelcast-tests.version>5.1.3</hazelcast-tests.version>
4343
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>

spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/java/de/codecentric/boot/admin/SpringBootAdminConsulApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8686

8787
http.authorizeHttpRequests((authorizeRequests) -> authorizeRequests
8888
.requestMatchers(new AntPathRequestMatcher(this.adminContextPath + "/assets/**")).permitAll()
89-
.requestMatchers(new AntPathRequestMatcher(this.adminContextPath + "/login")).permitAll().anyRequest().authenticated())
89+
.requestMatchers(new AntPathRequestMatcher(this.adminContextPath + "/login")).permitAll()
90+
.anyRequest().authenticated())
9091
.formLogin((formLogin) -> formLogin.loginPage(this.adminContextPath + "/login")
9192
.successHandler(successHandler))
9293
.logout((logout) -> logout.logoutUrl(this.adminContextPath + "/logout"))

spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/java/de/codecentric/boot/admin/SpringBootAdminEurekaApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8787

8888
http.authorizeHttpRequests((authorizeRequests) -> authorizeRequests
8989
.requestMatchers(new AntPathRequestMatcher(this.adminContextPath + "/assets/**")).permitAll()
90-
.requestMatchers(new AntPathRequestMatcher(this.adminContextPath + "/login")).permitAll().anyRequest().authenticated())
90+
.requestMatchers(new AntPathRequestMatcher(this.adminContextPath + "/login")).permitAll()
91+
.anyRequest().authenticated())
9192
.formLogin((formLogin) -> formLogin.loginPage(this.adminContextPath + "/login")
9293
.successHandler(successHandler))
9394
.logout((logout) -> logout.logoutUrl(this.adminContextPath + "/logout"))

spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/java/de/codecentric/boot/admin/SpringBootAdminHazelcastApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
143143

144144
http.authorizeHttpRequests((authorizeRequests) -> authorizeRequests
145145
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/assets/**"))).permitAll()
146-
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll().anyRequest().authenticated())
146+
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll()
147+
.anyRequest().authenticated())
147148
.formLogin((formLogin) -> formLogin.loginPage(this.adminServer.path("/login"))
148149
.successHandler(successHandler))
149150
.logout((logout) -> logout.logoutUrl(this.adminServer.path("/logout")))

spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
6060
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/variables.css"))).permitAll()
6161
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/actuator/info"))).permitAll()
6262
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/actuator/health"))).permitAll()
63-
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll().anyRequest().authenticated() // <2>
63+
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll().anyRequest()
64+
.authenticated() // <2>
6465
).formLogin(
6566
(formLogin) -> formLogin.loginPage(this.adminServer.path("/login")).successHandler(successHandler).and() // <3>
6667
).logout((logout) -> logout.logoutUrl(this.adminServer.path("/logout"))).httpBasic(Customizer.withDefaults()) // <4>
@@ -81,11 +82,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8182
@Bean
8283
public InMemoryUserDetailsManager userDetailsService() {
8384
User.UserBuilder users = User.withDefaultPasswordEncoder();
84-
UserDetails user = users
85-
.username(security.getUser().getName())
86-
.password(security.getUser().getPassword())
87-
.roles("USER")
88-
.build();
85+
UserDetails user = users.username(security.getUser().getName()).password(security.getUser().getPassword())
86+
.roles("USER").build();
8987
return new InMemoryUserDetailsManager(user);
9088
}
9189

spring-boot-admin-samples/spring-boot-admin-sample-war/src/main/java/de/codecentric/boot/admin/SpringBootAdminWarApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
9191

9292
http.authorizeHttpRequests((authorizeRequests) -> authorizeRequests
9393
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/assets/**"))).permitAll()
94-
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll().anyRequest().authenticated())
94+
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll()
95+
.anyRequest().authenticated())
9596

9697
.formLogin((formLogin) -> formLogin.loginPage(this.adminServer.path("/login"))
9798
.successHandler(successHandler))

spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/src/main/java/de/codecentric/boot/admin/SpringBootAdminZookeeperApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8787

8888
http.authorizeHttpRequests((authorizeRequests) -> authorizeRequests
8989
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/assets/**"))).permitAll()
90-
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll().anyRequest().authenticated())
90+
.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll()
91+
.anyRequest().authenticated())
9192
.formLogin((formLogin) -> formLogin.loginPage(this.adminServer.path("/login"))
9293
.successHandler(successHandler))
9394
.logout((logout) -> logout.logoutUrl(this.adminServer.path("/logout")))

0 commit comments

Comments
 (0)