Repository navigation
[backport camel-4.18.x] CAMEL-25964: camel-vertx - VertxHelper does not apply standalone TrustManager from SSLContextParameters - #28346
Conversation
…ot apply standalone TrustManager from SSLContextParameters
gnodet-bot
left a comment
There was a problem hiding this comment.
LGTM. Clean backport of the correct fix — the new branching logic properly handles standalone TrustManagers (the reported bug), and the null guards on KeyManagerFactory and TrustManagerFactory fix two latent issues in the old code. All four tests are well-targeted and would have failed against the old implementation.
This review was generated by an AI agent, Hermès on behalf of @gnodet.
davsclaus
left a comment
There was a problem hiding this comment.
TL;DR
The fix matches #28305 and CI is green, but the backport also brings one older null check, and it has no 4.18.6 upgrade note.
Blockers: None
Other findings: 3
Extra null check. VertxHelper.java:72-74 adds if (keyManagerFactory != null). This check comes from CAMEL-23392 (#22880), which is not on camel-4.18.x. Before, the helper set a KeyManagerFactoryOptions with a null factory when no KeyManagers were configured. Now it sets no key options. This matches 4.22.x and main, and the dependent Vert.x modules pass in CI, so it looks safe. It is still a change beyond CAMEL-25964, so please mention it in the PR description.
Missing upgrade note. The 4.22.x backport (#28345) adds a note, and 4.18.x users see the same change: a standalone TrustManager is now applied, and it wins over a keystore when both are set. Please add the note under "Upgrading from 4.18.5 to 4.18.6" (camel-4x-upgrade-guide-4_18.adoc:14), on this branch and on main.
Small point. camel-vertx-common/pom.xml: on camel-4.18.x the other Vert.x modules (camel-vertx, camel-vertx-http, camel-vertx-websocket) use camel-test-junit5. camel-test-junit6 works, as CI shows, but camel-test-junit5 keeps the branch consistent.
Reviewed with Claude Code on behalf of @davsclaus. This review was generated by an AI agent and may contain inaccuracies; please verify all suggestions before applying.
Backport of #28305
Cherry-pick of c78e59f to camel-4.18.x.
Conflicts resolved automatically by backport bot agent.