Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into legacy…
Browse files Browse the repository at this point in the history 
…permissions
  • Loading branch information
@andryou
andryou committed Jun 21, 2016
2 parents 6cbfb63 + bef745f commit 8724b43
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 8 deletions.
4 changes: 2 additions & 2 deletions html/updated.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<div id="message"></div>
<div id="main">
<div id="header"><span id="title">ScriptSafe</span><br /><br />
<h1>Updated to v<span id="versionno"></span>! (Monday, June 20, 2016)</h1>
<h1>Updated to v<span id="versionno"></span>! (Tuesday, June 21, 2016)</h1>
<br />
<hr>
<div style="text-align: left; line-height: 18px; font-size: 13px;"><br />
I spent the entire weekend focusing on bringing <strong>Fingerprinting Protection</strong> to ScriptSafe. The Options page now has a new Fingerprinting Protection section with not one, not two, not three, but <strong>eight brand-new options</strong>!<br /><br />
Still on my list: 1) translate ScriptSafe into multiple languages; and 2) improve design and appearance.<br /><br />
In this release you will find the following updates:
<ul>
<li><b>v1.0.7.14:</b><ul>
<li><b>v1.0.7.15:</b><ul>
<li>Added a new <strong>Fingerprinting Protection</strong> section with 8 new options <i>(disabled by default)</i>:<ul>
<li><b>Canvas Fingerprint Protection</b> - protect against fingerprinting attempts through &lt;canvas&gt; elements, with the following options:<ul>
<li>Disabled</li>
Expand Down
5 changes: 3 additions & 2 deletions js/scriptsafe.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// ScriptSafe by Andrew
// Credits and ideas: NotScripts, AdBlock Plus for Chrome, Ghostery, KB SSL Enforcer
'use strict';
var version = (function () {
Expand Down Expand Up @@ -862,10 +863,10 @@ if (!optionExists("version") || localStorage["version"] != version) {
}
localStorage['tempregexflag'] = "true";
}
localStorage["version"] = version;
if (localStorage["updatenotify"] == "true") {
if (!optionExists("version") && localStorage["updatenotify"] == "true") { // minor update so don't show updated page for existing installations
chrome.tabs.create({ url: chrome.extension.getURL('html/updated.html'), selected: true });
}
localStorage["version"] = version;
}
if (storageapi) {
chrome.storage.onChanged.addListener(function(changes, namespace) {
Expand Down
23 changes: 20 additions & 3 deletions js/ss.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function(){
// ScriptSafe by Andrew
var savedBeforeloadEvents = new Array();
var timer;
var iframe = 0;
Expand Down Expand Up @@ -385,13 +385,15 @@ function canvasBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -456,13 +458,15 @@ function canvasBlank() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -519,13 +523,15 @@ function canvasRandom() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -579,13 +585,15 @@ function audioBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -613,13 +621,15 @@ function canvasFontBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -647,13 +657,15 @@ function batteryBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -686,13 +698,15 @@ function webrtcDeviceBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -740,13 +754,15 @@ function webglBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -774,13 +790,15 @@ function gamepadBlock() {
contentWindow: {
get: function() {
var frame = iwin.apply(this);
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return frame;
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
return frame;
}
},
contentDocument: {
get: function() {
if (this.src && this.src.indexOf('://') != -1 && location.hostname != this.src.split('/')[2].split(':')[0]) return idoc.apply(this);
var frame = iwin.apply(this);
try { frame.HTMLCanvasElement } catch (err) { /* do nothing*/ }
processFunctions(frame);
Expand Down Expand Up @@ -946,5 +964,4 @@ function block(event) {
}
}
}
/* / Deprecated beforeload Handling */
})();
/* / Deprecated beforeload Handling */
4 changes: 4 additions & 0 deletions js/yoyo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3461,6 +3461,7 @@ var yoyo1 = [
'frtya.com',
'frtyb.com',
'frtye.com',
'fsm-europe.eu',
'ftjcfx.com',
'fttcj.com',
'ftvcash.com',
Expand Down Expand Up @@ -8060,6 +8061,7 @@ var yoyo1 = [
'xclusive.ly',
'xeanon.com',
'xed.pl',
'xenon.com.au',
'xeontopa.com',
'xertive.com',
'xfuckbook.com',
Expand Down Expand Up @@ -42173,6 +42175,7 @@ var yoyo2 = [
'kaspersky.122.2o7.net',
'kasperthreatpostprod.112.2o7.net',
'kasts.uspreslibraries.com',
'katie.dntrx.com',
'kb.2cnt.net',
'kb1vtest.2cnt.net',
'kb9kd.voluumtrk.com',
Expand Down Expand Up @@ -50313,6 +50316,7 @@ var yoyo2 = [
'stats.g.doubleclick.net',
'stats.gamespy.com',
'stats.gammacash.com',
'stats.gbvanalytics.com',
'stats.geegain.com',
'stats.gohip.com',
'stats.greenpixels.com',
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" ],
"update_url": "http://clients2.google.com/service/update2/crx",
"version": "1.0.7.14"
"version": "1.0.7.15"
}

0 comments on commit 8724b43

Please sign in to comment.