Skip to content

Commit e13e5e8

Browse files
pendula95vietj
authored andcommitted
Fixed failing test due to bad db password policy
1 parent ba46488 commit e13e5e8

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class ContainerPgRule extends ExternalResource {
3636

3737
private static final String connectionUri = System.getProperty("connection.uri");
3838
private static final String tlsConnectionUri = System.getProperty("tls.connection.uri");
39+
private static final String tlsForceConnectionUri = System.getProperty("tls.force.connection.uri");
3940

4041
private ServerContainer<?> server;
4142
private PgConnectOptions options;
@@ -95,7 +96,7 @@ private void initServer(String version) throws Exception {
9596
}
9697

9798
public static boolean isTestingWithExternalDatabase() {
98-
return isSystemPropertyValid(connectionUri) || isSystemPropertyValid(tlsConnectionUri);
99+
return isSystemPropertyValid(connectionUri) || isSystemPropertyValid(tlsConnectionUri) || isSystemPropertyValid(tlsForceConnectionUri);
99100
}
100101

101102
private static boolean isSystemPropertyValid(String systemProperty) {
@@ -144,7 +145,11 @@ protected void before() throws Throwable {
144145
if (isTestingWithExternalDatabase()) {
145146

146147
if (ssl) {
147-
options = PgConnectOptions.fromUri(tlsConnectionUri);
148+
if (forceSsl) {
149+
options = PgConnectOptions.fromUri(tlsForceConnectionUri);
150+
} else {
151+
options = PgConnectOptions.fromUri(tlsConnectionUri);
152+
}
148153
}
149154
else {
150155
options = PgConnectOptions.fromUri(connectionUri);

vertx-pg-client/src/test/resources/tls/pg_hba.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ local replication all trust
125125
host replication all 127.0.0.1/32 trust
126126
host replication all ::1/128 trust
127127

128-
hostssl all all all scram-sha-256
128+
hostssl all all all md5

0 commit comments

Comments
 (0)