Skip to content

Commit 5fcb494

Browse files
andryouandryou
committed
v1.0.7.10 RC
1 parent f143914 commit 5fcb494

File tree

5 files changed

+42
-28
lines changed

5 files changed

+42
-28
lines changed

‎html/options.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@
119119
</select> <i>(Default: -Unchanged-; modifies how all links are opened)</i></td></tr>
120120
<tr><td class="rowtitle"><label for="preservesamedomain">Respect Same-Domain</label>:</td><td><select id="preservesamedomain" class="savechange">
121121
<option value="false">Disabled</option>
122-
<option value="true">All Subdomains</option>
123-
<option value="strict">Strict Subdomain</option>
124-
</select> <i>(Default: disabled; preserve same-domain elements)</i></td></tr>
122+
<option value="strict">Strict - allow same domain only</option>
123+
<option value="true">Loose - allow same domain and subdomains</option>
124+
</select><br /><i>(Default: Disabled; preserve same-domain elements)</i></td></tr>
125125
<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>
126126
<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>
127127
<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>

‎html/updated.html

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,21 @@
88
<body>
99
<div id="message"></div>
1010
<div id="main">
11-
<h1>Updated to v<span id="versionno"></span>! (Thursday, June 9, 2016)</h1>
11+
<h1>Updated to v<span id="versionno"></span>! (Friday, June 10, 2016)</h1>
1212
<br />
1313
<hr>
1414
<div style="text-align: left; line-height: 18px; font-size: 13px;"><br />
1515
In this version you will find the following updates:
1616
<ul>
17-
<li><b>v1.0.7.9:</b><ul>
17+
<li><b>v1.0.7.10:</b><ul>
1818
<li><strong>Announcement: <a href="https://github.com/andryou/scriptsafe/issues/29" target="_blank">changes to ScriptSafe updates</a></strong></li>
19-
<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>
20-
<li>Added new option: <b>Paranoia Mode</b> - block allowed domains on unknown tabs <i>(default: disabled)</i><ul>
21-
<li>Feel free to enable this option for added security, and uncheck if you prefer to browse without it</li>
22-
<li>This is disabled by default as it changes how ScriptSafe behaves up until now</li>
23-
<li>I personally recommend enabling it</li>
19+
<li>Important compatibility fix for ScriptSafe to work in Chrome-derivative browsers</li>
20+
<li>Added more granularity for the <b>Respect Same-Domain</b> option. The three options are now:<ul>
21+
<li><b>Disabled</b></li>
22+
<li><b>Strict - allow same domain only</b></li>
23+
<li><b>Loose - allow same domain and subdomains</b> (this was the behaviour if Respect Same-Domain was enabled in the past)</li>
2424
</ul></li>
25-
<li>Smart grouping of domains in the panel based on parent domain</li>
26-
<li>Added support for recognizing and filtering new tab pages</li>
27-
<li>Minor fixes to hotkey function, options page, and panel</li>
28-
<li>Better distinction between webbugs and images</li>
25+
<li>Better inline element removal</li>
2926
<li>Updated unwanted content providers list</li>
3027
</ul></li>
3128
</ul>

