Merge branch 'release/1.1.4'

Author: rusher

.travis.yml

@@ -36,6 +36,7 @@ jobs:
   fast_finish: true
   allow_failures:
     - env: srv=build
+    - env: srv=xpand
   include:
     - stage: Minimal
       env: srv=mariadb v=10.6 local=1
@@ -55,6 +56,8 @@ jobs:
       name: "SkySQL"
     - env: srv=skysql-ha
       name: "SkySQL with replication"
+    - env: srv=xpand
+      name: "Xpand"
 
     - stage: Community
       env: srv=mariadb v=10.6

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [1.1.4](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/tree/1.1.4) (16 Mar 2023)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/compare/1.1.3...1.1.4)
+
+Bugs Fixed:
+
+* [R2DBC-76] Wrong MEDIUM field binary decoding
+* [R2DBC-77] Metadata is null when using returnGeneratedValues on server before 10.5
+* [R2DBC-79] Wrong client side parsing for named parameter when using user variable
+* [R2DBC-80] add option to disable hostname verification for SslMode.TUNNEL. thanks to @shubha-rajan
+* [R2DBC-81] missing parsing/builder variables for option restrictedAuth,rsaPublicKey,cachingRsaPublicKey and allowPublicKeyRetrievalString
+* [R2DBC-82] wrong transactionIsolation level set/get with server without session tracking
+* [R2DBC-85] adding hint in order to execute text command when useServerPrepStmts option is set
+* [R2DBC-83] support xpand 0000-00-00 timestamp/date encoding
+
+
+
 ## [1.1.3](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/tree/1.1.3) (22 Dec 2022)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/compare/1.1.2...1.1.3)
 

README.md

@@ -11,7 +11,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.mariadb</groupId>
   <artifactId>r2dbc-mariadb</artifactId>
-  <version>1.1.3</version>
+  <version>1.1.4</version>
   <packaging>jar</packaging>
   <url>https://github.com/mariadb-corporation/mariadb-connector-r2dbc</url>
 

pom.xml

@@ -98,7 +98,7 @@ public MariadbStatement createStatement(String sql) {
       throw new IllegalArgumentException("Statement cannot be empty.");
     }
 
