Added settings.database.ssl-mode setting, since vert.x 5 contains bug where ssl-mode preferred (default since 5.1.0) just hangs mysql connections and never releases them.

Author: And1sS

docs/config-app.md

@@ -323,6 +323,7 @@ For filesystem data source available next options:
 
 For database data source available next options:
 - `settings.database.type` - type of database to be used: `mysql` or `postgres`.
+- `settings.database.ssl-mode` - type of ssl mode to be used: `disabled`, `preferred` or `required`
 - `settings.database.host` - database destination host.
 - `settings.database.port` - database destination port.
 - `settings.database.dbname` - database name.

src/main/java/org/prebid/server/spring/config/database/DatabaseConfiguration.java

@@ -51,6 +51,7 @@ ConnectionPoolSettings connectionPoolSettings(DatabaseConfigurationProperties da
                 databaseConfigurationProperties.getMaxPreparedStatementCacheSize(),
                 databaseConfigurationProperties.getUser(),
                 databaseConfigurationProperties.getPassword(),
+                databaseConfigurationProperties.getSslMode(),
                 databaseConfigurationProperties.getType());
     }
 
@@ -85,6 +86,7 @@ Pool mysqlConnectionPool(Vertx vertx,
                 .setDatabase(databaseAddress.getDatabaseName())
                 .setUser(connectionPoolSettings.getUser())
                 .setPassword(connectionPoolSettings.getPassword())
+                .setSslMode(connectionPoolSettings.getSslMode().mysqlMode)
                 .setCachePreparedStatements(connectionPoolSettings.getEnablePreparedStatementCaching())
                 .setPreparedStatementCacheMaxSize(connectionPoolSettings.getMaxPreparedStatementCacheSize());
 
@@ -116,6 +118,7 @@ Pool postgresConnectionPool(Vertx vertx,
                 .setDatabase(databaseAddress.getDatabaseName())
                 .setUser(connectionPoolSettings.getUser())
                 .setPassword(connectionPoolSettings.getPassword())
+                .setSslMode(connectionPoolSettings.getSslMode().pgMode)
                 .setCachePreparedStatements(connectionPoolSettings.getEnablePreparedStatementCaching())
                 .setPreparedStatementCacheMaxSize(connectionPoolSettings.getMaxPreparedStatementCacheSize());
 

src/main/java/org/prebid/server/spring/config/database/model/ConnectionPoolSettings.java

@@ -17,5 +17,7 @@ public class ConnectionPoolSettings {
 
     String password;
 
+    SslMode sslMode;
+
     DatabaseType databaseType;
 }

src/main/java/org/prebid/server/spring/config/database/model/SslMode.java

@@ -0,0 +1,16 @@
+package org.prebid.server.spring.config.database.model;
+
+public enum SslMode {
+
+    disabled(io.vertx.pgclient.SslMode.DISABLE, io.vertx.mysqlclient.SslMode.DISABLED),
+    preferred(io.vertx.pgclient.SslMode.PREFER, io.vertx.mysqlclient.SslMode.PREFERRED),
+    required(io.vertx.pgclient.SslMode.REQUIRE, io.vertx.mysqlclient.SslMode.REQUIRED);
+
+    public final io.vertx.pgclient.SslMode pgMode;
+    public final io.vertx.mysqlclient.SslMode mysqlMode;
+
+    SslMode(io.vertx.pgclient.SslMode pgMode, io.vertx.mysqlclient.SslMode mysqlMode) {
+        this.pgMode = pgMode;
+        this.mysqlMode = mysqlMode;
+    }
+}

src/main/java/org/prebid/server/spring/config/database/properties/DatabaseConfigurationProperties.java

@@ -3,6 +3,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.prebid.server.spring.config.database.model.DatabaseType;
+import org.prebid.server.spring.config.database.model.SslMode;
 
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
@@ -16,6 +17,8 @@ public class DatabaseConfigurationProperties {
     @NotNull
     private DatabaseType type;
     @NotNull
+    private SslMode sslMode;
+    @NotNull
     @Min(1)
     private Integer poolSize;
     @NotNull

src/main/resources/application.yaml

@@ -167,6 +167,7 @@ settings:
   fail-on-disabled-bidders: true
   database:
     pool-size: 20
+    ssl-mode: disabled
     idle-connection-timeout: 300
     enable-prepared-statement-caching: false
     max-prepared-statement-cache-size: 256