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

SEC-3147: Add error parameter for default authentication-failure-url

Browse Source
This commit is contained in:
Kazuki Shimizu 2015-11-13 03:10:51 +09:00 committed by Rob Winch
parent 5f6e3855f1
commit 675ac80926
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2015 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.
@ -33,6 +33,7 @@ import org.w3c.dom.Element;
* @author Luke Taylor * @author Luke Taylor
* @author Ben Alex * @author Ben Alex
* @author Rob Winch * @author Rob Winch
* @author Kazuki Shimizu
*/ */
public class FormLoginBeanDefinitionParser { public class FormLoginBeanDefinitionParser {
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
@ -209,9 +210,9 @@ public class FormLoginBeanDefinitionParser {
BeanDefinitionBuilder failureHandler = BeanDefinitionBuilder BeanDefinitionBuilder failureHandler = BeanDefinitionBuilder
.rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class); .rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
if (!StringUtils.hasText(authenticationFailureUrl)) { if (!StringUtils.hasText(authenticationFailureUrl)) {
// Fall back to redisplaying the custom login page, if one was specified. // Fall back to re-displaying the custom login page, if one was specified.
if (StringUtils.hasText(loginPage)) { if (StringUtils.hasText(loginPage)) {
authenticationFailureUrl = loginPage; authenticationFailureUrl = loginPage + "?" + DefaultLoginPageGeneratingFilter.ERROR_PARAMETER_NAME;
} }
else { else {
authenticationFailureUrl = DEF_FORM_LOGIN_AUTHENTICATION_FAILURE_URL; authenticationFailureUrl = DEF_FORM_LOGIN_AUTHENTICATION_FAILURE_URL;

14
config/src/test/groovy/org/springframework/security/config/http/FormLoginConfigTests.groovy
View File

@ -144,4 +144,18 @@ class FormLoginConfigTests extends AbstractHttpConfigTests {
HttpServletResponse.SC_FORBIDDEN | false HttpServletResponse.SC_FORBIDDEN | false
HttpServletResponse.SC_MOVED_TEMPORARILY | true HttpServletResponse.SC_MOVED_TEMPORARILY | true
} }
def 'SEC-3147: authentication-failure-url should be contained "error" parameter if login-page="/login"'() {
xml.http {
'form-login'('login-page':'/login')
}
createAppContext()
def apf = getFilter(UsernamePasswordAuthenticationFilter.class);
expect:
apf.failureHandler.defaultFailureUrl == '/login?error'
}
} }