Commit7566f56

committed

support csp exceptions

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parentf287d5d commit7566f56Copy full SHA for 7566f56

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ CodeRoad has a number of configurations:`
`16`	`16`
`17`	`17`	-`CODEROAD_ADMIN_MODE` - a mode for tutorial developers. Under the "Review" page, you can jump around between levels & steps to test development. Defaults`false`.
`18`	`18`
	`19`	+-`CODEROAD_CONTENT_SECURITY_POLICY_EXEMPTIONS` - a list of CSP exemption hashes. For multiples, separate the list with a space.
	`20`	`+`
`19`	`21`	`##How to Use Variables`
`20`	`22`
`21`	`23`	`###Local`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,8 @@ if (!supportedOS.includes(OS_PLATFORM)) {`
`38`	`38`	`exportconstTUTORIAL_URL:string\|null=process.env.CODEROAD_TUTORIAL_URL\|\|null`
`39`	`39`
`40`	`40`	`exportconstDISABLE_RUN_ON_SAVE=(process.env.CODEROAD_DISABLE_RUN_ON_SAVE\|\|'').toLowerCase()==='true'`
	`41`	`+`
	`42`	`+// bypass "Refused to execute inline script because it violates the following Content Security Policy directive" issue`
	`43`	`+// for multiple exemptions, separate each with a space "a1 b1"`
	`44`	`+exportconstCONTENT_SECURITY_POLICY_EXEMPTIONS:string\|null=`
	`45`	`+process.env.CODEROAD_CONTENT_SECURITY_POLICY_EXEMPTIONS\|\|null`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import { JSDOM } from 'jsdom'`
`2`	`2`	`import*aspathfrom'path'`
`3`	`3`	`import*asvscodefrom'vscode'`
`4`	`4`	`import{onError}from'../telemetry'`
	`5`	`+import{CONTENT_SECURITY_POLICY_EXEMPTIONS}from'../../environment'`
`5`	`6`
`6`	`7`	`constgetNonce=():string=>{`
`7`	`8`	`lettext=''`
`@@ -46,6 +47,13 @@ async function render(panel: vscode.WebviewPanel, rootPath: string): Promise<voi`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`
	`50`	`+// support additional CSP exemptions when CodeRoad is embedded`
	`51`	`+if(CONTENT_SECURITY_POLICY_EXEMPTIONS&&CONTENT_SECURITY_POLICY_EXEMPTIONS.length){`
	`52`	`+for(constexemptionofCONTENT_SECURITY_POLICY_EXEMPTIONS.split(' ')){`
	`53`	`+nonces.push(exemption)`
	`54`	`+}`
	`55`	`+}`
	`56`	`+`
`49`	`57`	`// add run-time script from webpack`
`50`	`58`	`construnTimeScript=document.createElement('script')`
`51`	`59`	`runTimeScript.nonce=getNonce()`

Comments

(0)