Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

Fix cookie removal on subdomains of base domain

Browse Source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1126
This commit is contained in:
Raymond Hill 2020-06-24 17:18:14 -04:00
parent d95bab1e43
commit c4d39d3763
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
assets/resources/scriptlets.js
View File

@ -1197,14 +1197,14 @@
// https://github.com/NanoAdblocker/NanoFilters/issues/149 // https://github.com/NanoAdblocker/NanoFilters/issues/149
/// cookie-remover.js /// cookie-remover.js
(function() { (function() {
let needle = '{{1}}', const needle = '{{1}}';
reName = /./; let reName = /./;
if ( /^\/.+\/$/.test(needle) ) { if ( /^\/.+\/$/.test(needle) ) {
reName = new RegExp(needle.slice(1,-1)); reName = new RegExp(needle.slice(1,-1));
} else if ( needle !== '' && needle !== '{{1}}' ) { } else if ( needle !== '' && needle !== '{{1}}' ) {
reName = new RegExp(needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); reName = new RegExp(needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
} }
let removeCookie = function() { const removeCookie = function() {
document.cookie.split(';').forEach(cookieStr => { document.cookie.split(';').forEach(cookieStr => {
let pos = cookieStr.indexOf('='); let pos = cookieStr.indexOf('=');
if ( pos === -1 ) { return; } if ( pos === -1 ) { return; }
@ -1213,8 +1213,16 @@
let part1 = cookieName + '='; let part1 = cookieName + '=';
let part2a = '; domain=' + document.location.hostname; let part2a = '; domain=' + document.location.hostname;
let part2b = '; domain=.' + document.location.hostname; let part2b = '; domain=.' + document.location.hostname;
let part2c, part2d;
let domain = document.domain; let domain = document.domain;
let part2c = domain && domain !== document.location.hostname ? '; domain=.' + domain : undefined; if ( domain ) {
if ( domain !== document.location.hostname ) {
part2c = '; domain=.' + domain;
}
if ( domain.startsWith('www.') ) {
part2d = '; domain=' + domain.replace('www', '');
}
}
let part3 = '; path=/'; let part3 = '; path=/';
let part4 = '; Max-Age=-1000; expires=Thu, 01 Jan 1970 00:00:00 GMT'; let part4 = '; Max-Age=-1000; expires=Thu, 01 Jan 1970 00:00:00 GMT';
document.cookie = part1 + part4; document.cookie = part1 + part4;
@ -1226,6 +1234,9 @@
if ( part2c !== undefined ) { if ( part2c !== undefined ) {
document.cookie = part1 + part2c + part3 + part4; document.cookie = part1 + part2c + part3 + part4;
} }
if ( part2d !== undefined ) {
document.cookie = part1 + part2d + part3 + part4;
}
}); });
}; };
removeCookie(); removeCookie();