Browse Source

Simplify Error Message for Unsupported Security XSD Versions

Closes gh-17153

Signed-off-by: Deep Dhamala <dhamaladeep2@gmail.com>
pull/17310/head
Deep Dhamala 7 months ago committed by Josh Cummings
parent
commit
ca557a9880
  1. 4
      config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
  2. 3
      config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java

4
config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java

@ -94,9 +94,7 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { @@ -94,9 +94,7 @@ public final class SecurityNamespaceHandler implements NamespaceHandler {
public BeanDefinition parse(Element element, ParserContext pc) {
if (!namespaceMatchesVersion(element)) {
pc.getReaderContext()
.fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or "
+ "spring-security-3.1.xsd schema or spring-security-3.2.xsd schema or spring-security-4.0.xsd schema "
+ "with Spring Security 7.0. Please update your schema declarations to the 7.0 schema.",
.fatal("You cannot use any XSD older than spring-security-7.0.xsd. Either change to spring-security.xsd or spring-security-7.0.xsd",
element);
}
String name = pc.getDelegate().getLocalName(element);

3
config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java

@ -77,7 +77,8 @@ public class SecurityNamespaceHandlerTests { @@ -77,7 +77,8 @@ public class SecurityNamespaceHandlerTests {
.isThrownBy(() -> new InMemoryXmlApplicationContext(
"<user-service id='us'><user name='bob' password='bobspassword' authorities='ROLE_A' /></user-service>",
"3.0.3", null))
.withMessageContaining("You cannot use a spring-security-2.0.xsd");
.withMessageContaining(
"You cannot use any XSD older than spring-security-7.0.xsd. Either change to spring-security.xsd or spring-security-7.0.xsd");
}
// SEC-1868

Loading…
Cancel
Save