Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
github
/
spring-security
-ын хуулбар https://github.com/spring-projects/spring-security
2
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

SEC-2915: Fix defaut login page tests with tabs

Rob Winch 10 жил өмнө
parent
4fdfb8caba
commit
0bfbd2923a
3 өөрчлөгдсөн 38 нэмэгдсэн , 40 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 14 16
      config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.groovy
  2. 12 12
      config/src/test/groovy/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.groovy
  3. 12 12
      web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java

+ 14 - 16
config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.groovy
Файл харах 

@@ -1,5 +1,3 @@
 
-
 
-
 
 /*
 
  * Copyright 2002-2013 the original author or authors.
 
  *
 
@@ -57,12 +55,12 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 		when: "fail to log in"
 
 			super.setup()
 
@@ -81,12 +79,12 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <p><font color='red'>Your login attempt was not successful, try again.<br/><br/>Reason: Bad credentials</font></p><h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 		when: "login success"
 
 			super.setup()
 
@@ -110,12 +108,12 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 
 		then: "sent to default success page"
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <p><font color='green'>You have been logged out</font></p><h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 	}
 
 
@@ -195,13 +193,13 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td><input type='checkbox' name='remember-me'/></td><td>Remember me on this computer.</td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 	}
 
 
@@ -227,10 +225,10 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 
 			springSecurityFilterChain.doFilter(request,response,chain)
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><h3>Login with OpenID Identity</h3><form name='oidf' action='/login/openid' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
 </form></body></html>"""
 
 	}
 
@@ -256,19 +254,19 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td><input type='checkbox' name='remember-me'/></td><td>Remember me on this computer.</td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
-  </table>
 
+</table>
 
 </form><h3>Login with OpenID Identity</h3><form name='oidf' action='/login/openid' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
 
 	<tr><td><input type='checkbox' name='remember-me'></td><td>Remember me on this computer.</td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 	<input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
 
 </form></body></html>"""
 
 	}

+ 12 - 12
config/src/test/groovy/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.groovy
Файл харах 

@@ -24,11 +24,11 @@ class FormLoginBeanDefinitionParserTests extends AbstractHttpConfigTests {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 	}
 
 
@@ -47,11 +47,11 @@ class FormLoginBeanDefinitionParserTests extends AbstractHttpConfigTests {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.custom_user.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login_custom' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='custom_user' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='custom_password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 	}
 
 
@@ -70,16 +70,16 @@ class FormLoginBeanDefinitionParserTests extends AbstractHttpConfigTests {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 </form><h3>Login with OpenID Identity</h3><form name='oidf' action='/login/openid' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 	}
 
 
@@ -98,16 +98,16 @@ class FormLoginBeanDefinitionParserTests extends AbstractHttpConfigTests {
 
 		then:
 
 			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
 
 	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 </form><h3>Login with OpenID Identity</h3><form name='oidf' action='/login_custom' method='POST'>
 
- <table>
 
+<table>
 
 	<tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
 
 	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
 
-  </table>
 
+</table>
 
 </form></body></html>"""
 
 	}
 
 }

+ 12 - 12
web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
Файл харах 

@@ -199,21 +199,21 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean {
 
 			sb.append("<h3>Login with Username and Password</h3>");
 
 			sb.append("<form name='f' action='").append(request.getContextPath())
 
 					.append(authenticationUrl).append("' method='POST'>\n");
 
-			sb.append(" <table>\n");
 
-			sb.append("    <tr><td>User:</td><td><input type='text' name='");
 
+			sb.append("<table>\n");
 
+			sb.append("	<tr><td>User:</td><td><input type='text' name='");
 
 			sb.append(usernameParameter).append("' value='").append("'></td></tr>\n");
 
-			sb.append("    <tr><td>Password:</td><td><input type='password' name='")
 
+			sb.append("	<tr><td>Password:</td><td><input type='password' name='")
 
 					.append(passwordParameter).append("'/></td></tr>\n");
 
 
 			if (rememberMeParameter != null) {
 
-				sb.append("    <tr><td><input type='checkbox' name='")
 
+				sb.append("	<tr><td><input type='checkbox' name='")
 
 						.append(rememberMeParameter)
 
 						.append("'/></td><td>Remember me on this computer.</td></tr>\n");
 
 			}
 
 
-			sb.append("    <tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
 
+			sb.append("	<tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
 
 			renderHiddenInputs(sb, request);
 
-			sb.append("  </table>\n");
 
+			sb.append("</table>\n");
 
 			sb.append("</form>");
 
 		}
 
 
@@ -221,18 +221,18 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean {
 
 			sb.append("<h3>Login with OpenID Identity</h3>");
 
 			sb.append("<form name='oidf' action='").append(request.getContextPath())
 
 					.append(openIDauthenticationUrl).append("' method='POST'>\n");
 
-			sb.append(" <table>\n");
 
-			sb.append("    <tr><td>Identity:</td><td><input type='text' size='30' name='");
 
+			sb.append("<table>\n");
 
+			sb.append("	<tr><td>Identity:</td><td><input type='text' size='30' name='");
 
 			sb.append(openIDusernameParameter).append("'/></td></tr>\n");
 
 
 			if (openIDrememberMeParameter != null) {
 
-				sb.append("    <tr><td><input type='checkbox' name='")
 
+				sb.append("	<tr><td><input type='checkbox' name='")
 
 						.append(openIDrememberMeParameter)
 
 						.append("'></td><td>Remember me on this computer.</td></tr>\n");
 
 			}
 
 
-			sb.append("    <tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
 
-			sb.append("  </table>\n");
 
+			sb.append("	<tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
 
+			sb.append("</table>\n");
 
 			renderHiddenInputs(sb, request);
 
 			sb.append("</form>");
 
 		}
 
@@ -246,7 +246,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean {
 
 		CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
 
 
 		if (token != null) {
 
-			sb.append("    <input name=\"" + token.getParameterName()
 
+			sb.append("	<input name=\"" + token.getParameterName()
 
 					+ "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n");
 
 		}
 
 	}