Commit 688eecc

committed

add nonce generation

1 parent 4e9ce41 commit 688eeccCopy full SHA for 688eecc

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* JQuery PHP library`
`15`	`15`	`*`
`16`	`16`	`* @author jcheron`
`17`		`- * @version 1.004`
	`17`	`+ * @version 1.0.5`
`18`	`18`	`* @license Apache 2 http://www.apache.org/licenses/`
`19`	`19`	`*/`
`20`	`20`	`/**`
`@@ -213,7 +213,8 @@ public function __construct($params = array(), $injected = NULL) {`
`213`	`213`	`'defer' => false,`
`214`	`214`	`'ajax' => $ajaxDefault,`
`215`	`215`	`'historize' => true,`
`216`		`- 'autoActiveLinks' => true`
	`216`	`+ 'autoActiveLinks' => true,`
	`217`	`+ 'nonce' => true`
`217`	`218`	`];`
`218`	`219`	`foreach ($defaults as $key => $val) {`
`219`	`220`	`if (isset($params[$key]) === false \|\| $params[$key] === "") {`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ trait JsUtilsInternalTrait {`
`8`	`8`	`protected $jquery_code_for_compile = array();`
`9`	`9`
`10`	`10`	`protected $jquery_code_for_compile_at_last = array();`
	`11`	`+`
	`12`	`+ protected $nonce;`
`11`	`13`
`12`	`14`	`protected function _addToCompile($jsScript) {`
`13`	`15`	`$this->jquery_code_for_compile[] = $jsScript;`
`@@ -71,9 +73,26 @@ protected function minify($input) {`
`71`	`73`	`*/`
`72`	`74`	`protected function _open_script($src = '') {`
`73`	`75`	`$str = '<script ';`
	`76`	`+ if(isset($this->params['nonce'])){`
	`77`	`+ $str.=' nonce="'.$this->generateNonce($this->params['nonce']).'" ';`
	`78`	`+ $this->onNonce();`
	`79`	`+ }`
`74`	`80`	`$str .= ($src == '') ? '>' : ' src="' . $src . '">';`
`75`	`81`	`return $str;`
`76`	`82`	`}`
	`83`	`+`
	`84`	`+ protected function onNonce(){`
	`85`	`+`
	`86`	`+ }`
	`87`	`+`
	`88`	`+ protected function generateNonce($value=null): string {`
	`89`	`+ $bytes = \random_bytes((int) ($value ?? 32));`
	`90`	`+ return $this->nonce=\base64_encode($bytes);`
	`91`	`+ }`
	`92`	`+`
	`93`	`+ public function getNonce(){`
	`94`	`+ return $this->nonce;`
	`95`	`+ }`
`77`	`96`
`78`	`97`	`/**`
`79`	`98`	`* Outputs an closing </script>`

Comments

(0)