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

Progress Bar Won't Render if CSP is Turned On #501

Merged
merged 2 commits into from
Dec 19, 2021
Merged

Progress Bar Won't Render if CSP is Turned On #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
760be4f
Add 'nonce' for Progress Bar Inline <style/>
rience Dec 18, 2021
a009a06
Fixing Tests
rience Dec 19, 2021
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
7 changes: 7 additions & 0 deletions src/core/drive/progress_bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ export class ProgressBar {
const element = document.createElement("style")
element.type = "text/css"
element.textContent = ProgressBar.defaultCSS
if (this.cspNonce) {
element.nonce = this.cspNonce
}
return element
}

Expand All @@ -118,4 +121,8 @@ export class ProgressBar {
element.className = "turbo-progress-bar"
return element
}

get cspNonce() {
return document.head.querySelector('meta[name="csp-nonce"]')?.getAttribute("content")
}
}
2 changes: 2 additions & 0 deletions src/tests/fixtures/rendering.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="csp-nonce" content="123" />
<title>Turbo</title>
<script src="/dist/turbo.es2017-umd.js" data-turbo-track="reload"></script>
<script src="/src/tests/fixtures/test.js"></script>
Expand Down Expand Up @@ -40,6 +41,7 @@ <h1>Rendering</h1>
<p><a id="permanent-element-link" href="/src/tests/fixtures/permanent_element.html">Permanent element</a></p>
<p><a id="permanent-in-frame-element-link" href="/src/tests/fixtures/permanent_element.html" data-turbo-frame="frame">Permanent element in frame</a></p>
<p><a id="permanent-in-frame-without-layout-element-link" href="/src/tests/fixtures/frames/without_layout.html" data-turbo-frame="frame">Permanent element in frame without layout</a></p>
<p><a id="delayed-link" href="/__turbo/delayed_response">Delayed link</a></p>
</section>
<div id="permanent" data-turbo-permanent>Rendering</div>

Expand Down
7 changes: 7 additions & 0 deletions src/tests/functional/rendering_tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ export class RenderingTests extends TurboDriveTestCase {
this.assert(await newBody.equals(await this.body))
}

async "test progress bar inline style has nonce"() {
await this.remote.execute(() => window.Turbo.setProgressBarDelay(0))
await this.clickSelector("#delayed-link")

this.assert.ok(await this.hasSelector("script[nonce='123']"), "displays progress bar")
}

async "test triggers before-render and render events for error pages"() {
this.clickSelector("#nonexistent-link")
const { newBody } = await this.nextEventNamed("turbo:before-render")
Expand Down