‎js/ss.js

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ function block(event) {
3737
var elSrc = getElSrc(el);
3838
if (!elSrc) return;
3939
var elType = el.nodeName.toUpperCase();
40+
if (!(elType == "A" || elType == "IFRAME" || elType == "FRAME" || (elType == "SCRIPT" && SETTINGS['EXPERIMENTAL'] == '0') || elType == "EMBED" || elType == "OBJECT" || elType == "IMG")) return;
4041
elSrc = elSrc.toLowerCase();
4142
var thirdPartyCheck;
4243
var elementStatusCheck;
@@ -52,14 +53,15 @@ function block(event) {
5253
domainCheckStatus = '1';
5354
} else {
5455
domainCheckStatus = domainCheck(absoluteUrl, 1);
55-
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && extractDomainFromURL(absoluteUrl) == window.location.hostname)) thirdPartyCheck = false;
56-
else if (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && extractDomainFromURL(absoluteUrl) != window.location.hostname) thirdPartyCheck = true;
56+
var elementDomain = extractDomainFromURL(absoluteUrl);
57+
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && elementDomain == window.location.hostname)) thirdPartyCheck = false;
58+
else if (SETTINGS['PRESERVESAMEDOMAIN'] == 'strict' && elementDomain != window.location.hostname) thirdPartyCheck = true;
5759
else thirdPartyCheck = thirdParty(absoluteUrl);
5860
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'))
5961
elementStatusCheck = true;
6062
else elementStatusCheck = false;
6163
}
62-
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 && (
64+
if (elSrc.substr(0,17) != 'chrome-extension:' && elementStatusCheck && (
6365
(
6466
(
6567
(
@@ -119,8 +121,9 @@ function postLoadCheck(elSrc) {
119121
thirdPartyCheck = true;
120122
} else {
121123
domainCheckStatus = domainCheck(elSrc, 1);
122-
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) == window.location.hostname)) thirdPartyCheck = false;
123-
else if (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) != window.location.hostname) thirdPartyCheck = true;
124+
var elementDomain = extractDomainFromURL(elSrc);
125+
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && elementDomain == window.location.hostname)) thirdPartyCheck = false;
126+
else if (SETTINGS['preservesamedomain'] == 'strict' && elementDomain != window.location.hostname) thirdPartyCheck = true;
124127
else thirdPartyCheck = thirdParty(elSrc);
125128
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'))
126129
elementStatusCheck = true;
@@ -174,8 +177,9 @@ function blockreferrer() {
174177
thirdPartyCheck = true;
175178
} else {
176179
domainCheckStatus = domainCheck(elSrc, 1);
177-
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) == window.location.hostname)) thirdPartyCheck = false;
178-
else if (SETTINGS['preservesamedomain'] == 'strict' && extractDomainFromURL(elSrc) != window.location.hostname) thirdPartyCheck = true;
180+
var elementDomain = extractDomainFromURL(elSrc);
181+
if ((domainCheckStatus == '0' && !(SETTINGS['DOMAINSTATUS'] == '-1' && SETTINGS['MODE'] == 'block' && SETTINGS['PARANOIA'] == 'true')) || (SETTINGS['preservesamedomain'] == 'strict' && elementDomain == window.location.hostname)) thirdPartyCheck = false;
182+
else if (SETTINGS['preservesamedomain'] == 'strict' && elementDomain != window.location.hostname) thirdPartyCheck = true;
179183
else thirdPartyCheck = thirdParty(elSrc);
180184
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'))
181185
elementStatusCheck = true;
@@ -431,10 +435,12 @@ chrome.extension.sendRequest({reqtype: "get-settings", iframe: iframe}, function
431435
SETTINGS['LINKTARGET'] = response.linktarget;
432436
SETTINGS['REFERRER'] = response.referrer;
433437
SETTINGS['PARANOIA'] = response.paranoia;
434-
ScriptSafe();
435-
document.addEventListener("beforeload", block, true);
436-
for (var i = 0; i < savedBeforeloadEvents.length; i++)
437-
block(savedBeforeloadEvents[i]);
438+
if (SETTINGS['LISTSTATUS'] == 'true') {
439+
document.addEventListener("beforeload", block, true);
440+
for (var i = 0; i < savedBeforeloadEvents.length; i++)
441+
block(savedBeforeloadEvents[i]);
442+
ScriptSafe();
443+
}
438444
}
439445
delete savedBeforeloadEvents;
440446
});

