Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Handle nil additional options in mysql can-connect? (#73834)

Riley Thompsona3390f996676
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index 490aafc7544..31df543e24c 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -218,7 +218,7 @@
[driver details]
;; delegate to parent method to check whether we can connect; if so, check if it's an unsupported version and issue
;; a warning if it is
- (let [match (re-find disallowed-additional-opts (:additional-options details ""))]
+ (let [match (some->> (:additional-options details) (re-find disallowed-additional-opts))]
(when match
(throw (ex-info "Potentially dangerous keys in additional options" {:disallowed-key match}))))
(when ((get-method driver/can-connect? :sql-jdbc) driver details)
diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.clj
index 75347183a00..788bd2ae2a4 100644
--- a/test/metabase/driver/mysql_test.clj
+++ b/test/metabase/driver/mysql_test.clj
@@ -1042,21 +1042,26 @@
(jdbc/execute! spec "DROP USER IF EXISTS 'partial_revokes_test_user';"))))))))
(deftest ^:parallel only-connect-when-non-malicious-properties
- (testing "Reject connection strings with malicious properties"
- (are [bad-option] (let [details (assoc (tx/dbdef->connection-details :mysql :db
- {:database-name "argent"})
- :additional-options bad-option)
- result (try (driver/can-connect? :mysql details)
- ::did-not-throw
- (catch Exception e e))]
- (is (instance? clojure.lang.ExceptionInfo result))
- (is (partial= {:cause "Potentially dangerous keys in additional options"}
- (Throwable->map result))))
- "allowLoadLocalInfile=true"
- "allowLoadLocalInfileInPath=1"
- "allowUrlInLocalInfile=1"
- "autoDeserialize=1"
- "serverRSAPublicKeyFile=/path/to/file")))
+ (mt/test-driver :mysql
+ (let [details (:details (mt/db))]
+ (testing "Reject connection strings with malicious properties"
+ (are [bad-option] (let [details (assoc details :additional-options bad-option)]
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo
+ #"Potentially dangerous keys in additional options"
+ (driver/can-connect? :mysql details))))
+ "allowLoadLocalInfile=true"
+ "allowLoadLocalInfileInPath=1"
+ "allowUrlInLocalInfile=1"
+ "autoDeserialize=1"
+ "serverRSAPublicKeyFile=/path/to/file"))
+ (testing "Allow connection strings with non-malicious properties"
+ (are [ok-option] (let [details (assoc details :additional-options ok-option)]
+ (is (true? (driver/can-connect? :mysql details))))
+ nil
+ ""
+ " "
+ "tinyInt1isBit=1")
+ (is (true? (driver/can-connect? :mysql details)))))))
(deftest ^:parallel set-role-statement-escape-quotes-test
(mt/test-driver :mysql