Spring/spring-security-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use requestMatchers

Browse Source 
Closes gh-96
This commit is contained in:
Marcus Da Coregio
2022-10-07 15:35:14 -03:00
parent 92e7c69e19
commit 456419bff0
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servlet/java-configuration/authentication/preauth/build.gradle
View File

@@ -1,7 +1,7 @@
plugins { plugins {
id "java" id "java"
id "nebula.integtest" version "8.2.0" id "nebula.integtest" version "8.2.0"
id "org.gretty" version "3.0.6" id "org.gretty" version "4.0.0"
id "war" id "war"
} }
@@ -16,14 +16,14 @@ repositories {
ext["micrometer.version"] = "1.10.0-SNAPSHOT" ext["micrometer.version"] = "1.10.0-SNAPSHOT"
dependencies { dependencies {
implementation platform("org.springframework:spring-framework-bom:5.3.0") implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
implementation platform("org.junit:junit-bom:5.7.0") implementation platform("org.junit:junit-bom:5.7.0")
implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-config"
implementation "org.springframework.security:spring-security-web" implementation "org.springframework.security:spring-security-web"
implementation "org.springframework:spring-webmvc" implementation "org.springframework:spring-webmvc"
implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M3"
testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.assertj:assertj-core:3.18.0"
testImplementation "org.springframework:spring-test" testImplementation "org.springframework:spring-test"

4
servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
View File

@@ -1,5 +1,5 @@
gretty { gretty {
servletContainer = "tomcat9" servletContainer = "tomcat10"
contextPath = "/" contextPath = "/"
fileLogEnabled = false fileLogEnabled = false
integrationTestTask = 'integrationTest' integrationTestTask = 'integrationTest'
@@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all {
integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl
integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl
} }
} }

2
servlet/java-configuration/authentication/preauth/src/main/java/example/MvcWebApplicationInitializer.java
View File

@@ -16,7 +16,7 @@
package example; package example;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import org.springframework.web.filter.HiddenHttpMethodFilter; import org.springframework.web.filter.HiddenHttpMethodFilter;
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;

2
servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java
View File

@@ -34,7 +34,7 @@ public class SecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.antMatchers("/login", "/resources/**").permitAll() .requestMatchers("/login", "/resources/**").permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.jee((jee) -> jee.mappableRoles("USER", "ADMIN")); .jee((jee) -> jee.mappableRoles("USER", "ADMIN"));

8
servlet/java-configuration/authentication/preauth/src/main/java/example/WebMvcConfiguration.java
View File

@@ -16,10 +16,10 @@
package example; package example;
import org.thymeleaf.spring5.ISpringTemplateEngine; import org.thymeleaf.spring6.ISpringTemplateEngine;
import org.thymeleaf.spring5.SpringTemplateEngine; import org.thymeleaf.spring6.SpringTemplateEngine;
import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
import org.thymeleaf.spring5.view.ThymeleafViewResolver; import org.thymeleaf.spring6.view.ThymeleafViewResolver;
import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templatemode.TemplateMode;
import org.thymeleaf.templateresolver.ITemplateResolver; import org.thymeleaf.templateresolver.ITemplateResolver;

4
servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/SecurityConfig.java
View File

@@ -47,8 +47,8 @@ public class SecurityConfig {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.antMatchers("/favicon.ico").permitAll() .requestMatchers("/favicon.ico").permitAll()
.mvcMatchers("/second-factor", "/third-factor").access(mfaAuthorizationManager) .requestMatchers("/second-factor", "/third-factor").access(mfaAuthorizationManager)
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.formLogin((form) -> form .formLogin((form) -> form

4
servlet/spring-boot/java/oauth2/resource-server/hello-security/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
View File

@@ -43,8 +43,8 @@ public class OAuth2ResourceServerSecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") .requestMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
.antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") .requestMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt); .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);

2
servlet/spring-boot/java/oauth2/resource-server/jwe/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
View File

@@ -75,7 +75,7 @@ public class OAuth2ResourceServerSecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.antMatchers("/message/**").hasAuthority("SCOPE_message:read") .requestMatchers("/message/**").hasAuthority("SCOPE_message:read")
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.oauth2ResourceServer((oauth2) -> oauth2.jwt(withDefaults())); .oauth2ResourceServer((oauth2) -> oauth2.jwt(withDefaults()));

2
servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
View File

@@ -48,7 +48,7 @@ public class OAuth2ResourceServerSecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.mvcMatchers("/**/message/**").hasAuthority("SCOPE_message:read") .requestMatchers("/**/message/**").hasAuthority("SCOPE_message:read")
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.oauth2ResourceServer((oauth2) -> oauth2 .oauth2ResourceServer((oauth2) -> oauth2

4
servlet/spring-boot/java/oauth2/resource-server/opaque/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
View File

@@ -46,8 +46,8 @@ public class OAuth2ResourceServerSecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.mvcMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") .requestMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
.mvcMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") .requestMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.oauth2ResourceServer((oauth2) -> oauth2 .oauth2ResourceServer((oauth2) -> oauth2

2
servlet/spring-boot/java/oauth2/resource-server/static/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
View File

@@ -41,7 +41,7 @@ public class OAuth2ResourceServerSecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.mvcMatchers("/message/**").hasAuthority("SCOPE_message:read") .requestMatchers("/message/**").hasAuthority("SCOPE_message:read")
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.oauth2ResourceServer((oauth2) -> oauth2 .oauth2ResourceServer((oauth2) -> oauth2

2
servlet/spring-boot/java/oauth2/webclient/src/main/java/example/SecurityConfiguration.java
View File

@@ -41,7 +41,7 @@ public class SecurityConfiguration {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize .authorizeHttpRequests((authorize) -> authorize
.mvcMatchers("/", "/public/**").permitAll() .requestMatchers("/", "/public/**").permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.formLogin(withDefaults()) .formLogin(withDefaults())

4
servlet/spring-boot/kotlin/hello-security/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt
View File

@@ -35,8 +35,8 @@ class SecurityConfig {
@Bean @Bean
fun filterChain(http: HttpSecurity): SecurityFilterChain { fun filterChain(http: HttpSecurity): SecurityFilterChain {
http.authorizeRequests() http.authorizeRequests()
.antMatchers("/css/**").permitAll() .requestMatchers("/css/**").permitAll()
.antMatchers("/user/**").hasAuthority("ROLE_USER") .requestMatchers("/user/**").hasAuthority("ROLE_USER")
.and() .and()
.formLogin().loginPage("/log-in") .formLogin().loginPage("/log-in")
return http.build() return http.build()