fix: keep the admin status page preview iframe same-origin
The preview framed the page public URL, which for a custom domain is cross origin and blocked by the admin document CSP frame-src. Point the iframe at the same-origin public path while the frame chrome still shows the public URL.
This commit is contained in:
1 parent
ea23610b3a
commit
52b95ad121
2 files changed
+13
-1
No files matched your search
@@ -17,6 +17,7 @@ import {
|
|||||||
} from "@/Types/StatusPage";
|
} from "@/Types/StatusPage";
|
||||||
import {
|
import {
|
||||||
buildStatusPageApiPath,
|
buildStatusPageApiPath,
|
||||||
|
getStatusPagePreviewUrl,
|
||||||
getStatusPagePublicUrl,
|
getStatusPagePublicUrl,
|
||||||
isCustomDomainHost,
|
isCustomDomainHost,
|
||||||
} from "@/Utils/statusPageUrl";
|
} from "@/Utils/statusPageUrl";
|
||||||
@@ -142,6 +143,7 @@ const StatusPageView = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const publicUrl = getStatusPagePublicUrl(statusPage);
|
const publicUrl = getStatusPagePublicUrl(statusPage);
|
||||||
|
const previewUrl = getStatusPagePreviewUrl(statusPage);
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
loading={isLoading}
|
loading={isLoading}
|
||||||
@@ -163,7 +165,7 @@ const StatusPageView = () => {
|
|||||||
<BrowserFrame url={publicUrl}>
|
<BrowserFrame url={publicUrl}>
|
||||||
<Box
|
<Box
|
||||||
component="iframe"
|
component="iframe"
|
||||||
src={publicUrl}
|
src={previewUrl}
|
||||||
title={t("pages.statusPages.preview.title")}
|
title={t("pages.statusPages.preview.title")}
|
||||||
flex={1}
|
flex={1}
|
||||||
width="100%"
|
width="100%"
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ export const getStatusPagePublicUrl = (
|
|||||||
return `${PUBLIC_STATUS_PAGE_PREFIX}/${statusPage.url}`;
|
return `${PUBLIC_STATUS_PAGE_PREFIX}/${statusPage.url}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Same-origin URL for the admin preview iframe; a custom domain would be cross
|
||||||
|
// origin and blocked by the admin document's CSP frame-src.
|
||||||
|
export const getStatusPagePreviewUrl = (statusPage: Pick<StatusPage, "url">): string => {
|
||||||
|
if (typeof window !== "undefined") {
|
||||||
|
return `${window.location.origin}${PUBLIC_STATUS_PAGE_PREFIX}/${statusPage.url}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${PUBLIC_STATUS_PAGE_PREFIX}/${statusPage.url}`;
|
||||||
|
};
|
||||||
|
|
||||||
export const buildStatusPageApiPath = (options: {
|
export const buildStatusPageApiPath = (options: {
|
||||||
url?: string;
|
url?: string;
|
||||||
useCustomDomain?: boolean;
|
useCustomDomain?: boolean;
|
||||||
|
|||||||
Reference in new issue
Block a user