Fix CockroachDB SCRAM iteration limit - #11999
Open
skrcode wants to merge 1 commit into
Open
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Companion fix for #11879.
pgJDBC 42.7.12 adds a secure default cap of 100,000 SCRAM PBKDF2 iterations. CockroachDB v22.2 requests exactly 119,680, so the module’s runtime tests now fail with the driver’s explicit instruction to raise
scramMaxIterations.This sets a bounded default of 119,680 in both the current and deprecated Cockroach container APIs. It preserves pgJDBC’s protection rather than disabling it, and callers can still override the value through the existing URL-parameter map. The integration test now asserts that the generated JDBC URL contains the compatibility setting.
Verification:
:testcontainers-cockroachdb:compileJavapassed:testcontainers-cockroachdb:compileTestJavapassed:testcontainers-cockroachdb:checkstyleMainpassed:testcontainers-cockroachdb:checkstyleTestpassedgit diff --checkThe source PR’s CI reproduces the runtime failure three times against CockroachDB with the exact 119,680-versus-100,000 diagnostic. A post-fix runtime rerun was not available locally because Docker is not running, so no runtime pass is claimed.
spotlessCheckwas also attempted but blocked before source checking by a stale global Equo P2 cache lock; that user cache was left untouched.