Add Jaybird 4 support for enableLegacyClientAuth

Author: mrotteveel

CHANGES.md

@@ -7,7 +7,8 @@ Version History
 - Update org.testcontainers:jdbc to 1.14.3
 - Move static config in modules to constructor (see also https://github.com/testcontainers/testcontainers-java/pull/2473)
 - Add ContainerState#getHost as a replacement for getContainerIpAddress (see also https://github.com/testcontainers/testcontainers-java/pull/2742)
-- Added additional url params in JdbcDatabaseContainer (see also https://github.com/testcontainers/testcontainers-java/issues/1802) 
+- Added additional url params in JdbcDatabaseContainer (see also https://github.com/testcontainers/testcontainers-java/issues/1802)
+- For compatibility with Jaybird 4, when legacy client auth is enabled and `authPlugins` URL param has not been explicitly added, add URL param `authPlugins` with value `Srp256,Srp,Legacy_auth`
 
 1.0.3
 -----

pom.xml

@@ -39,7 +39,7 @@
 
         <testcontainers.version>1.14.3</testcontainers.version>
         <lombok.version>1.18.12</lombok.version>
-        <jaybird.version>3.0.9</jaybird.version>
+        <jaybird.version>4.0.0.java8</jaybird.version>
     </properties>
 
     <dependencies>

src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java

@@ -19,6 +19,7 @@ public class FirebirdContainer<SELF extends FirebirdContainer<SELF>> extends Jdb
     public static final Integer FIREBIRD_PORT = 3050;
     private static final String FIREBIRD_SYSDBA = "sysdba";
     private static final int ARC4_REQUIRED_BITS = 160;
+    private static final String CONNECTION_PROPERTY_AUTH_PLUGINS = "authPlugins";
 
     private String databaseName = "test";
     private String username = "test";
@@ -54,6 +55,10 @@ protected void configure() {
 
         if (enableLegacyClientAuth) {
             addEnv("EnableLegacyClientAuth", "true");
+            if (!urlParameters.containsKey(CONNECTION_PROPERTY_AUTH_PLUGINS)) {
+                // Allow legacy auth with Jaybird 4, while also allowing Srp256 and Srp
+                withUrlParam(CONNECTION_PROPERTY_AUTH_PLUGINS, "Srp256,Srp,Legacy_Auth");
+            }
         }
 
         if (enableWireCrypt) {

src/test/java/org/firebirdsql/testcontainers/FirebirdContainerTest.java

@@ -59,6 +59,33 @@ public void testWithEnableLegacyClientAuth() throws SQLException {
         }
     }
 
+    @Test
+    public void testWithEnableLegacyClientAuth_jdbcUrlIncludeAuthPlugins_default() {
+        try (FirebirdContainer<?> container = new FirebirdContainer<>()
+                .withEnableLegacyClientAuth()) {
+            container.start();
+
+            String jdbcUrl = container.getJdbcUrl();
+            assertThat(jdbcUrl, allOf(
+                    containsString("?"),
+                    containsString("authPlugins=Srp256,Srp,Legacy_Auth")));
+        }
+    }
+
+    @Test
+    public void testWithEnableLegacyClientAuth_jdbcUrlIncludeAuthPlugins_explicitlySet() {
+        try (FirebirdContainer<?> container = new FirebirdContainer<>()
+                .withEnableLegacyClientAuth()
+                .withUrlParam("authPlugins", "Legacy_Auth")) {
+            container.start();
+
+            String jdbcUrl = container.getJdbcUrl();
+            assertThat(jdbcUrl, allOf(
+                    containsString("?"),
+                    containsString("authPlugins=Legacy_Auth")));
+        }
+    }
+
     @Test
     public void testWithEnableWireCrypt() throws SQLException {
         try (FirebirdContainer<?> container = new FirebirdContainer<>().withEnableWireCrypt()) {
@@ -83,8 +110,8 @@ public void testWithEnableWireCrypt() throws SQLException {
      * The 2.5 images of jacobalberty/firebird handle FIREBIRD_DATABASE and need an absolute path to access the database
      */
     @Test
-    public void test258_scImage() throws Exception {
-        try (FirebirdContainer<?> container = new FirebirdContainer<>(IMAGE + ":2.5.8-sc").withDatabaseName("test")) {
+    public void test259_scImage() throws Exception {
+        try (FirebirdContainer<?> container = new FirebirdContainer<>(IMAGE + ":2.5.9-sc").withDatabaseName("test")) {
             assertEquals("Expect original database name before start",
                     "test", container.getDatabaseName());