Commit Graph

2877 Commits

Author SHA1 Message Date
Phillip Webb
1f68db06ba Merge branch '3.0.x' into 3.1.x
Closes gh-36163
2023-07-02 19:47:17 +01:00
Phillip Webb
f1b0d76d9b Merge branch '2.7.x' into 3.0.x
Closes gh-36162
2023-07-02 19:46:45 +01:00
Phillip Webb
b6990940b1 Polish 'Choose SAML party based on entity ID rather than always using first'
See gh-35902
2023-07-02 19:02:08 +01:00
Lasse Lindqvist
864af59adc Choose SAML party based on entity ID rather than always using first
Update `Saml2RelyingPartyRegistrationConfiguration` so that
`RelyingPartyRegistrations` uses `collectionFromMetadataLocation`
rather than `fromMetadataLocation` and searches candidates for a
matching entity ID.

Prior to this commit, it was possible for the wrong provider to be
used if multiple candidates existed in the returned metadata.

See gh-35902
2023-07-02 18:54:34 +01:00
Andy Wilkinson
e2f8fcf292 Merge branch '3.0.x' into 3.1.x
Closes gh-36121
2023-06-29 18:10:33 +01:00
Andy Wilkinson
6effd6061c Provide hints when template auto-config is excluded
Fixes gh-35682
2023-06-29 18:09:30 +01:00
Andy Wilkinson
ba8b1717fb Merge branch '3.0.x' into 3.1.x
Closes gh-36099
2023-06-27 20:30:47 +01:00
Andy Wilkinson
79cd3a027a Merge branch '2.7.x' into 3.0.x
Closes gh-36098
2023-06-27 20:30:24 +01:00
Andy Wilkinson
9e1f2c4257 Tolerate Flway 9.20
Closes gh-36029
2023-06-27 20:22:24 +01:00
Andy Wilkinson
9a57611ef5 Merge branch '3.0.x' into 3.1.x
Closes gh-36091
2023-06-27 14:02:57 +01:00
Andy Wilkinson
ffbef7bb80 Test server.max-http-request-header-size with Undertow
Closes gh-36047
2023-06-27 13:50:04 +01:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Phillip Webb
7a2fc9e636 Fix checkstyle violation
See gh-35914
2023-06-21 12:27:56 -07:00
Phillip Webb
3c7fbf3423 Polish 'Apply SslConfigurer in addition to configured mappers'
See gh-35914
2023-06-21 12:10:36 -07:00
Fernando Cappi
e6b5322f3e Apply SslConfigurer in addition to configured mappers
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.

Prior to this commit, SSL configuration would prevent configured
mappers from being applied.

See gh-35914
2023-06-21 12:10:36 -07:00
Andy Wilkinson
7266d4863b Merge branch '3.0.x' into 3.1.x
Closes gh-36009
2023-06-21 15:29:23 +01:00
Andy Wilkinson
39c382713b Initialize WebSocket infrastructure when using WebFlux and Jetty
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.

This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.

Fixes gh-33347
2023-06-21 14:59:50 +01:00
Phillip Webb
baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Johnny Lim
06157837e5 Polish
See gh-35872
2023-06-16 12:39:03 -07:00
Phillip Webb
691b549e36 Merge branch '2.7.x' into 3.0.x 2023-06-16 10:18:43 -07:00
Phillip Webb
f3f8610539 Polish 2023-06-16 10:17:08 -07:00
Andy Wilkinson
cb36df47c8 Merge branch '3.0.x' into 3.1.x
Closes gh-35905
2023-06-15 12:20:55 +01:00
Andy Wilkinson
6def7252d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson
088006ff60 Use ephemeral port for Hazelcast
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.

This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.

Closes gh-35903
2023-06-15 12:19:34 +01:00
Scott Frederick
7e6452edee Fix Redis URL property userinfo parsing
Fixes gh-35850
2023-06-13 16:42:19 -05:00
Stephane Nicoll
27ee605f91 Upgrade to Tomcat 10.1.9
Closes gh-35819
2023-06-10 10:11:29 +02:00
Stephane Nicoll
02a601eae3 Fix checkstyle violation 2023-06-10 08:52:54 +02:00
Scott Frederick
767ec4e22e Support encrypted PKCS8 private keys in SSL bundles
Properties `ssl.bundle.pem.mybundle.keystore.private-key-password`
and `ssl.bundle.pem.mybundle.truststore.private-key-password` have
been added for configuring the password required to decrypt an
encrypted private key.

