Skip to content

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

add data image check to urlTransform (#71588)

Nick Fitzpatricka4d498d24777
diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.tsx b/frontend/src/metabase/common/components/Markdown/Markdown.tsx
index 4c614830aa7..82223c635e1 100644
--- a/frontend/src/metabase/common/components/Markdown/Markdown.tsx
+++ b/frontend/src/metabase/common/components/Markdown/Markdown.tsx
@@ -5,6 +5,7 @@ import { defaultUrlTransform } from "react-markdown";
import remarkGfm from "remark-gfm";
import type { ColorName } from "metabase/ui/colors/types";
+import { DATA_IMAGE_URI_PATTERN } from "metabase/visualizations/lib/utils";
import { MarkdownRoot } from "./Markdown.styled";
@@ -18,6 +19,9 @@ function urlTransform(url: string): string {
if (url.startsWith("metabase://")) {
return url;
}
+ if (DATA_IMAGE_URI_PATTERN.test(url)) {
+ return url;
+ }
return defaultUrlTransform(url);
}
diff --git a/frontend/src/metabase/visualizations/lib/utils.ts b/frontend/src/metabase/visualizations/lib/utils.ts
index fafd8e30d7f..4fd4921d26d 100644
--- a/frontend/src/metabase/visualizations/lib/utils.ts
+++ b/frontend/src/metabase/visualizations/lib/utils.ts
@@ -562,3 +562,6 @@ export const segmentIsValid = (
const hasMax = typeof max === "number" && Number.isFinite(max);
return allowOpenEnded ? hasMin || hasMax : hasMin && hasMax;
};
+
+export const DATA_IMAGE_URI_PATTERN =
+ /^data:image\/(png|jpeg|jpg|gif|svg\+xml|webp);base64,/i;
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
index 1eccc04f062..097071566f8 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
@@ -1,7 +1,10 @@
import { useDisclosure } from "@mantine/hooks";
import cx from "classnames";
import { useCallback, useEffect, useMemo, useState } from "react";
-import ReactMarkdown, { type Options } from "react-markdown";
+import ReactMarkdown, {
+ type Options,
+ defaultUrlTransform,
+} from "react-markdown";
import rehypeExternalLinks from "rehype-external-links";
import remarkGfm from "remark-gfm";
import { t } from "ttag";
@@ -12,6 +15,7 @@ import { getParameterValues } from "metabase/dashboard/selectors";
import { useTranslateContent } from "metabase/i18n/hooks";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { isEmpty } from "metabase/lib/validate";
+import { DATA_IMAGE_URI_PATTERN } from "metabase/visualizations/lib/utils";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type { VisualizationGridSize } from "metabase/visualizations/types";
import type {
@@ -52,6 +56,13 @@ const REHYPE_PLUGINS: Options["rehypePlugins"] = [
[rehypeExternalLinks, { rel: ["noreferrer"], target: "_blank" }],
];
+function urlTransform(url: string): string {
+ if (DATA_IMAGE_URI_PATTERN.test(url)) {
+ return url;
+ }
+ return defaultUrlTransform(url);
+}
+
export function Text({
onUpdateVisualizationSettings,
className,
@@ -129,6 +140,7 @@ export function Text({
<ReactMarkdown
remarkPlugins={REMARK_PLUGINS}
rehypePlugins={REHYPE_PLUGINS}
+ urlTransform={urlTransform}
className={cx(
CS.full,
CS.flexFull,
@@ -186,6 +198,7 @@ export function Text({
)}
remarkPlugins={REMARK_PLUGINS}
rehypePlugins={REHYPE_PLUGINS}
+ urlTransform={urlTransform}
>
{content}
</ReactMarkdown>
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx
index 3bb926eb4d5..578d0f2d732 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx
@@ -95,6 +95,37 @@ describe("Text", () => {
"noreferrer",
);
});
+
+ it("should render a clickable base64 encoded image", () => {
+ const base64Src =
+ "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+ const options = {
+ settings: getSettingsWithText(
+ `[![alt](${base64Src})](https://example.com)`,
+ ),
+ };
+ setup(options);
+
+ const img = screen.getByRole("img", { name: "alt" });
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute("src", base64Src);
+
+ const link = screen.getByRole("link");
+ expect(link).toHaveAttribute("href", "https://example.com");
+ });
+
+ it("should not render data URIs that are not images", () => {
+ const options = {
+ settings: getSettingsWithText(
+ `![alt](data:text/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==)`,
+ ),
+ };
+ setup(options);
+
+ const img = screen.getByRole("img", { name: "alt" });
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute("src", "");
+ });
});
describe("Editing", () => {