Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ignore context path when calling privilege evaluator
Previously, the error page security filter passed the request's URI to the privilege evaluator. This was incorrect in applications with a custom context path as the privilege evaluator must be passed a path that does not include the context path and the request URI includes the context path. This commit updates the filter to use UrlPathHelper's pathWithinApplication instead. The path within the application does not include the context path. In addition, pathWithinAppliation also correctly handles applications configured with a servlet mapping other than the default of /. Closes gh-29299 Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
- Loading branch information
1 parent
fb44e1c
commit 3460c24
Showing
11 changed files
with
363 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
...-web-secure/src/test/java/smoketest/web/secure/AbstractUnauthenticatedErrorPageTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Copyright 2012-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 smoketest.web.secure; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.web.client.TestRestTemplate; | ||
| import org.springframework.http.HttpMethod; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * Abstract base class for tests to ensure that the error page is accessible only to | ||
| * authorized users. | ||
| * | ||
| * @author Madhura Bhave | ||
| */ | ||
| abstract class AbstractUnauthenticatedErrorPageTests { | ||
|
|
||
| @Autowired | ||
| private TestRestTemplate testRestTemplate; | ||
|
|
||
| private final String pathPrefix; | ||
|
|
||
| protected AbstractUnauthenticatedErrorPageTests(String pathPrefix) { | ||
| this.pathPrefix = pathPrefix; | ||
| } | ||
|
|
||
| @Test | ||
| void testBadCredentials() { | ||
| final ResponseEntity<JsonNode> response = this.testRestTemplate.withBasicAuth("username", "wrongpassword") | ||
| .exchange(this.pathPrefix + "/test", HttpMethod.GET, null, JsonNode.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); | ||
| JsonNode jsonResponse = response.getBody(); | ||
| assertThat(jsonResponse.get("error").asText()).isEqualTo("Unauthorized"); | ||
| } | ||
|
|
||
| @Test | ||
| void testNoCredentials() { | ||
| final ResponseEntity<JsonNode> response = this.testRestTemplate.exchange(this.pathPrefix + "/test", | ||
| HttpMethod.GET, null, JsonNode.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); | ||
| JsonNode jsonResponse = response.getBody(); | ||
| assertThat(jsonResponse.get("error").asText()).isEqualTo("Unauthorized"); | ||
| } | ||
|
|
||
| @Test | ||
| void testPublicNotFoundPage() { | ||
| final ResponseEntity<JsonNode> response = this.testRestTemplate.exchange(this.pathPrefix + "/public/notfound", | ||
| HttpMethod.GET, null, JsonNode.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); | ||
| JsonNode jsonResponse = response.getBody(); | ||
| assertThat(jsonResponse.get("error").asText()).isEqualTo("Not Found"); | ||
| } | ||
|
|
||
| @Test | ||
| void testPublicNotFoundPageWithCorrectCredentials() { | ||
| final ResponseEntity<JsonNode> response = this.testRestTemplate.withBasicAuth("username", "password") | ||
| .exchange(this.pathPrefix + "/public/notfound", HttpMethod.GET, null, JsonNode.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); | ||
| JsonNode jsonResponse = response.getBody(); | ||
| assertThat(jsonResponse.get("error").asText()).isEqualTo("Not Found"); | ||
| } | ||
|
|
||
| @Test | ||
| void testPublicNotFoundPageWithBadCredentials() { | ||
| final ResponseEntity<JsonNode> response = this.testRestTemplate.withBasicAuth("username", "wrong") | ||
| .exchange(this.pathPrefix + "/public/notfound", HttpMethod.GET, null, JsonNode.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); | ||
| JsonNode jsonResponse = response.getBody(); | ||
| assertThat(jsonResponse.get("error").asText()).isEqualTo("Unauthorized"); | ||
| } | ||
|
|
||
| @Test | ||
| void testCorrectCredentialsWithControllerException() { | ||
| final ResponseEntity<JsonNode> response = this.testRestTemplate.withBasicAuth("username", "password") | ||
| .exchange(this.pathPrefix + "/fail", HttpMethod.GET, null, JsonNode.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); | ||
| JsonNode jsonResponse = response.getBody(); | ||
| assertThat(jsonResponse.get("error").asText()).isEqualTo("Internal Server Error"); | ||
| } | ||
|
|
||
| @Test | ||
| void testCorrectCredentials() { | ||
| final ResponseEntity<String> response = this.testRestTemplate.withBasicAuth("username", "password") | ||
| .exchange(this.pathPrefix + "/test", HttpMethod.GET, null, String.class); | ||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); | ||
| assertThat(response.getBody()).isEqualTo("test"); | ||
| } | ||
|
|
||
| } |
39 changes: 39 additions & 0 deletions
39
...e-test-web-secure/src/test/java/smoketest/web/secure/CustomContextPathErrorPageTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright 2012-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 smoketest.web.secure; | ||
|
|
||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; | ||
|
|
||
| /** | ||
| * Tests to ensure that the error page with a custom context path is accessible only to | ||
| * authorized users. | ||
| * | ||
| * @author Madhura Bhave | ||
| */ | ||
| @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, | ||
| classes = { AbstractErrorPageTests.TestConfiguration.class, ErrorPageTests.SecurityConfiguration.class, | ||
| SampleWebSecureApplication.class }, | ||
| properties = { "server.error.include-message=always", "spring.security.user.name=username", | ||
| "spring.security.user.password=password", "server.servlet.context-path=/example" }) | ||
| class CustomContextPathErrorPageTests extends AbstractErrorPageTests { | ||
|
|
||
| CustomContextPathErrorPageTests() { | ||
| super(""); | ||
| } | ||
|
|
||
| } |
37 changes: 37 additions & 0 deletions
37
...re/src/test/java/smoketest/web/secure/CustomContextPathUnauthenticatedErrorPageTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Copyright 2012-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 smoketest.web.secure; | ||
|
|
||
| import org.springframework.boot.test.context.SpringBootTest; | ||
|
|
||
| /** | ||
| * Tests for error page that permits access to all with a custom context path. | ||
| * | ||
| * @author Madhura Bhave | ||
| */ | ||
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, | ||
| classes = { AbstractErrorPageTests.TestConfiguration.class, | ||
| UnauthenticatedErrorPageTests.SecurityConfiguration.class, SampleWebSecureApplication.class }, | ||
| properties = { "server.error.include-message=always", "spring.security.user.name=username", | ||
| "spring.security.user.password=password", "server.servlet.context-path=/example" }) | ||
| class CustomContextPathUnauthenticatedErrorPageTests extends AbstractUnauthenticatedErrorPageTests { | ||
|
|
||
| CustomContextPathUnauthenticatedErrorPageTests() { | ||
| super(""); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.