Commit Graph
1379 Commits
Author SHA1 Message Date
Andy Wilkinson 042c69a4f9 Merge branch '4.1.x'
Closes gh-51668
2026-09-11 14:19:14 +01:00
Andy Wilkinson 885720ae66 Merge branch '4.0.x' into 4.1.x
Closes gh-51667
2026-09-11 12:55:59 +01:00
Andy Wilkinson d08d6d053a Merge pull request #51666 from ohchanKyu
Closes gh-51666

* gh-51666:
  Polish "Use TLS port for Docker Compose RabbitMQ connection when SSL is configured"
  Use TLS port for Docker Compose RabbitMQ connection when SSL is configured
2026-09-11 12:47:17 +01:00
Andy Wilkinson 18295bf297 Polish "Use TLS port for Docker Compose RabbitMQ connection when SSL is configured"
See gh-51666

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-11 12:42:51 +01:00
ohchanKyu 458ed72f55 Use TLS port for Docker Compose RabbitMQ connection when SSL is configured
When a rabbitmq Docker Compose service has SSL bundle labels,
RabbitDockerComposeConnectionDetailsFactory created an SslBundle but
still resolved the address from container port 5672, the plain AMQP
listener. As the connection factory enables SSL when an SslBundle is
present, the TLS handshake was attempted against the non-TLS listener
and the connection failed.

The address is now resolved from container port 5671 when an SslBundle
is present, matching RabbitStreamDockerComposeConnectionDetailsFactory
and the Testcontainers-based RabbitContainerConnectionDetailsFactory.
The SSL integration test now opens a connection using the resolved
address and SslBundle so that it fails without this fix.

Signed-off-by: ohchanKyu <okc0202@naver.com>

