diff --git a/src/metabase/driver/druid.clj b/src/metabase/driver/druid.clj
index bae048ff55b4e2b89bf0dbd2ee739f8f094aa59f..26380b68295a4e401ed6319f944b3fac1c0b466c 100644
--- a/src/metabase/driver/druid.clj
+++ b/src/metabase/driver/druid.clj
@@ -47,7 +47,8 @@
;;; ### Misc. Driver Fns
(defn- can-connect? [details]
- (= 200 (:status (http/get (details->url details "/status")))))
+ (ssh/with-ssh-tunnel [details-with-tunnel details]
+ (= 200 (:status (http/get (details->url details-with-tunnel "/status"))))))
;;; ### Query Processing
diff --git a/src/metabase/driver/generic_sql.clj b/src/metabase/driver/generic_sql.clj
index 5145d3f804b3a5cee3f962347b99a39194e33a7d..4d97cf543544b5688e00f50391b8d984e642c061 100644
--- a/src/metabase/driver/generic_sql.clj
+++ b/src/metabase/driver/generic_sql.clj
@@ -202,9 +202,9 @@
^clojure.lang.Keyword [k]
(keyword (hx/escape-dots (name k))))
-
(defn- can-connect? [driver details]
- (let [connection (connection-details->spec driver details)]
+ (let [details-with-tunnel (ssh/include-ssh-tunnel details)
+ connection (connection-details->spec driver details-with-tunnel)]
(= 1 (first (vals (first (jdbc/query connection ["SELECT 1"])))))))
(defn pattern-based-column->base-type
diff --git a/src/metabase/driver/oracle.clj b/src/metabase/driver/oracle.clj
index ad731c1a310459f4ea2e8e9d3be6b46e9b962ed2..8b1bb29f3d5a4780bbcac8cc5acd01f5602f21ee 100644
--- a/src/metabase/driver/oracle.clj
+++ b/src/metabase/driver/oracle.clj
@@ -59,7 +59,7 @@
(dissoc details :host :port :sid :service-name)))
(defn- can-connect? [details]
- (let [connection (connection-details->spec details)]
+ (let [connection (connection-details->spec (ssh/include-ssh-tunnel details))]
(= 1M (first (vals (first (jdbc/query connection ["SELECT 1 FROM dual"])))))))
diff --git a/test/metabase/driver/druid_test.clj b/test/metabase/driver/druid_test.clj
index 46295750ab60f3d5b051066329a82d1a3b483928..2e0a9e64f1c1295f6e98efb34b3902293eaa37d9 100644
--- a/test/metabase/driver/druid_test.clj
+++ b/test/metabase/driver/druid_test.clj
@@ -5,11 +5,13 @@
[query-processor-test :refer [rows rows+column-names]]
[timeseries-query-processor-test :as timeseries-qp-test]
[util :as u]]
+ [expectations :refer [expect]]
[metabase.models.metric :refer [Metric]]
[metabase.query-processor.expand :as ql]
[metabase.test.data :as data]
[metabase.test.data.datasets :as datasets :refer [expect-with-engine]]
- [toucan.util.test :as tt]))
+ [toucan.util.test :as tt]
+ [metabase.driver :as driver]))
(def ^:const ^:private ^String native-query-1
(json/generate-string
@@ -246,3 +248,21 @@
:query {:source-table (data/id :checkins)
:aggregation [:+ ["METRIC" (u/get-id metric)] 1]
:breakout [(ql/breakout (ql/field-id (data/id :checkins :venue_price)))]}})))))
+
+(expect
+ #"com.jcraft.jsch.JSchException:"
+ (try
+ (let [engine :druid
+ details {:ssl false,
+ :password "changeme",
+ :tunnel-host "localhost",
+ :tunnel-pass "BOGUS-BOGUS",
+ :port 5432,
+ :dbname "test",
+ :host "http://localhost",
+ :tunnel-enabled true,
+ :tunnel-port 22,
+ :tunnel-user "bogus"}]
+ (driver/can-connect-with-details? engine details :rethrow-exceptions))
+ (catch Exception e
+ (.getMessage e))))
diff --git a/test/metabase/driver/generic_sql_test.clj b/test/metabase/driver/generic_sql_test.clj
index 43beff8b14b5b6190fdc42bdc71ef255e3e120cb..b78b80cc98f1e3c4dafc2cc35e4503bd776d0af7 100644
--- a/test/metabase/driver/generic_sql_test.clj
+++ b/test/metabase/driver/generic_sql_test.clj
@@ -123,3 +123,23 @@
0.5)
(dataset half-valid-urls
(field-percent-urls datasets/*driver* (db/select-one 'Field :id (id :urls :url)))))
+
+;;; Make sure invalid ssh credentials are detected if a direct connection is possible
+(expect
+ #"com.jcraft.jsch.JSchException:"
+ (try (let [engine :postgres
+ details {:ssl false,
+ :password "changeme",
+ :tunnel-host "localhost", ;; this test works if sshd is running or not
+ :tunnel-pass "BOGUS-BOGUS-BOGUS",
+ :port 5432,
+ :dbname "test",
+ :host "localhost",
+ :tunnel-enabled true,
+ :tunnel-port 22,
+ :engine :postgres,
+ :user "postgres",
+ :tunnel-user "example"}]
+ (driver/can-connect-with-details? engine details :rethrow-exceptions))
+ (catch Exception e
+ (.getMessage e))))
diff --git a/test/metabase/driver/mongo/util_test.clj b/test/metabase/driver/mongo/util_test.clj
index 52a4a4f516577491b9ab25f95089e90fac6cdfac..11fb9dbe0f50329f7a1c403e8d47a0f608a23865 100644
--- a/test/metabase/driver/mongo/util_test.clj
+++ b/test/metabase/driver/mongo/util_test.clj
@@ -1,7 +1,8 @@
(ns metabase.driver.mongo.util-test
(:require [expectations :refer :all]
metabase.driver.mongo.util
- [metabase.test.util :as tu])
+ [metabase.test.util :as tu]
+ [metabase.driver :as driver])
(:import com.mongodb.ReadPreference))
(tu/resolve-private-vars metabase.driver.mongo.util build-connection-options)
@@ -28,3 +29,21 @@
(expect
IllegalArgumentException
(build-connection-options :additional-options "readPreference=ternary"))
+
+(expect
+ #"We couldn't connect to the ssh tunnel host"
+ (try
+ (let [engine :mongo
+ details {:ssl false,
+ :password "changeme",
+ :tunnel-host "localhost",
+ :tunnel-pass "BOGUS-BOGUS",
+ :port 5432,
+ :dbname "test",
+ :host "localhost",
+ :tunnel-enabled true,
+ :tunnel-port 22,
+ :tunnel-user "bogus"}]
+ (driver/can-connect-with-details? engine details :rethrow-exceptions))
+ (catch Exception e
+ (.getMessage e))))
diff --git a/test/metabase/driver/oracle_test.clj b/test/metabase/driver/oracle_test.clj
index e6178bab05a32fc8c36b8e2dcf225aae726615d0..dcba09ad9940c05103d3d79b0dd7ecfc86d75ca4 100644
--- a/test/metabase/driver/oracle_test.clj
+++ b/test/metabase/driver/oracle_test.clj
@@ -4,7 +4,7 @@
[metabase.driver :as driver]
[metabase.driver
[generic-sql :as sql]
- oracle])
+ [oracle :as oracle]])
(:import metabase.driver.oracle.OracleDriver))
;; make sure we can connect with an SID
@@ -44,3 +44,21 @@
:port 1521
:service-name "MyCoolService"
:sid "ORCL"}))
+
+
+(expect
+ com.jcraft.jsch.JSchException
+ (let [engine :oracle
+ details {:ssl false,
+ :password "changeme",
+ :tunnel-host "localhost",
+ :tunnel-pass "BOGUS-BOGUS-BOGUS",
+ :port 12345,
+ :service-name "test",
+ :sid "asdf",
+ :host "localhost",
+ :tunnel-enabled true,
+ :tunnel-port 22,
+ :user "postgres",
+ :tunnel-user "example"}]
+ (#'oracle/can-connect? details)))
diff --git a/test/metabase/driver/presto_test.clj b/test/metabase/driver/presto_test.clj
index 190b56836899f57810ab99da0b235ff44a49be8b..ffeca83d0e4424e0863a85f4b8c840bdaadff06f 100644
--- a/test/metabase/driver/presto_test.clj
+++ b/test/metabase/driver/presto_test.clj
@@ -142,3 +142,20 @@
:order-by [[:default.categories.id :asc]]}
{:page {:page 2
:items 5}}))
+
+(expect
+ #"com.jcraft.jsch.JSchException:"
+ (try
+ (let [engine :presto
+ details {:ssl false,
+ :password "changeme",
+ :tunnel-host "localhost",
+ :tunnel-pass "BOGUS-BOGUS",
+ :catalog "BOGUS"
+ :host "localhost",
+ :tunnel-enabled true,
+ :tunnel-port 22,
+ :tunnel-user "bogus"}]
+ (driver/can-connect-with-details? engine details :rethrow-exceptions))
+ (catch Exception e
+ (.getMessage e))))