Commit 75e3a18

committed

add csp hash

1 parent 807644f commit 75e3a18Copy full SHA for 75e3a18

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -513,4 +513,8 @@ public function _add_event($element, $js, $event, $preventDefault = false, $stop`
`513`	`513`	`public function getInjected() {`
`514`	`514`	`return $this->injected;`
`515`	`515`	`}`
	`516`	`+`
	`517`	`+ public function setParam(string $param,$value){`
	`518`	`+ $this->params[$param]=$value;`
	`519`	`+ }`
`516`	`520`	`}`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,23 @@ class JsUtils extends \Ajax\JsUtils {`
`15`	`15`	`*/`
`16`	`16`	`protected function _open_script($src = '') {`
`17`	`17`	`$str = '<script ';`
`18`		`- if (($this->params['nonce']??false) && ContentSecurityManager::isStarted()) {`
	`18`	`+ if (($this->params['csp']??false)==='nonce' && ContentSecurityManager::isStarted()) {`
`19`	`19`	`$nonce = ContentSecurityManager::getNonce('jsUtils');`
`20`	`20`	`$str .= ' nonce="' . $nonce . '" ';`
`21`	`21`	`}`
`22`	`22`	`$str .= ($src == '') ? '>' : ' src="' . $src . '">';`
`23`	`23`	`return $str;`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ public function inline($script, $cdata = true) {`
	`27`	`+ if (($this->params['csp']??false)==='hash' && ContentSecurityManager::isStarted()) {`
	`28`	`+ $script= ($cdata) ? "\n// <![CDATA[\n{$script}\n// ]]>\n" : "\n{$script}\n";`
	`29`	`+ ContentSecurityManager::getHash('jsUtils',$script);`
	`30`	`+ }`
	`31`	`+ return $this->_open_script().$script.$this->_close_script();`
	`32`	`+ }`
	`33`	`+`
	`34`	`+`
`26`	`35`	`public function getUrl($url) {`
`27`	`36`	`return URequest::getUrl($url);`
`28`	`37`	`}`

Comments

(0)