mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-06-01 09:42:13 +00:00
Polish SecurityNamespaceHandler Tests
Issue gh-8974
This commit is contained in:
parent
8daa6ec1fd
commit
fbb7691be4
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2002-2016 the original author or authors.
|
* Copyright 2002-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -26,6 +26,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
|
|||||||
|
|
||||||
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
|
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
|
||||||
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
|
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
|
||||||
|
import org.springframework.security.config.util.SpringSecurityVersions;
|
||||||
import org.springframework.test.util.ReflectionTestUtils;
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
|
|
||||||
@ -133,6 +134,13 @@ public class SecurityNamespaceHandlerTests {
|
|||||||
// should load just fine since no websocket block
|
// should load just fine since no websocket block
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void configureWhenOldVersionThenErrorMessageContainsCorrectVersion() {
|
||||||
|
assertThatExceptionOfType(BeanDefinitionParsingException.class)
|
||||||
|
.isThrownBy(() -> new InMemoryXmlApplicationContext(XML_AUTHENTICATION_MANAGER, "3.0", null))
|
||||||
|
.withMessageContaining(SpringSecurityVersions.getCurrentXsdVersionFromSpringSchemas());
|
||||||
|
}
|
||||||
|
|
||||||
private void expectClassUtilsForNameThrowsNoClassDefFoundError(String className) {
|
private void expectClassUtilsForNameThrowsNoClassDefFoundError(String className) {
|
||||||
this.classUtils.when(() -> ClassUtils.forName(eq(FILTER_CHAIN_PROXY_CLASSNAME), any()))
|
this.classUtils.when(() -> ClassUtils.forName(eq(FILTER_CHAIN_PROXY_CLASSNAME), any()))
|
||||||
.thenThrow(new NoClassDefFoundError(className));
|
.thenThrow(new NoClassDefFoundError(className));
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2009-2020 the original author or authors.
|
* Copyright 2009-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -16,15 +16,10 @@
|
|||||||
|
|
||||||
package org.springframework.security.config.util;
|
package org.springframework.security.config.util;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
|
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.support.AbstractXmlApplicationContext;
|
import org.springframework.context.support.AbstractXmlApplicationContext;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
import org.springframework.security.core.SpringSecurityCoreVersion;
|
|
||||||
import org.springframework.security.util.InMemoryResource;
|
import org.springframework.security.util.InMemoryResource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -34,24 +29,6 @@ import org.springframework.security.util.InMemoryResource;
|
|||||||
*/
|
*/
|
||||||
public class InMemoryXmlApplicationContext extends AbstractXmlApplicationContext {
|
public class InMemoryXmlApplicationContext extends AbstractXmlApplicationContext {
|
||||||
|
|
||||||
private static String getCurrentXSDVersionFromSpringSchemas() {
|
|
||||||
Properties properties = new Properties();
|
|
||||||
try (InputStream is = SpringSecurityCoreVersion.class.getClassLoader()
|
|
||||||
.getResourceAsStream("META-INF/spring.schemas")) {
|
|
||||||
properties.load(is);
|
|
||||||
}
|
|
||||||
catch (IOException ex) {
|
|
||||||
throw new RuntimeException("Could not read 'META-INF/spring.schemas'", ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
String inPackageLocation = properties
|
|
||||||
.getProperty("https://www.springframework.org/schema/security/spring-security.xsd");
|
|
||||||
String[] parts = inPackageLocation.split("-");
|
|
||||||
String currentXSD = parts[parts.length - 1];
|
|
||||||
String currentVersion = currentXSD.replace(".xsd", "");
|
|
||||||
return currentVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
static final String BEANS_OPENING = "<b:beans xmlns='http://www.springframework.org/schema/security'\n"
|
static final String BEANS_OPENING = "<b:beans xmlns='http://www.springframework.org/schema/security'\n"
|
||||||
+ " xmlns:context='http://www.springframework.org/schema/context'\n"
|
+ " xmlns:context='http://www.springframework.org/schema/context'\n"
|
||||||
+ " xmlns:b='http://www.springframework.org/schema/beans'\n"
|
+ " xmlns:b='http://www.springframework.org/schema/beans'\n"
|
||||||
@ -66,7 +43,7 @@ public class InMemoryXmlApplicationContext extends AbstractXmlApplicationContext
|
|||||||
+ "http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd\n"
|
+ "http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd\n"
|
||||||
+ "http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-";
|
+ "http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-";
|
||||||
static final String BEANS_CLOSE = "</b:beans>\n";
|
static final String BEANS_CLOSE = "</b:beans>\n";
|
||||||
static final String SPRING_SECURITY_VERSION = getCurrentXSDVersionFromSpringSchemas();
|
static final String SPRING_SECURITY_VERSION = SpringSecurityVersions.getCurrentXsdVersionFromSpringSchemas();
|
||||||
|
|
||||||
Resource inMemoryXml;
|
Resource inMemoryXml;
|
||||||
|
|
||||||
|
@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2002-2021 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.security.config.util;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.util.Properties;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import org.springframework.security.core.SpringSecurityCoreVersion;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* For computing different Spring Security versions
|
||||||
|
*/
|
||||||
|
public final class SpringSecurityVersions {
|
||||||
|
|
||||||
|
static final Pattern SCHEMA_VERSION_PATTERN = Pattern.compile("\\d+\\.\\d+(\\.\\d+)?");
|
||||||
|
|
||||||
|
public static String getCurrentXsdVersionFromSpringSchemas() {
|
||||||
|
Properties properties = new Properties();
|
||||||
|
try (InputStream is = SpringSecurityCoreVersion.class.getClassLoader()
|
||||||
|
.getResourceAsStream("META-INF/spring.schemas")) {
|
||||||
|
properties.load(is);
|
||||||
|
}
|
||||||
|
catch (IOException ex) {
|
||||||
|
throw new RuntimeException("Could not read 'META-INF/spring.schemas'", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
String inPackageLocation = properties
|
||||||
|
.getProperty("https://www.springframework.org/schema/security/spring-security.xsd");
|
||||||
|
Matcher matcher = SCHEMA_VERSION_PATTERN.matcher(inPackageLocation);
|
||||||
|
if (matcher.find()) {
|
||||||
|
return matcher.group(0);
|
||||||
|
}
|
||||||
|
throw new IllegalStateException("Failed to find version");
|
||||||
|
}
|
||||||
|
|
||||||
|
private SpringSecurityVersions() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user