Skip to content

Commit

Permalink
v1.0.7.10 RC
Browse files Browse the repository at this point in the history
  • Loading branch information
@andryou
andryou committed Jun 10, 2016
1 parent f143914 commit 5fcb494
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 28 deletions.
6 changes: 3 additions & 3 deletions html/options.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
</select> <i>(Default: -Unchanged-; modifies how all links are opened)</i></td></tr>
<tr><td class="rowtitle"><label for="preservesamedomain">Respect Same-Domain</label>:</td><td><select id="preservesamedomain" class="savechange">
<option value="false">Disabled</option>
<option value="true">All Subdomains</option>
<option value="strict">Strict Subdomain</option>
</select> <i>(Default: disabled; preserve same-domain elements)</i></td></tr>
<option value="strict">Strict - allow same domain only</option>
<option value="true">Loose - allow same domain and subdomains</option>
</select><br /><i>(Default: Disabled; preserve same-domain elements)</i></td></tr>
<tr><td class="rowtitle"><label for="refresh">Auto-Refresh Page</label>:</td><td><input type="checkbox" id="refresh" class="save" /> <i>(Default: enabled; auto-refresh page after list change)</i></td></tr>
<tr><td class="rowtitle"><label for="rating">Show Rating Button</label>:</td><td><input type="checkbox" id="rating" class="save" /> <i>(Default: enabled; if ticked, adds rating button under domains in tab popup)</i></td></tr>
<tr><td class="rowtitle"><label for="classicoptions">Classic Options Mode</label>:</td><td><input type="checkbox" id="classicoptions" class="save" /> <i>(Default: disabled; if ticked, closes tab options everytime an option is clicked)</i></td></tr>
Expand Down
19 changes: 8 additions & 11 deletions html/updated.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,21 @@
<body>
<div id="message"></div>
<div id="main">
<h1>Updated to v<span id="versionno"></span>! (Thursday, June 9, 2016)</h1>
<h1>Updated to v<span id="versionno"></span>! (Friday, June 10, 2016)</h1>
<br />
<hr>
<div style="text-align: left; line-height: 18px; font-size: 13px;"><br />
In this version you will find the following updates:
<ul>
<li><b>v1.0.7.9:</b><ul>
<li><b>v1.0.7.10:</b><ul>
<li><strong>Announcement: <a href="https://github.com/andryou/scriptsafe/issues/29" target="_blank">changes to ScriptSafe updates</a></strong></li>
<li>Significant performance increase, due to improved list checking (how significant? <a href="https://github.com/andryou/scriptsafe/issues/15#issuecomment-224732853" target="_blank">Check it out!</a>)</li>
<li>Added new option: <b>Paranoia Mode</b> - block allowed domains on unknown tabs <i>(default: disabled)</i><ul>
<li>Feel free to enable this option for added security, and uncheck if you prefer to browse without it</li>
<li>This is disabled by default as it changes how ScriptSafe behaves up until now</li>
<li>I personally recommend enabling it</li>
<li>Important compatibility fix for ScriptSafe to work in Chrome-derivative browsers</li>
<li>Added more granularity for the <b>Respect Same-Domain</b> option. The three options are now:<ul>
<li><b>Disabled</b></li>
<li><b>Strict - allow same domain only</b></li>
<li><b>Loose - allow same domain and subdomains</b> (this was the behaviour if Respect Same-Domain was enabled in the past)</li>
</ul></li>
<li>Smart grouping of domains in the panel based on parent domain</li>
<li>Added support for recognizing and filtering new tab pages</li>
<li>Minor fixes to hotkey function, options page, and panel</li>
<li>Better distinction between webbugs and images</li>
<li>Better inline element removal</li>
<li>Updated unwanted content providers list</li>
</ul></li>
</ul>
Expand Down
28 changes: 17 additions & 11 deletions js/ss.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function block(event) {
var elSrc = getElSrc(el);
if (!elSrc) return;
var elType = el.nodeName.toUpperCase();
if (!(elType == "A" || elType == "IFRAME" || elType == "FRAME" || (elType == "SCRIPT" && SETTINGS['EXPERIMENTAL'] == '0') || elType == "EMBED" || elType == "OBJECT" || elType == "IMG")) return;
elSrc = elSrc.toLowerCase();
var thirdPartyCheck;
var elementStatusCheck;
Expand All @@ -52,14 +53,15 @@ function block(event) {
domainCheckStatus = '1';
} else {
domainCheckStatus = domainCheck(absoluteUrl, 1);
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && extractDomainFromURL(absoluteUrl) == window.location.hostname)) thirdPartyCheck = false;
else if (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && extractDomainFromURL(absoluteUrl) != window.location.hostname) thirdPartyCheck = true;
var elementDomain = extractDomainFromURL(absoluteUrl);
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && elementDomain == window.location.hostname)) thirdPartyCheck = false;
else if (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && elementDomain != window.location.hostname) thirdPartyCheck = true;
else thirdPartyCheck = thirdParty(absoluteUrl);
if ((SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true') || (domainCheckStatus != '0' && (domainCheckStatus == '1' || (domainCheckStatus == '-1' && SETTINGS['MODE'] == 'block'))) || ((SETTINGS['ANNOYANCES'] == 'true' && (SETTINGS['ANNOYANCESMODE'] == 'strict' || (SETTINGS['ANNOYANCESMODE'] == 'relaxed' && domainCheckStatus != '0'))) && baddiesCheck == '1') || (SETTINGS['ANTISOCIAL'] == 'true' && baddiesCheck == '2'))
elementStatusCheck = true;
else elementStatusCheck = false;
}
if (elSrc.substr(0,17) != 'chrome-extension:' && (elType == "A" || elType == "IFRAME" || elType == "FRAME" || (elType == "SCRIPT" && SETTINGS['EXPERIMENTAL'] == '0') || elType == "EMBED" || elType == "OBJECT" || elType == "IMG") && elementStatusCheck && (
if (elSrc.substr(0,17) != 'chrome-extension:' && elementStatusCheck && (
(
(
(
Expand Down Expand Up @@ -119,8 +121,9 @@ function postLoadCheck(elSrc) {
thirdPartyCheck = true;
} else {
domainCheckStatus = domainCheck(elSrc, 1);
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) == window.location.hostname)) thirdPartyCheck = false;
else if (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) != window.location.hostname) thirdPartyCheck = true;
var elementDomain = extractDomainFromURL(elSrc);
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && elementDomain == window.location.hostname)) thirdPartyCheck = false;
else if (SETTINGS['preservesamedomain'] == 'strict' && elementDomain != window.location.hostname) thirdPartyCheck = true;
else thirdPartyCheck = thirdParty(elSrc);
if ((SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true') || (domainCheckStatus != '0' && (domainCheckStatus == '1' || (domainCheckStatus == '-1' && SETTINGS['MODE'] == 'block'))) || ((SETTINGS['ANNOYANCES'] == 'true' && (SETTINGS['ANNOYANCESMODE'] == 'strict' || (SETTINGS['ANNOYANCESMODE'] == 'relaxed' && domainCheckStatus != '0'))) && baddiesCheck == '1') || (SETTINGS['ANTISOCIAL'] == 'true' && baddiesCheck == '2'))
elementStatusCheck = true;
Expand Down Expand Up @@ -174,8 +177,9 @@ function blockreferrer() {
thirdPartyCheck = true;
} else {
domainCheckStatus = domainCheck(elSrc, 1);
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) == window.location.hostname)) thirdPartyCheck = false;
else if (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) != window.location.hostname) thirdPartyCheck = true;
var elementDomain = extractDomainFromURL(elSrc);
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && elementDomain == window.location.hostname)) thirdPartyCheck = false;
else if (SETTINGS['preservesamedomain'] == 'strict' && elementDomain != window.location.hostname) thirdPartyCheck = true;
else thirdPartyCheck = thirdParty(elSrc);
if ((SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true') || (domainCheckStatus != '0' && (domainCheckStatus == '1' || (domainCheckStatus == '-1' && SETTINGS['MODE'] == 'block'))) || ((SETTINGS['ANNOYANCES'] == 'true' && (SETTINGS['ANNOYANCESMODE'] == 'strict' || (SETTINGS['ANNOYANCESMODE'] == 'relaxed' && domainCheckStatus != '0'))) && baddiesCheck == '1') || (SETTINGS['ANTISOCIAL'] == 'true' && baddiesCheck == '2'))
elementStatusCheck = true;
Expand Down Expand Up @@ -431,10 +435,12 @@ chrome.extension.sendRequest({reqtype: "get-settings", iframe: iframe}, function
SETTINGS['LINKTARGET'] = response.linktarget;
SETTINGS['REFERRER'] = response.referrer;
SETTINGS['PARANOIA'] = response.paranoia;
ScriptSafe();
document.addEventListener("beforeload", block, true);
for (var i = 0; i < savedBeforeloadEvents.length; i++)
block(savedBeforeloadEvents[i]);
if (SETTINGS['LISTSTATUS'] == 'true') {
document.addEventListener("beforeload", block, true);
for (var i = 0; i < savedBeforeloadEvents.length; i++)
block(savedBeforeloadEvents[i]);
ScriptSafe();
}
}
delete savedBeforeloadEvents;
});
15 changes: 13 additions & 2 deletions js/yoyo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3110,7 +3110,6 @@ var yoyo1 = [
'errornuker.com',
'ertya.com',
'escalatenetwork.com',
'esdcoach.de',
'esellerate.net',
'esomniture.com',
'espdesign.com.au',
Expand All @@ -3119,6 +3118,7 @@ var yoyo1 = [
'estat.com',
'esther-munsey.us',
'esther-strauss.us',
'et-code.ru',
'etahub.com',
'etargetnet.com',
'eternitymobiles.com',
Expand Down Expand Up @@ -4749,6 +4749,7 @@ var yoyo1 = [
'lowes-pianos-and-organs.com',
'loxtk.com',
'lsawards.com',
'luceinveneto.com',
'luchtenbergdecor.com.br',
'lucidmedia.com',
'luciole.co.uk',
Expand Down Expand Up @@ -5862,7 +5863,6 @@ var yoyo1 = [
'platinumbucks.com',
'platsovetrf.ru',
'play2mobi.com',
'play44.net',
'play4traffic.com',
'playertraffic.com',
'playhaven.com',
Expand Down Expand Up @@ -28065,6 +28065,7 @@ var yoyo2 = [
'advantedges.go2cloud.org',
'advdl.ammadv.it',
'adveng.hiasys.com',
'advent.mkofoed.dk',
'adventize.go2cloud.org',
'adverserve.austriacomplus.at',
'advert.ananzi.co.za',
Expand Down Expand Up @@ -28587,6 +28588,7 @@ var yoyo2 = [
'aimtoday.aol.com',
'aio.lp.mydas.mobi',
'aircrafte.bernhard-rau.de',
'airplane.mm-sos.com',
'airpushmarketing.s3.amazonaws.com',
'ais.abacast.com',
'aj.600z.com',
Expand Down Expand Up @@ -36209,6 +36211,7 @@ var yoyo2 = [
'crackberry.us.intellitxt.com',
'crain.d1.sc.omtrdc.net',
'crd1.bannerbank.ru',
'cream.mobtu.tk',
'create.leadid.com',
'createthegroup.122.2o7.net',
'creative.360yield.com',
Expand Down Expand Up @@ -40213,6 +40216,7 @@ var yoyo2 = [
'grafix.xxxcounter.com',
'grammarly.go2cloud.org',
'granite.bnex.com',
'granular.matorral.cl',
'graphics.cams.com',
'graphics.friendfinder.com',
'graphics.medleyads.com',
Expand Down Expand Up @@ -40367,6 +40371,7 @@ var yoyo2 = [
'hardsextube-bud.gravityrd-services.com',
'hardwaregeeks.us.intellitxt.com',
'hardwarezone.us.intellitxt.com',
'harmon.markhamgreens.ca',
'harmony-central.us.intellitxt.com',
'harpo.122.2o7.net',
'harrahscom.112.2o7.net',
Expand Down Expand Up @@ -41434,6 +41439,7 @@ var yoyo2 = [
'imgcache.classesusa.com',
'imgcache.vmsn.de',
'imgcdn.nrelate.com',
'imgg.adskeeper.co.uk',
'imgg.dt07.net',
'imgg.marketgid.com',
'imgg.steepto.com',
Expand Down Expand Up @@ -46646,6 +46652,7 @@ var yoyo2 = [
'popme.163.com',
'popoholic.us.intellitxt.com',
'poponthepop.us.intellitxt.com',
'popovo.mclegend.tk',
'pops.ero-advertising.com',
'pops.freeze.com',
'pops.velmedia.net',
Expand Down Expand Up @@ -47679,6 +47686,7 @@ var yoyo2 = [
'reports.superfish.com',
'reports.wes.df.telemetry.microsoft.com',
'reports.zedo.com',
'reprimand.lukashotary.sk',
'reprox01.dus.local.vmsn.de',
'republika.onet.pl',
'req.adsmogo.com',
Expand Down Expand Up @@ -49248,6 +49256,7 @@ var yoyo2 = [
'slbbbcom.112.2o7.net',
'sleep.vermontteddybear.com',
'slider.plugrush.com',
'slight.localmusicmovement.com',
'slimxxxtubeacn.dnset.com',
'slimxxxtubealn.ddns.name',
'slimxxxtubeanr.ddns.name',
Expand Down Expand Up @@ -51350,6 +51359,7 @@ var yoyo2 = [
'thomasvillefurniture.122.2o7.net',
'thome.112.2o7.net',
'thoughtsmedia.us.intellitxt.com',
'thread.martinpascal.cl',
'threadwatch.us.intellitxt.com',
'threepillarsattorneys.vtgbackstage.com',
'thriftless.tinhocxd.com',
Expand Down Expand Up @@ -52874,6 +52884,7 @@ var yoyo2 = [
'upload.zedo.com',
'uploads.tmweb.ru',
'uponor.otistores.com',
'upper.lucianelgi.ro',
'upsoj.iptvdeals.com',
'upstart.88vid.com',
'upstats.yadro.ru',
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
"options_page": "html/options.html",
"permissions": [ "http://*/*", "https://*/*", "tabs", "unlimitedStorage", "webRequest", "webRequestBlocking", "storage", "notifications", "privacy" ],
"update_url": "http://clients2.google.com/service/update2/crx",
"version": "1.0.7.9"
"version": "1.0.7.10"
}

0 comments on commit 5fcb494

Please sign in to comment.