Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Improved bugfix for CSP Restriction for TrustedTypePolicy Creation in Loading Indicator #1000

Merged
merged 1 commit into from
Jun 13, 2024
Merged

fix: Improved bugfix for CSP Restriction for TrustedTypePolicy Creation in Loading Indicator #1000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 18 additions & 25 deletions core/parcel-runtime/src/utils/loading-indicator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,29 @@

const LOADING_ID = "__plasmo-loading__"

// Function to update the CSP to allow the new trusted type policy
function updateCSP() {
const cspMetaTag = document.querySelector(
'meta[http-equiv="Content-Security-Policy"]'
)

if (!cspMetaTag) {
return
}

const currentCSP = cspMetaTag.getAttribute("content")
const newPolicy = ` trusted-html-${LOADING_ID}`

if (currentCSP.includes(newPolicy)) {
return
}

const updatedCSP = currentCSP + newPolicy
cspMetaTag.setAttribute("content", updatedCSP)
}

function createTrustedPolicy() {
const trustedTypes = globalThis.window?.trustedTypes
if (typeof trustedTypes === "undefined") {
return undefined
}
updateCSP()
return trustedTypes.createPolicy(`trusted-html-${LOADING_ID}`, {
createHTML: (str) => str
})

const trustedTypeLists = (
document.querySelector('meta[name="trusted-types"]') as HTMLMetaElement
)?.content?.split(" ")

const trustedKey = trustedTypeLists
? trustedTypeLists[trustedTypeLists?.length - 1]
: undefined

// Function to update the CSP to allow the new trusted type policy or use existing policy
const trustedPolicy =
typeof trustedTypes !== "undefined"
? trustedTypes.createPolicy(trustedKey || `trusted-html-${LOADING_ID}`, {
createHTML: (str) => str
})
: undefined

return trustedPolicy
}

const trustedPolicy = createTrustedPolicy()
Expand Down
Loading