HTML markup fixed in DefaultLoginPageGeneratingFilter

Ending div moved out of condition. Fixes: gh-6417
spring-projects · Jan 22, 2019 · ffe602f · ffe602f
1 parent c82440e
commit ffe602f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...amework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.groovy b/...amework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.groovy
@@ -79,6 +79,7 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 <input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+</div>
 </body></html>"""
 		when: "fail to log in"
 			super.setup()
@@ -121,6 +122,7 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 <input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+</div>
 </body></html>"""
 		when: "login success"
 			super.setup()
@@ -168,6 +170,7 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 <input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+</div>
 </body></html>"""
 	}
 
@@ -272,6 +275,7 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 <input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+</div>
 </body></html>"""
 	}
 
@@ -318,6 +322,7 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 <input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+</div>
 </body></html>"""
 	}
 
@@ -377,6 +382,7 @@ public class DefaultLoginPageConfigurerTests extends BaseSpringSpec {
 <input name="${csrfToken.parameterName}" type="hidden" value="${csrfToken.token}" />
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+</div>
 </body></html>"""
 	}
 

diff --git a/...est/java/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.java b/...est/java/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.java
@@ -80,6 +80,7 @@ public void getLoginWhenAutoConfigThenShowsDefaultLoginPage()
 						+ "        </p>\n"
 						+ "        <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
 						+ "      </form>\n"
+						+ "</div>\n"
 						+ "</body></html>";
 
 		this.mvc.perform(get("/login")).andExpect(content().string(expectedContent));
@@ -126,6 +127,7 @@ public void getLoginWhenConfiguredWithCustomAttributesThenLoginPageReflects()
 						+ "        </p>\n"
 						+ "        <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
 						+ "      </form>\n"
+						+ "</div>\n"
 						+ "</body></html>";
 
 		this.mvc.perform(get("/login")).andExpect(content().string(expectedContent));
@@ -171,6 +173,7 @@ public void getLoginWhenConfiguredForOpenIdThenLoginPageReflects()
 						+ "        </p>\n"
 						+ "        <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
 						+ "      </form>\n"
+						+ "</div>\n"
 						+ "</body></html>";
 
 		this.mvc.perform(get("/login")).andExpect(content().string(expectedContent));
@@ -214,6 +217,7 @@ public void getLoginWhenConfiguredForOpenIdWithCustomAttributesThenLoginPageRefl
 						+ "        </p>\n"
 						+ "        <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
 						+ "      </form>\n"
+						+ "</div>\n"
 						+ "</body></html>";
 
 		this.mvc.perform(get("/login")).andExpect(content().string(expectedContent));

diff --git a/.../org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java b/.../org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
@@ -285,9 +285,9 @@ private String generateLoginPageHtml(HttpServletRequest request, boolean loginEr
 				sb.append("</a>");
 				sb.append("</td></tr>\n");
 			}
-			sb.append("</table></div>\n");
+			sb.append("</table>\n");
 		}
-
+		sb.append("</div>\n");
 		sb.append("</body></html>");
 
 		return sb.toString();