Only PKCS8 private keys with encryption are supported. PKCS1 and EC
private keys with encryption are much more complex to decrypt, and
are not supported.

Fixes gh-35652
2023-06-09 11:52:36 -05:00
Andy Wilkinson
39276f8302 Adapt to deprecation of rejectIllegalHeader
Closes gh-35442
2023-06-09 15:48:18 +02:00
Andy Wilkinson
ce85290d01 Merge branch '3.0.x'
Closes gh-35773
2023-06-07 11:27:26 +01:00
Andy Wilkinson
51e980200a Merge branch '2.7.x' into 3.0.x
Closes gh-35772
2023-06-07 11:27:01 +01:00
Andy Wilkinson
ca50cd8c8a Stop using an infinite timeout for connecting to Hazelcast
Closes gh-35771
2023-06-07 11:22:50 +01:00
Andy Wilkinson
3eaaf58536 Start building against Spring Data Bom 2023.0.1 snapshots
See gh-35750
2023-06-06 07:36:36 +01:00
Andy Wilkinson
e9cd0c1f3a Restore compatibility with Flyway 9.0.x
Closes gh-35721
2023-06-05 20:48:46 +01:00
Andy Wilkinson
d8078f1c12 Start building against Spring Data Bom 2022.0.7 snapshots
See gh-35738
2023-06-05 20:02:42 +01:00
rafaelrc7
ed47e09c13 Implement validity check to spring.rabbitmq.host config property
As discussed on issue #35628, at some point the host property accepted
multiple comma-separated hosts. However, this was not intended, and for
better clarification, it was decided to implement a clearer error
message for this situation.

See gh-35684
2023-06-05 09:56:06 +02:00
Scott Frederick
a02eb48528 Fix building of MongoDB connection string with authentication db
This commit restores the previous behavior of MongoDB auto-
configuration, where the value of the
`spring.data.mongodb.authentication-database` is set in the
credentials when provided.

Fixes gh-35567
2023-05-31 16:16:25 -05:00
Scott Frederick
593fa1dc42 Allow Mongo database property to override database in URI
This commit restores the previous behavior of MongoDB auto-
configuration, where the value of the `spring.data.mongodb.database`
property takes precedence over the database specified in a
`spring.data.mongodb.uri` property.

Fixes gh-35566
2023-05-31 11:20:53 -05:00
Scott Frederick
703883d302 Merge branch '3.0.x'
Closes gh-35610
2023-05-23 14:36:46 -05:00
Scott Frederick
72fd94f2b5 Align bean name with Spring Data Elasticsearch requirements
Fixes gh-33651
2023-05-23 14:36:02 -05:00
Andy Wilkinson
dd74f8caba Merge branch '3.0.x'
Closes gh-35554
2023-05-18 08:57:08 +01:00
Andy Wilkinson
af9cd8cf0b Merge branch '2.7.x' into 3.0.x
Closes gh-35553
2023-05-18 08:56:49 +01:00
Phillip Webb
418dd1ba5b Return 406 status code if welcome page is not accepted
Add `WelcomePageNotAcceptableHandlerMapping` which will return
an HTTP 406 status if a suitable welcome page is found but
cannot be accepted for the request.

An additional mapper is used so that we don't need to change
the order of the `WelcomePageHandlerMapping`. It's possible
that users may have additional root handler mappings
registered to run after the `WelcomePageHandlerMapping`
and we still need to respect those.

Fixes gh-35552
2023-05-18 08:55:45 +01:00
Andy Wilkinson
75ffbc921d Account for new loggers property in FlywayPropertiesTets
See gh-35158
2023-05-18 08:03:25 +01:00
Phillip Webb
cf95ae92ea Allow flyway loggers to be configured and provide SLF4J default
Add `spring.flyway.loggers` property which can be used to configure
Flyway loggers and has a default value of "slf4j".

Closes gh-35158
2023-05-17 17:24:29 -07:00
Phillip Webb
d7b4353e99 Polish "Add property defaults for Spring Authorization Server"
See gh-35460
2023-05-17 17:06:54 -07:00
Steve Riesenberg
42c3cba18e Add property defaults for Spring Authorization Server
See gh-35460
2023-05-17 17:06:39 -07:00