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

Enhancements to correctly handle authentication failures.

This commit is contained in:
Ben Alex 2007-12-04 01:50:45 +00:00
parent 2a83843e7d
commit 021f03487e
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
View File

@ -32,10 +32,6 @@ public class FormLoginBeanDefinitionParser implements BeanDefinitionParser {
private static final String DEFAULT_FORM_LOGIN_TARGET_URL = "/"; private static final String DEFAULT_FORM_LOGIN_TARGET_URL = "/";
private static final String FORM_LOGIN_AUTH_FAILURE_URL_ATTRIBUTE = "defaultTargetUrl"; private static final String FORM_LOGIN_AUTH_FAILURE_URL_ATTRIBUTE = "defaultTargetUrl";
// TODO: Change AbstractProcessingFilter to not need a failure URL and just write a failure message
// to the response if one isn't set.
private static final String DEFAULT_FORM_LOGIN_AUTH_FAILURE_URL = "/loginError";
public BeanDefinition parse(Element elt, ParserContext parserContext) { public BeanDefinition parse(Element elt, ParserContext parserContext) {
ConfigUtils.registerProviderManagerIfNecessary(parserContext); ConfigUtils.registerProviderManagerIfNecessary(parserContext);
@ -91,7 +87,7 @@ public class FormLoginBeanDefinitionParser implements BeanDefinitionParser {
String authenticationFailureUrl = elt.getAttribute(FORM_LOGIN_AUTH_FAILURE_URL_ATTRIBUTE); String authenticationFailureUrl = elt.getAttribute(FORM_LOGIN_AUTH_FAILURE_URL_ATTRIBUTE);
if (!StringUtils.hasText(authenticationFailureUrl)) { if (!StringUtils.hasText(authenticationFailureUrl)) {
authenticationFailureUrl = DEFAULT_FORM_LOGIN_AUTH_FAILURE_URL; authenticationFailureUrl = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL + "?" + DefaultLoginPageGeneratingFilter.ERROR_PARAMETER_NAME;
} }
filterBuilder.addPropertyValue("authenticationFailureUrl", authenticationFailureUrl); filterBuilder.addPropertyValue("authenticationFailureUrl", authenticationFailureUrl);

28
core/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java
View File

@ -1,19 +1,18 @@
package org.springframework.security.ui.webapp; package org.springframework.security.ui.webapp;
import org.springframework.security.AuthenticationException; import java.io.IOException;
import org.springframework.security.ui.AbstractProcessingFilter;
import org.springframework.security.ui.FilterChainOrderUtils;
import org.springframework.security.ui.SpringSecurityFilter;
import org.springframework.security.ui.rememberme.AbstractRememberMeServices;
import org.springframework.security.ui.rememberme.TokenBasedRememberMeServices;
import org.springframework.util.StringUtils;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException;
import org.springframework.security.AuthenticationException;
import org.springframework.security.ui.AbstractProcessingFilter;
import org.springframework.security.ui.FilterChainOrderUtils;
import org.springframework.security.ui.SpringSecurityFilter;
import org.springframework.security.ui.rememberme.AbstractRememberMeServices;
/** /**
* For internal use with namespace configuration in the case where a user doesn't configure a login page. * For internal use with namespace configuration in the case where a user doesn't configure a login page.
@ -25,7 +24,8 @@ import java.io.IOException;
* @version $Id$ * @version $Id$
*/ */
public class DefaultLoginPageGeneratingFilter extends SpringSecurityFilter { public class DefaultLoginPageGeneratingFilter extends SpringSecurityFilter {
public static final String DEFAULT_LOGIN_PAGE_URL = "/login"; public static final String DEFAULT_LOGIN_PAGE_URL = "/spring_security_login";
public static final String ERROR_PARAMETER_NAME = "login_error";
private String authenticationUrl; private String authenticationUrl;
private String usernameParameter; private String usernameParameter;
private String passwordParameter; private String passwordParameter;
@ -52,7 +52,7 @@ public class DefaultLoginPageGeneratingFilter extends SpringSecurityFilter {
} }
private String generateLoginPageHtml(HttpServletRequest request) { private String generateLoginPageHtml(HttpServletRequest request) {
boolean loginError = StringUtils.hasText(request.getParameter("login_error")); boolean loginError = request.getParameter(ERROR_PARAMETER_NAME) != null;
String errorMsg = "none"; String errorMsg = "none";
String lastUser = ""; String lastUser = "";
@ -60,8 +60,12 @@ public class DefaultLoginPageGeneratingFilter extends SpringSecurityFilter {
HttpSession session = request.getSession(false); HttpSession session = request.getSession(false);
if(session != null) { if(session != null) {
errorMsg = ((AuthenticationException) lastUser = (String) session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY);
session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage(); AuthenticationException ex = (AuthenticationException) session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY);
errorMsg = ex != null ? ex.getMessage() : "none";
if (lastUser == null) {
lastUser = "";
}
} }
} }

2
core/src/main/resources/org/springframework/security/config/spring-security-2.0.rnc
View File

@ -105,7 +105,7 @@ form-login.attlist &=
## The URL that the form is submitted to ## The URL that the form is submitted to
[ a:defaultValue = "/j_spring_security_check" ] attribute loginUrl {xsd:string}? [ a:defaultValue = "/j_spring_security_check" ] attribute loginUrl {xsd:string}?
form-login.attlist &= form-login.attlist &=
## The URL for the login page ## The URL for the login page. If no login URL is specified, Spring Security will automatically create a login URL at /spring_security_login and a corresponding filter to render that login URL when requested.
attribute loginPage {xsd:string}? attribute loginPage {xsd:string}?
filter-chain-map = filter-chain-map =

2
core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
View File

@ -221,7 +221,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="loginPage" type="xs:string"> <xs:attribute name="loginPage" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>The URL for the login page</xs:documentation> <xs:documentation>The URL for the login page. If no login URL is specified, Spring Security will automatically create a login URL at /spring_security_login and a corresponding filter to render that login URL when requested.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>