LogoutPageGeneratingWebFilter Uses Context Path

vanwobe · jzheaux · commit a5351f3d890b · 2022-08-25T15:36:04.000-06:00
Closes gh-11716
diff --git a/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java b/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -58,14 +58,15 @@ private Mono<Void> render(ServerWebExchange exchange) {
 
 	private Mono<DataBuffer> createBuffer(ServerWebExchange exchange) {
 		Mono<CsrfToken> token = exchange.getAttributeOrDefault(CsrfToken.class.getName(), Mono.empty());
+		String contextPath = exchange.getRequest().getPath().contextPath().value();
 		return token.map(LogoutPageGeneratingWebFilter::csrfToken).defaultIfEmpty("").map((csrfTokenHtmlInput) -> {
-			byte[] bytes = createPage(csrfTokenHtmlInput);
+			byte[] bytes = createPage(csrfTokenHtmlInput, contextPath);
 			DataBufferFactory bufferFactory = exchange.getResponse().bufferFactory();
 			return bufferFactory.wrap(bytes);
 		});
 	}
 
-	private static byte[] createPage(String csrfTokenHtmlInput) {
+	private static byte[] createPage(String csrfTokenHtmlInput, String contextPath) {
 		StringBuilder page = new StringBuilder();
 		page.append("<!DOCTYPE html>\n");
 		page.append("<html lang=\"en\">\n");
@@ -82,7 +83,7 @@ private static byte[] createPage(String csrfTokenHtmlInput) {
 		page.append("  </head>\n");
 		page.append("  <body>\n");
 		page.append("     <div class=\"container\">\n");
-		page.append("      <form class=\"form-signin\" method=\"post\" action=\"/logout\">\n");
+		page.append("      <form class=\"form-signin\" method=\"post\" action=\"" + contextPath + "/logout\">\n");
 		page.append("        <h2 class=\"form-signin-heading\">Are you sure you want to log out?</h2>\n");
 		page.append(csrfTokenHtmlInput);
 		page.append("        <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Log Out</button>\n");
diff --git a/web/src/test/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilterTests.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2022 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.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
+import org.springframework.mock.web.server.MockServerWebExchange;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class LogoutPageGeneratingWebFilterTests {
+
+	@Test
+	public void filterWhenLogoutWithContextPathThenActionContainsContextPath() throws Exception {
+		LogoutPageGeneratingWebFilter filter = new LogoutPageGeneratingWebFilter();
+		MockServerWebExchange exchange = MockServerWebExchange
+				.from(MockServerHttpRequest.get("/test/logout").contextPath("/test"));
+		filter.filter(exchange, (e) -> Mono.empty()).block();
+		assertThat(exchange.getResponse().getBodyAsString().block()).contains("action=\"/test/logout\"");
+	}
+
+	@Test
+	public void filterWhenLogoutWithNoContextPathThenActionDoesNotContainsContextPath() throws Exception {
+		LogoutPageGeneratingWebFilter filter = new LogoutPageGeneratingWebFilter();
+		MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/logout"));
+		filter.filter(exchange, (e) -> Mono.empty()).block();
+		assertThat(exchange.getResponse().getBodyAsString().block()).contains("action=\"/logout\"");
+	}
+
+}
