Email for professionals and teams
fix(security): drop unsafe-eval from the production CSP and add COOP (#221)
Hieu Nguyen (Jack)b8ac37d89521
diff --git a/src/components/loading-transition-types.d.ts b/src/components/loading-transition-types.d.tsindex d1ede3a..8d46438 100644--- a/src/components/loading-transition-types.d.ts+++ b/src/components/loading-transition-types.d.ts@@ -6,5 +6,5 @@ export type LoadingTransitionProps = {};export type PageLoadingContextValue = {- reportLoading(id: string, loading: boolean): void;+ reportLoading(id: string, loading: boolean, silent?: boolean): void;};diff --git a/src/components/loading-transition.tsx b/src/components/loading-transition.tsxindex 2d8817a..1a236d9 100644--- a/src/components/loading-transition.tsx+++ b/src/components/loading-transition.tsx@@ -26,13 +26,18 @@ export function LoadingTransition({ children, ready }: LoadingTransitionProps) {const [pageMounted, setPageMounted] = useState(false);const [pendingLoads, setPendingLoads] = useState(0);const [dataWaitExpired, setDataWaitExpired] = useState(false);+ const [visibleLoads, setVisibleLoads] = useState(0);const loadingIds = useRef(new Set<string>());+ const visibleIds = useRef(new Set<string>());const fetchingQueries = useIsFetching();- const reportLoading = useCallback((id: string, loading: boolean) => {+ const reportLoading = useCallback((id: string, loading: boolean, silent = false) => {if (loading) loadingIds.current.add(id);else loadingIds.current.delete(id);+ if (loading && !silent) visibleIds.current.add(id);+ else visibleIds.current.delete(id);setPendingLoads(loadingIds.current.size);+ setVisibleLoads(visibleIds.current.size);}, []);const loadingContext = useMemo(() => ({ reportLoading }), [reportLoading]);const canComplete = ready && pageMounted && (dataWaitExpired || (pendingLoads === 0 && fetchingQueries === 0));@@ -81,7 +86,7 @@ export function LoadingTransition({ children, ready }: LoadingTransitionProps) {};}, [canComplete, showInitialLoader]);- const showTopLoadingBar = initialLoadComplete && (!ready || pendingLoads > 0);+ const showTopLoadingBar = initialLoadComplete && (!ready || visibleLoads > 0);return (<PageLoadingContext.Provider value={loadingContext}>diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsxindex 81441b0..7cbcc33 100644--- a/src/components/messages/message-folder-page.tsx+++ b/src/components/messages/message-folder-page.tsx@@ -326,7 +326,7 @@ export function MessageFolderPage({group: grouped ? "thread" : undefined,}, !mailboxesLoading, config.folderId);const { counts } = useMessageCounts(selectedMailbox?.id, !mailboxesLoading);- usePageLoading(mailboxesLoading || isLoading);+ usePageLoading(mailboxesLoading || isLoading, true);const headerIcons = config.headerIcons ?? [];const hasActiveFilters = !!query.trim();const folderCount = config.folderIddiff --git a/src/components/page-loading.tsx b/src/components/page-loading.tsxindex 490b13d..e4f0ede 100644--- a/src/components/page-loading.tsx+++ b/src/components/page-loading.tsx@@ -5,12 +5,12 @@ import type { PageLoadingContextValue } from "./loading-transition-types";export const PageLoadingContext = createContext<PageLoadingContextValue | null>(null);-export function usePageLoading(loading: boolean) {+export function usePageLoading(loading: boolean, silent = false) {const context = useContext(PageLoadingContext);const id = useId();useEffect(() => {- context?.reportLoading(id, loading);+ context?.reportLoading(id, loading, silent);return () => context?.reportLoading(id, false);- }, [context, id, loading]);+ }, [context, id, loading, silent]);}diff --git a/src/lib/security/headers.ts b/src/lib/security/headers.tsindex 19669a7..b7e12db 100644--- a/src/lib/security/headers.ts+++ b/src/lib/security/headers.ts@@ -1,6 +1,9 @@+// Dev tooling (HMR, source maps) evaluates strings; production never needs to.+const scriptEval = process.env.NODE_ENV === "production" ? "" : " 'unsafe-eval'";+const csp = ["default-src 'self'",- "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://challenges.cloudflare.com",+ `script-src 'self' 'unsafe-inline'${scriptEval} https://challenges.cloudflare.com`,"style-src 'self' 'unsafe-inline'","img-src 'self' data: blob: https:","font-src 'self' data:",@@ -21,6 +24,8 @@ export function getSecurityHeaders() {{ key: "Strict-Transport-Security", value: "max-age=31536000; includeSubDomains" },{ key: "X-Content-Type-Options", value: "nosniff" },{ key: "X-Frame-Options", value: "SAMEORIGIN" },+ // No window the app opens or that opens the app keeps a reference to it.+ { key: "Cross-Origin-Opener-Policy", value: "same-origin" },{ key: "Referrer-Policy", value: "strict-origin-when-cross-origin" },{key: "Permissions-Policy",