Skip to content

Only accept a document in getStyleNonce and getScriptNonce #483

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Only accept a document in getStyleNonce and getScriptNonce #483

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
17 changes: 5 additions & 12 deletions src/dom/globals/window.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,21 @@ export function open(
/**
* Returns CSP nonce, if set for any script tag.
*/
export function getScriptNonce(documentOrWindow?: Document | Window): string {
return getNonceFor('script', documentOrWindow);
export function getScriptNonce(doc?: Document): string {
return getNonceFor('script', doc);
}

/**
* Returns CSP nonce, if set for any style tag.
*/
export function getStyleNonce(documentOrWindow?: Document | Window): string {
return getNonceFor('style', documentOrWindow);
export function getStyleNonce(doc?: Document): string {
return getNonceFor('style', doc);
}

function getNonceFor(
elementName: 'script' | 'style',
documentOrWindow: Document | Window = document,
doc: Document = document,
): string {
// Note: We can't use `instanceof` here because `documentOrWindow` likely
// comes from a different realm.
const doc =
'document' in documentOrWindow
? documentOrWindow.document
: documentOrWindow;

// document.querySelector can be undefined in non-browser environments.
const el = doc.querySelector?.<HTMLScriptElement | HTMLStyleElement>(
`${elementName}[nonce]`,
Expand Down