See gh-51666
2026-09-11 12:35:40 +01:00
Oleksandr Shevchenko ce75f008b0 Add baggage tag fields to spans with OpenTelemetry
With OpenTelemetry, fields listed in management.tracing.baggage.tag-fields
only became span tags when the application itself touched the baggage
through the Tracer API. Baggage that arrived with a request was
propagated correctly, but spans were not tagged with it (see
micrometer-metrics/tracing#933).

This commit registers Micrometer Tracing's BaggageTaggingSpanProcessor
whenever baggage is enabled and at least one tag field is configured, so
that spans are tagged with the baggage that is present in their parent
context. A custom BaggageTaggingSpanProcessor bean backs off the
auto-configured one. The tag-fields property is now also mentioned in
the baggage section of the tracing documentation.

See gh-51656

Signed-off-by: Oleksandr Shevchenko <oleksandr.shevchenko@datarobot.com>
2026-09-11 11:18:02 +01:00
htjworld 0959b436de Include security error body in WebFlux Cloud Foundry endpoint responses
See gh-50256

Signed-off-by: htjworld <itjhan01@gmail.com>
2026-09-09 13:52:28 +01:00
Andy Wilkinson 677efea937 Merge branch '4.1.x'
Closes gh-51646
2026-09-09 10:37:59 +01:00
Andy Wilkinson d601081bd5 Merge branch '4.0.x' into 4.1.x
Closes gh-51645
2026-09-09 10:37:08 +01:00
Andy Wilkinson a9fbd4a24c Polish "Remove redundant whitespace"
See gh-51644

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-09 10:00:36 +01:00
Tran Ngoc Nhan fd7a52b954 Remove redundant whitespace
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>

See gh-51644
2026-09-09 10:00:23 +01:00
Andy Wilkinson 0f2500898c Merge branch '4.1.x'
Closes gh-51640
2026-09-09 08:21:24 +01:00
Andy Wilkinson e383449a5d Merge branch '4.0.x' into 4.1.x
Closes gh-51639
2026-09-09 08:21:12 +01:00
Andy Wilkinson 06c0fa8d5c Retain WebFlux's default SameSite when property not set
Fixes gh-51636
2026-09-09 08:18:47 +01:00
Stéphane Nicoll a6d43b9ac6 Merge branch '4.1.x' 2026-09-08 19:00:07 +02:00
Stéphane Nicoll 163fac2cb1 Merge branch '4.0.x' into 4.1.x 2026-09-08 18:30:45 +02:00
Stéphane Nicoll 4fc987180d Polish "Add support for creating a container from a TestImage value"
See gh-51082
2026-09-08 18:30:35 +02:00
Andy Wilkinson b6aadce4a0 Merge branch '4.1.x'
Closes gh-51633
2026-09-08 16:56:36 +01:00
Andy Wilkinson 7c11fcf97f Merge branch '4.0.x' into 4.1.x
Closes gh-51632
2026-09-08 16:55:15 +01:00
ohchanKyu afc3178f33 Fix typo in deprecated Pushgateway base-url property metadata
The deprecation entry for
management.prometheus.metrics.export.pushgateway.base-url was declared
as "management.promethus", so the deprecation was never reported.

Signed-off-by: ohchanKyu <okc0202@naver.com>

See gh-51627
2026-09-08 16:54:18 +01:00
Andy Wilkinson 7ba781c705 Merge branch '4.1.x'
Closes gh-51631
2026-09-08 16:52:12 +01:00
Andy Wilkinson e158494508 Merge branch '4.0.x' into 4.1.x
Closes gh-51630
2026-09-08 16:51:49 +01:00
JaeHyunAn 537c80dbb9 Honor authorities-claim-delimiter when set on its own
See gh-51619

Signed-off-by: JaeHyunAn <98042706+yyuneu@users.noreply.github.com>
2026-09-08 16:39:54 +01:00
Stéphane Nicoll 03d367bb07 Merge branch '4.1.x'
Closes gh-51629
2026-09-08 17:29:34 +02:00
Stéphane Nicoll 18292d400c Merge branch '4.0.x' into 4.1.x
Closes gh-51628
2026-09-08 16:57:00 +02:00
Stéphane Nicoll b1e91c942e Add support for creating a container from a TestImage value
This commit improves TestImage so that an explicit image can trigger
the creation of the container, with optional additional setup. This
removes the need of creating additional container types for images that
have multiple flavors, and to please the static method that can only
create a container based on a single match.

Closes gh-51082
2026-09-08 16:46:48 +02:00
Andy Wilkinson bd99f6c6aa Merge branch '4.1.x'
Closes gh-51617
2026-09-08 09:20:15 +01:00
Andy Wilkinson 60dc60c5f6 Merge branch '4.0.x' into 4.1.x
Closes gh-51616
2026-09-08 09:19:33 +01:00
Andy Wilkinson 23275d826b Polish "Preserve firewall in reactive CF security auto-configuration"
See gh-51549

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-08 09:18:26 +01:00
Andy Wilkinson ca1cec34cb Merge branch '4.1.x'
Closes gh-51615
2026-09-08 09:16:20 +01:00
Andy Wilkinson c1900d0bc9 Merge branch '4.0.x' into 4.1.x
Closes gh-51614
2026-09-08 09:15:55 +01:00
aashikantkumar 4f3d0349f3 Preserve firewall in reactive CF security auto-configuration
Prior to this commit, CloudFoundryReactiveActuatorAutoConfiguration
registered a BeanPostProcessor replaced the WebFilterChainProxy bean
with one that handled CF security and delegated to the existing
chain.

Constructing a new WebFilterChainProxy resulted in the loss of any
firewall customization on the existing chain as Spring Security does
not provide an API to retreive the firewall from the existing chain
and apply it to the new chain.

This commit changes the approach and aligns it with its Servlet
counterpart. Instead of post-processing the filter chain proxy, a new
SecurityWebFilterChain that handles cloudfoundryapplication/**
is defined. This chain becomes part of the existing
WebFilterChainProxy, preserving any firewall customization.

Signed-off-by: aashikantkumar <aashikantkumar2@gmail.com>

See gh-51549
2026-09-08 08:56:38 +01:00
Andy Wilkinson 1d79f56ad7 Return 503 for missing application ID or cloud controller URL
Previously, the CloudFoundryAuthorizationExceptions thrown for a
missing application ID or cloud controller URL were not routed
through the error handling that turned them into a SecurityResponse
with a 503 status code. As a result, they were processed by the
general exception handling which resulted in a 500 response.

This commit updates the reactive SecurityInterceptor so that the
exceptions are processed through
SecurityInterceptor::getErrorResponse. This aligns the behavior of
the Cloud Foundry security intergration in a reactive application
more closely with that of a Servlet application.

Fixes gh-51613
2026-09-08 08:51:58 +01:00
Andy Wilkinson 85535ce81f Merge branch '4.1.x'
Closes gh-51607
2026-09-07 12:20:42 +01:00
Andy Wilkinson 50350d0c83 Merge branch '4.0.x' into 4.1.x
Closes gh-51606
2026-09-07 12:20:30 +01:00
Hyunwoo Jung 528c8bd1ea Fix typos
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51590
2026-09-07 11:53:30 +01:00
Andy Wilkinson f50c8311b9 Move Servlet-specific Tomcat properties to server.tomcat.servlet
Closes gh-51603
2026-09-07 09:58:08 +01:00
Andy Wilkinson 8924f1691c Polish "Default use-relative-redirects to true"
See gh-51173

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-07 08:55:46 +01:00
Tiziano Basile f119e58767 Default use-relative-redirects to true
Spring Boot unconditionally set useRelativeRedirects on the Tomcat
Context, defaulting it to false. That overrode Tomcat's own default and
forced absolute Location headers on every sendRedirect.

Keep server.tomcat.use-relative-redirects a simple boolean, but default
it to true so that relative Location headers are used out of the box.
The property can still be set to false to opt back into absolute
redirects.

Smoke tests that asserted a port-qualified absolute Location are updated
to the relative form, and the proxy tip in the reference documentation is
qualified since the context root redirect no longer carries a scheme.

Signed-off-by: Tiziano Basile <tiz.basile@gmail.com>

See gh-51173
2026-09-07 08:50:09 +01:00
Andy Wilkinson a07c43466b Merge branch '4.1.x'
Closes gh-51602
2026-09-07 08:43:59 +01:00
Andy Wilkinson 61275b0c64 Merge branch '4.0.x' into 4.1.x
Closes gh-51601
2026-09-07 08:43:48 +01:00
Fabio Grassi b49f9e2c32 Switch to Java 17 variants of Oracle JDBC dependencies
Signed-off-by: Fabio Grassi <40345396+fabio-grassi@users.noreply.github.com>

See gh-51593
2026-09-07 08:31:23 +01:00
Andy Wilkinson 57b44b0594 Merge branch '4.1.x'
Closes gh-51600
2026-09-07 08:27:14 +01:00
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Andy Wilkinson f7bb983335 Merge branch '4.1.x'
Closes gh-51588
2026-09-04 16:20:05 +01:00
Andy Wilkinson 154a77cae9 Make reactive resource server back off with custom security
Previously, the auto-configuration of reactive OAuth 2 resource
server based web security did not back off when a custom
SecurityWebFilterChain was defined. This did not match the
equivalent servlet-based auto-configuration which backs off when
a custom SecurityFilterChain is defined.

This commit updates the reactive auto-configuration to behave in
the same way as the servlet auto-configuration. A new annotation,
@ConditionalOnDefaultReactiveWebSecurity, is introduced. The
existing servlet-specific annotation,
@ConditionalOnDefaultWebSecurity is deprecated and a replacement
named @ConditionalOnDefaultServletWebSecurity is introduced.

Fixes gh-50778
2026-09-04 16:08:58 +01:00
Andy Wilkinson d305cc0ddc Merge branch '4.1.x'
Closes gh-51585
2026-09-04 12:58:46 +01:00
Andy Wilkinson 61a62d56d8 Merge branch '4.0.x' into 4.1.x
Closes gh-51584
2026-09-04 12:58:36 +01:00
Manu Sridharan 1c50b1cb7c Fix new warnings from NullAway 0.14.1
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51507
2026-09-04 12:56:34 +01:00