Merge pull request #1 from AliasIO/master

update fork

src/apps.json

@@ -255,11 +255,13 @@
 			"cats": [
 				"36"
 			],  
-			"env": "^ados(?:Results)?$",
+			"headers": {
+				"X-Advertising-By": "adnegah.net"
+			},
 			"html": "<iframe [^>]*src=\"[^\"]+adnegah\\.net",
 			"icon": "adnegah.png",
-			"script": "[^a-z]adnegah.*\\.js",
+			"script": "[^a-z]adnegah.*\\.js$", 
-			"website": "http://Adnegah.net"
+			"website": "https://Adnegah.net"
 		},
 		"Adobe ColdFusion": {
 			"cats": [
@@ -654,6 +656,17 @@
 			"icon": "Arc Forum.png",
 			"website": "http://arclanguage.org"
 		},
+		"ArcGIS API for JavaScript":{
+			"cats": [
+				"35"
+			],
+			"script": [
+				"js.arcgis.com",
+				"basemaps.arcgis.com"
+			],
+			"icon": "arcgis_icon.png",
+			"website": "https://developers.arcgis.com/javascript/"
+		},
 		"Artifactory": {
 			"cats": [
 				"47"
@@ -6435,7 +6448,7 @@
 			],
 			"headers": {
 				"Set-Cookie": "PUBLICCMS_USER",
-				"X-Powered-PublicCMS": ""
+				"X-Powered-PublicCMS": "(.*)\\;version:\\1"
 			},
 			"icon": "Public CMS.png",
 			"implies": "Java",
@@ -8162,6 +8175,16 @@
 			"icon": "TornadoServer.png",
 			"website": "http://tornadoweb.org"
 		},
+		"TotalCode": {
+			"cats": [
+				"6"
+			],
+			"headers": {
+				"X-Powered-By": "^TotalCode$"
+			},
+			"icon": "TotalCode.png",
+			"website": "http://www.totalcode.com"
+		},
 		"Trac": {
 			"cats": [
 				"13"
@@ -8325,13 +8348,24 @@
 			"script": "use\\.typekit\\.com",
 			"website": "http://typekit.com"
 		},
+		"uCoz": {
+			"cats": [
+				1
+			],
+			"headers": {
+				"Set-Cookie": "uCoz="
+			},
+			"icon": "uCoz.svg",
+			"website": "https://ucoz.ru"
+		},
 		"UIKit": {
 			"cats": [
 				"18"
 			],
 			"icon": "UIKit.png",
+			"html": "<[^>]+class=\"[^\"]*(?:uk-container|uk-section)",
 			"script": "uikit.*\\.js",
-			"website": "http://getuikit.com"
+			"website": "https://getuikit.com"
 		},
 		"UNIX": {
 			"cats": [
@@ -10022,6 +10056,16 @@
 			],
 			"website": "http://osticket.com"
 		},
+		"otrs": {
+			"cats": [
+				"13"
+			],
+			"html": "<!--\\s+OTRS: Copyright \\d+-\\d+, OTRS AG",
+			"script": "^/otrs-web/js/",
+			"icon": "otrs.png",
+			"implies": "perl",
+			"website": "https://www.otrs.com"
+		},
 		"ownCloud": {
 			"cats": [
 				"19"

src/drivers/npm/package.json

@@ -2,7 +2,7 @@
   "name": "Wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {

src/drivers/webextension/_locales/pl/messages.json

@@ -10,11 +10,15 @@
 	"optionTracking":           { "message": "Przesyłaj anonimowe statystyki aplikacji wykrytych przez Wappalyzer do twórców" },
 	"nothingToDo":              { "message": "Nic tu nie ma." },
 	"noAppsDetected":           { "message": "Nie wykryto żadnych aplikacji." },
-	"categoryName1":            { "message": "CMS" },
+	"categoryName1":            { "message": "System zarządzania treścią" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Menedżer baz danych" },
 	"categoryName4":            { "message": "Narzędzia dokumentacji" },
 	"categoryName5":            { "message": "Widżet" },
+	"categoryName6":            { "message": "E-biznes" },
+	"categoryName7":            { "message": "Galeria zdjęć" },
+	"categoryName8":            { "message": "Wiki" },
+	"categoryName9":            { "message": "Panele hostingowe" },
 	"categoryName10":           { "message": "Statystyki" },
 	"categoryName11":           { "message": "Blog" },
 	"categoryName12":           { "message": "Framework JavaScript" },
@@ -26,7 +30,7 @@
 	"categoryName18":           { "message": "Framework webowy" },
 	"categoryName19":           { "message": "Różne" },
 	"categoryName20":           { "message": "Edytor" },
-	"categoryName21":           { "message": "LMS" },
+	"categoryName21":           { "message": "System zarządzania nauczaniem" },
 	"categoryName22":           { "message": "Serwer internetowy" },
 	"categoryName23":           { "message": "Narzędzia cache" },
 	"categoryName24":           { "message": "Edytor tekstu sformatowanego" },
@@ -36,7 +40,7 @@
 	"categoryName28":           { "message": "System operacyjny" },
 	"categoryName29":           { "message": "Silnik wyszukiwarki" },
 	"categoryName30":           { "message": "Poczta internetowa" },
-	"categoryName31":           { "message": "CDN" },
+	"categoryName31":           { "message": "System dostarczania treści" },
 	"categoryName32":           { "message": "Automatyzacja marketingu" },
 	"categoryName33":           { "message": "Rozszerzenie serwera WWW" },
 	"categoryName34":           { "message": "Baza danych" },
@@ -58,5 +62,5 @@
 	"categoryName50":           { "message": "Systemy zarządzania dokumentami" },
 	"categoryName51":           { "message": "Konstruktory stron" },
 	"categoryName52":           { "message": "Czat na żywo" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "Zarządzanie relacjami z klientami" }
 }

src/drivers/webextension/js/driver.js

@@ -203,7 +203,7 @@
 						break;
 					case 'ad_log':
 						w.adCache.push(message.subject);
-
+						w.checkAdCache();
 						break;
 					case 'get_apps':
 						response = {

src/drivers/webextension/js/iframe.js

@@ -181,7 +181,7 @@ var exports = {};
 				video_assets: opt_video_assets,
 				assets: opt_assets,
 				version: '3',
-				mrev: '9c4d5b3-c',
+				mrev: 'a80971b-c',
 				msgNum: this.msgNum,
 				timestamp: new Date().getTime(),
 				pageVis: document.visibilityState,
@@ -890,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 = '1490888598-28717-31700-14775-21098';
+	var POST_MSG_ID = '1498662251-16965-9321-27566-5783';
 	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
 
 	function getPageTags(doc) {

src/drivers/webextension/js/network.js

@@ -114,9 +114,20 @@
 		}
 	}
 
-	function isTrackingEnabled() {
+	function ifTrackingEnabled(ifCallback, elseCallback) {
 
-		return parseInt(localStorage.tracking, 10);
+		browser.storage.local.get('tracking').then(function(item) {
+
+			if ( item.hasOwnProperty('tracking') ) {
+				if ( item.tracking ) {
+					ifCallback();
+				} else {
+					elseCallback();
+				}
+			} else {
+				ifCallback();
+			}
+		});
 
 	}
 
@@ -195,18 +206,21 @@
 			var tabId = details.tabId;
 			this.cleanupCollector(tabId);
 
-			if ( isTrackingEnabled() ) {
+			ifTrackingEnabled(
-				if ( !areListenersRegistered ) {
+				function() {
+					if ( !areListenersRegistered ) {
 
-					registerListeners();
+						registerListeners();
-				}
+					}
-				this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+					this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
-			} else {
+				}.bind(this),
-				if ( areListenersRegistered ) {
+				function() {
+					if ( areListenersRegistered ) {
 
-					unregisterListeners();
+						unregisterListeners();
+					}
 				}
-			}
+			);
 		},
 
 		onNavigationCommitted: function(details) {
@@ -777,8 +791,16 @@
 
 	browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
 		if ( request === 'is_tracking_enabled' ) {
-			sendResponse({'tracking_enabled': isTrackingEnabled()});
+			ifTrackingEnabled(
+				function() {
+					sendResponse({'tracking_enabled': true});
+				},
+				function() {
+					sendResponse({'tracking_enabled': false});
+				}
+			);
 		}
+		return true;
 	});
 
 })();

src/drivers/webextension/manifest.edge.json

@@ -4,7 +4,7 @@
 	"author": "Elbert Alias",
 	"homepage_url": "https://wappalyzer.com/",
 	"description": "Identify web technologies",
-	"version": "4.1.4",
+	"version": "4.1.5",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/drivers/webextension/manifest.json

@@ -4,7 +4,7 @@
 	"author": "Elbert Alias",
 	"homepage_url": "https://wappalyzer.com/",
 	"description": "Identify web technologies",
-	"version": "4.1.4",
+	"version": "4.1.5",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/icons/uCoz.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="1100px" height="1100px" viewBox="0 0 1100 1100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.4 (8054) - http://www.bohemiancoding.com/sketch -->
+    <title>LOGO</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="Dimensions-3" sketch:type="MSArtboardGroup" transform="translate(-260.000000, -3512.000000)">
+            <g id="LOGO" sketch:type="MSLayerGroup" transform="translate(260.000000, 3512.000000)">
+                <path d="M550,1100 C853.756612,1100 1100,853.756612 1100,550 C1100,246.243388 853.756612,0 550,0 C246.243388,0 0,246.243388 0,550 C0,853.756612 246.243388,1100 550,1100 Z" id="Oval-150" fill="#498BFA" sketch:type="MSShapeGroup"></path>
+                <path d="M679.259063,305.221016 L679.259063,633.813477 C679.259063,701.84971 624.126021,758.89182 556.132871,761.213261 C556.132871,761.213261 551.424989,761.384302 551.010202,761.384302 C550.352535,761.384302 545.080102,761.191144 545.080102,761.191144 C476.472336,758.878634 420.854753,701.351813 420.854753,632.711738 L420.854753,305.221016 L340.350514,305.221016 L340.350514,631.322425 C340.350514,747.090137 434.205902,840.734323 549.976105,840.482583 L551.0102,840.480335 L551.0102,840.480335 C666.205614,840.480335 759.589947,746.63277 759.589947,630.851732 L759.589947,305.221016 L679.259063,305.221016 Z" id="Oval-20" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/wappalyzer.js

@@ -367,6 +367,12 @@ var wappalyzer = (function() {
 			}
 		},
 
+		checkAdCache: function() {
+			if ( Object.keys(w.ping.hostnames).length >= 50 || w.adCache.length >= 50 ) {
+				driver('ping');
+			}
+		},
+
 		/**
 		 * Track detected applications
 		 */
@@ -404,10 +410,7 @@ var wappalyzer = (function() {
 					w.ping.hostnames[hostname].meta['language'] = match[1];
 				}
 			}
-
+			w.checkAdCache();
-			if ( Object.keys(w.ping.hostnames).length >= 50 || w.adCache.length >= 50 ) {
-				driver('ping');
-			}
 		},
 
 		/**
@@ -452,7 +455,7 @@ var wappalyzer = (function() {
 				patterns.forEach(function(pattern) {
 					var match;
 
-					while ( match = regex.exec(html) ) {
+					while ( (match = regex.exec(html)) ) {
 						if ( pattern.regex.test(match[2]) ) {
 							app.setDetected(pattern, 'script', match[2]);
 						}
@@ -471,7 +474,7 @@ var wappalyzer = (function() {
 				patterns = parsePatterns(w.apps[app.app].meta);
 
 			if ( patterns ) {
-				while ( match = regex.exec(html) ) {
+				while ( (match = regex.exec(html)) ) {
 					for ( meta in patterns ) {
 						if ( new RegExp('(name|property)=["\']' + meta + '["\']', 'i').test(match) ) {
 							content = match.toString().match(/content=("|')([^"']+)("|')/i);