Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidying.

This commit is contained in:
Luke Taylor 2009-08-23 16:03:40 +00:00
parent ea01e9cdf7
commit 00352227ac
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
View File

@ -1069,7 +1069,6 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
String customEntryPoint = element.getAttribute(ATT_ENTRY_POINT_REF); String customEntryPoint = element.getAttribute(ATT_ENTRY_POINT_REF);
if (StringUtils.hasText(customEntryPoint)) { if (StringUtils.hasText(customEntryPoint)) {
// pc.getRegistry().registerAlias(customEntryPoint, BeanIds.MAIN_ENTRY_POINT);
return new RuntimeBeanReference(customEntryPoint); return new RuntimeBeanReference(customEntryPoint);
} }
@ -1078,7 +1077,6 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
Element openIDLoginElt = DomUtils.getChildElementByTagName(element, Elements.OPENID_LOGIN); Element openIDLoginElt = DomUtils.getChildElementByTagName(element, Elements.OPENID_LOGIN);
// Basic takes precedence if explicit element is used and no others are configured // Basic takes precedence if explicit element is used and no others are configured
if (basicAuthElt != null && formLoginElt == null && openIDLoginElt == null) { if (basicAuthElt != null && formLoginElt == null && openIDLoginElt == null) {
//pc.getRegistry().registerAlias(BeanIds.BASIC_AUTHENTICATION_ENTRY_POINT, BeanIds.MAIN_ENTRY_POINT);
return basic.entryPoint; return basic.entryPoint;
} }
@ -1087,19 +1085,16 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
String openIDLoginPage = getLoginFormUrl(openID.entryPoint); String openIDLoginPage = getLoginFormUrl(openID.entryPoint);
if (form.filter != null && openIDLoginPage == null) { if (form.filter != null && openIDLoginPage == null) {
//pc.getRegistry().registerAlias(BeanIds.FORM_LOGIN_ENTRY_POINT, BeanIds.MAIN_ENTRY_POINT);
return form.entryPoint; return form.entryPoint;
} }
// Otherwise use OpenID if enabled // Otherwise use OpenID if enabled
if (openID.filter != null && form.filter == null) { if (openID.filter != null && form.filter == null) {
//pc.getRegistry().registerAlias(BeanIds.OPEN_ID_ENTRY_POINT, BeanIds.MAIN_ENTRY_POINT);
return openID.entryPoint; return openID.entryPoint;
} }
// If X.509 has been enabled, use the preauth entry point. // If X.509 has been enabled, use the preauth entry point.
if (DomUtils.getChildElementByTagName(element, Elements.X509) != null) { if (DomUtils.getChildElementByTagName(element, Elements.X509) != null) {
//pc.getRegistry().registerAlias(BeanIds.PRE_AUTH_ENTRY_POINT, BeanIds.MAIN_ENTRY_POINT);
return x509.entryPoint; return x509.entryPoint;
} }
@ -1191,9 +1186,8 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
} }
/** /**
* Parses the intercept-url elements and populates the FilterChainProxy's filter chain Map and the * Parses the intercept-url elements to obtain the map used by channel security.
* map used to create the FilterInvocationDefintionSource for the FilterSecurityInterceptor. * This will be empty unless the <tt>requires-channel</tt> attribute has been used on a URL path.
* @return
*/ */
private ManagedMap<BeanDefinition,List<ConfigAttribute>> parseInterceptUrlsForChannelSecurity(List<Element> urlElts, private ManagedMap<BeanDefinition,List<ConfigAttribute>> parseInterceptUrlsForChannelSecurity(List<Element> urlElts,
boolean useLowerCasePaths, ParserContext parserContext) { boolean useLowerCasePaths, ParserContext parserContext) {