Skip to content

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

Don't include archived cards in embedded dashboards (#82529)

Nathan Voxland587b659ee78c
diff --git a/src/metabase/embedding_rest/api/embed.clj b/src/metabase/embedding_rest/api/embed.clj
index 8b8428b2ccf..13c2cb2c341 100644
--- a/src/metabase/embedding_rest/api/embed.clj
+++ b/src/metabase/embedding_rest/api/embed.clj
@@ -193,7 +193,7 @@
dashboard-id (api.embed.common/unsigned-token->dashboard-id unsigned-token)
dashboard (api/check-404 (embedding-rest.db/dashboard dashboard-id))
dashcard (api/check-404 (embedding-rest.db/dashcard dashcard-id))
- card (api/check-404 (embedding-rest.db/card card-id))]
+ card (api/check-404 (embedding-rest.db/active-card card-id))]
(api.embed.common/check-embedding-enabled-for-dashboard dashboard)
(api.embed.common/process-query-for-dashcard
:export-format export-format
@@ -444,7 +444,7 @@
dashboard-id (api.embed.common/unsigned-token->dashboard-id unsigned)
dashboard (api/check-404 (embedding-rest.db/dashboard dashboard-id))
dashcard (api/check-404 (embedding-rest.db/dashcard dashcard-id))
- card (api/check-404 (embedding-rest.db/card card-id))]
+ card (api/check-404 (embedding-rest.db/active-card card-id))]
(api.embed.common/check-embedding-enabled-for-dashboard dashboard)
(api.embed.common/process-tiles-query-for-dashcard
dashboard dashcard card
diff --git a/src/metabase/embedding_rest/api/preview_embed.clj b/src/metabase/embedding_rest/api/preview_embed.clj
index aecb540c27f..db2ff6af66f 100644
--- a/src/metabase/embedding_rest/api/preview_embed.clj
+++ b/src/metabase/embedding_rest/api/preview_embed.clj
@@ -178,7 +178,7 @@
dashboard-id (embed/get-in-unsigned-token-or-throw unsigned-token [:resource :dashboard])
dashboard (api/check-404 (embedding-rest.db/dashboard dashboard-id))
dashcard (api/check-404 (embedding-rest.db/dashcard dashcard-id))
- card (api/check-404 (embedding-rest.db/card card-id))
+ card (api/check-404 (embedding-rest.db/active-card card-id))
embedding-params (token-embedding-params unsigned-token)
token-params (embed/get-in-unsigned-token-or-throw unsigned-token [:params])]
(api.embed.common/process-query-for-dashcard
@@ -225,7 +225,7 @@
dashboard-id (embed/get-in-unsigned-token-or-throw unsigned-token [:resource :dashboard])
dashboard (api/check-404 (embedding-rest.db/dashboard dashboard-id))
dashcard (api/check-404 (embedding-rest.db/dashcard dashcard-id))
- card (api/check-404 (embedding-rest.db/card card-id))
+ card (api/check-404 (embedding-rest.db/active-card card-id))
embedding-params (token-embedding-params unsigned-token)
token-params (embed/get-in-unsigned-token-or-throw unsigned-token [:params])]
(api.embed.common/process-query-for-dashcard
@@ -288,7 +288,7 @@
dashboard-id (embed/get-in-unsigned-token-or-throw unsigned-token [:resource :dashboard])
dashboard (api/check-404 (embedding-rest.db/dashboard dashboard-id))
dashcard (api/check-404 (embedding-rest.db/dashcard dashcard-id))
- card (api/check-404 (embedding-rest.db/card card-id))]
+ card (api/check-404 (embedding-rest.db/active-card card-id))]
(api.embed.common/process-tiles-query-for-dashcard
dashboard dashcard card
(api.embed.common/tile-parameters-for-dashboard
diff --git a/src/metabase/embedding_rest/db.clj b/src/metabase/embedding_rest/db.clj
index 81e75bc38d1..3f6024f5c62 100644
--- a/src/metabase/embedding_rest/db.clj
+++ b/src/metabase/embedding_rest/db.clj
@@ -14,6 +14,12 @@
[card-id :- ::lib.schema.id/card]
(t2/select-one :model/Card card-id))
+(mu/defn active-card
+ "The non-archived Card with `card-id`, or nil. A trashed Card keeps its DashboardCard rows, so the dashcard routes
+ select it as absent rather than checking `:archived` after the fact."
+ [card-id :- ::lib.schema.id/card]
+ (t2/select-one :model/Card :id card-id :archived false))
+
(mu/defn card-embedding-params
"The embedding parameters of the Card with `card-id`, or nil."
[card-id :- ::lib.schema.id/card]
diff --git a/test/metabase/embedding_rest/api/embed_test.clj b/test/metabase/embedding_rest/api/embed_test.clj
index 354271dcaf9..1377dcc8d6e 100644
--- a/test/metabase/embedding_rest/api/embed_test.clj
+++ b/test/metabase/embedding_rest/api/embed_test.clj
@@ -1105,6 +1105,16 @@
(is (= "Message seems corrupt or manipulated"
(client/client :get 400 (with-new-secret-key! (dashcard-url dashcard)))))))))
+(deftest dashcard-archived-card-test
+ (testing "GET /api/embed/dashboard/:token/dashcard/:dashcard-id/card/:card-id[/:export-format]"
+ (testing "refuses a trashed Card, indistinguishably from a missing one, even though its DashboardCard row survives"
+ (with-embedding-enabled-and-new-secret-key!
+ (with-temp-dashcard [dashcard {:dash {:enable_embedding true}
+ :card {:archived true}}]
+ (do-response-formats [response-format _request-options]
+ (is (= "Not found."
+ (client/client :get 400 (str (dashcard-url dashcard) response-format))))))))))
+
(deftest dashboard-locked-params-test
(with-embedding-enabled-and-new-secret-key!
(with-temp-dashcard [dashcard {:dash {:enable_embedding true, :embedding_params {:venue_id "locked"}}}]
@@ -1707,6 +1717,16 @@
(is (= "Embedding is not enabled for this object."
(client/client :get 400 (pivot-dashcard-url dashcard))))))))
+(deftest pivot-dashcard-archived-card-test
+ (testing "GET /api/embed/pivot/dashboard/:token/dashcard/:dashcard-id/card/:card-id refuses a trashed Card"
+ (mt/dataset test-data
+ (with-embedding-enabled-and-new-secret-key!
+ (with-temp-dashcard [dashcard {:dash {:enable_embedding true, :parameters []}
+ :card (assoc (api.pivots/pivot-card) :archived true)
+ :dashcard {:parameter_mappings []}}]
+ (is (= "Not found."
+ (client/client :get 400 (pivot-dashcard-url dashcard)))))))))
+
(deftest pivot-dashcard-signing-check-test
(mt/dataset test-data
(testing (str "check that if embedding is enabled globally and for the object that requests fail if they are signed "
@@ -2269,6 +2289,20 @@
:latField (tiles.api-test/encoded-lat-field-ref)
:lonField (tiles.api-test/encoded-lon-field-ref)))))))))
+(deftest dashcard-tile-archived-card-test
+ (testing "GET api/embed/tiles/dashboard/:token/dashcard/:dashcard-id/card/:card-id/:zoom/:x/:y refuses a trashed Card"
+ (with-embedding-enabled-and-new-secret-key!
+ (mt/with-temp [:model/Dashboard {dashboard-id :id} {:enable_embedding true}
+ :model/Card {card-id :id} {:dataset_query (venues-query)
+ :archived true}
+ :model/DashboardCard {dashcard-id :id} {:card_id card-id
+ :dashboard_id dashboard-id}]
+ (is (= "Not found."
+ (client/client :get 400 (format "embed/tiles/dashboard/%s/dashcard/%d/card/%d/1/1/1"
+ (dash-token dashboard-id) dashcard-id card-id)
+ :latField (tiles.api-test/encoded-lat-field-ref)
+ :lonField (tiles.api-test/encoded-lon-field-ref))))))))
+
(deftest dashcard-tile-query-does-not-save-last-used-parameters-test
(testing "GET api/embed/tiles/dashboard/:token/dashcard/:dashcard-id/card/:card-id/:zoom/:x/:y"
(testing "must not persist the URL's parameters as a signed-in visitor's last used parameter values"
diff --git a/test/metabase/embedding_rest/api/preview_embed_test.clj b/test/metabase/embedding_rest/api/preview_embed_test.clj
index 071857a0880..ec92f54c98f 100644
--- a/test/metabase/embedding_rest/api/preview_embed_test.clj
+++ b/test/metabase/embedding_rest/api/preview_embed_test.clj
@@ -282,6 +282,14 @@
(is (= "Message seems corrupt or manipulated"
(mt/user-http-request :crowberto :get 400 (embed-test/with-new-secret-key! (dashcard-url dashcard))))))))))
+(deftest dashcard-archived-card-test
+ (testing "GET /api/preview_embed/dashboard/:token/dashcard/:dashcard-id/card/:card-id"
+ (testing "refuses a trashed Card, even though its DashboardCard row survives"
+ (embed-test/with-embedding-enabled-and-new-secret-key!
+ (embed-test/with-temp-dashcard [dashcard {:card {:archived true}}]
+ (is (= "Not found."
+ (mt/user-http-request :crowberto :get 404 (dashcard-url dashcard)))))))))
+
(deftest dashcard-locked-params-test
(testing "/api/preview_embed/dashboard/:token/dashcard/:dashcard-id/card/:card-id"
(testing "LOCKED params"
@@ -475,6 +483,16 @@
(is (= "Message seems corrupt or manipulated"
(mt/user-http-request :crowberto :get 400 (embed-test/with-new-secret-key! (pivot-dashcard-url dashcard))))))))))))
+(deftest pivot-dashcard-archived-card-test
+ (testing "GET /api/preview_embed/pivot/dashboard/:token/dashcard/:dashcard-id/card/:card-id refuses a trashed Card"
+ (mt/dataset test-data
+ (embed-test/with-embedding-enabled-and-new-secret-key!
+ (embed-test/with-temp-dashcard [dashcard {:dash {:parameters []}
+ :card (assoc (api.pivots/pivot-card) :archived true)
+ :dashcard {:parameter_mappings []}}]
+ (is (= "Not found."
+ (mt/user-http-request :crowberto :get 404 (pivot-dashcard-url dashcard)))))))))
+
(deftest handle-single-params-for-operator-filters-test
(testing "Query endpoints should work with a single URL parameter for an operator filter (#20438)"
(mt/dataset test-data
@@ -803,6 +821,20 @@
:latField (tiles.api-test/encoded-lat-field-ref)
:lonField (tiles.api-test/encoded-lon-field-ref)))))))))
+(deftest dashcard-tile-archived-card-test
+ (testing "GET api/preview_embed/tiles/dashboard/:uuid/dashcard/:dashcard-id/card/:card-id/:zoom/:x/:y refuses a trashed Card"
+ (embed-test/with-embedding-enabled-and-new-secret-key!
+ (mt/with-temp [:model/Dashboard {dashboard-id :id} {:enable_embedding true}
+ :model/Card {card-id :id} {:dataset_query (venues-query)
+ :archived true}
+ :model/DashboardCard {dashcard-id :id} {:card_id card-id
+ :dashboard_id dashboard-id}]
+ (is (= "Not found."
+ (mt/user-http-request :crowberto :get 404 (format "preview_embed/tiles/dashboard/%s/dashcard/%d/card/%d/1/1/1"
+ (embed-test/dash-token dashboard-id) dashcard-id card-id)
+ :latField (tiles.api-test/encoded-lat-field-ref)
+ :lonField (tiles.api-test/encoded-lon-field-ref))))))))
+
(deftest card-tile-query-implicit-join-ref-test
(testing "GET api/preview_embed/tiles/card/:uuid/:zoom/:x/:y returns a 400 when the lat/lon refs use an implicit join"
(embed-test/with-embedding-enabled-and-new-secret-key!