The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Upgrade snowflake jdbc to 4.0.1 (#70505)
Riley Thompsone70f22e0eb22
diff --git a/modules/drivers/snowflake/deps.edn b/modules/drivers/snowflake/deps.ednindex 73d7b2e051e..63d4d2303f4 100644--- a/modules/drivers/snowflake/deps.edn+++ b/modules/drivers/snowflake/deps.edn@@ -2,16 +2,7 @@["src" "resources"]:deps- {net.snowflake/snowflake-jdbc-thin {:mvn/version "3.28.0"- :exclusions [com.nimbusds/nimbus-jose-jwt- org.apache.commons/commons-lang3- org.bouncycastle/bcpkix-jdk18on- org.bouncycastle/bcprov-jdk18on- org.bouncycastle/bcutil-jdk18on]}+ {net.snowflake/snowflake-jdbc-thin {:mvn/version "4.0.1"+ :exclusions [io.grpc/grpc-netty-shaded]};; drop when snowflake update driver to the one without the vulnerabilities- com.nimbusds/nimbus-jose-jwt {:mvn/version "10.5"}- io.grpc/grpc-netty-shaded {:mvn/version "1.77.0"}- org.apache.commons/commons-lang3 {:mvn/version "3.19.0"}- org.bouncycastle/bcpkix-jdk18on {:mvn/version "1.81"}- org.bouncycastle/bcprov-jdk18on {:mvn/version "1.81"}- org.bouncycastle/bcutil-jdk18on {:mvn/version "1.82"}}}+ io.grpc/grpc-netty-shaded {:mvn/version "1.77.0"}}}diff --git a/modules/drivers/snowflake/resources/metabase-plugin.yaml b/modules/drivers/snowflake/resources/metabase-plugin.yamlindex 9a7ea1a0c0d..0c0b5edd0a2 100644--- a/modules/drivers/snowflake/resources/metabase-plugin.yaml+++ b/modules/drivers/snowflake/resources/metabase-plugin.yaml@@ -71,4 +71,4 @@ init:- step: load-namespacenamespace: metabase.driver.snowflake- step: register-jdbc-driver- class: net.snowflake.client.jdbc.SnowflakeDriver+ class: net.snowflake.client.api.driver.SnowflakeDriverdiff --git a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj b/modules/drivers/snowflake/src/metabase/driver/snowflake.cljindex b707a428c89..f40151c3e1c 100644--- a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj+++ b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj@@ -39,10 +39,10 @@[ring.util.codec :as codec])(:import(java.io File)+ (java.net URI URLDecoder)(java.sql Connection DatabaseMetaData ResultSet ResultSetMetaData Types)(java.time LocalDate LocalDateTime LocalTime OffsetDateTime OffsetTime ZonedDateTime)- (java.util Properties)- (net.snowflake.client.jdbc SnowflakeConnectString SnowflakeSQLException)))+ (net.snowflake.client.api.exception SnowflakeSQLException)))(set! *warn-on-reflection* true)@@ -139,14 +139,31 @@(when raw-name(str "\"" (str/replace raw-name "\"" "\"\"") "\"")))+(def ^:private snowflake-url-prefix "jdbc:snowflake://")+(defn connection-str->parameters"Get map of parameters from Snowflake `conn-str`, where keys are uppercase string parameter names and values- are strings. Returns nil when string is invalid."+ are strings. Returns nil when string is invalid.+ This is based on the implementation of SnowflakeConnectString.parse in https://github.com/snowflakedb/snowflake-jdbc"[conn-str]- (let [^SnowflakeConnectString conn-str* (SnowflakeConnectString/parse conn-str (Properties.))]- (if-not (.isValid conn-str*)- (log/warn "Invalid connection string.")- (.getParameters conn-str*))))+ (when (and conn-str (str/starts-with? conn-str snowflake-url-prefix))+ (let [after-prefix (subs conn-str (count snowflake-url-prefix))+ after-prefix' (if (or (str/starts-with? after-prefix "http://")+ (str/starts-with? after-prefix "https://"))+ after-prefix+ (subs conn-str (str/index-of conn-str "snowflake:")))+ uri (URI. after-prefix')]+ (when-let [query-data (.getRawQuery uri)]+ (->> (str/split query-data #"&")+ (keep (fn [param]+ (let [key-val (str/split param #"=")]+ (if-not (= 2 (count key-val))+ (log/warnf "Invalid Snowflake connection URI parameter: '%s'" param)+ (let [[k v] key-val]+ [(u/upper-case-en (URLDecoder/decode ^String k "UTF-8"))+ (URLDecoder/decode ^String v "UTF-8")])))))+ (into {})+ not-empty)))))(defn- maybe-add-role-to-spec-url"Maybe add role to `spec`'s `:connection-uri`. This is necessary for rsa auth to work, because at the time of writing@@ -213,7 +230,7 @@(let [upcase-not-nil (fn [s] (when s (u/upper-case-en s)))];; it appears to be the case that their JDBC driver ignores `db` -- see my bug report at;; https://support.snowflake.net/s/question/0D50Z00008WTOMCSA5/- (-> (merge {:classname "net.snowflake.client.jdbc.SnowflakeDriver"+ (-> (merge {:classname "net.snowflake.client.api.driver.SnowflakeDriver":subprotocol "snowflake":client_metadata_request_use_connection_ctx true:ssl truediff --git a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.cljindex 0f16313e3ca..8841e5fddd7 100644--- a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj+++ b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj@@ -518,7 +518,7 @@(original-query db sql-params (or opts {})))))](is (can-connect? (:details (mt/db))))))(is (thrown?- net.snowflake.client.jdbc.SnowflakeSQLException+ net.snowflake.client.api.exception.SnowflakeSQLException(can-connect? (assoc (:details (mt/db)) :db (mt/random-name))))"can-connect? should throw for Snowflake databases that don't exist (#9511)")(is (can-connect? (-> (:details (mt/db))@@ -1022,25 +1022,24 @@nil "" "asdf" "snowflake:jdbc://x")))(deftest ^:parallel connection-str->parameters-test-2- (testing "Returns `\"ACCOUNT\"` for valid strings of no parameters"- (are [conn-str] (= {"ACCOUNT" "x"} (driver.snowflake/connection-str->parameters conn-str))- "jdbc:snowflake://x.snowflakecomputing.com"- "jdbc:snowflake://x.snowflakecomputing.com/"- "jdbc:snowflake://x.snowflakecomputing.com/?")))+ (testing "Returns nil for valid strings of no parameters"+ (are [conn-str exp] (= exp (driver.snowflake/connection-str->parameters conn-str))+ "jdbc:snowflake://x.snowflakecomputing.com" nil+ "jdbc:snowflake://x.snowflakecomputing.com/" nil+ "jdbc:snowflake://x.snowflakecomputing.com/?" nil+ "jdbc:snowflake://x.snowflakecomputing.com/?x" nil)))(deftest ^:parallel connection-str->parameters-test-3(testing "Returns decoded parameters"(let [role "!@#$%^&*()"]- (is (= {"ACCOUNT" "x"- "ROLE" role}+ (is (= {"ROLE" role}(driver.snowflake/connection-str->parameters (str "jdbc:snowflake://x.snowflakecomputing.com/""?role=" (codec/url-encode role))))))))(deftest ^:parallel connection-str->parameters-test-4(testing "Returns multiple url parameters"(let [role "!@#$%^&*()"]- (is (= {"ACCOUNT" "x"- "ROLE" role+ (is (= {"ROLE" role"FOO" "bar"}(driver.snowflake/connection-str->parameters (str "jdbc:snowflake://x.snowflakecomputing.com/""?role=" (codec/url-encode role)diff --git a/resources/log4j2.xml b/resources/log4j2.xmlindex 75124c417a7..70e017fdfa9 100644--- a/resources/log4j2.xml+++ b/resources/log4j2.xml@@ -31,8 +31,8 @@<Logger name="metabase.query-processor.async" level="DEBUG"/><Logger name="metabase.server.middleware" level="DEBUG"/><Logger name="org.quartz" level="INFO"/>- <Logger name="net.snowflake.client.jdbc.SnowflakeConnectString" level="ERROR"/>- <Logger name="net.snowflake.client.core.SessionUtil" level="FATAL"/>+ <Logger name="net.snowflake.client.internal.jdbc.SnowflakeConnectString" level="ERROR"/>+ <Logger name="net.snowflake.client.internal.core.SessionUtil" level="FATAL"/><Root level="WARN"><AppenderRef ref="STDOUT"/>