Commit Graph

540 Commits

Author SHA1 Message Date
Phillip Webb
8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08:00
Phillip Webb
e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb
27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb
fee45e056a Merge branch '2.6.x' into 2.7.x
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb
91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb
eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb
e1c84e2972 Merge branch '2.6.x' into 2.7.x
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb
72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
7c16668bf3 Log Docker output to aid debugging
Add an SLF4J logger so that we can see real time output of the
Docker container.

See gh-29370
2022-01-12 14:03:27 -08:00
Stephane Nicoll
69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll
a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Phillip Webb
b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
izeye
728206dba0 Polish GraphQL changes
See gh-29140
Closes gh-29194
2022-01-03 17:36:57 +01:00
Brian Clozel
88ee4fab36 Polish
See gh-29140
2021-12-21 10:33:51 +01:00
Brian Clozel
c522a8007b Add smoke test for Spring GraphQL
See gh-29140
2021-12-21 08:34:49 +01:00
Madhura Bhave
d9d161cd6b Allow previously authorized users to access the error page
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
 or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.

This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.

Fixes gh-28953
2021-12-17 16:58:58 -08:00
Phillip Webb
f676602c96 Merge branch '2.5.x' into 2.6.x 2021-12-16 13:49:12 -08:00
Phillip Webb
783981ba98 Merge branch '2.4.x' into 2.5.x 2021-12-16 13:48:25 -08:00
Phillip Webb
d336a96b7f Update web.xml xsd references to for 3.1 version
See gh-29075
2021-12-16 13:45:12 -08:00
Phillip Webb
6e01c3edbe Merge branch '2.5.x' into 2.6.x
Closes gh-29077
2021-12-15 22:17:22 -08:00
Phillip Webb
17363d1b3a Merge branch '2.4.x' into 2.5.x
Closes gh-29076
2021-12-15 22:16:37 -08:00
Phillip Webb
1749c893dc Update web-app version to 3.1
Update the web-app version specified in `web.xml` to 3.1 in order to
make Eclipse happy.

Closes gh-29075
2021-12-15 22:14:52 -08:00
Andy Wilkinson
3b23c542a0 Test servlet 3.1 compatibility in deployment tests
Closes gh-28906
2021-12-09 12:24:43 +00:00
Phillip Webb
beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Scott Frederick
4eed637481 Merge branch '2.5.x'
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick
12244a8edd Remove use of Thymeleaf from smoke tests
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson
015cf920da Name custom task inputs
Closes gh-28753
2021-11-19 15:35:39 +00:00
Phillip Webb
b6d0b44703 Fix @SuppressWarnings 2021-11-18 17:26:18 -08:00
Madhura Bhave
dd1d1482dc Deny unauthorized access to the error page
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson
7ed19a3b59 Merge branch '2.5.x'
Closes gh-28735
2021-11-18 12:21:11 +00:00
Andy Wilkinson
88457d9cfa Merge branch '2.4.x' into 2.5.x
Closes gh-28734
2021-11-18 12:20:50 +00:00
Andy Wilkinson
7d19ea4ca1 Limit log output produced by spring-boot-deployment-tests:intTest
Closes gh-28730
2021-11-18 12:18:34 +00:00
Madhura Bhave
6b79d2860f Merge branch '2.5.x' into main
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave
64270eca51 Convert environment used by SpringBootTestContextLoader
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
2021-11-17 16:40:53 -08:00
Andy Wilkinson
2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
c80283b85f Merge branch '2.5.x'
Closes gh-28653
2021-11-12 13:05:42 +00:00
Andy Wilkinson
92fd3b79a5 Merge branch '2.4.x' into 2.5.x
Closes gh-28652
2021-11-12 13:05:14 +00:00
Andy Wilkinson
08aac25c00 Limit logging produced by spring-boot-loader-tests's intTest task
Closes gh-28651
2021-11-12 13:04:10 +00:00
Andy Wilkinson
c7a2d61aee Merge branch '2.4.x'
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c Merge branch '2.4.x' into 2.5.x
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b Allow tests to be run in parallel across multiple workers
Closes gh-19876
2021-10-29 12:48:45 +01:00
Andy Wilkinson
2541c0cbdc Disable on Windows tests that use embedded Kafka
Closes gh-28406
2021-10-21 10:46:50 +01:00
Madhura Bhave
42d21a8336 Remove parameterization of session smoke tests
There are dedicated smoke tests for Hazelcast, MongoDB and Redis
that run on CI.
This commit also polishes some of the other smoke tests related to
Spring Session
2021-10-19 16:47:53 -07:00
Madhura Bhave
2caa6cb227 Polish "Add smoke tests for Spring Session Redis/Mongo"
See gh-28362
2021-10-19 15:54:19 -07:00
Angel L. Villalain Garcia
9a16c246ec Add smoke tests for Spring Session Redis/Mongo
Add smoke tests that verify the correct behavior of the sessions
endpoint when using Spring Session with MongoDB and Redis.

See gh-28362
2021-10-19 15:53:59 -07:00
Stephane Nicoll
4ebac4cc66 Merge branch '2.5.x'
Closes gh-28279
2021-10-11 09:09:15 +02:00
Stephane Nicoll
0103eb123b Merge branch '2.4.x' into 2.5.x
Closes gh-28278
2021-10-11 09:09:08 +02:00
dreis2211
ae1167e026 Remove unused settings.xml in integration tests
See gh-28269
2021-10-11 09:08:29 +02:00