Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use random trusted-types policy name 

Related commit:
4f0d1301ab
This commit is contained in:
Raymond Hill 2024-08-04 00:15:40 -04:00
parent fea92ac110
commit 3668445679
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
assets/resources/scriptlets.js
View File

@ -203,17 +203,28 @@ function safeSelf() {
/******************************************************************************/ /******************************************************************************/
builtinScriptlets.push({ builtinScriptlets.push({
name: 'get-exception-token.fn', name: 'get-random-token.fn',
fn: getExceptionToken, fn: getRandomToken,
dependencies: [ dependencies: [
'safe-self.fn', 'safe-self.fn',
], ],
}); });
function getExceptionToken() { function getRandomToken() {
const safe = safeSelf(); const safe = safeSelf();
const token = return safe.String_fromCharCode(Date.now() % 26 + 97) +
safe.String_fromCharCode(Date.now() % 26 + 97) +
safe.Math_floor(safe.Math_random() * 982451653 + 982451653).toString(36); safe.Math_floor(safe.Math_random() * 982451653 + 982451653).toString(36);
}
/******************************************************************************/
builtinScriptlets.push({
name: 'get-exception-token.fn',
fn: getExceptionToken,
dependencies: [
'get-random-token.fn',
],
});
function getExceptionToken() {
const token = getRandomToken();
const oe = self.onerror; const oe = self.onerror;
self.onerror = function(msg, ...args) { self.onerror = function(msg, ...args) {
if ( typeof msg === 'string' && msg.includes(token) ) { return true; } if ( typeof msg === 'string' && msg.includes(token) ) { return true; }
@ -701,6 +712,7 @@ builtinScriptlets.push({
name: 'replace-node-text.fn', name: 'replace-node-text.fn',
fn: replaceNodeTextFn, fn: replaceNodeTextFn,
dependencies: [ dependencies: [
'get-random-token.fn',
'run-at.fn', 'run-at.fn',
'safe-self.fn', 'safe-self.fn',
], ],
@ -736,7 +748,7 @@ function replaceNodeTextFn(
if ( tt instanceof Object ) { if ( tt instanceof Object ) {
if ( typeof tt.getPropertyType === 'function' ) { if ( typeof tt.getPropertyType === 'function' ) {
if ( tt.getPropertyType('script', 'textContent') === 'TrustedScript' ) { if ( tt.getPropertyType('script', 'textContent') === 'TrustedScript' ) {
return tt.createPolicy('uBO', out); return tt.createPolicy(getRandomToken(), out);
} }
} }
} }