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

LoginPageGeneratingWebFilter honors context path 

Closes gh-8807
This commit is contained in:
Rob Winch 2020-07-07 11:43:49 -05:00
parent f479f0ea49
commit 09fe6071e1
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java
View File

@ -105,7 +105,7 @@ public class LoginPageGeneratingWebFilter implements WebFilter {
+ " </head>\n" + " </head>\n"
+ " <body>\n" + " <body>\n"
+ " <div class=\"container\">\n" + " <div class=\"container\">\n"
+ formLogin(queryParams, csrfTokenHtmlInput) + formLogin(queryParams, contextPath, csrfTokenHtmlInput)
+ oauth2LoginLinks(queryParams, contextPath, this.oauth2AuthenticationUrlToClientName) + oauth2LoginLinks(queryParams, contextPath, this.oauth2AuthenticationUrlToClientName)
+ " </div>\n" + " </div>\n"
+ " </body>\n" + " </body>\n"
@ -114,13 +114,13 @@ public class LoginPageGeneratingWebFilter implements WebFilter {
return page.getBytes(Charset.defaultCharset()); return page.getBytes(Charset.defaultCharset());
} }
private String formLogin(MultiValueMap<String, String> queryParams, String csrfTokenHtmlInput) { private String formLogin(MultiValueMap<String, String> queryParams, String contextPath, String csrfTokenHtmlInput) {
if (!this.formLoginEnabled) { if (!this.formLoginEnabled) {
return ""; return "";
} }
boolean isError = queryParams.containsKey("error"); boolean isError = queryParams.containsKey("error");
boolean isLogoutSuccess = queryParams.containsKey("logout"); boolean isLogoutSuccess = queryParams.containsKey("logout");
return " <form class=\"form-signin\" method=\"post\" action=\"/login\">\n" return " <form class=\"form-signin\" method=\"post\" action=\"" + contextPath + "/login\">\n"
+ " <h2 class=\"form-signin-heading\">Please sign in</h2>\n" + " <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
+ createError(isError) + createError(isError)
+ createLogoutSuccess(isLogoutSuccess) + createLogoutSuccess(isLogoutSuccess)

52
web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.web.server.ui;
import org.junit.Test;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import reactor.core.publisher.Mono;
import static org.assertj.core.api.Assertions.assertThat;
public class LoginPageGeneratingWebFilterTests {
@Test
public void filterWhenLoginWithContextPathThenActionContainsContextPath() throws Exception {
LoginPageGeneratingWebFilter filter = new LoginPageGeneratingWebFilter();
filter.setFormLoginEnabled(true);
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/test/login").contextPath("/test"));
filter.filter(exchange, e -> Mono.empty()).block();
assertThat(exchange.getResponse().getBodyAsString().block()).contains("action=\"/test/login\"");
}
@Test
public void filterWhenLoginWithNoContextPathThenActionDoesNotContainsContextPath() throws Exception {
LoginPageGeneratingWebFilter filter = new LoginPageGeneratingWebFilter();
filter.setFormLoginEnabled(true);
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/login"));
filter.filter(exchange, e -> Mono.empty()).block();
assertThat(exchange.getResponse().getBodyAsString().block()).contains("action=\"/login\"");
}
}