From 1aee40dcca30e5d6eddaf22006ae26286e41ba89 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Wed, 14 Sep 2022 10:14:11 -0500 Subject: [PATCH] Polish gh-11665 * Add authentication-converter-ref to 6.0 * Add @Configuration to test configs --- .../security/config/spring-security-6.0.rnc | 3 +++ .../security/config/spring-security-6.0.xsd | 7 +++++++ .../resource/OAuth2ResourceServerConfigurerTests.java | 1 + .../config/web/server/OAuth2ResourceServerSpecTests.java | 1 + 4 files changed, 12 insertions(+) diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-6.0.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-6.0.rnc index 56c5d393ab..f64965cee0 100644 --- a/config/src/main/resources/org/springframework/security/config/spring-security-6.0.rnc +++ b/config/src/main/resources/org/springframework/security/config/spring-security-6.0.rnc @@ -667,6 +667,9 @@ opaque-token.attlist &= opaque-token.attlist &= ## Reference to an OpaqueTokenIntrospector attribute introspector-ref {xsd:token}? +opaque-token.attlist &= + ## Reference to an OpaqueTokenAuthenticationConverter responsible for converting successful introspection result into an Authentication. + attribute authentication-converter-ref {xsd:token}? saml2-login = ## Configures authentication support for SAML 2.0 Login diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-6.0.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-6.0.xsd index df6d97c3a3..704daae069 100644 --- a/config/src/main/resources/org/springframework/security/config/spring-security-6.0.xsd +++ b/config/src/main/resources/org/springframework/security/config/spring-security-6.0.xsd @@ -2037,6 +2037,13 @@ + + + Reference to an OpaqueTokenAuthenticationConverter responsible for converting successful + introspection result into an Authentication. + + + diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java index 19f98bb50c..baa7aaf7db 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java @@ -2463,6 +2463,7 @@ public class OAuth2ResourceServerConfigurerTests { } + @Configuration @EnableWebSecurity static class OpaqueTokenAuthenticationConverterConfig extends WebSecurityConfigurerAdapter { diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java index 1d1cf35936..472e6f023d 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java @@ -1075,6 +1075,7 @@ public class OAuth2ResourceServerSpecTests { } + @Configuration @EnableWebFlux @EnableWebFluxSecurity static class ReactiveOpaqueTokenAuthenticationConverterConfig {