From 8e0c7765e43497b02537d4c71b50a70a07f09911 Mon Sep 17 00:00:00 2001
From: metamben <103100869+metamben@users.noreply.github.com>
Date: Fri, 19 May 2023 20:26:39 +0300
Subject: [PATCH] Handle rubbish in mongodb versionArray (#30879)
Fixes #29678.
---
.../drivers/mongo/src/metabase/driver/mongo.clj | 9 +++++++--
.../mongo/test/metabase/driver/mongo_test.clj | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/modules/drivers/mongo/src/metabase/driver/mongo.clj b/modules/drivers/mongo/src/metabase/driver/mongo.clj
index c45da7de982..49a250eda5b 100644
--- a/modules/drivers/mongo/src/metabase/driver/mongo.clj
+++ b/modules/drivers/mongo/src/metabase/driver/mongo.clj
@@ -183,9 +183,14 @@
(defmethod driver/dbms-version :mongo
[_ database]
(with-mongo-connection [^com.mongodb.DB conn database]
- (let [build-info (mg/command conn {:buildInfo 1})]
+ (let [build-info (mg/command conn {:buildInfo 1})
+ version-array (get build-info "versionArray")
+ sanitized-version-array (into [] (take-while nat-int?) version-array)]
+ (when (not= (take 3 version-array) (take 3 sanitized-version-array))
+ (log/warnf "sanitizing versionArray %s results in %s, losing information"
+ version-array sanitized-version-array))
{:version (get build-info "version")
- :semantic-version (get build-info "versionArray")})))
+ :semantic-version sanitized-version-array})))
(defmethod driver/describe-database :mongo
[_ database]
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo_test.clj
index a1f78025f89..6f85ae0be20 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo_test.clj
@@ -21,6 +21,7 @@
[metabase.test.data.mongo :as tdm]
[metabase.util.log :as log]
[monger.collection :as mcoll]
+ [monger.core :as mg]
[taoensso.nippy :as nippy]
[toucan2.core :as t2])
(:import org.bson.types.ObjectId))
@@ -488,3 +489,19 @@
(mt/rows
(mt/run-mbql-query bird_species
{:filter [:contains $bird_species._ "nett"]}))))))))
+
+(deftest strange-versionArray-test
+ (mt/test-driver :mongo
+ (testing "Negative values in versionArray are ignored (#29678)"
+ (with-redefs [mg/command (constantly {"version" "4.0.28-23"
+ "versionArray" [4 0 29 -100]})]
+ (is (= {:version "4.0.28-23"
+ :semantic-version [4 0 29]}
+ (driver/dbms-version :mongo (mt/db))))))
+
+ (testing "Any values after rubbish in versionArray are ignored"
+ (with-redefs [mg/command (constantly {"version" "4.0.28-23"
+ "versionArray" [4 0 "NaN" 29]})]
+ (is (= {:version "4.0.28-23"
+ :semantic-version [4 0]}
+ (driver/dbms-version :mongo (mt/db))))))))
--
GitLab