浏览代码

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
Erik van Paassen 6 年之前
父节点
当前提交
3a6582d2a6

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

@@ -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"
 	## 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 }?
 	attribute request-matcher-ref { xsd:token }?
 csrf-options.attlist &=
 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 }?
 	attribute token-repository-ref { xsd:token }?
 
 
 headers =
 headers =

+ 2 - 1
config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd

@@ -2337,7 +2337,8 @@
       </xs:attribute>
       </xs:attribute>
       <xs:attribute name="token-repository-ref" type="xs:token">
       <xs:attribute name="token-repository-ref" type="xs:token">
          <xs:annotation>
          <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:documentation>
          </xs:annotation>
          </xs:annotation>
       </xs:attribute>
       </xs:attribute>

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

@@ -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"
 	## 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 }?
 	attribute request-matcher-ref { xsd:token }?
 csrf-options.attlist &=
 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 }?
 	attribute token-repository-ref { xsd:token }?
 
 
 headers =
 headers =

+ 2 - 1
config/src/main/resources/org/springframework/security/config/spring-security-5.0.xsd

@@ -2232,7 +2232,8 @@
       </xs:attribute>
       </xs:attribute>
       <xs:attribute name="token-repository-ref" type="xs:token">
       <xs:attribute name="token-repository-ref" type="xs:token">
          <xs:annotation>
          <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:documentation>
          </xs:annotation>
          </xs:annotation>
       </xs:attribute>
       </xs:attribute>

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

@@ -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"
 	## 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 }?
 	attribute request-matcher-ref { xsd:token }?
 csrf-options.attlist &=
 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 }?
 	attribute token-repository-ref { xsd:token }?
 
 
 headers =
 headers =

+ 2 - 1
config/src/main/resources/org/springframework/security/config/spring-security-5.1.xsd

@@ -2232,7 +2232,8 @@
       </xs:attribute>
       </xs:attribute>
       <xs:attribute name="token-repository-ref" type="xs:token">
       <xs:attribute name="token-repository-ref" type="xs:token">
          <xs:annotation>
          <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:documentation>
          </xs:annotation>
          </xs:annotation>
       </xs:attribute>
       </xs:attribute>