‎js/yoyo.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3110,7 +3110,6 @@ var yoyo1 = [
31103110
'errornuker.com',
31113111
'ertya.com',
31123112
'escalatenetwork.com',
3113-
'esdcoach.de',
31143113
'esellerate.net',
31153114
'esomniture.com',
31163115
'espdesign.com.au',
@@ -3119,6 +3118,7 @@ var yoyo1 = [
31193118
'estat.com',
31203119
'esther-munsey.us',
31213120
'esther-strauss.us',
3121+
'et-code.ru',
31223122
'etahub.com',
31233123
'etargetnet.com',
31243124
'eternitymobiles.com',
@@ -4749,6 +4749,7 @@ var yoyo1 = [
47494749
'lowes-pianos-and-organs.com',
47504750
'loxtk.com',
47514751
'lsawards.com',
4752+
'luceinveneto.com',
47524753
'luchtenbergdecor.com.br',
47534754
'lucidmedia.com',
47544755
'luciole.co.uk',
@@ -5862,7 +5863,6 @@ var yoyo1 = [
58625863
'platinumbucks.com',
58635864
'platsovetrf.ru',
58645865
'play2mobi.com',
5865-
'play44.net',
58665866
'play4traffic.com',
58675867
'playertraffic.com',
58685868
'playhaven.com',
@@ -28065,6 +28065,7 @@ var yoyo2 = [
2806528065
'advantedges.go2cloud.org',
2806628066
'advdl.ammadv.it',
2806728067
'adveng.hiasys.com',
28068+
'advent.mkofoed.dk',
2806828069
'adventize.go2cloud.org',
2806928070
'adverserve.austriacomplus.at',
2807028071
'advert.ananzi.co.za',
@@ -28587,6 +28588,7 @@ var yoyo2 = [
2858728588
'aimtoday.aol.com',
2858828589
'aio.lp.mydas.mobi',
2858928590
'aircrafte.bernhard-rau.de',
28591+
'airplane.mm-sos.com',
2859028592
'airpushmarketing.s3.amazonaws.com',
2859128593
'ais.abacast.com',
2859228594
'aj.600z.com',
@@ -36209,6 +36211,7 @@ var yoyo2 = [
3620936211
'crackberry.us.intellitxt.com',
3621036212
'crain.d1.sc.omtrdc.net',
3621136213
'crd1.bannerbank.ru',
36214+
'cream.mobtu.tk',
3621236215
'create.leadid.com',
3621336216
'createthegroup.122.2o7.net',
3621436217
'creative.360yield.com',
@@ -40213,6 +40216,7 @@ var yoyo2 = [
4021340216
'grafix.xxxcounter.com',
4021440217
'grammarly.go2cloud.org',
4021540218
'granite.bnex.com',
40219+
'granular.matorral.cl',
4021640220
'graphics.cams.com',
4021740221
'graphics.friendfinder.com',
4021840222
'graphics.medleyads.com',
@@ -40367,6 +40371,7 @@ var yoyo2 = [
4036740371
'hardsextube-bud.gravityrd-services.com',
4036840372
'hardwaregeeks.us.intellitxt.com',
4036940373
'hardwarezone.us.intellitxt.com',
40374+
'harmon.markhamgreens.ca',
4037040375
'harmony-central.us.intellitxt.com',
4037140376
'harpo.122.2o7.net',
4037240377
'harrahscom.112.2o7.net',
@@ -41434,6 +41439,7 @@ var yoyo2 = [
4143441439
'imgcache.classesusa.com',
4143541440
'imgcache.vmsn.de',
4143641441
'imgcdn.nrelate.com',
41442+
'imgg.adskeeper.co.uk',
4143741443
'imgg.dt07.net',
4143841444
'imgg.marketgid.com',
4143941445
'imgg.steepto.com',
@@ -46646,6 +46652,7 @@ var yoyo2 = [
4664646652
'popme.163.com',
4664746653
'popoholic.us.intellitxt.com',
4664846654
'poponthepop.us.intellitxt.com',
46655+
'popovo.mclegend.tk',
4664946656
'pops.ero-advertising.com',
4665046657
'pops.freeze.com',
4665146658
'pops.velmedia.net',
@@ -47679,6 +47686,7 @@ var yoyo2 = [
4767947686
'reports.superfish.com',
4768047687
'reports.wes.df.telemetry.microsoft.com',
4768147688
'reports.zedo.com',
47689+
'reprimand.lukashotary.sk',
4768247690
'reprox01.dus.local.vmsn.de',
4768347691
'republika.onet.pl',
4768447692
'req.adsmogo.com',
@@ -49248,6 +49256,7 @@ var yoyo2 = [
4924849256
'slbbbcom.112.2o7.net',
4924949257
'sleep.vermontteddybear.com',
4925049258
'slider.plugrush.com',
49259+
'slight.localmusicmovement.com',
4925149260
'slimxxxtubeacn.dnset.com',
4925249261
'slimxxxtubealn.ddns.name',
4925349262
'slimxxxtubeanr.ddns.name',
@@ -51350,6 +51359,7 @@ var yoyo2 = [
5135051359
'thomasvillefurniture.122.2o7.net',
5135151360
'thome.112.2o7.net',
5135251361
'thoughtsmedia.us.intellitxt.com',
51362+
'thread.martinpascal.cl',
5135351363
'threadwatch.us.intellitxt.com',
5135451364
'threepillarsattorneys.vtgbackstage.com',
5135551365
'thriftless.tinhocxd.com',
@@ -52874,6 +52884,7 @@ var yoyo2 = [
5287452884
'upload.zedo.com',
5287552885
'uploads.tmweb.ru',
5287652886
'uponor.otistores.com',
52887+
'upper.lucianelgi.ro',
5287752888
'upsoj.iptvdeals.com',
5287852889
'upstart.88vid.com',
5287952890
'upstats.yadro.ru',

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@
4747
"options_page": "html/options.html",
4848
"permissions": [ "http://*/*", "https://*/*", "tabs", "unlimitedStorage", "webRequest", "webRequestBlocking", "storage", "notifications", "privacy" ],
4949
"update_url": "http://clients2.google.com/service/update2/crx",
50-
"version": "1.0.7.9"
50+
"version": "1.0.7.10"
5151
}

0 commit comments

Comments
 (0)