Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1269: Combining <form-login> and <open-id> fails to find entry point. Fixed entry point choice conditions when using openID and/or form-login

Browse Source
This commit is contained in:
Luke Taylor
2009-10-14 00:30:28 +00:00
parent 12d825e557
commit 799b96520b
3 changed files with 69 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
config/src/test/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParserTests.java
View File

@@ -993,6 +993,52 @@ public class HttpSecurityBeanDefinitionParserTests {
"</http>", appContext);
}
@Test
public void openIDAndFormLoginWorkTogether() throws Exception {
setContext(
"<http>" +
" <openid-login />" +
" <form-login />" +
"</http>" +
AUTH_PROVIDER_XML);
ExceptionTranslationFilter etf = (ExceptionTranslationFilter) getFilter(ExceptionTranslationFilter.class);
LoginUrlAuthenticationEntryPoint ap = (LoginUrlAuthenticationEntryPoint) etf.getAuthenticationEntryPoint();
assertEquals("/spring_security_login", ap.getLoginFormUrl());
// Default login filter should be present since we haven't specified any login URLs
getFilter(DefaultLoginPageGeneratingFilter.class);
}
@Test
public void formLoginEntryPointTakesPrecedenceIfLoginUrlIsSet() throws Exception {
setContext(
"<http>" +
" <openid-login />" +
" <form-login login-page='/form_login_page' />" +
"</http>" +
AUTH_PROVIDER_XML);
ExceptionTranslationFilter etf = (ExceptionTranslationFilter) getFilter(ExceptionTranslationFilter.class);
LoginUrlAuthenticationEntryPoint ap = (LoginUrlAuthenticationEntryPoint) etf.getAuthenticationEntryPoint();
assertEquals("/form_login_page", ap.getLoginFormUrl());
try {
getFilter(DefaultLoginPageGeneratingFilter.class);
fail("Login page generating filter shouldn't be present");
} catch (Exception expected) {
}
}
@Test
public void openIDEntryPointTakesPrecedenceIfLoginUrlIsSet() throws Exception {
setContext(
"<http>" +
" <openid-login login-page='/openid_login' />" +
" <form-login />" +
"</http>" +
AUTH_PROVIDER_XML);
ExceptionTranslationFilter etf = (ExceptionTranslationFilter) getFilter(ExceptionTranslationFilter.class);
LoginUrlAuthenticationEntryPoint ap = (LoginUrlAuthenticationEntryPoint) etf.getAuthenticationEntryPoint();
assertEquals("/openid_login", ap.getLoginFormUrl());
}
@SuppressWarnings("unchecked")
@Test
public void openIDWithAttributeExchangeConfigurationIsParsedCorrectly() throws Exception {
@@ -1018,6 +1064,15 @@ public class HttpSecurityBeanDefinitionParserTests {
assertEquals(2, attributes.get(1).getCount());
}
@Test(expected=BeanDefinitionParsingException.class)
public void multipleLoginPagesCausesError() throws Exception {
setContext(
"<http>" +
" <openid-login login-page='/openid_login_page' />" +
" <form-login login-page='/form_login_page' />" +
"</http>" +
AUTH_PROVIDER_XML);
}
private void setContext(String context) {
appContext = new InMemoryXmlApplicationContext(context);