Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update request-matcher schema and XML tests to use path

Browse Source 
Closes gh-18641

Signed-off-by: Menashe Eliezer <menashe.eliezer@gmail.com>
This commit is contained in:
Menashe Eliezer
2026-02-13 16:57:07 +01:00
committed by Josh Cummings
parent ba12f5e6d0
commit ee97c83042
8 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/src/main/resources/org/springframework/security/config/spring-security-7.0.rnc
+2 -2
View File
@@ -12,8 +12,8 @@ base64 =
## Whether a string should be base64 encoded ## Whether a string should be base64 encoded
attribute base64 {xsd:boolean} attribute base64 {xsd:boolean}
request-matcher = request-matcher =
## Defines the strategy use for matching incoming requests. Currently the options are 'mvc' (for Spring MVC matcher), 'ant' (for ant path patterns), 'regex' for regular expressions and 'ciRegex' for case-insensitive regular expressions. ## Defines the strategy use for matching incoming requests. Currently the options are 'path' (for PathPatternRequestMatcher), 'regex' for regular expressions and 'ciRegex' for case-insensitive regular expressions.
attribute request-matcher {"mvc" | "ant" | "regex" | "ciRegex"} attribute request-matcher {"path" | "regex" | "ciRegex"}
port = port =
## Specifies an IP port number. Used to configure an embedded LDAP server, for example. ## Specifies an IP port number. Used to configure an embedded LDAP server, for example.
attribute port { xsd:nonNegativeInteger } attribute port { xsd:nonNegativeInteger }
config/src/main/resources/org/springframework/security/config/spring-security-7.0.xsd
+16 -20
View File
@@ -27,15 +27,14 @@
<xs:attributeGroup name="request-matcher"> <xs:attributeGroup name="request-matcher">
<xs:attribute name="request-matcher" use="required"> <xs:attribute name="request-matcher" use="required">
<xs:annotation> <xs:annotation>
<xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'mvc' <xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'path'
(for Spring MVC matcher), 'ant' (for ant path patterns), 'regex' for regular expressions (for PathPatternRequestMatcher), 'regex' for regular expressions and 'ciRegex' for
and 'ciRegex' for case-insensitive regular expressions. case-insensitive regular expressions.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:enumeration value="mvc"/> <xs:enumeration value="path"/>
<xs:enumeration value="ant"/>
<xs:enumeration value="regex"/> <xs:enumeration value="regex"/>
<xs:enumeration value="ciRegex"/> <xs:enumeration value="ciRegex"/>
</xs:restriction> </xs:restriction>
@@ -1306,15 +1305,14 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="request-matcher"> <xs:attribute name="request-matcher">
<xs:annotation> <xs:annotation>
<xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'mvc' <xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'path'
(for Spring MVC matcher), 'ant' (for ant path patterns), 'regex' for regular expressions (for PathPatternRequestMatcher), 'regex' for regular expressions and 'ciRegex' for
and 'ciRegex' for case-insensitive regular expressions. case-insensitive regular expressions.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:enumeration value="mvc"/> <xs:enumeration value="path"/>
<xs:enumeration value="ant"/>
<xs:enumeration value="regex"/> <xs:enumeration value="regex"/>
<xs:enumeration value="ciRegex"/> <xs:enumeration value="ciRegex"/>
</xs:restriction> </xs:restriction>
@@ -2474,15 +2472,14 @@
<xs:attributeGroup name="filter-chain-map.attlist"> <xs:attributeGroup name="filter-chain-map.attlist">
<xs:attribute name="request-matcher"> <xs:attribute name="request-matcher">
<xs:annotation> <xs:annotation>
<xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'mvc' <xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'path'
(for Spring MVC matcher), 'ant' (for ant path patterns), 'regex' for regular expressions (for PathPatternRequestMatcher), 'regex' for regular expressions and 'ciRegex' for
and 'ciRegex' for case-insensitive regular expressions. case-insensitive regular expressions.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:enumeration value="mvc"/> <xs:enumeration value="path"/>
<xs:enumeration value="ant"/>
<xs:enumeration value="regex"/> <xs:enumeration value="regex"/>
<xs:enumeration value="ciRegex"/> <xs:enumeration value="ciRegex"/>
</xs:restriction> </xs:restriction>
@@ -2580,15 +2577,14 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="request-matcher"> <xs:attribute name="request-matcher">
<xs:annotation> <xs:annotation>
<xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'mvc' <xs:documentation>Defines the strategy use for matching incoming requests. Currently the options are 'path'
(for Spring MVC matcher), 'ant' (for ant path patterns), 'regex' for regular expressions (for PathPatternRequestMatcher), 'regex' for regular expressions and 'ciRegex' for
and 'ciRegex' for case-insensitive regular expressions. case-insensitive regular expressions.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:enumeration value="mvc"/> <xs:enumeration value="path"/>
<xs:enumeration value="ant"/>
<xs:enumeration value="regex"/> <xs:enumeration value="regex"/>
<xs:enumeration value="ciRegex"/> <xs:enumeration value="ciRegex"/>
</xs:restriction> </xs:restriction>
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-AntMatcherServletPath.xml
+1 -1
View File
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans.xsd"> https://www.springframework.org/schema/beans/spring-beans.xsd">
<http request-matcher="ant" use-authorization-manager="false"> <http request-matcher="path" use-authorization-manager="false">
<intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/> <intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/>
<http-basic/> <http-basic/>
</http> </http>
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-AntMatcherServletPathAuthorizationManager.xml
+1 -1
View File
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans.xsd"> https://www.springframework.org/schema/beans/spring-beans.xsd">
<http request-matcher="ant"> <http request-matcher="path">
<intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/> <intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/>
<http-basic/> <http-basic/>
</http> </http>
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchers.xml
+1 -1
View File
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc
https://www.springframework.org/schema/mvc/spring-mvc.xsd"> https://www.springframework.org/schema/mvc/spring-mvc.xsd">
<http auto-config="true" request-matcher="mvc" use-authorization-manager="false"> <http auto-config="true" request-matcher="path" use-authorization-manager="false">
<intercept-url pattern="/path" access="denyAll"/> <intercept-url pattern="/path" access="denyAll"/>
<http-basic/> <http-basic/>
</http> </http>
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersAuthorizationManager.xml
+1 -1
View File
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc
https://www.springframework.org/schema/mvc/spring-mvc.xsd"> https://www.springframework.org/schema/mvc/spring-mvc.xsd">
<http auto-config="true" request-matcher="mvc"> <http auto-config="true" request-matcher="path">
<intercept-url pattern="/path" access="denyAll"/> <intercept-url pattern="/path" access="denyAll"/>
<http-basic/> <http-basic/>
</http> </http>
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersServletPath.xml
+1 -1
View File
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc
https://www.springframework.org/schema/mvc/spring-mvc.xsd"> https://www.springframework.org/schema/mvc/spring-mvc.xsd">
<http auto-config="true" request-matcher="mvc" use-authorization-manager="false"> <http auto-config="true" request-matcher="path" use-authorization-manager="false">
<intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/> <intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/>
<http-basic/> <http-basic/>
</http> </http>
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersServletPathAuthorizationManager.xml
+1 -1
View File
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc
https://www.springframework.org/schema/mvc/spring-mvc.xsd"> https://www.springframework.org/schema/mvc/spring-mvc.xsd">
<http auto-config="true" request-matcher="mvc"> <http auto-config="true" request-matcher="path">
<intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/> <intercept-url pattern="/path" access="denyAll" servlet-path="/spring"/>
<http-basic/> <http-basic/>
</http> </http>