Merge branch 'release/3.1.2'

Author: rusher

.travis.yml

@@ -33,7 +33,7 @@ install:
         connector-test-machine/launch.bat -t "$srv" -v "$v" -d testj
         ;;
       linux)
-        source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testj -n 0 -l "$local" -p "$packet"
+        source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testj -l "$local" -p "$packet"
         ;;
     esac
 

CHANGELOG.md

@@ -1,4 +1,19 @@
 # Change Log
+
+## [3.1.2](https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.1.2) (Jan 2023)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.1.1...3.1.2)
+
+* CONJ-1040 possible ConcurrentModificationException when connecting
+* CONJ-1041 possible ArrayIndexOutOfBoundsException
+
+## [2.7.8](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.7.8) (Jan 2023)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.7...2.7.8)
+
+* CONJ-1039 setQueryTimeout not honored by CallableStatement for procedures depending on security context
+* CONJ-1041 possible ArrayIndexOutOfBoundsException
+* CONJ-1023 set missing SSL capability in handshake after SSL exchanges
+
+
 ## [3.1.1](https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.1.1) (Jan 2023)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.1.0...3.1.1)
 

README.md

@@ -26,7 +26,7 @@ or maven :
 <dependency>
 	<groupId>org.mariadb.jdbc</groupId>
 	<artifactId>mariadb-java-client</artifactId>
-	<version>3.1.1</version>
+	<version>3.1.2</version>
 </dependency>
 ```
 
@@ -45,7 +45,7 @@ Development snapshot are available on sonatype nexus repository
     <dependency>
         <groupId>org.mariadb.jdbc</groupId>
         <artifactId>mariadb-java-client</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.3-SNAPSHOT</version>
     </dependency>
 </dependencies>
 ```

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 

src/main/java/org/mariadb/jdbc/Configuration.java

