' + chrome.i18n.getMessage('noAppsDetected') + '
';
- } else {
- detectedApps.innerHTML = '' + chrome.i18n.getMessage('nothingToDo') + '
';
- }
- });
-
- popup.displayApps();
- },
-
- displayApps: function() {
- var appName, confidence, version;
-
- chrome.tabs.getSelected(null, function(tab) {
- chrome.extension.sendRequest({ id: 'get_apps', tab: tab }, function(response) {
- if ( response.tabCache && response.tabCache.count > 0 ) {
- detectedApps.innerHTML = '';
-
- for ( appName in response.tabCache.appsDetected ) {
- confidence = response.tabCache.appsDetected[appName].confidenceTotal;
- version = response.tabCache.appsDetected[appName].version;
-
- var html =
- '' +
- '' +
- '
' +
- '' + appName + '' + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '' +
- '';
-
- response.apps[appName].cats.forEach(function(cat) {
- html +=
- '' +
- '' + chrome.i18n.getMessage('categoryName' + cat) + '' +
- '';
- });
-
- html +=
- '' +
- '
';
-
- detectedApps.innerHTML = detectedApps.innerHTML + html;
- }
- }
- });
- });
- }
- };
-
- popup.init();
-});
diff --git a/src/drivers/chrome/manifest.json b/src/drivers/chrome/manifest.json
deleted file mode 100644
index 2542cc790..000000000
--- a/src/drivers/chrome/manifest.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{ "name": "Wappalyzer",
- "homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
- "description": "Identifies software on the web",
- "version": "2.52",
- "default_locale": "en",
- "manifest_version": 2,
- "icons": {
- "16": "images/icon_hot.png",
- "32": "images/icon_32.png",
- "128": "images/icon_128.png"
- },
- "page_action": {
- "default_icon": "images/icon_32.png",
- "default_title": "Wappalyzer - click for details",
- "default_popup": "popup.html"
- },
- "background": { "page": "background.html" },
- "content_scripts": [{
- "matches": [ "http://*/*", "https://*/*" ],
- "js": [ "js/content.js" ],
- "run_at": "document_idle"
- }, {
- "matches": [ "http://*/*", "https://*/*" ],
- "js": [ "js/iframe.js" ],
- "run_at": "document_start",
- "all_frames": true
- }],
- "web_accessible_resources": [
- "js/inject.js"
- ],
- "options_page": "options.html",
- "permissions": [ "tabs", "webRequest", "webNavigation", "http://*/*", "https://*/*" ],
- "content_security_policy": "script-src 'self' https://ssl.google-analytics.com; object-src 'self'"
-}
diff --git a/src/drivers/chrome/options.html b/src/drivers/chrome/options.html
deleted file mode 100644
index 1df81d498..000000000
--- a/src/drivers/chrome/options.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- - -
- -- -
- -- -
- -
- Popup
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/firefox b/src/drivers/firefox
new file mode 100644
index 000000000..8eb4f289f
--- /dev/null
+++ b/src/drivers/firefox
@@ -0,0 +1,524 @@
+/**
+ * Wappalyzer v2
+ *
+ * Created by Elbert Alias
+ *
+ * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
+ */
+
+var wappalyzer = (function() {
+ //'use strict';
+
+ /**
+ * Application class
+ */
+ var Application = function(app, detected) {
+ this.app = app;
+ this.confidence = {};
+ this.confidenceTotal = 0;
+ this.detected = Boolean(detected);
+ this.excludes = [];
+ this.version = '';
+ this.versions = [];
+ };
+
+ Application.prototype = {
+ /**
+ * Calculate confidence total
+ */
+ getConfidence: function() {
+ var total = 0, id;
+
+ for ( id in this.confidence ) {
+ total += this.confidence[id];
+ }
+
+ return this.confidenceTotal = Math.min(total, 100);
+ },
+
+ /**
+ * Resolve version number (find the longest version number that contains all shorter detected version numbers)
+ */
+ getVersion: function() {
+ var i, resolved;
+
+ if ( !this.versions.length ) {
+ return;
+ }
+
+ this.versions.sort(function(a, b) {
+ return a.length - b.length;
+ });
+
+ resolved = this.versions[0];
+
+ for ( i = 1; i < this.versions.length; i++ ) {
+ if ( this.versions[i].indexOf(resolved) === -1 ) {
+ break;
+ }
+
+ resolved = this.versions[i];
+ }
+
+ return this.version = resolved;
+ },
+
+ setDetected: function(pattern, type, value, key) {
+ this.detected = true;
+
+ // Set confidence level
+ this.confidence[type + ' ' + ( key ? key + ' ' : '' ) + pattern.regex] = pattern.confidence ? pattern.confidence : 100;
+
+ // Detect version number
+ if ( pattern.version ) {
+ var
+ version = pattern.version,
+ matches = pattern.regex.exec(value);
+
+ if ( matches ) {
+ matches.forEach(function(match, i) {
+ // Parse ternary operator
+ var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.*)$').exec(version);
+
+ if ( ternary && ternary.length === 3 ) {
+ w.log({ match: match, i: i, ternary: ternary });
+
+ version = version.replace(ternary[0], match ? ternary[1] : ternary[2]);
+
+ w.log({ version: version });
+ }
+
+ // Replace back references
+ version = version.replace(new RegExp('\\\\' + i, 'g'), match ? match : '');
+ });
+
+ if ( version && this.versions.indexOf(version) < 0 ) {
+ this.versions.push(version);
+ }
+
+ this.getVersion();
+ }
+ }
+ }
+ };
+
+ var Profiler = function() {
+ this.regexCount = 0;
+ this.startTime = new Date().getTime();
+ this.lastTime = new Date().getTime();
+ this.slowest = { duration: null, app: '', type: '', pattern: '' };
+ this.timedOut = false;
+ };
+
+ Profiler.prototype = {
+ checkPoint: function(app, type, regex) {
+ var duration = new Date().getTime() - this.lastTime;
+
+ if ( !this.slowest.duration || duration > this.slowest.duration ) {
+ this.slowest.duration = duration;
+ this.slowest.app = app;
+ this.slowest.type = type;
+ this.slowest.regex = regex;
+ }
+
+ this.regexCount++;
+
+ this.lastTime = new Date().getTime();
+
+ this.timedOut = this.lastTime - this.startTime > w.driver.timeout;
+ }
+ };
+
+ /**
+ * Call driver functions
+ */
+ var driver = function(func, args) {
+ if ( typeof w.driver[func] !== 'function' ) {
+ w.log('not implemented: w.driver.' + func, 'warn');
+
+ return;
+ }
+
+ if ( func !== 'log' ) {
+ w.log('w.driver.' + func);
+ }
+
+ return w.driver[func](args);
+ };
+
+ /**
+ * Parse apps.json patterns
+ */
+ var parse = function(patterns) {
+ var
+ attrs,
+ parsed = [];
+
+ // Convert single patterns to an array
+ if ( typeof patterns === 'string' ) {
+ patterns = [ patterns ];
+ }
+
+ patterns.forEach(function(pattern) {
+ attrs = {};
+
+ pattern.split('\\;').forEach(function(attr, i) {
+ if ( i ) {
+ // Key value pairs
+ attr = attr.split(':');
+
+ if ( attr.length > 1 ) {
+ attrs[attr.shift()] = attr.join(':');
+ }
+ } else {
+ attrs.string = attr;
+
+ try {
+ attrs.regex = new RegExp(attr.replace('/', '\/'), 'i'); // Escape slashes in regular expression
+ } catch (e) {
+ attrs.regex = new RegExp();
+
+ w.log(e + ': ' + attr, 'error');
+ }
+ }
+ });
+
+ parsed.push(attrs);
+ });
+
+ return parsed;
+ };
+
+ /**
+ * Main script
+ */
+ var w = {
+ apps: {},
+ cats: null,
+ ping: { hostnames: {} },
+ adCache: [],
+ detected: {},
+
+ config: {
+ websiteURL: 'https://wappalyzer.com/',
+ twitterURL: 'https://twitter.com/Wappalyzer',
+ githubURL: 'https://github.com/AliasIO/Wappalyzer',
+ },
+
+ /**
+ * Log messages to console
+ */
+ log: function(message, type) {
+ if ( type === undefined ) {
+ type = 'debug';
+ }
+
+ if ( typeof message === 'object' ) {
+ message = JSON.stringify(message);
+ }
+
+ driver('log', { message: message, type: type });
+ },
+
+ /**
+ * Initialize
+ */
+ init: function() {
+ w.log('w.init');
+
+ // Checks
+ if ( w.driver === undefined ) {
+ w.log('no driver, exiting');
+
+ return;
+ }
+
+ // Initialize driver
+ driver('init');
+ },
+
+ /**
+ * Analyze the request
+ */
+ analyze: function(hostname, url, data) {
+ var
+ i, app, confidence, type, regexMeta, regexScript, match, content, meta, header, version, id,
+ profiler = new Profiler(),
+ apps = {},
+ excludes = [],
+ checkImplies = true;
+
+ w.log('w.analyze');
+
+ // Remove hash from URL
+ data.url = url = url.split('#')[0];
+
+ if ( w.apps === undefined || w.categories === undefined ) {
+ w.log('apps.json not loaded, check for syntax errors');
+
+ return;
+ }
+
+ if ( w.detected[url] === undefined ) {
+ w.detected[url] = {};
+ }
+
+ for ( app in w.apps ) {
+ // Exit loop after one second to prevent CPU hogging
+ // Remaining patterns will not be evaluated
+ if ( profiler.timedOut ) {
+ w.log('Timeout, exiting loop');
+
+ break;
+ }
+
+ apps[app] = w.detected[url] && w.detected[url][app] ? w.detected[url][app] : new Application(app);
+
+ for ( type in w.apps[app] ) {
+ switch ( type ) {
+ case 'url':
+ parse(w.apps[app][type]).forEach(function(pattern) {
+ if ( pattern.regex.test(url) ) {
+ apps[app].setDetected(pattern, type, url);
+ }
+
+ profiler.checkPoint(app, type, pattern.regex);
+ });
+
+ break;
+ case 'html':
+ if ( typeof data[type] !== 'string' || !data.html ) {
+ break;
+ }
+
+ parse(w.apps[app][type]).forEach(function(pattern) {
+ if ( pattern.regex.test(data[type]) ) {
+ apps[app].setDetected(pattern, type, data[type]);
+ }
+
+ profiler.checkPoint(app, type, pattern.regex);
+ });
+
+ break;
+ case 'script':
+ if ( typeof data.html !== 'string' || !data.html ) {
+ break;
+ }
+
+ regexScript = new RegExp(']+src=("|\')([^"\']+)', 'ig');
+
+ parse(w.apps[app][type]).forEach(function(pattern) {
+ while ( match = regexScript.exec(data.html) ) {
+ if ( pattern.regex.test(match[2]) ) {
+ apps[app].setDetected(pattern, type, match[2]);
+ }
+ }
+
+ profiler.checkPoint(app, type, pattern.regex);
+ });
+
+ break;
+ case 'meta':
+ if ( typeof data.html !== 'string' || !data.html ) {
+ break;
+ }
+
+ regexMeta = /]+>/ig;
+
+ while ( match = regexMeta.exec(data.html) ) {
+ for ( meta in w.apps[app][type] ) {
+ profiler.checkPoint(app, type, regexMeta);
+
+ if ( new RegExp('(name|property)=["\']' + meta + '["\']', 'i').test(match) ) {
+ content = match.toString().match(/content=("|')([^"']+)("|')/i);
+
+ parse(w.apps[app].meta[meta]).forEach(function(pattern) {
+ if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
+ apps[app].setDetected(pattern, type, content[2], meta);
+ }
+
+ profiler.checkPoint(app, type, pattern.regex);
+ });
+ }
+ }
+ }
+
+ break;
+ case 'headers':
+ if ( typeof data[type] !== 'object' || !data[type] ) {
+ break;
+ }
+
+ for ( header in w.apps[app].headers ) {
+ parse(w.apps[app][type][header]).forEach(function(pattern) {
+ if ( data[type][header.toLowerCase()] instanceof Array ) {
+ data[type][header.toLowerCase()].forEach(function(el) {
+ if ( typeof el === 'string' && pattern.regex.test(el) ) {
+ apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
+ }
+ });
+ } else {
+ if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
+ apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
+ }
+ }
+
+ profiler.checkPoint(app, type, pattern.regex);
+ });
+ }
+
+ break;
+ case 'env':
+ if ( typeof data[type] !== 'object' || !data[type] ) {
+ break;
+ }
+
+ parse(w.apps[app][type]).forEach(function(pattern) {
+ for ( i in data[type] ) {
+
+ if ( pattern.regex.test(data[type][i]) ) {
+ apps[app].setDetected(pattern, type, data[type][i]);
+ }
+ }
+
+ profiler.checkPoint(app, type, pattern.regex);
+ });
+
+ break;
+ }
+ }
+ }
+
+ w.log('[ profiler ] Tested ' + profiler.regexCount + ' regular expressions in ' + ( (new Date().getTime() - profiler.startTime) / 1000 ) + 's');
+ w.log('[ profiler ] Slowest pattern took ' + ( profiler.slowest.duration / 1000 ) + 's: ' + profiler.slowest.app + ' | ' + profiler.slowest.type + ' | ' + profiler.slowest.regex);
+
+ for ( app in apps ) {
+ if ( !apps[app].detected ) {
+ delete apps[app];
+ }
+ }
+
+ // Exclude app in detected apps only
+ for ( app in apps ) {
+ if (w.apps[app].excludes ) {
+ if ( typeof w.apps[app].excludes === 'string' ) {
+ w.apps[app].excludes = [ w.apps[app].excludes ];
+ }
+
+ w.apps[app].excludes.forEach(function(excluded) {
+ excludes.push(excluded);
+ });
+ }
+ }
+
+ // Remove excluded applications
+ for ( app in apps ) {
+ if ( excludes.indexOf(app) !== -1 ) {
+ delete apps[app];
+ }
+ }
+
+ // Implied applications
+ // Run several passes as implied apps may imply other apps
+ while ( checkImplies ) {
+ checkImplies = false;
+
+ for ( app in apps ) {
+ confidence = apps[app].confidence;
+
+ if ( w.apps[app] && w.apps[app].implies ) {
+ // Cast strings to an array
+ if ( typeof w.apps[app].implies === 'string' ) {
+ w.apps[app].implies = [ w.apps[app].implies ];
+ }
+
+ w.apps[app].implies.forEach(function(implied) {
+ implied = parse(implied)[0];
+
+ if ( !w.apps[implied.string] ) {
+ w.log('Implied application ' + implied.string + ' does not exist', 'warn');
+
+ return;
+ }
+
+ if ( !apps.hasOwnProperty(implied.string) ) {
+ apps[implied.string] = w.detected[url] && w.detected[url][implied.string] ? w.detected[url][implied.string] : new Application(implied.string, true);
+
+ checkImplies = true;
+ }
+
+ // Apply app confidence to implied app
+ for ( id in confidence ) {
+ apps[implied.string].confidence[id + ' implied by ' + app] = confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 );
+ }
+ });
+ }
+ }
+ }
+
+ w.log(Object.keys(apps).length + ' apps detected: ' + Object.keys(apps).join(', ') + ' on ' + url);
+
+ // Keep history of detected apps
+ for ( app in apps ) {
+ confidence = apps[app].confidence;
+ version = apps[app].version;
+
+ // Per URL
+ w.detected[url][app] = apps[app];
+
+ for ( id in confidence ) {
+ w.detected[url][app].confidence[id] = confidence[id];
+ }
+
+ if ( w.detected[url][app].getConfidence() >= 100 ) {
+ // Per hostname
+ if ( /(www.)?((.+?)\.(([a-z]{2,3}\.)?[a-z]{2,6}))$/.test(hostname) && !/((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/.test(url) ) {
+ if ( !w.ping.hostnames.hasOwnProperty(hostname) ) {
+ w.ping.hostnames[hostname] = { applications: {}, meta: {} };
+ }
+
+ if ( !w.ping.hostnames[hostname].applications.hasOwnProperty(app) ) {
+ w.ping.hostnames[hostname].applications[app] = { hits: 0 };
+ }
+
+ w.ping.hostnames[hostname].applications[app].hits ++;
+
+ if ( version ) {
+ w.ping.hostnames[hostname].applications[app].version = version;
+ }
+ } else {
+ w.log('Ignoring hostname "' + hostname + '"');
+ }
+ }
+ }
+
+ // Additional information
+ if ( w.ping.hostnames.hasOwnProperty(hostname) ) {
+ if ( typeof data.html === 'string' && data.html ) {
+ match = data.html.match(/]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
+
+ if ( match && match.length ) {
+ w.ping.hostnames[hostname].meta['language'] = match[1];
+ }
+ }
+ }
+
+ if ( Object.keys(w.ping.hostnames).length >= 50 || w.adCache.length >= 50 ) {
+ driver('ping');
+ }
+
+ apps = null;
+ data = null;
+
+ driver('displayApps');
+ }
+ };
+
+ return w;
+})();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+ exports.wappalyzer = wappalyzer;
+}
diff --git a/src/drivers/firefox/.gitignore b/src/drivers/firefox/.gitignore
deleted file mode 100644
index 8484335b2..000000000
--- a/src/drivers/firefox/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-data/apps.json
-data/images/icons/*.png
-data/images/icons/*.svg
-data/js/iframe.js
-wappalyzer.js
diff --git a/src/drivers/firefox/data/css/panel.css b/src/drivers/firefox/data/css/panel.css
deleted file mode 100644
index a4f6661c3..000000000
--- a/src/drivers/firefox/data/css/panel.css
+++ /dev/null
@@ -1,69 +0,0 @@
-body {
- background: #fff;
- color: #000;
- font-family: Helvetica, Arial, sans-serif;
- font-size: 13px;
- line-height: 16px;
- margin: 0;
- min-width: 200px;
- padding: 15px;
-}
-
-img {
- display: inline-block;
- height: 16px;
- margin-right: 8px;
- vertical-align: top;
- width: 16px;
-}
-
-.detected-app {
- padding: 7px 0;
-}
-
-.detected-app:first-child {
- padding-top: 0;
-}
-
-.detected-app:last-child {
- border: none;
- padding-bottom: 0;
-}
-
- .detected-app a {
- color: #000;
- display: block;
- text-decoration: none;
- }
-
- .detected-app a .label .name {
- border-bottom: 1px dotted #999;
- }
-
- .detected-app a:hover .label .name {
- border-bottom: 1px solid #333;
- }
-
- .detected-app a .category .name {
- border-bottom: 1px solid transparent;
- }
-
- .detected-app a:hover .category .name {
- border-bottom: 1px solid #999;
- }
-
-.label {
- font-weight: bold;
-}
-
-.category {
- color: #999;
- display: block;
- margin: 5px 0 0 24px;
-}
-
-#empty {
- color: #999;
- font-style: italic;
- text-align: center;
-}
diff --git a/src/drivers/firefox/data/images/icon32.png b/src/drivers/firefox/data/images/icon32.png
deleted file mode 100644
index cc9d30b15..000000000
Binary files a/src/drivers/firefox/data/images/icon32.png and /dev/null differ
diff --git a/src/drivers/firefox/data/images/icons/.gitkeep b/src/drivers/firefox/data/images/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/drivers/firefox/data/js/panel.js b/src/drivers/firefox/data/js/panel.js
deleted file mode 100644
index 8fbfc9d3d..000000000
--- a/src/drivers/firefox/data/js/panel.js
+++ /dev/null
@@ -1,96 +0,0 @@
-(function() {
- self.port.on('displayApps', function(message) {
- var
- div, a, img, label, name, slugify, confidence, version,
- d = document,
- detectedApps = d.getElementById('detected-apps'),
- empty = d.getElementById('empty');
-
- slugify = function(string) {
- return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/g, '');
- };
-
- while ( detectedApps.firstChild ) {
- detectedApps.removeChild(detectedApps.firstChild);
- }
-
- if ( message.tabs.count > 0 ) {
- empty.style.display = 'none';
-
- for ( appName in message.tabs.appsDetected ) {
- div = d.createElement('div');
- a = d.createElement('a');
- img = d.createElement('img');
- label = d.createElement('span');
- name = d.createElement('span');
-
- confidence = message.tabs.appsDetected[appName].confidenceTotal;
- version = message.tabs.appsDetected[appName].version;
-
- div.setAttribute('class', 'detected-app');
-
- a.setAttribute('href', '#');
-
- (function(appName) {
- a.addEventListener('click', function(e) {
- e.preventDefault();
-
- self.port.emit('goToUrl', 'applications/' + slugify(appName));
- });
- }(appName));
-
- img.setAttribute('src', 'images/icons/' + message.apps[appName].icon);
- img.setAttribute('height', '16');
- img.setAttribute('width', '16');
-
- label.setAttribute('class', 'label');
-
- name.setAttribute('class', 'name');
-
- name.appendChild(d.createTextNode(appName));
-
- label.appendChild(name);
- label.appendChild(d.createTextNode(( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '')));
-
- a.appendChild(img);
- a.appendChild(label);
-
- div.appendChild(a);
-
- message.apps[appName].cats.forEach(function(cat) {
- a = d.createElement('a');
- label = d.createElement('span');
- name = d.createElement('span');
-
- a.setAttribute('href', '#');
-
- (function(appName) {
- a.addEventListener('click', function(e) {
- e.preventDefault();
-
- self.port.emit('goToUrl', 'categories/' + slugify(message.categories[cat]));
- });
- }(appName));
-
- label.setAttribute('class', 'category');
-
- name.setAttribute('class', 'name');
-
- name.appendChild(d.createTextNode(message.categoryNames[cat]));
-
- label.appendChild(name);
-
- a.appendChild(label);
-
- div.appendChild(a);
- });
-
- detectedApps.appendChild(div);
- }
- } else {
- empty.style.display = 'inherit';
- }
-
- self.port.emit('resize', document.body.offsetHeight);
- });
-}());
diff --git a/src/drivers/firefox/data/js/tab.js b/src/drivers/firefox/data/js/tab.js
deleted file mode 100644
index 72719ec2b..000000000
--- a/src/drivers/firefox/data/js/tab.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function() {
- try {
- if ( document && document.contentType === 'text/html' ) {
- var html = new XMLSerializer().serializeToString(document),
-
- self.port.emit('log', html);
-
- self.port.emit('log', 'init');
-
- if ( html.length > 50000 ) {
- html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
- }
-
- self.port.emit('analyze', {
- hostname: location.hostname,
- url: location.href,
- analyze: { html: html }
- });
-
- setTimeout(function() {
- var env = Object.keys(unsafeWindow).slice(0, 500);
-
- self.port.emit('analyze', {
- hostname: location.hostname,
- url: location.href,
- analyze: { env: env }
- });
- }, 1000);
- }
- } catch (e) { }
-}());
diff --git a/src/drivers/firefox/data/panel.html b/src/drivers/firefox/data/panel.html
deleted file mode 100644
index 83f1abe54..000000000
--- a/src/drivers/firefox/data/panel.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
- Panel
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/firefox/driver.js b/src/drivers/firefox/driver.js
deleted file mode 100644
index 4eb7565c0..000000000
--- a/src/drivers/firefox/driver.js
+++ /dev/null
@@ -1,520 +0,0 @@
-(function() {
- 'use strict';
-
- var
- w = require('wappalyzer').wappalyzer,
- {Cc, Ci} = require('chrome'),
- headersCache = {},
- categoryNames = {},
- windows = [],
- Window,
- Tab,
- Panel,
- Button,
- button,
- pageMod,
- UrlBar;
-
- exports.main = function(options, callbacks) {
- w.log('main: ' + options.loadReason);
-
- w.init();
- };
-
- exports.onUnload = function(reason) {
- var win;
-
- w.log('unload: ' + reason);
-
- for each ( win in windows ) {
- win.destroy();
- }
- };
-
- Window = function(win) {
- var
- self = this,
- tab;
-
- w.log('new Window');
-
- this.window = win;
- this.tabs = {};
- this.urlBar = null;
-
- if ( button ) {
- button.destroy();
- }
-
- if ( require('sdk/simple-prefs').prefs.urlbar ) {
- this.urlBar = new UrlBar(this.window);
- } else {
- button = new Button();
- }
-
- require('sdk/simple-prefs').on('urlbar', function() {
- self.destroy();
-
- if ( button ) {
- button.destroy();
- }
-
- if ( require('sdk/simple-prefs').prefs.urlbar ) {
- self.urlBar = new UrlBar(this.window);
- } else {
- button = new Button();
- }
-
- self.displayApps();
- });
-
- for each ( tab in this.window.tabs ) {
- this.tabs[tab.id] = new Tab(tab);
- }
-
- this.window.tabs
- .on('open', function(tab) {
- self.tabs[tab.id] = new Tab(tab);
- })
- .on('close', function(tab) {
- self.tabs[tab.id] = null;
- })
- .on('activate', function(tab) {
- self.displayApps();
- });
-
- self.displayApps();
- };
-
- Window.prototype.displayApps = function() {
- var
- self = this,
- tab = this.window.tabs.activeTab,
- url,
- count = 0,
- message = {};
-
- w.log('Window.displayApps');
-
- if ( !tab || require('sdk/tabs').activeTab !== tab ) {
- return;
- }
-
- url = tab.url.replace(/#.*$/, '');
- count = w.detected[url] ? Object.keys(w.detected[url]).length : 0;
-
- this.tabs[tab.id].count = count;
- this.tabs[tab.id].appsDetected = w.detected[url];
-
- message = {
- tabs: this.tabs[tab.id],
- apps: w.apps,
- categories: w.categories,
- categoryNames: categoryNames
- };
-
- if ( this.urlBar ) {
- this.urlBar.clear();
-
- // Add icons
- if ( count ) {
- for ( appName in this.tabs[tab.id].appsDetected ) {
- this.urlBar.addIcon(appName);
- }
- } else {
- this.urlBar.addIcon();
- }
-
- this.urlBar.panel.get().port.emit('displayApps', message);
- }
-
- if ( button ) {
- button.setIcon();
-
- if ( count ) {
- var
- appName,
- found = false;
-
- // Find the main application to display
- w.driver.categoryOrder.forEach(function(match) {
- for ( appName in w.detected[url] ) {
- w.apps[appName].cats.forEach(function(cat) {
- if ( cat == match && !found ) {
- button.setIcon(appName);
-
- found = true;
- }
- });
- }
- });
- }
-
- button.panel.get().port.emit('displayApps', message);
- }
- };
-
- Window.prototype.destroy = function() {
- if ( this.urlBar ) {
- this.urlBar.destroy();
-
- this.urlBar = null;
- }
- };
-
- pageMod = require('sdk/page-mod');
- pageMod.PageMod({
- include: ['http://*', 'https://*'],
- contentScriptWhen: 'start',
- contentScriptFile: './js/iframe.js',
- onAttach: function(worker) {
- worker.port.on('ad_log', function(message) {
- w.adCache.push(message.subject);
- });
- }
- });
-
- Tab = function(tab) {
- tab.on('ready', function(tab) {
- var worker = tab.attach({
- contentScriptFile: require('sdk/self').data.url('js/tab.js')
- });
-
- worker.port.on('analyze', function(message) {
- var url = message.url.replace(/#.*$/, '');
-
- if ( typeof headersCache[url] !== 'undefined' ) {
- message.analyze.headers = headersCache[url];
- }
-
- w.analyze(message.hostname, url, message.analyze);
- });
-
- worker.port.on('log', function(message) {
- w.log('[ tab.js ] ' + message);
- });
- });
- };
-
- Panel = function() {
- var self = this;
-
- this.panel = require('sdk/panel').Panel({
- width: 250,
- height: 50,
- contentURL: require('sdk/self').data.url('panel.html'),
- contentScriptFile: require('sdk/self').data.url('js/panel.js'),
- position: { right: 30, top: 30 },
- onHide: function() {
- if ( button ) {
- button.get().state('window', { checked: false });
- }
- }
- });
-
- this.panel.port.on('resize', function(height) {
- self.panel.height = height;
- });
-
- this.panel.port.on('goToUrl', function(url) {
- self.panel.hide();
-
- w.driver.goToURL({ url: w.config.websiteURL + url, medium: 'panel' });
- });
- };
-
- Panel.prototype.get = function() {
- return this.panel;
- };
-
- Panel.prototype.destroy = function() {
- this.panel.destroy();
- };
-
- Button = function() {
- var self = this;
-
- this.panel = new Panel();
-
- this.button = require('sdk/ui/button/toggle').ToggleButton({
- id: 'wappalyzer',
- label: 'Wappalyzer',
- icon: './images/icon32.png',
- onChange: function(state) {
- if ( state.checked ) {
- self.panel.get().show({ position: self.button });
- }
- }
- });
- };
-
- Button.prototype.setIcon = function(appName) {
- var url = typeof appName === 'undefined' ? './images/icon32.png' : './images/icons/' + w.apps[appName].icon;
-
- this.button.icon = url;
- };
-
- Button.prototype.get = function() {
- return this.button;
- };
-
- Button.prototype.destroy = function() {
- this.panel.destroy();
-
- this.button.destroy();
- };
-
- UrlBar = function(window) {
- var self = this;
-
- this.panel = new Panel();
-
- this.onClick = function() {
- self.panel.get().show();
- }
-
- // Can't get document from sdk/windows. Use active window instead.
- // This breaks switching between URL bar and button with multiple windows open
- this.document = Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator)
- .getMostRecentWindow('navigator:browser').document;
-
- if ( this.document.getElementById('wappalyzer-urlbar') ) {
- this.urlBar = this.document.getElementById('wappalyzer-urlbar');
-
- return;
- }
- //
-
- this.urlBar = this.document.createElement('hbox');
-
- this.urlBar.setAttribute('id', 'wappalyzer-urlbar');
- this.urlBar.setAttribute('style', 'cursor: pointer; margin: 0 2px;');
- this.urlBar.setAttribute('tooltiptext', require('sdk/l10n').get('name'));
-
- this.urlBar.addEventListener('click', this.onClick);
-
- this.document.getElementById('urlbar-icons').appendChild(this.urlBar);
- };
-
- UrlBar.prototype.get = function() {
- return this.urlBar;
- };
-
- UrlBar.prototype.addIcon = function(appName) {
- var
- icon = this.document.createElement('image'),
- url = typeof appName === 'undefined' ? 'images/icon32.png' : 'images/icons/' + w.apps[appName].icon,
- tooltipText = ( typeof appName !== 'undefined' ? appName + ' - ' + require('sdk/l10n').get('clickForDetails') + ' - ' : '' ) + require('sdk/l10n').get('name');
-
- icon.setAttribute('src', require('sdk/self').data.url(url));
- icon.setAttribute('class', 'wappalyzer-icon');
- icon.setAttribute('width', '16');
- icon.setAttribute('height', '16');
- icon.setAttribute('style', 'margin: 0 1px;');
- icon.setAttribute('tooltiptext', tooltipText);
-
- this.get().appendChild(icon);
-
- return this;
- };
-
- UrlBar.prototype.clear = function() {
- var icons;
-
- do {
- icons = this.get().getElementsByClassName('wappalyzer-icon');
-
- if ( icons.length ) {
- this.get().removeChild(icons[0]);
- }
- } while ( icons.length );
-
- return this;
- };
-
- UrlBar.prototype.destroy = function() {
- this.panel.destroy();
-
- this.urlBar.removeEventListener('click', this.onClick);
-
- this.urlBar.remove();
-
- return this;
- }
-
- w.driver = {
- timeout: 1000,
-
- /**
- * Log messages to console
- */
- log: function(args) {
- console.log('[wappalyzer ' + args.type + '] ' + args.message);
- },
-
- /**
- * Initialize
- */
- init: function(callback) {
- var
- id,
- version,
- win,
- httpRequestObserver,
- json = JSON.parse(require('sdk/self').data.load('apps.json'));
-
- w.log('driver.init');
-
- try {
- version = require('sdk/self').version;
-
- if ( !require('sdk/simple-storage').storage.version ) {
- w.driver.goToURL({ url: w.config.websiteURL + 'installed', medium: 'install' });
- } else if ( version !== require('sdk/simple-storage').storage.version ) {
- w.driver.goToURL({ url: w.config.websiteURL + 'upgraded', medium: 'upgrade', background: true });
- }
-
- require('sdk/simple-storage').storage.version = version;
- } catch(e) { }
-
- w.apps = json.apps;
- w.categories = json.categories;
-
- for ( id in w.categories ) {
- categoryNames[id] = require('sdk/l10n').get('cat' + id);
- }
-
- require('sdk/windows').browserWindows
- .on('open', function(win) {
- windows.push(new Window(win));
- });
-
- for each ( win in require('sdk/windows').browserWindows ) {
- windows.push(new Window(win));
- }
-
- httpRequestObserver = {
- init: function() {
- var observerService = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
-
- observerService.addObserver(this, 'http-on-examine-response', false);
- },
-
- observe: function(subject, topic, data) {
- if ( topic == 'http-on-examine-response' ) {
- subject.QueryInterface(Ci.nsIHttpChannel);
-
- this.onExamineResponse(subject);
- }
- },
-
- onExamineResponse: function (subject) {
- var uri = subject.URI.spec.replace(/#.*$/, ''); // Remove hash
-
- if ( headersCache.length > 50 ) {
- headersCache = {};
- }
-
- if ( subject.contentType === 'text/html' ) {
- if ( typeof headersCache[uri] === 'undefined' ) {
- headersCache[uri] = {};
- }
-
- subject.visitResponseHeaders(function(header, value) {
- headersCache[uri][header.toLowerCase()] = value;
- });
- }
- }
- };
-
- httpRequestObserver.init();
- },
-
- goToURL: function(args) {
- var url = args.url + ( typeof args.medium === 'undefined' ? '' : '?pk_campaign=firefox&pk_kwd=' + args.medium);
-
- require('sdk/tabs').open({ url: url, inBackground: typeof args.background !== 'undefined' && args.background });
- },
-
- ping: function() {
- var Request = require('sdk/request').Request, post;
-
- if ( Object.keys(w.ping.hostnames).length && require('sdk/simple-prefs').prefs.tracking ) {
- post = function(url, data) {
- Request({
- url: url,
- content: { json: JSON.stringify(data) },
- onComplete: function (response) {
- w.log('w.driver.ping: status ' + response.status);
- }
- }).post();
- };
-
- post('http://ping.wappalyzer.com/v2/', w.ping);
-
- w.log('w.driver.ping: ' + JSON.stringify(w.ping));
-
- w.ping = { hostnames: {} };
-
- post('https://ad.wappalyzer.com/log/wp/', w.adCache);
-
- w.adCache = [];
- }
- },
-
- displayApps: function() {
- var win;
-
- for each ( win in windows ) {
- win.displayApps();
- }
- },
-
- categoryOrder: [ // Used to pick the main application
- 1, // CMS
- 11, // Blog
- 6, // Web Shop
- 2, // Message Board
- 51, // Landing Page Builder
- 8, // Wiki
- 13, // Issue Tracker
- 30, // Web Mail
- 18, // Web Framework
- 21, // LMS
- 7, // Photo Gallery
- 38, // Media Server
- 3, // Database Manager
- 34, // Database
- 4, // Documentation Tool
- 9, // Hosting Panel
- 29, // Search Engine
- 12, // JavaScript Framework
- 26, // Mobile Framework
- 25, // JavaScript Graphics
- 22, // Web Server
- 27, // Programming Language
- 28, // Operating System
- 15, // Comment System
- 20, // Editor
- 41, // Payment Processor
- 10, // Analytics
- 32, // Marketing Automation
- 31, // CDN
- 23, // Cache Tool
- 17, // Font Script
- 24, // Rich Text Editor
- 35, // Map
- 5, // Widget
- 14, // Video Player
- 16, // Captcha
- 33, // Web Server Extension
- 37, // Network Device
- 39, // Webcam
- 40, // Printer
- 36, // Advertising Network
- 42, // Tag Managers
- 43, // Paywalls
- 19 // Miscellaneous
- ]
- };
-}());
diff --git a/src/drivers/firefox/images/icon48.png b/src/drivers/firefox/images/icon48.png
deleted file mode 100644
index 82259f227..000000000
Binary files a/src/drivers/firefox/images/icon48.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon64.png b/src/drivers/firefox/images/icon64.png
deleted file mode 100644
index 5817776b1..000000000
Binary files a/src/drivers/firefox/images/icon64.png and /dev/null differ
diff --git a/src/drivers/firefox/locale/de-DE.properties b/src/drivers/firefox/locale/de-DE.properties
deleted file mode 100755
index 1de0e86e6..000000000
--- a/src/drivers/firefox/locale/de-DE.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Keine Applikationen erkannt
-clickForDetails = Klicken für Details
-
-preferences = Weitere Optionen ...
-categories = Kategorienverwaltung
-tracking_title = Tracken
-tracking_description = Sende anonyme Reports über gefundene Applikationen zu Forschungszwecken an wappalyzer.com
-urlbar_title = Display icons in URL bar
-urlbar_description = Uncheck to display toolbar button.
-
-feedback = Feedback
-github = Github
-twitter = Twitter
-website = Zu wappalyzer.com browsen
-
-cat1 = CMS
-cat2 = Message Board
-cat3 = Datenbank-Manager
-cat4 = Dokumentationstool
-cat5 = Widget
-cat6 = eCommerce
-cat7 = Fotogallery
-cat8 = Wiki
-cat9 = Hosting Panel
-cat10 = Analytics
-cat11 = Blog
-cat12 = JavaScript Framework
-cat13 = Issue Tracker
-cat14 = Video Player
-cat15 = Kommentarsystem
-cat16 = CAPTCHA
-cat17 = Font Script
-cat18 = Web Framework
-cat19 = Diverses
-cat20 = Editor
-cat21 = LMS
-cat22 = Web-Server
-cat23 = Cache Tool
-cat24 = Rich Text Editor
-cat25 = JavaScript Graphics
-cat26 = Mobile Framework
-cat27 = Programmiersprache
-cat28 = Betriebssystem
-cat29 = Such-Engine
-cat30 = Web mail
-cat31 = CDN
-cat32 = Marketing Automation
-cat33 = Web-Server-Erweiterung
-cat34 = Datenbank
-cat35 = Karte
-cat36 = Werbenetzwerk
-cat37 = Netzwerkgerät
-cat38 = Medienserver
-cat39 = Webcam
-cat40 = Drucker
-cat41 = Payment Processor
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Build/CI System
-cat45 = SCADA System
-cat46 = Fernzugriff
-cat47 = Development Tool
-cat48 = Netzwerkspeicher
-cat49 = Feed-Leser
-cat50 = Document Management Systems
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/el-GR.properties b/src/drivers/firefox/locale/el-GR.properties
deleted file mode 100644
index 626098c94..000000000
--- a/src/drivers/firefox/locale/el-GR.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Δεν ανιχνεύθηκαν εφαρμογές
-clickForDetails = Κάντε κλικ για λεπτομέρειες
-
-preferences = Ρυθμίσεις
-categories = Κατηγορίες
-tracking_title = Παρακολούθηση
-tracking_description = Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα
-urlbar_title = Προβολή εικονιδίων στη μπάρα διεύθυνσης
-urlbar_description = Αποεπιλέξτε για να εμφανίσετε το κουμπί της εργαλειοθήκης.
-
-feedback = Feedback
-github = Github
-twitter = Twitter
-website = Πήγαινε στο wappalyzer.com
-
-cat1 = CMS
-cat2 = Διαδικτυακό Φόρουμ
-cat3 = Διαχειριστής Βάσης Δεδομένων
-cat4 = Εργαλείο Τεκμηρίωσης
-cat5 = Widget
-cat6 = eCommerce
-cat7 = Gallery Φωτογραφιών
-cat8 = Wiki
-cat9 = Hosting Panel
-cat10 = Analytics
-cat11 = Blog
-cat12 = Framework της JavaScript
-cat13 = Πρόγραμμα Παρακολούθησης Προβλημάτων
-cat14 = Πρόγραμμα αναπαραγωγής Βίντεο
-cat15 = Σύστημα Σχολίων
-cat16 = CAPTCHA
-cat17 = Script Γραμματοσειράς
-cat18 = Framework Διαδικτύου
-cat19 = Διάφορα
-cat20 = Επεξεργαστής Κειμένου
-cat21 = LMS
-cat22 = Διακομιστής Διαδικτύου
-cat23 = Εργαλείο Μνήμης Cache
-cat24 = Επεξεργαστής Εμπλουτισμένου Κειμένου
-cat25 = Γραφικά JavaScript
-cat26 = Framework για Κινητά
-cat27 = Γλώσσα Προγραμματισμού
-cat28 = Λειτουργικό Σύστημα
-cat29 = Μηχανή Αναζήτησης
-cat30 = Web Mail
-cat31 = CDN
-cat32 = Αυτοματοποίηση Marketing
-cat33 = Επέκταση Διακομιστή Διαδικτύου
-cat34 = Βάση Δεδομένων
-cat35 = Χάρτης
-cat36 = Δίκτυο Διαφημίσεων
-cat37 = Υπηρεσία Δικτύου
-cat38 = Διακομιστής Πολυμέσων
-cat39 = Διαδικτυακή κάμερα
-cat40 = Εκτυπωτής
-cat41 = Σύστημα Επεξεργασίας Πληρωμών
-cat42 = Σύστημα Διαχείρισης Tags
-cat43 = Paywall
-cat44 = Σύστημα Build/CI
-cat45 = Σύστημα SCADA
-cat46 = Απομακρυσμένη Πρόσβαση
-cat47 = Εργαλείο Ανάπτυξης
-cat48 = Δικτυακός Αποθηκευτικός Χώρος
-cat49 = Feed Readers
-cat50 = Συστήματα Διαχειρίσης Εγγράφων
-cat51 = Σύστημα Κατασκευής Σελίδων Υποδοχής
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/en-GB.properties b/src/drivers/firefox/locale/en-GB.properties
deleted file mode 100755
index 0c2ec9d3d..000000000
--- a/src/drivers/firefox/locale/en-GB.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = No applications detected
-clickForDetails = Click for details
-
-preferences = Options
-categories = Categories
-tracking_title = Tracking
-tracking_description = Anonymously send reports on detected applications to wappalyzer.com for analysis
-urlbar_title = Display icons in URL bar
-urlbar_description = Uncheck to display toolbar button.
-
-feedback = Feedback
-github = Github
-twitter = Twitter
-website = Go to wappalyzer.com
-
-cat1 = CMS
-cat2 = Message Board
-cat3 = Database Manager
-cat4 = Documentation Tool
-cat5 = Widget
-cat6 = eCommerce
-cat7 = Photo Gallery
-cat8 = Wiki
-cat9 = Hosting Panel
-cat10 = Analytics
-cat11 = Blog
-cat12 = JavaScript Framework
-cat13 = Issue Tracker
-cat14 = Video Player
-cat15 = Comment System
-cat16 = CAPTCHA
-cat17 = Font Script
-cat18 = Web Framework
-cat19 = Miscellaneous
-cat20 = Editor
-cat21 = LMS
-cat22 = Web Server
-cat23 = Cache Tool
-cat24 = Rich Text Editor
-cat25 = JavaScript Graphics
-cat26 = Mobile Framework
-cat27 = Programming Language
-cat28 = Operating System
-cat29 = Search Engine
-cat30 = Web Mail
-cat31 = CDN
-cat32 = Marketing Automation
-cat33 = Web Server Extension
-cat34 = Database
-cat35 = Map
-cat36 = Advertising Network
-cat37 = Network Device
-cat38 = Media Server
-cat39 = Webcam
-cat40 = Printer
-cat41 = Payment Processor
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Build/CI System
-cat45 = SCADA System
-cat46 = Remote Access
-cat47 = Development Tool
-cat48 = Network Storage
-cat49 = Feed Readers
-cat50 = Document Management Systems
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/en-US.properties b/src/drivers/firefox/locale/en-US.properties
deleted file mode 100755
index 0c2ec9d3d..000000000
--- a/src/drivers/firefox/locale/en-US.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = No applications detected
-clickForDetails = Click for details
-
-preferences = Options
-categories = Categories
-tracking_title = Tracking
-tracking_description = Anonymously send reports on detected applications to wappalyzer.com for analysis
-urlbar_title = Display icons in URL bar
-urlbar_description = Uncheck to display toolbar button.
-
-feedback = Feedback
-github = Github
-twitter = Twitter
-website = Go to wappalyzer.com
-
-cat1 = CMS
-cat2 = Message Board
-cat3 = Database Manager
-cat4 = Documentation Tool
-cat5 = Widget
-cat6 = eCommerce
-cat7 = Photo Gallery
-cat8 = Wiki
-cat9 = Hosting Panel
-cat10 = Analytics
-cat11 = Blog
-cat12 = JavaScript Framework
-cat13 = Issue Tracker
-cat14 = Video Player
-cat15 = Comment System
-cat16 = CAPTCHA
-cat17 = Font Script
-cat18 = Web Framework
-cat19 = Miscellaneous
-cat20 = Editor
-cat21 = LMS
-cat22 = Web Server
-cat23 = Cache Tool
-cat24 = Rich Text Editor
-cat25 = JavaScript Graphics
-cat26 = Mobile Framework
-cat27 = Programming Language
-cat28 = Operating System
-cat29 = Search Engine
-cat30 = Web Mail
-cat31 = CDN
-cat32 = Marketing Automation
-cat33 = Web Server Extension
-cat34 = Database
-cat35 = Map
-cat36 = Advertising Network
-cat37 = Network Device
-cat38 = Media Server
-cat39 = Webcam
-cat40 = Printer
-cat41 = Payment Processor
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Build/CI System
-cat45 = SCADA System
-cat46 = Remote Access
-cat47 = Development Tool
-cat48 = Network Storage
-cat49 = Feed Readers
-cat50 = Document Management Systems
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/es-ES.properties b/src/drivers/firefox/locale/es-ES.properties
deleted file mode 100755
index 503d472e8..000000000
--- a/src/drivers/firefox/locale/es-ES.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Aplicaciones no detectadas
-clickForDetail = Clic para detalles
-
-preferences = Opciones
-categories = Categorías
-tracking_title = Seguimiento
-tracking_description = Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis
-urlbar_title = Display icons in URL bar
-urlbar_description = Uncheck to display toolbar button.
-
-feedback = Opinión
-github = Github
-twitter = Twitter
-website = Ir a wappalyzer.com
-
-cat1 = Gestor de Contenido
-cat2 = Foro
-cat3 = estor de Bases de Datos
-cat4 = Herramienta de Documentación
-cat5 = Widget
-cat6 = Tienda Web
-cat7 = Galería fotográfica
-cat8 = Wiki
-cat9 = Panel de Hosting
-cat10 = Analítica
-cat11 = Blog
-cat12 = Framework JavaScript
-cat13 = Gestor de Incidencias
-cat14 = Reproductor de Vídeo
-cat15 = Sistema de Comentarios
-cat16 = CAPTCHA
-cat17 = Tipografía
-cat18 = Framework Web
-cat19 = Miscelánea
-cat20 = Editor
-cat21 = LMS
-cat22 = Servidor Web
-cat23 = Herramienta de Cache
-cat24 = Editor de Texto Enriquecido
-cat25 = Gráficos JavaScript
-cat26 = Framework Móvil
-cat27 = Lenguaje de programación
-cat28 = Sistema Operativo
-cat29 = Motor de Búsqueda
-cat30 = Correo Web
-cat31 = CDN
-cat32 = Automatización de Marketing
-cat33 = Extensión de Servidor Web
-cat34 = Base de Datos
-cat35 = Mapa
-cat36 = Red de Publicidad
-cat37 = Dispositivo de Red
-cat38 = Servidores de Contenido
-cat39 = Webcam
-cat40 = Impresora
-cat41 = Payment Processor
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Build/CI System
-cat45 = SCADA System
-cat46 = Remote Access
-cat47 = Development Tool
-cat48 = Network Storage
-cat49 = Feed Readers
-cat50 = Document Management Systems
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/fr-FR.properties b/src/drivers/firefox/locale/fr-FR.properties
deleted file mode 100644
index f65c5da0c..000000000
--- a/src/drivers/firefox/locale/fr-FR.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Pas d'applications détectées
-clickForDetails = Cliquer pour plus de détails
-
-preferences = Plus d'options...
-categories = Gérer les catégories
-tracking_title = Traçage
-tracking_description = Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche
-urlbar_title = Afficher les icônes dans la barre d'adresse
-urlbar_description = Décocher pour afficher le bouton dans la barre des modules
-
-feedback = Donner votre avis
-github = Github
-twitter = Twitter
-website = Aller sur wappalyzer.com
-
-cat1 = CMS
-cat2 = Forum
-cat3 = Gestionnaire de base de données
-cat4 = Outil de documentation
-cat5 = Widget
-cat6 = Boutique en ligne
-cat7 = Galerie photo
-cat8 = Wiki
-cat9 = Gestionnaire de serveur
-cat10 = Outil de statistiques
-cat11 = Blog
-cat12 = Framework JavaScript
-cat13 = Outils de suivi de problèmes
-cat14 = Lecteur de vidéos
-cat15 = Système de commentaires
-cat16 = CAPTCHA
-cat17 = Script de police
-cat18 = Framework web
-cat19 = Divers
-cat20 = Editeur
-cat21 = LMS
-cat22 = Serveur web
-cat23 = Outil de cache
-cat24 = Editeur WYSIWYG
-cat25 = Graphismes JavaScript
-cat26 = Framework pour mobiles
-cat27 = Language de programmation
-cat28 = Système d'exploitation
-cat29 = Moteur de recherche
-cat30 = Web Mail
-cat31 = CDN
-cat32 = Logiciel de marketing
-cat33 = Extension de serveur web
-cat34 = Base de données
-cat35 = Carte
-cat36 = Réseau publicitaire
-cat37 = Périphérique réseau
-cat38 = Serveur multimédia
-cat39 = Webcam
-cat40 = Imprimante
-cat41 = Service de paiement
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Système CI
-cat45 = Système SCADA
-cat46 = Accès à distance
-cat47 = Outil de développement
-cat48 = Stockage réseau
-cat49 = Lecteur RSS
-cat50 = Système de gestion de documents
-cat51 = Landing Page Builder
-cat52 = Chat en direct
diff --git a/src/drivers/firefox/locale/it-IT.properties b/src/drivers/firefox/locale/it-IT.properties
deleted file mode 100755
index aaaf8f5ef..000000000
--- a/src/drivers/firefox/locale/it-IT.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Nessuna applicazione rilevata
-clickForDetails = Clicca per i dettagli
-
-preferences = Opzioni
-categories = Categorie
-tracking_title = Tracking
-tracking_description = Inviare anonimamente un report sulle applicazioni rilevate a wappalyzer.com per l'analisi
-urlbar_title = Mostra le icone nella barra delle URL
-urlbar_description = Deselezionare per visualizzare il pulsante nella barra degli strumenti.
-
-feedback = Feedback
-github = Github
-twitter = Twitter
-website = Vai su wappalyzer.com
-
-cat1 = CMS
-cat2 = Forum
-cat3 = Gestore di database
-cat4 = Strumento di documentazione
-cat5 = Widget
-cat6 = eCommerce
-cat7 = Galleria fotografica
-cat8 = Wiki
-cat9 = Pannello Hosting
-cat10 = Analytics
-cat11 = Blog
-cat12 = Framework JavaScript
-cat13 = Issue Tracker
-cat14 = Player Video
-cat15 = Sistema di commenti
-cat16 = CAPTCHA
-cat17 = Font Script
-cat18 = Framework Web
-cat19 = Miscellanea
-cat20 = Editor
-cat21 = LMS
-cat22 = Web Server
-cat23 = Cache Tool
-cat24 = Editor di Testo Ricco
-cat25 = JavaScript Graphics
-cat26 = Framework Mobile
-cat27 = Linguaggio di Programmazione
-cat28 = Sistema Operativo
-cat29 = Motore di Ricerca
-cat30 = Web Mail
-cat31 = CDN
-cat32 = Marketing Automation
-cat33 = Estensione Web Server
-cat34 = Database
-cat35 = Mappa
-cat36 = Network Pubblicitario
-cat37 = Network Device
-cat38 = Media Server
-cat39 = Webcam
-cat40 = Stampante
-cat41 = Payment Processor
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Sistema Build/CI
-cat45 = SCADA System
-cat46 = Accesso Remoto
-cat47 = Strumenti di Sviluppo
-cat48 = Network Storage
-cat49 = Lettore di Feed
-cat50 = Sistema di Gestione Documenti
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/nl-NL.properties b/src/drivers/firefox/locale/nl-NL.properties
deleted file mode 100755
index 9d2833f50..000000000
--- a/src/drivers/firefox/locale/nl-NL.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Geen applicaties gedetecteerd
-clickForDetails = Klik voor details
-
-preferences = Meer opties…
-categories = Beheer categoriën
-tracking_title = Tracking
-tracking_description = Verzend anonieme informatie over applicaties naar wappalyzer.com voor onderzoek
-urlbar_title = Laat iconen in de adresbalk zien
-urlbar_description = Uncheck to display toolbar button.
-
-feedback = Feedback
-github = Github
-twitter = Twitter
-website = Ga naar wappalyzer.com
-
-cat1 = CMS
-cat2 = Forum
-cat3 = Database Manager
-cat4 = Documentatie Tool
-cat5 = Widget
-cat6 = Webwinkel
-cat7 = Fotogalerij
-cat8 = Wiki
-cat9 = Hosting Paneel
-cat10 = Analytics
-cat11 = Blog
-cat12 = JavaScript Framework
-cat13 = Issue Tracker
-cat14 = Videospeler
-cat15 = Reactiesysteem
-cat16 = CAPTCHA
-cat17 = Font Script
-cat18 = Web Framework
-cat19 = Overige
-cat20 = Editor
-cat21 = LMS
-cat22 = Webserver
-cat23 = Cache Tool
-cat24 = Rich Text Editor
-cat25 = JavaScript Graphics
-cat26 = Mobiel Framework
-cat27 = Programmeertaal
-cat28 = Besturingssysteem
-cat29 = Zoekmachine
-cat30 = Webmail
-cat31 = CDN
-cat32 = Marketing Automatisering
-cat33 = Web Server Extensie
-cat34 = Database
-cat35 = Landkaart
-cat36 = Advertentienetwerk
-cat37 = Netwerk Apparaat
-cat38 = Media Server
-cat39 = Webcam
-cat40 = Printer
-cat41 = Betalingsverwerker
-cat42 = Tag Manager
-cat43 = Paywall
-cat44 = Build/CI System
-cat45 = SCADA System
-cat46 = Remote Access
-cat47 = Development Tool
-cat48 = Network Storage
-cat49 = Feed Readers
-cat50 = Document Management Systems
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/ro-RO.properties b/src/drivers/firefox/locale/ro-RO.properties
deleted file mode 100644
index 61bf776f5..000000000
--- a/src/drivers/firefox/locale/ro-RO.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Nici o aplicație detectată
-clickForDetails = Click pentru detalii
-
-preferences = Opțiuni
-categories = Categorii
-tracking_title = Analiză
-tracking_description = Trimite rapoarte anonime despre aplicațiile detectate către wappalyzer.com pentru cercetare
-urlbar_title = Afișează iconițe în bara URL
-urlbar_description = Debifează pentru a arăta butonul în toolbar.
-
-feedback = Părere
-github = Github
-twitter = Twitter
-website = Mergi la wappalyzer.com
-
-
-cat1 = CMS
-cat2 = Forum de discuții
-cat3 = Manager baze de date
-cat4 = Unealtă pentru documentare
-cat5 = Widget
-cat10 = Analiză trafic web
-cat11 = Blog
-cat12 = Framework JavaScript
-cat13 = Tracker probleme
-cat14 = Player Video
-cat15 = Sistem de comentarii
-cat16 = Verificare Captcha
-cat17 = Script pentru fonturi
-cat18 = Framework Web
-cat19 = Divers
-cat20 = Editor
-cat21 = LMS
-cat22 = Server Web
-cat23 = Unealtă Cache
-cat24 = Editor Texte Rich
-cat25 = Grafică JavaScript
-cat26 = Framework Mobile
-cat27 = Limbaj de programare
-cat28 = Sistem de operare
-cat29 = Motor de căutare
-cat30 = Poștă electronică
-cat31 = CDN
-cat32 = Automatizare marketing
-cat33 = Extensie server web
-cat34 = Bază de date
-cat35 = Hartă
-cat36 = Rețea de advertising
-cat37 = Serviciu rețea
-cat38 = Server Media
-cat39 = Webcam
-cat40 = Imprimantă
-cat41 = Sistem de plată
-cat42 = Manager cuvinte cheie
-cat43 = Paywall
-cat44 = Build/CI System
-cat45 = SCADA System
-cat46 = Remote Access
-cat47 = Development Tool
-cat48 = Network Storage
-cat49 = Feed Readers
-cat50 = Document Management Systems
-cat51 = Landing Page Builder
-cat52 = Live Chat
diff --git a/src/drivers/firefox/locale/ru-RU.properties b/src/drivers/firefox/locale/ru-RU.properties
deleted file mode 100644
index 5c820a05f..000000000
--- a/src/drivers/firefox/locale/ru-RU.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-name = Wappalyzer
-noAppsDetected = Нет данных о сайте
-clickForDetails = Щелкните, чтобы посмотреть детально
-
-preferences = Настройки Wappalyzer
-categories = Категории
-tracking_title = Слежение
-tracking_description = Анонимно отправлять статистику распознанных данных на сервер (для улучшения расширения)
-urlbar_title = Отображать иконку в строке URL
-urlbar_description = Снимите галочку, чтобы отображать кнопку на панели
-
-feedback = Обратная связь
-github = Форкнуть на GitHub!
-twitter = Следите за новостями в Твиттере
-website = Перейти на Wappalyzer.com
-
-cat1 = CMS
-cat2 = Форум
-cat3 = Менеджер БД
-cat4 = Документация
-cat5 = Виджет
-cat6 = Электронная коммерция
-cat7 = Фотогалерея
-cat8 = Wiki
-cat9 = Панель хостинга
-cat10 = Аналитика
-cat11 = Блог
-cat12 = JS фреймворк
-cat13 = Баг трекер
-cat14 = Видео плеер
-cat15 = Система комментариев
-cat16 = Капча
-cat17 = Шрифт
-cat18 = Веб фреймворк
-cat19 = Прочее
-cat20 = HTML редактор
-cat21 = LMS
-cat22 = Веб сервер
-cat23 = Кеширование
-cat24 = WYSIWYG редактор
-cat25 = JS графика
-cat26 = Мобильный фреймворк
-cat27 = Язык программирования
-cat28 = Операционная система
-cat29 = Поисковый движок
-cat30 = Веб почта
-cat31 = CDN
-cat32 = Управление маркетингом
-cat33 = Расширение Веб сервера
-cat34 = База данных
-cat35 = Карта
-cat36 = Рекламная сеть
-cat37 = Сетевая служба
-cat38 = Медиа сервер
-cat39 = Вебкамера
-cat40 = Принтер
-cat41 = Провайдер платежей
-cat42 = Менеджер тэгов
-cat43 = Paywall
-cat44 = Система непрерывной интеграции
-cat45 = Система SCADA
-cat46 = Удаленное управление
-cat47 = Утилита для разработчиков
-cat48 = Сетевое хранилище
-cat49 = Граббер контента
-cat50 = Управление документами
-cat51 = Генератор лендингов
-cat52 = Live Chat
diff --git a/src/drivers/firefox/package.json b/src/drivers/firefox/package.json
deleted file mode 100644
index c6a05fcf8..000000000
--- a/src/drivers/firefox/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "name": "wappalyzer",
- "title": "Wappalyzer",
- "homepage": "https://wappalyzer.com",
- "icon": "images/icon48.png",
- "icon64": "images/icon64.png",
- "id": "wappalyzer@crunchlabz.com",
- "description": "Identifies software on the web",
- "author": "Elbert Alias",
- "license": "GPLv3",
- "version": "3.2.11",
- "main": "driver.js",
- "preferences": [{
- "name": "tracking",
- "title": "Tracking",
- "description": "Anonymously send reports on detected applications to wappalyzer.com for analysis",
- "type": "bool",
- "value": true
- }, {
- "name": "urlbar",
- "title": "Display icons in URL bar",
- "description": "Uncheck to display toolbar button.",
- "type": "bool",
- "value": true
- }],
- "permissions": {
- "private-browsing": true
- }
-}
diff --git a/src/drivers/webextension/.gitignore b/src/drivers/webextension/.gitignore
index d0671fb4f..602df1590 100644
--- a/src/drivers/webextension/.gitignore
+++ b/src/drivers/webextension/.gitignore
@@ -3,3 +3,5 @@ images/icons/converted/*.png
images/icons/*.png
images/icons/*.svg
js/wappalyzer.js
+js/iframe.js
+js/network.js
diff --git a/src/drivers/webextension/images/icon_64.png b/src/drivers/webextension/images/icon_64.png
new file mode 100644
index 000000000..160dfde79
Binary files /dev/null and b/src/drivers/webextension/images/icon_64.png differ
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 9e0ace31a..3c5c7bd26 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -54,7 +54,7 @@
// Version check
try {
- var version = browser.app.getDetails().version;
+ var version = browser.runtime.getManifest().version;
if ( localStorage['version'] == null ) {
firstRun = true;
diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js
index fcf40539f..d37f91ef1 100644
--- a/src/drivers/webextension/js/iframe.js
+++ b/src/drivers/webextension/js/iframe.js
@@ -69,6 +69,7 @@ var exports = {};
realArray: function(a) {
return Array.prototype.slice.apply(a);
},
+
onDocLoaded: function(doc, callback) {
if ( doc.readyState === 'loading' ) {
doc.addEventListener('DOMContentLoaded', callback);
@@ -112,10 +113,42 @@ var exports = {};
try {
dict[key] = window.decodeURIComponent(val);
} catch (e) {
+
+ continue;
}
}
return dict;
},
+ sendToBackground: function(message, event, responseMessage, onResponse) {
+ if ( typeof browser !== 'undefined' ) {
+ var response = browser.runtime.sendMessage(message);
+ response.then(onResponse);
+ } else if ( typeof chrome !== 'undefined' ) {
+ chrome.runtime.sendMessage(message, onResponse);
+ } else if ( window.self.port ) {
+ window.self.port.on(responseMessage, onResponse);
+ window.self.port.emit(event, message);
+ }
+ },
+
+ ifTrackingEnabled: function(callback, elseCallback) {
+
+ this.sendToBackground(
+ 'is_tracking_enabled',
+ '',
+ 'tracking_enabled_response',
+ function(message) {
+ if ( message.tracking_enabled ) {
+
+ callback();
+ } else {
+
+ elseCallback();
+ }
+ }
+ );
+
+ }
};
utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
@@ -135,7 +168,7 @@ var exports = {};
LogGenerator.prototype = {
log: function(event, opt_assets, opt_pageTags) {
var opt_video_assets;
- if ( event === 'video' ) {
+ if ( event === 'video' || event === 'invalid-video' ) {
opt_video_assets = opt_assets || [];
opt_assets = [];
} else {
@@ -148,7 +181,7 @@ var exports = {};
video_assets: opt_video_assets,
assets: opt_assets,
version: '3',
- mrev: '5dacb94-c',
+ mrev: '9c4d5b3-c',
msgNum: this.msgNum,
timestamp: new Date().getTime(),
pageVis: document.visibilityState,
@@ -305,7 +338,6 @@ var exports = {};
return div;
}
}
- return null;
};
TopSearcher.prototype._jumpedOut = function(el) {
@@ -858,7 +890,7 @@ var exports = {};
var _pageTags;
var INIT_MS_BW_SEARCHES = 2000;
var PAGE_TAG_RE = new RegExp('gpt|oascentral');
- var POST_MSG_ID = '1484952787-11883-24071-12354-1549';
+ var POST_MSG_ID = '1490888598-28717-31700-14775-21098';
var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
function getPageTags(doc) {
@@ -924,9 +956,9 @@ var exports = {};
if ( exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete' ) {
extractAds();
}
- setTimeout(function() {
- extractAdsWrapper();
- }, INIT_MS_BW_SEARCHES);
+ setTimeout(
+ function() { extractAdsWrapper(); }, INIT_MS_BW_SEARCHES
+ );
}
function extractAds() {
@@ -987,7 +1019,6 @@ var exports = {};
}
}
}
- return null;
}
function onPostMessage(event) {
@@ -1009,6 +1040,8 @@ var exports = {};
delete adData.postMessageId;
+ event.stopImmediatePropagation();
+
if ( isChildWin(myWin, ifrWin) ) {
if ( exports.utils.isFriendlyWindow(ifrWin) ) {
ifrTag = ifrWin.frameElement;
@@ -1053,12 +1086,24 @@ var exports = {};
callback(msg);
}
});
+ } else if ( typeof chrome !== 'undefined' ) {
+ chrome.runtime.onMessage.addListener(function(msg) {
+ if ( msg.event === event ) {
+ callback(msg);
+ }
+ });
} else if ( window.self.port ) {
window.self.port.on(event, callback);
}
}
exports.coordinator = {
+ addPostMessageListener: function() {
+ if ( !exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
+ window.addEventListener('message', onPostMessage, false);
+ }
+ },
+
init: function(onAdFound) {
if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
@@ -1066,8 +1111,6 @@ var exports = {};
}
_onAdFound = onAdFound;
- window.addEventListener('message', onPostMessage, false);
-
if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
var log = _logGen.log('page');
onAdFound(log);
@@ -1092,26 +1135,32 @@ var exports = {};
if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
window.adparser = {
init: exports.coordinator.init,
+ addPostMessageListener: exports.coordinator.addPostMessageListener,
+ ifTrackingEnabled: exports.utils.ifTrackingEnabled,
+ sendToBackground: exports.utils.sendToBackground
};
} else {
- exports.coordinator.init(function() {});
+ exports.coordinator.addPostMessageListener();
+ exports.utils.ifTrackingEnabled(
+ function() {
+ exports.coordinator.init(function() {});
+ },
+ function() {}
+ );
}
-
})(window);
(function(adparser) {
- function sendToBackground(event, message) {
- if ( window.self.port ) {
- window.self.port.emit(event, message);
- } else if ( typeof browser !== 'undefined' ) {
- browser.runtime.sendMessage(message);
- }
- }
-
function onAdFound(log) {
- sendToBackground('ad_log', { id: 'ad_log', subject: log });
+ adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', function(){});
}
- if ( window === window.top ) {
- adparser.init(onAdFound);
+ if ( window === window.top ) {
+ adparser.addPostMessageListener();
+ adparser.ifTrackingEnabled(
+ function() {
+ adparser.init(onAdFound);
+ },
+ function() {}
+ )
}
})(window.adparser);
diff --git a/src/drivers/webextension/js/network.js b/src/drivers/webextension/js/network.js
index 9dc38f5a2..b2f2ea018 100644
--- a/src/drivers/webextension/js/network.js
+++ b/src/drivers/webextension/js/network.js
@@ -1,6 +1,27 @@
'use strict';
(function() {
+ function isChrome() {
+ return (typeof chrome !== 'undefined' &&
+ window.navigator.userAgent.match(/Chrom(?:e|ium)\/([0-9\.]+)/));
+ }
+
+ var browserProxy;
+ if ( isChrome() ) {
+ browserProxy = chrome;
+ } else {
+ browserProxy = browser;
+ }
+
+ var MIN_FF_MAJOR_VERSION = 51;
+
+ var requiredBrowserApis = [
+ browserProxy.webNavigation,
+ browserProxy.tabs,
+ browserProxy.webRequest,
+ browserProxy.runtime
+ ];
+ var areListenersRegistered = false;
var secBefore = 2000;
var secAfter = 5000;
var secBetweenDupAssets = 10e3;
@@ -22,11 +43,27 @@
var topVideoAssetDomains = [
'2mdn.net',
+ 'adap.tv',
+ 'adnxs.com',
+ 'adsrvr.org',
+ 'btrll.com',
+ 'celtra.com',
+ 'flashtalking.com',
+ 'flite.com',
'innovid.com',
+ 'jivox.com',
+ 'mixpo.com',
+ 'nytimes.com',
+ 'playwire.com',
+ 'selectmedia.asia',
'serving-sys.com',
- 'btrll.com',
+ 'solvemedia.com',
+ 'spotible.com',
'teads.tv',
- 'tubemogul.com'
+ 'tribalfusion.com',
+ 'tubemogul.com',
+ 'videologygroup.com',
+ 'washingtonpost.com'
];
if ( !String.prototype.endsWith ) {
@@ -42,6 +79,47 @@
};
}
+ function getFrame(getFrameDetails, callback) {
+ if ( typeof chrome !== 'undefined' ) {
+ chrome.webNavigation.getFrame(getFrameDetails, callback);
+ } else if ( typeof browser !== 'undefined' ) {
+ var gettingFrame = browser.webNavigation.getFrame(getFrameDetails);
+ gettingFrame.then(callback);
+ }
+ }
+
+ function ifBrowserValid(callback, elseCallback) {
+ if ( isChrome() ) {
+
+ callback();
+ } else if ( typeof browser !== 'undefined' ) {
+ try {
+ var gettingInfo = browser.runtime.getBrowserInfo();
+ gettingInfo.then(function(browserInfo) {
+ var browserVersion = parseInt(browserInfo.version.split('.')[0]);
+
+ if ( browserInfo.name === 'Firefox' &&
+ browserVersion >= MIN_FF_MAJOR_VERSION) {
+ callback();
+ } else {
+ elseCallback();
+ }
+ });
+ } catch (err) {
+
+ elseCallback();
+ }
+ } else {
+ elseCallback();
+ }
+ }
+
+ function isTrackingEnabled() {
+
+ return parseInt(localStorage.tracking, 10);
+
+ }
+
function isPixelRequest(request) {
return (request.type === 'image' || request.responseStatus === 204) &&
request.size <= 1000;
@@ -57,7 +135,7 @@
}
function stripQueryParams(url) {
- return url.split('?',1)[0];
+ return url.split('?', 1)[0];
}
function parseHostnameFromUrl(url) {
@@ -117,7 +195,18 @@
var tabId = details.tabId;
this.cleanupCollector(tabId);
- this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+ if ( isTrackingEnabled() ) {
+ if ( !areListenersRegistered ) {
+
+ registerListeners();
+ }
+ this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+ } else {
+ if ( areListenersRegistered ) {
+
+ unregisterListeners();
+ }
+ }
},
onNavigationCommitted: function(details) {
@@ -160,7 +249,7 @@
PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function() {
var logMessage = Array.from(arguments).join(' ');
var message = {message: logMessage, event: 'console-log-message'};
- browser.tabs.sendMessage(this.tabId, message);
+ browserProxy.tabs.sendMessage(this.tabId, message);
};
PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, isValidAd) {
@@ -179,7 +268,9 @@
return parseHostnameFromUrl(request.url);
});
msg.assets = [{
+
url: parseHostnameFromUrl(assetReq.url),
+
contentType: assetReq.contentType,
size: assetReq.size
}];
@@ -188,7 +279,7 @@
msg.origUrl = curPageUrl;
msg.displayAdFound = this.displayAdFound;
- browser.tabs.sendMessage(this.tabId, msg);
+ browserProxy.tabs.sendMessage(this.tabId, msg);
};
PageNetworkTrafficCollector.prototype.getRedirKey = function(url, frameId) {
@@ -236,7 +327,7 @@
frameId: details.frameId
};
var pageNetworkTrafficController = this;
- browser.webNavigation.getFrame(getFrameDetails).then(function(frameDetails) {
+ getFrame(getFrameDetails, function(frameDetails) {
if ( frameDetails && frameDetails.url ) {
pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
}
@@ -356,7 +447,7 @@
frameId: responseDetails.frameId
};
var pageNetworkTrafficController = this;
- browser.webNavigation.getFrame(getFrameDetails).then(function(frameDetails) {
+ getFrame(getFrameDetails, function(frameDetails) {
if ( frameDetails && frameDetails.url ) {
pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
}
@@ -484,6 +575,10 @@
var hasVpaidOrVastRequest = tagRequests.some(function(tagRequest) {
return isVpaidOrVastRequest(tagRequest);
});
+
+ if ( assetRequest.isYoutubeAd ) {
+ return true;
+ }
if ( hasVpaidOrVastRequest ) {
return true;
}
@@ -498,7 +593,7 @@
var _this = this,
origPageUrl, msgAssetReq;
msgAssetReq = this.msgsBeingSent[msgKey];
- browser.tabs.get(this.tabId, function(tab) {origPageUrl = tab.url;});
+ browserProxy.tabs.get(this.tabId, function(tab) {origPageUrl = tab.url;});
setTimeout(function() {
var rawRequests = [];
@@ -531,54 +626,159 @@
}
};
- browser.webRequest.onBeforeRequest.addListener(function(details) {
+ function onBeforeRequestListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
- }, {urls: ['http://*/*', 'https://*/*']}, []);
+ }
- browser.webRequest.onSendHeaders.addListener(function(details) {
+ function onSendHeadersListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
- }, {urls: ['http://*/*', 'https://*/*']}, ['requestHeaders']);
+ }
- browser.webRequest.onHeadersReceived.addListener(function(details) {
+ function onHeadersReceivedListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
- }, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
+ }
- browser.webRequest.onBeforeRedirect.addListener(function(details) {
+ function onBeforeRedirectListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
- }, {urls: ['http://*/*', 'https://*/*']}, []);
+ }
- browser.webRequest.onResponseStarted.addListener(function(details) {
+ function onResponseStartedListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
- }, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
-
- browser.webNavigation.onBeforeNavigate.addListener(function(details) {
- if ( details.frameId === 0 ) {
- globalPageContainer.onNewNavigation(details);
- }
- }, {});
+ }
- browser.webNavigation.onCommitted.addListener(function(details) {
+ function onCommittedListener(details) {
if ( details.frameId === 0 ) {
globalPageContainer.onNavigationCommitted(details);
}
- });
+ }
- browser.webNavigation.onCompleted.addListener(function(details) {
+ function onCompletedListener(details) {
if ( details.frameId === 0 ) {
globalPageContainer.onNavigationCompleted(details);
}
- });
+ }
- browser.tabs.onRemoved.addListener(function(tabId, closeInfo) {
+ function onRemovedListener(tabId, closeInfo) {
globalPageContainer.onTabClose(tabId, closeInfo);
- });
+ }
- browser.runtime.onMessage.addListener(function(message, sender, sendResponse) {
+ function onMessageListener(message, sender, sendResponse) {
if ( message.event === 'new-ad' && message.data.event === 'ad' ) {
var tabId = sender.tab.id;
if ( tabId ) {
globalPageContainer.onDisplayAdFound(tabId);
}
}
+ }
+
+ function registerListeners() {
+
+ browserProxy.webRequest.onBeforeRequest.addListener(
+ onBeforeRequestListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ []
+ );
+
+ browserProxy.webRequest.onSendHeaders.addListener(
+ onSendHeadersListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ ['requestHeaders']
+ );
+
+ browserProxy.webRequest.onHeadersReceived.addListener(
+ onHeadersReceivedListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ ['responseHeaders']
+ );
+
+ browserProxy.webRequest.onBeforeRedirect.addListener(
+ onBeforeRedirectListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ []
+ );
+
+ browserProxy.webRequest.onResponseStarted.addListener(
+ onResponseStartedListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ ['responseHeaders']
+ );
+
+ browserProxy.webNavigation.onCommitted.addListener(onCommittedListener);
+ browserProxy.webNavigation.onCompleted.addListener(onCompletedListener);
+ browserProxy.tabs.onRemoved.addListener(onRemovedListener);
+ browserProxy.runtime.onMessage.addListener(onMessageListener);
+
+ areListenersRegistered = true;
+ }
+
+ function unregisterListeners() {
+
+ browserProxy.webRequest.onBeforeRequest.removeListener(
+ onBeforeRequestListener
+ );
+
+ browserProxy.webRequest.onSendHeaders.removeListener(
+ onSendHeadersListener
+ );
+
+ browserProxy.webRequest.onHeadersReceived.removeListener(
+ onHeadersReceivedListener
+ );
+
+ browserProxy.webRequest.onBeforeRedirect.removeListener(
+ onBeforeRedirectListener
+ );
+
+ browserProxy.webRequest.onResponseStarted.removeListener(
+ onResponseStartedListener
+ );
+
+ browserProxy.webNavigation.onCommitted.removeListener(onCommittedListener);
+ browserProxy.webNavigation.onCompleted.removeListener(onCompletedListener);
+ browserProxy.tabs.onRemoved.removeListener(onRemovedListener);
+ browserProxy.runtime.onMessage.removeListener(onMessageListener);
+
+ areListenersRegistered = false;
+ }
+
+ function areRequiredBrowserApisAvailable() {
+ return requiredBrowserApis.every(function(api) {
+ return typeof api !== 'undefined';
+ });
+ }
+
+ if ( areRequiredBrowserApisAvailable() ) {
+ ifBrowserValid(
+ function() {
+ browserProxy.webNavigation.onBeforeNavigate.addListener(
+ function(details) {
+ if ( details.frameId === 0 ) {
+ globalPageContainer.onNewNavigation(details);
+ }
+ },
+ {
+ url: [{urlMatches: 'http://*/*'}, {urlMatches: 'https://*/*'}]
+ }
+ );
+ }, function() {
+
+ }
+ );
+ }
+
+ browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+ if ( request === 'is_browser_valid' ) {
+ ifBrowserValid(
+ sendResponse({'browser_valid': true}),
+ sendResponse({'browser_valid': false})
+ );
+ }
});
+
+ browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+ if ( request === 'is_tracking_enabled' ) {
+ sendResponse({'tracking_enabled': isTrackingEnabled()});
+ }
+ });
+
})();
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index 6e81a7939..99b415211 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -10,7 +10,7 @@ document.addEventListener('DOMContentLoaded', function() {
popup = {
init: function() {
- browser.tabs.query({ active: true }).then(function(tabs) {
+ browser.tabs.query({ active: true, windowId: browser.windows.WINDOW_ID_CURRENT }).then(function(tabs) {
if ( tabs[0].url.match(/https?:\/\//) ) {
detectedApps.innerHTML = '
- - - -
- - diff --git a/src/drivers/chrome/popup.html b/src/drivers/chrome/popup.html deleted file mode 100644 index 2412d04ac..000000000 --- a/src/drivers/chrome/popup.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - -' + browser.i18n.getMessage('noAppsDetected') + '
';
} else {
@@ -24,7 +24,7 @@ document.addEventListener('DOMContentLoaded', function() {
displayApps: function() {
var appName, confidence, version;
- browser.tabs.query({ active: true }).then(function(tabs) {
+ browser.tabs.query({ active: true, windowId: browser.windows.WINDOW_ID_CURRENT }).then(function(tabs) {
function sendGetApps(response) {
if ( response.tabCache && response.tabCache.count > 0 ) {
detectedApps.innerHTML = '';
diff --git a/src/utils/iframe.js b/src/utils/iframe.js
index 64e2c20e4..d37f91ef1 100644
--- a/src/utils/iframe.js
+++ b/src/utils/iframe.js
@@ -69,6 +69,7 @@ var exports = {};
realArray: function(a) {
return Array.prototype.slice.apply(a);
},
+
onDocLoaded: function(doc, callback) {
if ( doc.readyState === 'loading' ) {
doc.addEventListener('DOMContentLoaded', callback);
@@ -118,6 +119,36 @@ var exports = {};
}
return dict;
},
+ sendToBackground: function(message, event, responseMessage, onResponse) {
+ if ( typeof browser !== 'undefined' ) {
+ var response = browser.runtime.sendMessage(message);
+ response.then(onResponse);
+ } else if ( typeof chrome !== 'undefined' ) {
+ chrome.runtime.sendMessage(message, onResponse);
+ } else if ( window.self.port ) {
+ window.self.port.on(responseMessage, onResponse);
+ window.self.port.emit(event, message);
+ }
+ },
+
+ ifTrackingEnabled: function(callback, elseCallback) {
+
+ this.sendToBackground(
+ 'is_tracking_enabled',
+ '',
+ 'tracking_enabled_response',
+ function(message) {
+ if ( message.tracking_enabled ) {
+
+ callback();
+ } else {
+
+ elseCallback();
+ }
+ }
+ );
+
+ }
};
utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
@@ -137,7 +168,7 @@ var exports = {};
LogGenerator.prototype = {
log: function(event, opt_assets, opt_pageTags) {
var opt_video_assets;
- if ( event === 'video' ) {
+ if ( event === 'video' || event === 'invalid-video' ) {
opt_video_assets = opt_assets || [];
opt_assets = [];
} else {
@@ -150,7 +181,7 @@ var exports = {};
video_assets: opt_video_assets,
assets: opt_assets,
version: '3',
- mrev: '9efbfba-c',
+ mrev: '9c4d5b3-c',
msgNum: this.msgNum,
timestamp: new Date().getTime(),
pageVis: document.visibilityState,
@@ -859,7 +890,7 @@ var exports = {};
var _pageTags;
var INIT_MS_BW_SEARCHES = 2000;
var PAGE_TAG_RE = new RegExp('gpt|oascentral');
- var POST_MSG_ID = '1488911709-15415-26289-19282-15751';
+ var POST_MSG_ID = '1490888598-28717-31700-14775-21098';
var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
function getPageTags(doc) {
@@ -925,9 +956,9 @@ var exports = {};
if ( exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete' ) {
extractAds();
}
- setTimeout(function() {
- extractAdsWrapper();
- }, INIT_MS_BW_SEARCHES);
+ setTimeout(
+ function() { extractAdsWrapper(); }, INIT_MS_BW_SEARCHES
+ );
}
function extractAds() {
@@ -1049,7 +1080,13 @@ var exports = {};
}
function addBackgroundListener(event, callback) {
- if ( typeof chrome !== 'undefined' ) {
+ if ( typeof browser !== 'undefined' ) {
+ browser.runtime.onMessage.addListener(function(msg) {
+ if ( msg.event === event ) {
+ callback(msg);
+ }
+ });
+ } else if ( typeof chrome !== 'undefined' ) {
chrome.runtime.onMessage.addListener(function(msg) {
if ( msg.event === event ) {
callback(msg);
@@ -1061,6 +1098,12 @@ var exports = {};
}
exports.coordinator = {
+ addPostMessageListener: function() {
+ if ( !exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
+ window.addEventListener('message', onPostMessage, false);
+ }
+ },
+
init: function(onAdFound) {
if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
@@ -1068,8 +1111,6 @@ var exports = {};
}
_onAdFound = onAdFound;
- window.addEventListener('message', onPostMessage, false);
-
if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
var log = _logGen.log('page');
onAdFound(log);
@@ -1094,26 +1135,32 @@ var exports = {};
if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
window.adparser = {
init: exports.coordinator.init,
+ addPostMessageListener: exports.coordinator.addPostMessageListener,
+ ifTrackingEnabled: exports.utils.ifTrackingEnabled,
+ sendToBackground: exports.utils.sendToBackground
};
} else {
- exports.coordinator.init(function() {});
+ exports.coordinator.addPostMessageListener();
+ exports.utils.ifTrackingEnabled(
+ function() {
+ exports.coordinator.init(function() {});
+ },
+ function() {}
+ );
}
-
})(window);
(function(adparser) {
- function sendToBackground(event, message) {
- if ( window.self.port ) {
- window.self.port.emit(event, message);
- } else if ( typeof chrome !== 'undefined' ) {
- chrome.extension.sendRequest(message);
- }
- }
-
function onAdFound(log) {
- sendToBackground('ad_log', { id: 'ad_log', subject: log });
+ adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', function(){});
}
- if ( window === window.top ) {
- adparser.init(onAdFound);
+ if ( window === window.top ) {
+ adparser.addPostMessageListener();
+ adparser.ifTrackingEnabled(
+ function() {
+ adparser.init(onAdFound);
+ },
+ function() {}
+ )
}
})(window.adparser);
diff --git a/src/utils/network.js b/src/utils/network.js
index 944db09c2..b2f2ea018 100644
--- a/src/utils/network.js
+++ b/src/utils/network.js
@@ -1,6 +1,27 @@
'use strict';
(function() {
+ function isChrome() {
+ return (typeof chrome !== 'undefined' &&
+ window.navigator.userAgent.match(/Chrom(?:e|ium)\/([0-9\.]+)/));
+ }
+
+ var browserProxy;
+ if ( isChrome() ) {
+ browserProxy = chrome;
+ } else {
+ browserProxy = browser;
+ }
+
+ var MIN_FF_MAJOR_VERSION = 51;
+
+ var requiredBrowserApis = [
+ browserProxy.webNavigation,
+ browserProxy.tabs,
+ browserProxy.webRequest,
+ browserProxy.runtime
+ ];
+ var areListenersRegistered = false;
var secBefore = 2000;
var secAfter = 5000;
var secBetweenDupAssets = 10e3;
@@ -58,6 +79,47 @@
};
}
+ function getFrame(getFrameDetails, callback) {
+ if ( typeof chrome !== 'undefined' ) {
+ chrome.webNavigation.getFrame(getFrameDetails, callback);
+ } else if ( typeof browser !== 'undefined' ) {
+ var gettingFrame = browser.webNavigation.getFrame(getFrameDetails);
+ gettingFrame.then(callback);
+ }
+ }
+
+ function ifBrowserValid(callback, elseCallback) {
+ if ( isChrome() ) {
+
+ callback();
+ } else if ( typeof browser !== 'undefined' ) {
+ try {
+ var gettingInfo = browser.runtime.getBrowserInfo();
+ gettingInfo.then(function(browserInfo) {
+ var browserVersion = parseInt(browserInfo.version.split('.')[0]);
+
+ if ( browserInfo.name === 'Firefox' &&
+ browserVersion >= MIN_FF_MAJOR_VERSION) {
+ callback();
+ } else {
+ elseCallback();
+ }
+ });
+ } catch (err) {
+
+ elseCallback();
+ }
+ } else {
+ elseCallback();
+ }
+ }
+
+ function isTrackingEnabled() {
+
+ return parseInt(localStorage.tracking, 10);
+
+ }
+
function isPixelRequest(request) {
return (request.type === 'image' || request.responseStatus === 204) &&
request.size <= 1000;
@@ -73,7 +135,7 @@
}
function stripQueryParams(url) {
- return url.split('?',1)[0];
+ return url.split('?', 1)[0];
}
function parseHostnameFromUrl(url) {
@@ -133,7 +195,18 @@
var tabId = details.tabId;
this.cleanupCollector(tabId);
- this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+ if ( isTrackingEnabled() ) {
+ if ( !areListenersRegistered ) {
+
+ registerListeners();
+ }
+ this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+ } else {
+ if ( areListenersRegistered ) {
+
+ unregisterListeners();
+ }
+ }
},
onNavigationCommitted: function(details) {
@@ -176,7 +249,7 @@
PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function() {
var logMessage = Array.from(arguments).join(' ');
var message = {message: logMessage, event: 'console-log-message'};
- chrome.tabs.sendMessage(this.tabId, message);
+ browserProxy.tabs.sendMessage(this.tabId, message);
};
PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, isValidAd) {
@@ -195,7 +268,9 @@
return parseHostnameFromUrl(request.url);
});
msg.assets = [{
+
url: parseHostnameFromUrl(assetReq.url),
+
contentType: assetReq.contentType,
size: assetReq.size
}];
@@ -204,7 +279,7 @@
msg.origUrl = curPageUrl;
msg.displayAdFound = this.displayAdFound;
- chrome.tabs.sendMessage(this.tabId, msg);
+ browserProxy.tabs.sendMessage(this.tabId, msg);
};
PageNetworkTrafficCollector.prototype.getRedirKey = function(url, frameId) {
@@ -252,7 +327,7 @@
frameId: details.frameId
};
var pageNetworkTrafficController = this;
- chrome.webNavigation.getFrame(getFrameDetails, function(frameDetails) {
+ getFrame(getFrameDetails, function(frameDetails) {
if ( frameDetails && frameDetails.url ) {
pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
}
@@ -372,7 +447,7 @@
frameId: responseDetails.frameId
};
var pageNetworkTrafficController = this;
- chrome.webNavigation.getFrame(getFrameDetails, function(frameDetails) {
+ getFrame(getFrameDetails, function(frameDetails) {
if ( frameDetails && frameDetails.url ) {
pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
}
@@ -518,7 +593,7 @@
var _this = this,
origPageUrl, msgAssetReq;
msgAssetReq = this.msgsBeingSent[msgKey];
- chrome.tabs.get(this.tabId, function(tab) {origPageUrl = tab.url;});
+ browserProxy.tabs.get(this.tabId, function(tab) {origPageUrl = tab.url;});
setTimeout(function() {
var rawRequests = [];
@@ -551,54 +626,159 @@
}
};
- chrome.webRequest.onBeforeRequest.addListener(function(details) {
+ function onBeforeRequestListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
- }, {urls: ['http://*/*', 'https://*/*']}, []);
+ }
- chrome.webRequest.onSendHeaders.addListener(function(details) {
+ function onSendHeadersListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
- }, {urls: ['http://*/*', 'https://*/*']}, ['requestHeaders']);
+ }
- chrome.webRequest.onHeadersReceived.addListener(function(details) {
+ function onHeadersReceivedListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
- }, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
+ }
- chrome.webRequest.onBeforeRedirect.addListener(function(details) {
+ function onBeforeRedirectListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
- }, {urls: ['http://*/*', 'https://*/*']}, []);
+ }
- chrome.webRequest.onResponseStarted.addListener(function(details) {
+ function onResponseStartedListener(details) {
globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
- }, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
-
- chrome.webNavigation.onBeforeNavigate.addListener(function(details) {
- if ( details.frameId === 0 ) {
- globalPageContainer.onNewNavigation(details);
- }
- }, {});
+ }
- chrome.webNavigation.onCommitted.addListener(function(details) {
+ function onCommittedListener(details) {
if ( details.frameId === 0 ) {
globalPageContainer.onNavigationCommitted(details);
}
- });
+ }
- chrome.webNavigation.onCompleted.addListener(function(details) {
+ function onCompletedListener(details) {
if ( details.frameId === 0 ) {
globalPageContainer.onNavigationCompleted(details);
}
- });
+ }
- chrome.tabs.onRemoved.addListener(function(tabId, closeInfo) {
+ function onRemovedListener(tabId, closeInfo) {
globalPageContainer.onTabClose(tabId, closeInfo);
- });
+ }
- chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
+ function onMessageListener(message, sender, sendResponse) {
if ( message.event === 'new-ad' && message.data.event === 'ad' ) {
var tabId = sender.tab.id;
if ( tabId ) {
globalPageContainer.onDisplayAdFound(tabId);
}
}
+ }
+
+ function registerListeners() {
+
+ browserProxy.webRequest.onBeforeRequest.addListener(
+ onBeforeRequestListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ []
+ );
+
+ browserProxy.webRequest.onSendHeaders.addListener(
+ onSendHeadersListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ ['requestHeaders']
+ );
+
+ browserProxy.webRequest.onHeadersReceived.addListener(
+ onHeadersReceivedListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ ['responseHeaders']
+ );
+
+ browserProxy.webRequest.onBeforeRedirect.addListener(
+ onBeforeRedirectListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ []
+ );
+
+ browserProxy.webRequest.onResponseStarted.addListener(
+ onResponseStartedListener,
+ {urls: ['http://*/*', 'https://*/*']},
+ ['responseHeaders']
+ );
+
+ browserProxy.webNavigation.onCommitted.addListener(onCommittedListener);
+ browserProxy.webNavigation.onCompleted.addListener(onCompletedListener);
+ browserProxy.tabs.onRemoved.addListener(onRemovedListener);
+ browserProxy.runtime.onMessage.addListener(onMessageListener);
+
+ areListenersRegistered = true;
+ }
+
+ function unregisterListeners() {
+
+ browserProxy.webRequest.onBeforeRequest.removeListener(
+ onBeforeRequestListener
+ );
+
+ browserProxy.webRequest.onSendHeaders.removeListener(
+ onSendHeadersListener
+ );
+
+ browserProxy.webRequest.onHeadersReceived.removeListener(
+ onHeadersReceivedListener
+ );
+
+ browserProxy.webRequest.onBeforeRedirect.removeListener(
+ onBeforeRedirectListener
+ );
+
+ browserProxy.webRequest.onResponseStarted.removeListener(
+ onResponseStartedListener
+ );
+
+ browserProxy.webNavigation.onCommitted.removeListener(onCommittedListener);
+ browserProxy.webNavigation.onCompleted.removeListener(onCompletedListener);
+ browserProxy.tabs.onRemoved.removeListener(onRemovedListener);
+ browserProxy.runtime.onMessage.removeListener(onMessageListener);
+
+ areListenersRegistered = false;
+ }
+
+ function areRequiredBrowserApisAvailable() {
+ return requiredBrowserApis.every(function(api) {
+ return typeof api !== 'undefined';
+ });
+ }
+
+ if ( areRequiredBrowserApisAvailable() ) {
+ ifBrowserValid(
+ function() {
+ browserProxy.webNavigation.onBeforeNavigate.addListener(
+ function(details) {
+ if ( details.frameId === 0 ) {
+ globalPageContainer.onNewNavigation(details);
+ }
+ },
+ {
+ url: [{urlMatches: 'http://*/*'}, {urlMatches: 'https://*/*'}]
+ }
+ );
+ }, function() {
+
+ }
+ );
+ }
+
+ browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+ if ( request === 'is_browser_valid' ) {
+ ifBrowserValid(
+ sendResponse({'browser_valid': true}),
+ sendResponse({'browser_valid': false})
+ );
+ }
});
+
+ browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+ if ( request === 'is_tracking_enabled' ) {
+ sendResponse({'tracking_enabled': isTrackingEnabled()});
+ }
+ });
+
})();