Skip to content

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

Update and pin netty-codec dependencies (#72800)

metamben74885b3416e8
diff --git a/deps.edn b/deps.edn
index 78e5f6b755f..b18da8d181a 100644
--- a/deps.edn
+++ b/deps.edn
@@ -90,8 +90,8 @@
:git/sha "ffc4edc482c057cd9412c62f018a41e9140c618b"
:git/url "https://github.com/eerohele/pp"}
io.github.metabase/macaw {:mvn/version "0.2.36"} ; Parse native SQL queries
- io.netty/netty-codec-http {:mvn/version "4.2.9.Final"} ; override of transitive dep from aws s3
- io.netty/netty-codec-http2 {:mvn/version "4.2.9.Final"} ; override of transitive dep from aws s3
+ io.netty/netty-codec-http {:mvn/version "4.2.12.Final"} ; override of transitive dep from aws s3
+ io.netty/netty-codec-http2 {:mvn/version "4.2.12.Final"} ; override of transitive dep from aws s3
io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"} ; prometheus jvm collector
junegunn/grouper {:mvn/version "0.1.1"} ; Batch processing helper
kixi/stats {:mvn/version "0.5.7" ; Various statistic measures implemented as transducers
diff --git a/modules/drivers/athena/deps.edn b/modules/drivers/athena/deps.edn
index eaa7d40abb3..32ddd1b3c62 100644
--- a/modules/drivers/athena/deps.edn
+++ b/modules/drivers/athena/deps.edn
@@ -12,4 +12,9 @@
{com.metabase/athena-jdbc-thin {:mvn/version "3.7.0"
:exclusions [software.amazon.awssdk/athena-streaming]}
;; not on Maven Central; published to our private maven by the athena workflow
- com.metabase/athena-streaming {:mvn/version "2.0"}}}
+ com.metabase/athena-streaming {:mvn/version "2.0"}
+ ;; override transitive deps from netty-nio-client to fix CVE-2025-67735 (CRLF Injection)
+ ;; the root deps.edn already overrides these, but Snyk scans this module in isolation
+ ;; version should match the override in the root deps.edn
+ io.netty/netty-codec-http {:mvn/version "4.2.12.Final"}
+ io.netty/netty-codec-http2 {:mvn/version "4.2.12.Final"}}}
diff --git a/modules/drivers/bigquery-cloud-sdk/deps.edn b/modules/drivers/bigquery-cloud-sdk/deps.edn
index c19f49d1356..e23f979c5df 100644
--- a/modules/drivers/bigquery-cloud-sdk/deps.edn
+++ b/modules/drivers/bigquery-cloud-sdk/deps.edn
@@ -25,7 +25,7 @@
;; was 1.71.0. bumping to 77
io.grpc/grpc-netty-shaded {:mvn/version "1.77.0"}
;; matches those in athena
- io.netty/netty-common {:mvn/version "4.2.7.Final"}
- io.netty/netty-buffer {:mvn/version "4.2.7.Final"}
+ io.netty/netty-common {:mvn/version "4.2.12.Final"}
+ io.netty/netty-buffer {:mvn/version "4.2.12.Final"}
;; pinned: google-cloud-bigquery pulls 2.18.2 which has resource exhaustion vulns
com.fasterxml.jackson.core/jackson-core {:mvn/version "2.21.2"}}}
diff --git a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj
index befc944365f..8671af21870 100644
--- a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj
+++ b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj
@@ -198,11 +198,12 @@
(defmethod driver/table-exists? :bigquery-cloud-sdk
[_ database {table-id :name, dataset-id :schema :as _table}]
- (let [details (driver.conn/effective-details database)
- client (database-details->client details)
- project-id (get-project-id details)]
- (boolean
- (get-table* client project-id dataset-id table-id))))
+ (when-not (or (str/blank? dataset-id) (str/blank? table-id))
+ (let [details (driver.conn/effective-details database)
+ client (database-details->client details)
+ project-id (get-project-id details)]
+ (boolean
+ (get-table* client project-id dataset-id table-id)))))
(declare ^:dynamic *process-native*)
diff --git a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj
index 6880b320750..06ed3c49d32 100644
--- a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj
+++ b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj
@@ -676,10 +676,6 @@
(should-qualify-identifier? identifier) update-identifier-prefix-components
true (vary-meta assoc ::do-not-qualify? true))))
-(defmethod sql.qp/->honeysql [:bigquery-cloud-sdk ::sql.qp/nfc-path]
- [_driver [_ nfc-path]]
- nfc-path)
-
(defn- with-base-temporal-type
[[_ _id-or-name {:keys [base-type]} :as clause]]
(if (not (instance? clojure.lang.IObj clause))
diff --git a/modules/drivers/hive-like/deps.edn b/modules/drivers/hive-like/deps.edn
index fb061cd4b0a..7c6fcb8bcef 100644
--- a/modules/drivers/hive-like/deps.edn
+++ b/modules/drivers/hive-like/deps.edn
@@ -245,11 +245,11 @@
;; Netty — pinned explicitly at safe versions for security scanning.
;; Driver JARs are scanned individually so these must be declared directly.
- io.netty/netty-common {:mvn/version "4.2.9.Final"}
- io.netty/netty-handler {:mvn/version "4.2.9.Final"}
- io.netty/netty-transport {:mvn/version "4.2.9.Final"}
- io.netty/netty-buffer {:mvn/version "4.2.9.Final"}
- io.netty/netty-codec {:mvn/version "4.2.9.Final"}
- io.netty/netty-resolver {:mvn/version "4.2.9.Final"}
- io.netty/netty-transport-native-unix-common {:mvn/version "4.2.9.Final"}
- io.netty/netty-transport-native-epoll {:mvn/version "4.2.9.Final"}}}
+ io.netty/netty-common {:mvn/version "4.2.12.Final"}
+ io.netty/netty-handler {:mvn/version "4.2.12.Final"}
+ io.netty/netty-transport {:mvn/version "4.2.12.Final"}
+ io.netty/netty-buffer {:mvn/version "4.2.12.Final"}
+ io.netty/netty-codec {:mvn/version "4.2.12.Final"}
+ io.netty/netty-resolver {:mvn/version "4.2.12.Final"}
+ io.netty/netty-transport-native-unix-common {:mvn/version "4.2.12.Final"}
+ io.netty/netty-transport-native-epoll {:mvn/version "4.2.12.Final"}}}