Browse Source

Polish gh-11665

* Add authentication-converter-ref to 6.0
* Add @Configuration to test configs
pull/11827/head
Steve Riesenberg 3 years ago
parent
commit
1aee40dcca
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
  1. 3
      config/src/main/resources/org/springframework/security/config/spring-security-6.0.rnc
  2. 7
      config/src/main/resources/org/springframework/security/config/spring-security-6.0.xsd
  3. 1
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java
  4. 1
      config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java

3
config/src/main/resources/org/springframework/security/config/spring-security-6.0.rnc

@ -667,6 +667,9 @@ opaque-token.attlist &= @@ -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

7
config/src/main/resources/org/springframework/security/config/spring-security-6.0.xsd

@ -2037,6 +2037,13 @@ @@ -2037,6 +2037,13 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="authentication-converter-ref" type="xs:token">
<xs:annotation>
<xs:documentation>Reference to an OpaqueTokenAuthenticationConverter responsible for converting successful
introspection result into an Authentication.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
<xs:attributeGroup name="saml2-login.attlist">

1
config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java

@ -2463,6 +2463,7 @@ public class OAuth2ResourceServerConfigurerTests { @@ -2463,6 +2463,7 @@ public class OAuth2ResourceServerConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class OpaqueTokenAuthenticationConverterConfig extends WebSecurityConfigurerAdapter {

1
config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java

@ -1075,6 +1075,7 @@ public class OAuth2ResourceServerSpecTests { @@ -1075,6 +1075,7 @@ public class OAuth2ResourceServerSpecTests {
}
@Configuration
@EnableWebFlux
@EnableWebFluxSecurity
static class ReactiveOpaqueTokenAuthenticationConverterConfig {

Loading…
Cancel
Save