@@ -617,21 +617,17 @@ private static void mapPropertiesToOption(Builder builder, Properties properties
       // loop on properties,
       // - check DefaultOption to check that property value correspond to type (and range)
       // - set values
-      Properties remainingProperties = new Properties();
-      properties.forEach((key, val) -> remainingProperties.put(key, val));
-
-      for (Field field : Builder.class.getDeclaredFields()) {
-        if (remainingProperties.isEmpty()) break;
-        for (final Object keyObj : remainingProperties.keySet()) {
-          String realKey =
-              OptionAliases.OPTIONS_ALIASES.get(keyObj.toString().toLowerCase(Locale.ROOT));
-          if (realKey == null) realKey = keyObj.toString();
-          final Object propertyValue = remainingProperties.get(keyObj);
-
-          if (propertyValue != null && realKey != null) {
+      for (final Object keyObj : properties.keySet()) {
+        String realKey =
+            OptionAliases.OPTIONS_ALIASES.get(keyObj.toString().toLowerCase(Locale.ROOT));
+        if (realKey == null) realKey = keyObj.toString();
+        final Object propertyValue = properties.get(keyObj);
+        if (propertyValue != null && realKey != null) {
+          boolean used = false;
+          for (Field field : Builder.class.getDeclaredFields()) {
             if (realKey.toLowerCase(Locale.ROOT).equals(field.getName().toLowerCase(Locale.ROOT))) {
               field.setAccessible(true);
-              remainingProperties.remove(keyObj);
+              used = true;
 
               if (field.getGenericType().equals(String.class)
                   && !propertyValue.toString().isEmpty()) {
@@ -668,13 +664,10 @@ private static void mapPropertiesToOption(Builder builder, Properties properties
               }
             }
           }
+          if (!used) nonMappedOptions.put(realKey, propertyValue);
         }
       }
 
-      // keep unknown option:
-      // those might be used in authentication or identity plugin
-      remainingProperties.forEach((key, val) -> nonMappedOptions.put(key, val));
-
       // for compatibility with 2.x
       if (isSet("useSsl", nonMappedOptions) || isSet("useSSL", nonMappedOptions)) {
         Properties deprecatedDesc = new Properties();

src/main/java/org/mariadb/jdbc/DatabaseMetaData.java

@@ -9,6 +9,7 @@
 import java.text.ParseException;
 import java.util.*;
 import org.mariadb.jdbc.client.DataType;
+import org.mariadb.jdbc.client.ServerVersion;
 import org.mariadb.jdbc.client.result.CompleteResult;
 import org.mariadb.jdbc.client.result.Result;
 import org.mariadb.jdbc.util.VersionFactory;
@@ -823,43 +824,60 @@ public ResultSet getColumns(
       String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
       throws SQLException {
 
-    StringBuilder sb =
-        new StringBuilder(
-            "SELECT TABLE_SCHEMA TABLE_CAT, NULL TABLE_SCHEM, TABLE_NAME, COLUMN_NAME,"
-                + dataTypeClause("COLUMN_TYPE")
-                + " DATA_TYPE,"
-                + DataTypeClause(conf)
-                + " TYPE_NAME, "
-                + " CASE DATA_TYPE"
-                + "  WHEN 'time' THEN "
-                + "IF(DATETIME_PRECISION = 0, 10, CAST(11 + DATETIME_PRECISION as signed integer))"
-                + "  WHEN 'date' THEN 10"
-                + "  WHEN 'datetime' THEN "
-                + "IF(DATETIME_PRECISION = 0, 19, CAST(20 + DATETIME_PRECISION as signed integer))"
-                + "  WHEN 'timestamp' THEN "
-                + "IF(DATETIME_PRECISION = 0, 19, CAST(20 + DATETIME_PRECISION as signed integer))"
-                + (conf.yearIsDateType() ? "" : " WHEN 'year' THEN 5")
-                + "  ELSE "
-                + "  IF(NUMERIC_PRECISION IS NULL, LEAST(CHARACTER_MAXIMUM_LENGTH,"
-                + Integer.MAX_VALUE
-                + "), NUMERIC_PRECISION) "
-                + " END"
-                + " COLUMN_SIZE, 65535 BUFFER_LENGTH, "
-                + " CONVERT (CASE DATA_TYPE"
-                + " WHEN 'year' THEN "
-                + (conf.yearIsDateType() ? "NUMERIC_SCALE" : "0")
-                + " WHEN 'tinyint' THEN "
-                + (conf.tinyInt1isBit() ? "0" : "NUMERIC_SCALE")
-                + " ELSE NUMERIC_SCALE END, UNSIGNED INTEGER) DECIMAL_DIGITS,"
-                + " 10 NUM_PREC_RADIX, IF(IS_NULLABLE = 'yes',1,0) NULLABLE,COLUMN_COMMENT REMARKS,"
-                + " COLUMN_DEFAULT COLUMN_DEF, 0 SQL_DATA_TYPE, 0 SQL_DATETIME_SUB,  "
-                + " LEAST(CHARACTER_OCTET_LENGTH,"
-                + Integer.MAX_VALUE
-                + ") CHAR_OCTET_LENGTH,"
-                + " ORDINAL_POSITION, IS_NULLABLE, NULL SCOPE_CATALOG, NULL SCOPE_SCHEMA, NULL SCOPE_TABLE, NULL SOURCE_DATA_TYPE,"
-                + " IF(EXTRA = 'auto_increment','YES','NO') IS_AUTOINCREMENT, "
-                + " IF(EXTRA in ('VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED') ,'YES','NO') IS_GENERATEDCOLUMN "
-                + " FROM INFORMATION_SCHEMA.COLUMNS");
+    ServerVersion version = connection.getContext().getVersion();
+    boolean supportsFractionalSeconds =
+        version.isMariaDBServer()
+            /* "In MariaDB 5.3 and later, the TIME, DATETIME, and TIMESTAMP types, along with the temporal
+            functions, CAST and dynamic columns, now support microseconds."
+            https://web.archive.org/web/20130928042640/https://mariadb.com/kb/en/microseconds-in-mariadb/
+            */
+            ? version.versionGreaterOrEqual(5, 3, 0)
+            // See https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-4.html
+            : version.versionGreaterOrEqual(5, 6, 4);
+    StringBuilder sb = new StringBuilder();
+    sb.append(
+        "SELECT TABLE_SCHEMA TABLE_CAT, NULL TABLE_SCHEM, TABLE_NAME, COLUMN_NAME,"
+            + dataTypeClause("COLUMN_TYPE")
+            + " DATA_TYPE,"
+            + DataTypeClause(conf)
+            + " TYPE_NAME, "
+            + " CASE DATA_TYPE"
+            + "  WHEN 'date' THEN 10");
+    if (supportsFractionalSeconds) {
+      sb.append(
+          "  WHEN 'time' THEN "
+              + "IF(DATETIME_PRECISION = 0, 10, CAST(11 + DATETIME_PRECISION as signed integer))"
+              + "  WHEN 'datetime' THEN "
+              + "IF(DATETIME_PRECISION = 0, 19, CAST(20 + DATETIME_PRECISION as signed integer))"
+              + "  WHEN 'timestamp' THEN "
+              + "IF(DATETIME_PRECISION = 0, 19, CAST(20 + DATETIME_PRECISION as signed integer))");
+    } else {
+      // Older versions do not include the DATETIME_PRECISION column in INFORMATION_SCHEMA.COLUMNS.
+      sb.append(" WHEN 'time' THEN 10 WHEN 'datetime' THEN 19 WHEN 'timestamp' THEN 19");
+    }
+    sb.append(
+        (conf.yearIsDateType() ? "" : " WHEN 'year' THEN 5")
+            + "  ELSE "
+            + "  IF(NUMERIC_PRECISION IS NULL, LEAST(CHARACTER_MAXIMUM_LENGTH,"
+            + Integer.MAX_VALUE
+            + "), NUMERIC_PRECISION) "
+            + " END"
+            + " COLUMN_SIZE, 65535 BUFFER_LENGTH, "
+            + " CONVERT (CASE DATA_TYPE"
+            + " WHEN 'year' THEN "
+            + (conf.yearIsDateType() ? "NUMERIC_SCALE" : "0")
+            + " WHEN 'tinyint' THEN "
+            + (conf.tinyInt1isBit() ? "0" : "NUMERIC_SCALE")
+            + " ELSE NUMERIC_SCALE END, UNSIGNED INTEGER) DECIMAL_DIGITS,"
+            + " 10 NUM_PREC_RADIX, IF(IS_NULLABLE = 'yes',1,0) NULLABLE,COLUMN_COMMENT REMARKS,"
+            + " COLUMN_DEFAULT COLUMN_DEF, 0 SQL_DATA_TYPE, 0 SQL_DATETIME_SUB,  "
+            + " LEAST(CHARACTER_OCTET_LENGTH,"
+            + Integer.MAX_VALUE
+            + ") CHAR_OCTET_LENGTH,"
+            + " ORDINAL_POSITION, IS_NULLABLE, NULL SCOPE_CATALOG, NULL SCOPE_SCHEMA, NULL SCOPE_TABLE, NULL SOURCE_DATA_TYPE,"
+            + " IF(EXTRA = 'auto_increment','YES','NO') IS_AUTOINCREMENT, "
+            + " IF(EXTRA in ('VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED') ,'YES','NO') IS_GENERATEDCOLUMN "
+            + " FROM INFORMATION_SCHEMA.COLUMNS");
     boolean firstCondition = catalogCond(true, sb, "TABLE_SCHEMA", catalog);
     firstCondition = patternCond(firstCondition, sb, "TABLE_NAME", tableNamePattern);
     firstCondition = patternCond(firstCondition, sb, "COLUMN_NAME", columnNamePattern);

src/main/java/org/mariadb/jdbc/client/socket/impl/PacketWriter.java

@@ -561,8 +561,10 @@ public void writeBytesEscaped(byte[] bytes, int len, boolean noBackslashEscapes)
           }
 
         } else {
-
           // not enough space in buf, will fill buf
+          if (buf.length <= pos) {
+            writeSocket(false);
+          }
           if (noBackslashEscapes) {
             for (int i = 0; i < len; i++) {
               if (QUOTE == bytes[i]) {

src/main/java/org/mariadb/jdbc/plugin/authentication/standard/CachingSha2PasswordPlugin.java

@@ -134,7 +134,11 @@ public ReadableByteBuf process(Writer out, Reader in, Context context)
               // retrieve public key from configuration or from server
               PublicKey publicKey;
               if (conf.serverRsaPublicKeyFile() != null) {
-                publicKey = readPublicKeyFromFile(conf.serverRsaPublicKeyFile());
+                if (conf.serverRsaPublicKeyFile().contains("BEGIN PUBLIC KEY")) {
+                  publicKey = generatePublicKey(conf.serverRsaPublicKeyFile().getBytes());
+                } else {
+                  publicKey = readPublicKeyFromFile(conf.serverRsaPublicKeyFile());
+                }
               } else {
                 // read public key from socket
                 if (!conf.allowPublicKeyRetrieval()) {

src/main/java/org/mariadb/jdbc/util/VersionFactory.java

@@ -21,10 +21,11 @@ public static Version getInstance() {
               Version.class.getClassLoader().getResourceAsStream("mariadb.properties")) {
             if (inputStream == null) {
               System.out.println("property file 'mariadb.properties' not found in the classpath");
+            } else {
+              Properties prop = new Properties();
+              prop.load(inputStream);
+              tmpVersion = prop.getProperty("version");
             }
-            Properties prop = new Properties();
-            prop.load(inputStream);
-            tmpVersion = prop.getProperty("version");
           } catch (IOException e) {
             e.printStackTrace();
           }

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

@@ -993,9 +993,16 @@ public void localSocket() throws Exception {
     } catch (SQLException e) {
       // eat
     }
-
-    stmt.execute("CREATE USER testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
-    stmt.execute("GRANT SELECT on *.* to testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
+    boolean useOldNotation =
+        (!isMariaDBServer() || !minVersion(10, 2, 0))
+            && (isMariaDBServer() || !minVersion(8, 0, 0));
+    if (useOldNotation) {
+      stmt.execute("CREATE USER testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
+      stmt.execute("GRANT SELECT on *.* to testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
+    } else {
+      stmt.execute("CREATE USER testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
+      stmt.execute("GRANT SELECT on *.* to testSocket");
+    }
     // mysql 8.0.31 broken public key retrieval, so avoid FLUSHING for now
     Assumptions.assumeTrue(!isMariaDBServer() && !exactVersion(8, 0, 31));
     stmt.execute("FLUSH PRIVILEGES");

src/test/java/org/mariadb/jdbc/integration/Sha256AuthenticationTest.java

@@ -15,7 +15,7 @@ public class Sha256AuthenticationTest extends Common {
 
   private static void dropUserWithoutError(org.mariadb.jdbc.Statement stmt, String user) {
     try {
-      stmt.execute("DROP USER " + user);
+      stmt.execute("DROP USER IF EXISTS " + user);
     } catch (SQLException e) {
       // eat
     }
@@ -65,6 +65,17 @@ public static void init() throws Exception {
       rsaPublicKey = checkFileExists("../../ssl/public.key");
     }
 
+    if (rsaPublicKey == null) {
+      ResultSet rs = stmt.executeQuery("SHOW STATUS like 'Caching_sha2_password_rsa_public_key'");
+      rs.next();
+      rsaPublicKey = rs.getString(2);
+      if ("".equals(rsaPublicKey)) rsaPublicKey = null;
+      if (rsaPublicKey != null) {
+        System.out.println(
+            "rsaPublicKey set from @@Caching_sha2_password_rsa_public_key:" + rsaPublicKey);
+      }
+    }
+
     stmt.execute(
         "CREATE USER 'cachingSha256User'@'%' IDENTIFIED WITH caching_sha2_password BY '!Passw0rd3Works'");
     stmt.execute(
@@ -126,7 +137,7 @@ public void cachingSha256Empty() throws Exception {
     Assumptions.assumeTrue(
         !isWindows() && !isMariaDBServer() && rsaPublicKey != null && minVersion(8, 0, 0));
     // mysql 8.0.31 broken public key retrieval, so avoid FLUSHING for now
-    Assumptions.assumeTrue(!isMariaDBServer() && !exactVersion(8, 0, 31));
+    Assumptions.assumeTrue(!isMariaDBServer() && !minVersion(8, 0, 31));
     sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
     try (Connection con = createCon("user=cachingSha256User2&allowPublicKeyRetrieval&password=")) {
       con.isValid(1);
@@ -155,7 +166,7 @@ public void wrongRsaPath() throws Exception {
   public void cachingSha256Allow() throws Exception {
     Assumptions.assumeTrue(!isMariaDBServer() && rsaPublicKey != null && minVersion(8, 0, 0));
     // mysql 8.0.31 broken public key retrieval, so avoid FLUSHING for now
-    Assumptions.assumeTrue(!isMariaDBServer() && !exactVersion(8, 0, 31));
+    Assumptions.assumeTrue(!isMariaDBServer() && !minVersion(8, 0, 31));
     sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
     try (Connection con =
         createCon("user=cachingSha256User3&allowPublicKeyRetrieval&password=!Passw0rd3Works")) {
@@ -205,7 +216,7 @@ public void cachingSha256PluginTest() throws Exception {
   public void cachingSha256PluginTestWithoutServerRsaKey() throws Exception {
     Assumptions.assumeTrue(!isWindows() && minVersion(8, 0, 0));
     // mysql 8.0.31 broken public key retrieval, so avoid FLUSHING for now
-    Assumptions.assumeTrue(!isMariaDBServer() && !exactVersion(8, 0, 31));
+    Assumptions.assumeTrue(!isMariaDBServer() && !minVersion(8, 0, 31));
     sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
     try (Connection con =
         createCon("user=cachingSha256User&password=!Passw0rd3Works&allowPublicKeyRetrieval")) {

src/test/java/org/mariadb/jdbc/unit/client/socket/PackerWriterTest.java src/test/java/org/mariadb/jdbc/unit/client/socket/PacketWriterTest.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.mariadb.jdbc.client.socket.impl.PacketWriter;
 
-public class PackerWriterTest {
+public class PacketWriterTest {
 
   @Test
   public void growBuffer() throws IOException {

src/test/java/org/mariadb/jdbc/unit/util/VersionFactoryTest.java

@@ -0,0 +1,17 @@
+package org.mariadb.jdbc.unit.util;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+import org.mariadb.jdbc.util.Version;
+import org.mariadb.jdbc.util.VersionFactory;
+
+class VersionFactoryTest {
+
+  @Test
+  public void testGetInstance() {
+    Version actual = VersionFactory.getInstance();
+
+    assertNotNull(actual);
+  }
+}