Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-23 12:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-955: ability to externalize port mapping for secured channel to a property file

Browse Source 
http://jira.springframework.org/browse/SEC-955. Changed schema to make port-mapping type xsd:string to allow placeholders.
This commit is contained in:
Luke Taylor 2008-08-26 13:20:01 +00:00
parent 150f3d97d0
commit 83868a7334
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.rnc
View File

@ -400,9 +400,9 @@ port-mappings.attlist &= empty
port-mapping = port-mapping =
element port-mapping {http-port, https-port} element port-mapping {http-port, https-port}
http-port = attribute http {xsd:integer} http-port = attribute http {xsd:string}
https-port = attribute https {xsd:integer} https-port = attribute https {xsd:string}
x509 = x509 =

21
core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.xsd
View File

@ -876,8 +876,8 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="requires-channel"> <xs:attribute name="requires-channel">
<xs:annotation> <xs:annotation>
<xs:documentation>Used to specify that a URL must be accessed over http or <xs:documentation>Used to specify that a URL must be accessed over http or https, or that
https</xs:documentation> there is no preference.</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
@ -1042,17 +1042,24 @@
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="concurrent-sessions.attlist"> <xs:attributeGroup name="concurrent-sessions.attlist">
<xs:attribute name="max-sessions" type="xs:positiveInteger"/> <xs:attribute name="max-sessions" type="xs:positiveInteger">
<xs:annotation>
<xs:documentation>The maximum number of sessions a single user can have open at the same
time. Defaults to "1".</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="expired-url" type="xs:string"> <xs:attribute name="expired-url" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>The URL a user will be redirected to if they attempt to use a session <xs:documentation>The URL a user will be redirected to if they attempt to use a session
which has been "expired" by the concurrent session controller.</xs:documentation> which has been "expired" by the concurrent session controller because they have logged in
again.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="exception-if-maximum-exceeded" type="security:boolean"> <xs:attribute name="exception-if-maximum-exceeded" type="security:boolean">
<xs:annotation> <xs:annotation>
<xs:documentation>Specifies that an exception should be raised when a user attempts to login <xs:documentation>Specifies that an exception should be raised when a user attempts to login
twice. The default behaviour is to expire the original session.</xs:documentation> when they already have the maximum configured sessions open. The default behaviour is to
expire the original session.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="session-registry-alias" type="xs:string"> <xs:attribute name="session-registry-alias" type="xs:string">
@ -1152,10 +1159,10 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:attributeGroup name="http-port"> <xs:attributeGroup name="http-port">
<xs:attribute name="http" use="required" type="xs:integer"/> <xs:attribute name="http" use="required" type="xs:string"/>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="https-port"> <xs:attributeGroup name="https-port">
<xs:attribute name="https" use="required" type="xs:integer"/> <xs:attribute name="https" use="required" type="xs:string"/>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="x509.attlist"> <xs:attributeGroup name="x509.attlist">
<xs:attribute name="subject-principal-regex" type="xs:string"> <xs:attribute name="subject-principal-regex" type="xs:string">

18
core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
View File

@ -300,6 +300,24 @@ public class HttpSecurityBeanDefinitionParserTests {
assertEquals(Integer.valueOf(9443), pm.lookupHttpsPort(9080)); assertEquals(Integer.valueOf(9443), pm.lookupHttpsPort(9080));
} }
@Test
public void portMappingsWorkWithPlaceholders() throws Exception {
System.setProperty("http", "9080");
System.setProperty("https", "9443");
setContext(
" <b:bean id='configurer' class='org.springframework.beans.factory.config.PropertyPlaceholderConfigurer'/>" +
" <http auto-config='true'>" +
" <port-mappings>" +
" <port-mapping http='${http}' https='${https}'/>" +
" </port-mappings>" +
" </http>" + AUTH_PROVIDER_XML);
PortMapperImpl pm = (PortMapperImpl) appContext.getBean(BeanIds.PORT_MAPPER);
assertEquals(1, pm.getTranslatedPortMappings().size());
assertEquals(Integer.valueOf(9080), pm.lookupHttpPort(9443));
assertEquals(Integer.valueOf(9443), pm.lookupHttpsPort(9080));
}
@Test @Test
public void externalFiltersAreTreatedCorrectly() throws Exception { public void externalFiltersAreTreatedCorrectly() throws Exception {
// Decorated user-filters should be added to stack. The others should be ignored. // Decorated user-filters should be added to stack. The others should be ignored.