Browse Source

Fix csrf:token-repository-ref XSD documentation

The documentation of the token-repository-ref attribute of the csrf
element in the schema has been updated to make clear the default
repository is lazy. Targets versions 4.2, 5.0 and 5.1.

Fixes gh-6037
pull/6066/head
Erik van Paassen 7 years ago committed by Rob Winch
parent
commit
3a6582d2a6
  1. 2
      config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc
  2. 3
      config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd
  3. 2
      config/src/main/resources/org/springframework/security/config/spring-security-5.0.rnc
  4. 3
      config/src/main/resources/org/springframework/security/config/spring-security-5.0.xsd
  5. 2
      config/src/main/resources/org/springframework/security/config/spring-security-5.1.rnc
  6. 3
      config/src/main/resources/org/springframework/security/config/spring-security-5.1.xsd

2
config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc

@ -748,7 +748,7 @@ csrf-options.attlist &= @@ -748,7 +748,7 @@ csrf-options.attlist &=
## The RequestMatcher instance to be used to determine if CSRF should be applied. Default is any HTTP method except "GET", "TRACE", "HEAD", "OPTIONS"
attribute request-matcher-ref { xsd:token }?
csrf-options.attlist &=
## The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository
## The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository wrapped by LazyCsrfTokenRepository.
attribute token-repository-ref { xsd:token }?
headers =

3
config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd

@ -2337,7 +2337,8 @@ @@ -2337,7 +2337,8 @@
</xs:attribute>
<xs:attribute name="token-repository-ref" type="xs:token">
<xs:annotation>
<xs:documentation>The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository
<xs:documentation>The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository wrapped by
LazyCsrfTokenRepository.
</xs:documentation>
</xs:annotation>
</xs:attribute>

2
config/src/main/resources/org/springframework/security/config/spring-security-5.0.rnc

@ -738,7 +738,7 @@ csrf-options.attlist &= @@ -738,7 +738,7 @@ csrf-options.attlist &=
## The RequestMatcher instance to be used to determine if CSRF should be applied. Default is any HTTP method except "GET", "TRACE", "HEAD", "OPTIONS"
attribute request-matcher-ref { xsd:token }?
csrf-options.attlist &=
## The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository
## The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository wrapped by LazyCsrfTokenRepository.
attribute token-repository-ref { xsd:token }?
headers =

3
config/src/main/resources/org/springframework/security/config/spring-security-5.0.xsd

@ -2232,7 +2232,8 @@ @@ -2232,7 +2232,8 @@
</xs:attribute>
<xs:attribute name="token-repository-ref" type="xs:token">
<xs:annotation>
<xs:documentation>The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository
<xs:documentation>The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository wrapped by
LazyCsrfTokenRepository.
</xs:documentation>
</xs:annotation>
</xs:attribute>

2
config/src/main/resources/org/springframework/security/config/spring-security-5.1.rnc

@ -738,7 +738,7 @@ csrf-options.attlist &= @@ -738,7 +738,7 @@ csrf-options.attlist &=
## The RequestMatcher instance to be used to determine if CSRF should be applied. Default is any HTTP method except "GET", "TRACE", "HEAD", "OPTIONS"
attribute request-matcher-ref { xsd:token }?
csrf-options.attlist &=
## The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository
## The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository wrapped by LazyCsrfTokenRepository.
attribute token-repository-ref { xsd:token }?
headers =

3
config/src/main/resources/org/springframework/security/config/spring-security-5.1.xsd

@ -2232,7 +2232,8 @@ @@ -2232,7 +2232,8 @@
</xs:attribute>
<xs:attribute name="token-repository-ref" type="xs:token">
<xs:annotation>
<xs:documentation>The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository
<xs:documentation>The CsrfTokenRepository to use. The default is HttpSessionCsrfTokenRepository wrapped by
LazyCsrfTokenRepository.
</xs:documentation>
</xs:annotation>
</xs:attribute>

Loading…
Cancel
Save