-    if (this.configuration.useServerPrepStmts() || sql.contains("call")) {
+    if ((this.configuration.useServerPrepStmts() || sql.contains("call")) && !sql.startsWith("/*text*/")) {
       return new MariadbServerParameterizedQueryStatement(this.client, sql, this.configuration);
     }
     return new MariadbClientParameterizedQueryStatement(this.client, sql, this.configuration);
@@ -112,7 +112,7 @@ public MariadbConnectionMetadata getMetadata() {
   @Override
   public IsolationLevel getTransactionIsolationLevel() {
     if (isolationLevel != null) return isolationLevel;
-    if ((client.getContext().getClientCapabilities() | Capabilities.CLIENT_SESSION_TRACK) > 0
+    if ((client.getContext().getClientCapabilities() & Capabilities.CLIENT_SESSION_TRACK) > 0
         && client.getContext().getIsolationLevel() != null)
       return client.getContext().getIsolationLevel();
     return this.sessionIsolationLevel;
@@ -221,7 +221,7 @@ public Mono<Void> setStatementTimeout(Duration timeout) {
   public Mono<Void> setTransactionIsolationLevel(IsolationLevel isolationLevel) {
     Assert.requireNonNull(isolationLevel, "isolationLevel must not be null");
 
-    if ((client.getContext().getClientCapabilities() | Capabilities.CLIENT_SESSION_TRACK) > 0
+    if ((client.getContext().getClientCapabilities() & Capabilities.CLIENT_SESSION_TRACK) > 0
         && client.getContext().getIsolationLevel() != null
         && client.getContext().getIsolationLevel().equals(isolationLevel)) return Mono.empty();
 

src/main/java/org/mariadb/r2dbc/MariadbConnection.java

@@ -95,7 +95,8 @@ private MariadbConnectionConfiguration(
       boolean tinyInt1isBit,
       String restrictedAuth,
       @Nullable LoopResources loopResources,
-      @Nullable UnaryOperator<SslContextBuilder> sslContextBuilderCustomizer) {
+      @Nullable UnaryOperator<SslContextBuilder> sslContextBuilderCustomizer,
+      boolean sslTunnelDisableHostVerification) {
     this.haMode = haMode == null ? HaMode.NONE : HaMode.from(haMode);
     this.connectTimeout = connectTimeout == null ? Duration.ofSeconds(10) : connectTimeout;
     this.tcpKeepAlive = tcpKeepAlive == null ? Boolean.FALSE : tcpKeepAlive;
@@ -128,6 +129,7 @@ private MariadbConnectionConfiguration(
               clientSslKey,
               clientSslPassword,
               tlsProtocol,
+              sslTunnelDisableHostVerification,
               sslContextBuilderCustomizer);
     }
     this.rsaPublicKey = rsaPublicKey;
@@ -195,6 +197,28 @@ public static Builder fromOptions(ConnectionFactoryOptions connectionFactoryOpti
               connectionFactoryOptions.getValue(MariadbConnectionFactoryProvider.TCP_KEEP_ALIVE)));
     }
 
+    if (connectionFactoryOptions.hasOption(
+        MariadbConnectionFactoryProvider.ALLOW_PUBLIC_KEY_RETRIEVAL)) {
+      builder.allowPublicKeyRetrieval(
+          boolValue(
+              connectionFactoryOptions.getValue(
+                  MariadbConnectionFactoryProvider.ALLOW_PUBLIC_KEY_RETRIEVAL)));
+    }
+
+    if (connectionFactoryOptions.hasOption(
+        MariadbConnectionFactoryProvider.CACHING_RSA_PUBLIC_KEY)) {
+      builder.cachingRsaPublicKey(
+          (String)
+              connectionFactoryOptions.getValue(
+                  MariadbConnectionFactoryProvider.CACHING_RSA_PUBLIC_KEY));
+    }
+
+    if (connectionFactoryOptions.hasOption(MariadbConnectionFactoryProvider.RSA_PUBLIC_KEY)) {
+      builder.rsaPublicKey(
+          (String)
+              connectionFactoryOptions.getValue(MariadbConnectionFactoryProvider.RSA_PUBLIC_KEY));
+    }
+
     if (connectionFactoryOptions.hasOption(MariadbConnectionFactoryProvider.TCP_ABORTIVE_CLOSE)) {
       builder.tcpAbortiveClose(
           boolValue(
@@ -316,13 +340,28 @@ public static Builder fromOptions(ConnectionFactoryOptions connectionFactoryOpti
       }
       builder.pamOtherPwd(pairs);
     }
+
+    if (connectionFactoryOptions.hasOption(MariadbConnectionFactoryProvider.RESTRICTED_AUTH)) {
+      builder.restrictedAuth(
+          (String)
+              connectionFactoryOptions.getValue(MariadbConnectionFactoryProvider.RESTRICTED_AUTH));
+    }
+
     if (connectionFactoryOptions.hasOption(MariadbConnectionFactoryProvider.LOOP_RESOURCES)) {
       LoopResources loopResources =
           (LoopResources)
               connectionFactoryOptions.getValue(MariadbConnectionFactoryProvider.LOOP_RESOURCES);
       builder.loopResources(loopResources);
     }
 
+    if (connectionFactoryOptions.hasOption(
+        MariadbConnectionFactoryProvider.SSL_TUNNEL_DISABLE_HOST_VERIFICATION)) {
+      builder.sslTunnelDisableHostVerification(
+          boolValue(
+              connectionFactoryOptions.getValue(
+                  MariadbConnectionFactoryProvider.SSL_TUNNEL_DISABLE_HOST_VERIFICATION)));
+    }
+
     if (connectionFactoryOptions.hasOption(
         MariadbConnectionFactoryProvider.SSL_CONTEXT_BUILDER_CUSTOMIZER)) {
       builder.sslContextBuilderCustomizer(
@@ -539,7 +578,7 @@ public String toString() {
         + ", pamOtherPwd="
         + hiddenPamPwd
         + ", restrictedAuth="
-        + restrictedAuth
+        + (restrictedAuth == null ? "" : Arrays.toString(restrictedAuth))
         + '}';
   }
 
@@ -587,6 +626,8 @@ public static final class Builder implements Cloneable {
 
     private Builder() {}
 
+    private boolean sslTunnelDisableHostVerification;
+
     /**
      * Returns a configured {@link MariadbConnectionConfiguration}.
      *
@@ -641,7 +682,8 @@ public MariadbConnectionConfiguration build() {
           this.tinyInt1isBit,
           this.restrictedAuth,
           this.loopResources,
-          this.sslContextBuilderCustomizer);
+          this.sslContextBuilderCustomizer,
+          this.sslTunnelDisableHostVerification);
     }
 
     /**
@@ -976,6 +1018,11 @@ public Builder sslContextBuilderCustomizer(
       return this;
     }
 
+    public Builder sslTunnelDisableHostVerification(boolean sslTunnelDisableHostVerification) {
+      this.sslTunnelDisableHostVerification = sslTunnelDisableHostVerification;
+      return this;
+    }
+
     @Override
     public Builder clone() throws CloneNotSupportedException {
       return (Builder) super.clone();
@@ -1054,6 +1101,8 @@ public String toString() {
           + clientSslPassword
           + ", sslMode="
           + sslMode
+          + ", sslTunnelDisableHostVerification="
+          + sslTunnelDisableHostVerification
           + ", pamOtherPwd="
           + hiddenPamPwd
           + ", tinyInt1isBit="

src/main/java/org/mariadb/r2dbc/MariadbConnectionConfiguration.java

@@ -25,7 +25,7 @@ public final class MariadbConnectionFactoryProvider implements ConnectionFactory
   public static final Option<Boolean> ALLOW_PIPELINING = Option.valueOf("allowPipelining");
   public static final Option<Boolean> USE_SERVER_PREPARE = Option.valueOf("useServerPrepStmts");
   public static final Option<String> ISOLATION_LEVEL = Option.valueOf("isolationLevel");
-  public static final Option<Boolean> AUTO_COMMIT = Option.valueOf("autoCommit");
+  public static final Option<Boolean> AUTO_COMMIT = Option.valueOf("autocommit");
   public static final Option<Boolean> TINY_IS_BIT = Option.valueOf("tinyInt1isBit");
   public static final Option<Integer> PREPARE_CACHE_SIZE = Option.valueOf("prepareCacheSize");
   public static final Option<String> SSL_MODE = Option.valueOf("sslMode");
@@ -38,8 +38,18 @@ public final class MariadbConnectionFactoryProvider implements ConnectionFactory
   public static final Option<Boolean> TCP_ABORTIVE_CLOSE = Option.valueOf("tcpAbortiveClose");
   public static final Option<String> SESSION_VARIABLES = Option.valueOf("sessionVariables");
   public static final Option<LoopResources> LOOP_RESOURCES = Option.valueOf("loopResources");
+  public static final Option<Boolean> ALLOW_PUBLIC_KEY_RETRIEVAL =
+      Option.valueOf("allowPublicKeyRetrieval");
+
+  public static final Option<String> CACHING_RSA_PUBLIC_KEY = Option.valueOf("cachingRsaPublicKey");
+  public static final Option<String> RSA_PUBLIC_KEY = Option.valueOf("rsaPublicKey");
+
+  public static final Option<String> RESTRICTED_AUTH = Option.valueOf("restrictedAuth");
+
   public static final Option<UnaryOperator<SslContextBuilder>> SSL_CONTEXT_BUILDER_CUSTOMIZER =
       Option.valueOf("sslContextBuilderCustomizer");
+  public static final Option<Boolean> SSL_TUNNEL_DISABLE_HOST_VERIFICATION =
+      Option.valueOf("sslTunnelDisableHostVerification");
 
   static MariadbConnectionConfiguration createConfiguration(
       ConnectionFactoryOptions connectionFactoryOptions) {

src/main/java/org/mariadb/r2dbc/MariadbConnectionFactoryProvider.java

@@ -113,7 +113,7 @@ public ClientMessage next(
         } else {
           if (!configuration.allowPublicKeyRetrieval()) {
             throw new R2dbcNonTransientResourceException(
-                "RSA public key is not available client side (option " + "serverRsaPublicKeyFile)",
+                "RSA public key is not available client side (option serverRsaPublicKeyFile)",
                 "S1009");
           }
           state = State.REQUEST_SERVER_KEY;

src/main/java/org/mariadb/r2dbc/authentication/standard/Sha256PasswordPluginFlow.java

@@ -106,7 +106,9 @@ protected SimpleClient(
               sslContext.newEngine(
                   connection.channel().alloc(), hostAddress.getHost(), hostAddress.getPort());
           SSLParameters sslParameters = engine.getSSLParameters();
-          sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
+          if (!configuration.getSslConfig().tunnelHostVerificationDisabled()) {
+            sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
+          }
           engine.setSSLParameters(sslParameters);
         } else {
           engine = sslContext.newEngine(connection.channel().alloc());

src/main/java/org/mariadb/r2dbc/client/SimpleClient.java

@@ -109,10 +109,10 @@ public BigDecimal decodeBinary(
         return BigDecimal.valueOf((int) buf.readShortLE());
 
       case MEDIUMINT:
-        if (!column.isSigned()) {
-          return BigDecimal.valueOf((buf.readUnsignedMediumLE()));
-        }
-        return BigDecimal.valueOf(buf.readMediumLE());
+        BigDecimal v =
+            BigDecimal.valueOf(column.isSigned() ? buf.readMediumLE() : buf.readUnsignedMediumLE());
+        buf.readByte(); // needed since binary protocol exchange for medium are on 4 bytes
+        return v;
 
       case INTEGER:
         if (!column.isSigned()) {