Skip to content

Fix CockroachDB SCRAM iteration limit #11999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skrcode wants to merge 1 commit into
base: dependabot/gradle/modules/cockroachdb/org.postgresql-postgresql-42.7.12
Choose a base branch
from
+9 −0
Open

Fix CockroachDB SCRAM iteration limit #11999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/cockroachdb/src/main/java/org/testcontainers/cockroachdb/CockroachContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer

private static final String TEST_QUERY_STRING = "SELECT 1";

// CockroachDB v22.2 uses 119,680 SCRAM iterations, above pgJDBC's default safety limit.
private static final String DEFAULT_SCRAM_MAX_ITERATIONS = "119680";

private static final int REST_API_PORT = 8080;

private static final int DB_PORT = 26257;
Expand All @@ -52,6 +55,7 @@ public CockroachContainer(final String dockerImageName) {
public CockroachContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
withUrlParam("scramMaxIterations", DEFAULT_SCRAM_MAX_ITERATIONS);
this.isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);

WaitAllStrategy waitStrategy = new WaitAllStrategy();
Expand Down
4 changes: 4 additions & 0 deletions modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer

private static final String TEST_QUERY_STRING = "SELECT 1";

// CockroachDB v22.2 uses 119,680 SCRAM iterations, above pgJDBC's default safety limit.
private static final String DEFAULT_SCRAM_MAX_ITERATIONS = "119680";

private static final int REST_API_PORT = 8080;

private static final int DB_PORT = 26257;
Expand Down Expand Up @@ -70,6 +73,7 @@ public CockroachContainer(final String dockerImageName) {
public CockroachContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
withUrlParam("scramMaxIterations", DEFAULT_SCRAM_MAX_ITERATIONS);
this.isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);

WaitAllStrategy waitStrategy = new WaitAllStrategy();
Expand Down
1 change: 1 addition & 0 deletions modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ void testWithAdditionalUrlParamInJdbcUrl() {
assertThat(jdbcUrl)
.contains("?")
.contains("&")
.contains("scramMaxIterations=119680")
.contains("sslmode=disable")
.contains("application_name=cockroach");
} finally {
Expand Down