Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-19 03:05:22 +02:00
Code Issues Releases Wiki Activity

Allow the use of quotes in set-cookie scriptlet

Browse Source 
Related discussion:
https://github.com/uBlockOrigin/uAssets/issues/20630#issuecomment-1807260357
This commit is contained in:
Raymond Hill 2023-11-12 19:26:05 -05:00
parent 30a01d8e84
commit 7c562d0c5c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/resources/scriptlets.js
View File

@ -853,8 +853,8 @@ function setLocalStorageItemFn(
const unquoted = match && match[2] || normalized; const unquoted = match && match[2] || normalized;
if ( trustedValues.includes(unquoted) === false ) { if ( trustedValues.includes(unquoted) === false ) {
if ( /^\d+$/.test(unquoted) === false ) { return; } if ( /^\d+$/.test(unquoted) === false ) { return; }
const integer = parseInt(unquoted, 10); const n = parseInt(unquoted, 10);
if ( integer > 32767 ) { return; } if ( n > 32767 ) { return; }
} }
} }
@ -3418,16 +3418,17 @@ function setCookie(
'ok', 'ok',
'on', 'off', 'on', 'off',
'true', 't', 'false', 'f', 'true', 't', 'false', 'f',
'y', 'n', 'yes', 'y', 'no', 'n',
'yes', 'no',
'necessary', 'required', 'necessary', 'required',
]; ];
if ( validValues.includes(value.toLowerCase()) === false ) { const normalized = value.toLowerCase();
if ( /^\d+$/.test(value) === false ) { return; } const match = /^("?)(.+)\1$/.exec(normalized);
const unquoted = match && match[2] || normalized;
if ( validValues.includes(unquoted) === false ) {
if ( /^\d+$/.test(unquoted) === false ) { return; }
const n = parseInt(value, 10); const n = parseInt(value, 10);
if ( n > 15 ) { return; } if ( n > 15 ) { return; }
} }
value = encodeURIComponent(value);
setCookieFn( setCookieFn(
false, false,