From 7f50cc97cde657c348591e492edd4f41fef40fa6 Mon Sep 17 00:00:00 2001
From: ElbertF <elbert@alias.io>
Date: Fri, 17 Aug 2012 21:10:33 +1000
Subject: [PATCH] Analyze response headers in Chrome driver

---
 .gitignore                   |   1 -
 drivers/chrome/bg.html       |   3 +-
 drivers/chrome/js/content.js | 103 ++++++++++--------
 drivers/chrome/js/driver.js  | 201 +++--------------------------------
 drivers/chrome/js/locale.js  |  31 ++++++
 drivers/chrome/manifest.json |   2 +-
 drivers/chrome/popup.html    |  70 +++---------
 drivers/firefox/.gitignore   |   1 +
 8 files changed, 120 insertions(+), 292 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 drivers/chrome/js/locale.js
 create mode 100644 drivers/firefox/.gitignore
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f54313f2d..000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-drivers/firefox/wappalyzer.xpi
diff --git a/drivers/chrome/bg.html b/drivers/chrome/bg.html
index 2ed7a4900..c91b915aa 100644
--- a/drivers/chrome/bg.html
+++ b/drivers/chrome/bg.html
@@ -2,10 +2,9 @@
 
 <html>
 	<head>
-		<script src="js/lib/jquery.min.js"></script>
 		<script src="js/wappalyzer.js"></script>
-		<script src="js/driver.js"></script>
 		<script src="js/apps.js"></script>
+		<script src="js/driver.js"></script>
 	</head>
 	<body>
 		<script>
diff --git a/drivers/chrome/js/content.js b/drivers/chrome/js/content.js
index 61ecbdee4..a884d2f05 100644
--- a/drivers/chrome/js/content.js
+++ b/drivers/chrome/js/content.js
@@ -1,85 +1,98 @@
 (function() {
-	var self = {
-		debug:   true,
-		element: false,
-		prevUrl: '',
-
+	var c = {
 		init: function() {
-			self.log('init');
+			c.log('init');
 
-			self.onPageLoad();
-		},
+			chrome.extension.sendRequest({ id: 'analyze', subject: { html: document.documentElement.innerHTML } });
 
-		log: function(message) {
-			if ( self.debug && message ) {
-				console.log("Wappalyzer content.js: " + message);
-			}
+			c.getEnvironmentVars();
+			c.getResponseHeaders();
 		},
 
-		onPageLoad: function(e) {
-			self.log('onPageLoad');
-
-			if ( document.body ) {
-				self.getEnvironmentVars();
-			}
+		log: function(message) {
+			chrome.extension.sendRequest({ id: 'log', message: '[ content.js ] ' + message });
 		},
 
 		getEnvironmentVars: function() {
-			self.log('getEnvironmentVars');
+			c.log('getEnvironmentVars');
 
 			if ( typeof document.documentElement.innerHTML === 'undefined' ) {
 				return;
 			}
 
-			var environmentVars = '';
-
 			try {
-				var element = document.createElement('wappalyzerData');
+				var container = document.createElement('wappalyzerData');
 
-				element.setAttribute('id',    'wappalyzerData');
-				element.setAttribute('style', 'display: none');
+				container.setAttribute('id',    'wappalyzerData');
+				container.setAttribute('style', 'display: none');
 
 				var script = document.createElement('script');
 
 				script.setAttribute('id', 'wappalyzerEnvDetection');
-				script.setAttribute('id', 'text/javascript');
 
-				script.innerHTML = '(function() {' +
+				script.innerHTML =
+					'(function() {' +
 						'try {' +
-							'var event = document.createEvent("Events");' +
+							'var i, environmentVars, event = document.createEvent("Events");' +
 							'event.initEvent("wappalyzerEvent", true, false);' +
-							'var environmentVars = "";' +
-							'for ( var i in window ) { environmentVars += i + " "; }' +
+							'for ( i in window ) { environmentVars += i + " "; }' +
 							'document.getElementById("wappalyzerData").appendChild(document.createComment(environmentVars));' +
 							'document.getElementById("wappalyzerData").dispatchEvent(event);' +
 						'}' +
 						'catch(e) { }' +
 					'})();';
 
-				element.addEventListener('wappalyzerEvent', (function(event) {
-					environmentVars = event.target.childNodes[0].nodeValue;
-
-					self.log('getEnvironmentVars: ' + environmentVars);
+				container.addEventListener('wappalyzerEvent', (function(event) {
+					var environmentVars = event.target.childNodes[0].nodeValue;
 
-					document.documentElement.removeChild(element);
+					document.documentElement.removeChild(container);
 					document.documentElement.removeChild(script);
 
-					chrome.extension.sendRequest({
-						html: document.documentElement.innerHTML,
-						msg: 'analyze',
-						env: environmentVars.split(' ')
-					});
+					c.log('getEnvironmentVars: ' + environmentVars);
+
+					environmentVars = environmentVars.split(' ');
+
+					chrome.extension.sendRequest({ id: 'analyze', subject: { env: environmentVars } });
 				}), true);
 
-				document.documentElement.appendChild(element);
+				document.documentElement.appendChild(container);
 				document.documentElement.appendChild(script);
-			} catch(e) { }
+			} catch(e) {
+				c.log('Error: ' + e);
+			}
+		},
+
+		getResponseHeaders: function() {
+			var xhr = new XMLHttpRequest();
+
+			xhr.open('GET', window.location, true);
+
+			xhr.onreadystatechange = function() {
+				if ( xhr.readyState === 4 && xhr.status ) {
+					var headers = xhr.getAllResponseHeaders().split("\n");
+
+					if ( headers.length > 0 && headers[0] != '' ) {
+						c.log('responseHeaders: ' + xhr.getAllResponseHeaders());
+
+						var responseHeaders = {};
 
-			return environmentVars;
+						headers.forEach(function(line) {
+							if ( line ) {
+								name  = line.substring(0, line.indexOf(': '));
+								value = line.substring(line.indexOf(': ') + 2, line.length - 1);
+
+								responseHeaders[name] = value;
+							}
+						});
+
+						chrome.extension.sendRequest({ id: 'analyze', subject: { headers: responseHeaders } });
+					}
+				}
+			}
+
+			xhr.send();
 		}
 	}
 
-	self.init();
-
-	return self;
+	c.init();
 })();
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index 3772ccf75..75de3384b 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -3,12 +3,11 @@
  */
 
 (function() {
-	if ( wappalyzer == null ) return;
+	if ( wappalyzer == null ) { return; }
 
 	var w = wappalyzer;
 
 	var
-		debug = true,
 		tab,
 		tabCache = {}
 		;
@@ -18,9 +17,7 @@
 		 * Log messages to console
 		 */
 		log: function(args) {
-			if ( debug ) {
-				console.log(args.message);
-			}
+			console.log(args.message);
 		},
 
 		/**
@@ -32,21 +29,18 @@
 			chrome.browserAction.setBadgeBackgroundColor({ color: [255, 102, 0, 255] });
 
 			chrome.extension.onRequest.addListener(function(request, sender, sendResponse) {
-				if ( typeof(request.msg != 'undefined' ) ) {
-					w.log('request: ' + request.msg);
+				if ( typeof request.id != 'undefined' ) {
+					w.log('request: ' + request.id);
+
+					switch ( request.id ) {
+						case 'log':
+							w.log(request.message);
 
-					switch ( request.msg ) {
+							break;
 						case 'analyze':
 							tab = sender.tab;
 
-							chrome.browserAction.setBadgeText({ tabId: tab.id, text: '' });
-
-							tabCache[tab.id] = {
-								count: 0,
-								appsDetected: {}
-								};
-
-							w.analyze(tab.url, tab.url, { html: request.html, env: request.env });
+							w.analyze(tab.url, tab.url, request.subject);
 
 							break;
 						case 'get_apps':
@@ -83,180 +77,11 @@
 				appsDetected: w.detected[tab.url]
 				};
 
-			chrome.browserAction.setBadgeText({ tabId: tab.id, text: count });
-		},
-	};
-
-	w.init();
-})();
-
-/*
-var wappalyzer = (function(){
-	self = {
-		debug:    false,
-		tabCache: {},
-
-		log: function(message) {
-			if ( self.debug && message ) {
-				console.log(message);
+			if ( count > 0 ) {
+				chrome.browserAction.setBadgeText({ tabId: tab.id, text: count });
 			}
 		},
-
-		init: function() {
-			self.log('init');
-
-			chrome.browserAction.setBadgeBackgroundColor({ color: [255, 102, 0, 255] });
-
-			chrome.extension.onRequest.addListener(function(request, sender, sendResponse) {
-				if ( typeof(request.msg != 'undefined' ) ) {
-					self.log('request: ' + request.msg);
-
-					switch ( request.msg ) {
-						case 'analyze':
-							wappalyzer.analyze(sender.tab.id, sender.tab.url, request.html, request.env);
-
-							break;
-						case 'get_apps':
-							sendResponse({ tabCache: wappalyzer.tabCache[request.tab.id] });
-
-							break;
-					}
-				}
-			});
-
-			chrome.tabs.getAllInWindow(null, function(tabs) {
-				for ( i in tabs ) {
-					if ( tabs[i].url.match(/https?:\/\//) ) {
-				chrome.tabs.executeScript(tabs[i].id, { file: 'content.js' });
-				}
-				}
-			});
-
-			chrome.tabs.onRemoved.addListener(function(tabId) {
-				self.log('remove tab');
-
-				wappalyzer.tabCache[tabId] = null;
-			});
-		},
-
-		analyze: function(tabId, url, html, environmentVars) {
-			var app;
-			chrome.browserAction.setBadgeText({ tabId: tabId, text: '' });
-
-			wappalyzer.tabCache[tabId] = {
-				count: 0,
-				appsDetected: {}
-			};
-
-			if ( html && html.length > 50000 ) {
-				html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
-			}
-
-			for ( var appName in wappalyzer.apps ) {
-				app = wappalyzer.apps[appName];
-				// Scan html
-				if ( html ) {
-
-					if ( typeof(wappalyzer.tabCache[tabId].appsDetected[appName]) == 'undefined' ) {
-						if ( typeof(app.html) != 'undefined' ) {
-							var regex = app.html;
-
-							if ( regex.test(html) ) {
-								wappalyzer.register(tabId, appName);
-							}
-						}
-					}
-				}
-
-				// Scan script tags
-				if ( html && typeof app.script != 'undefined' ) {
-					var
-						regex = /<script[^>]+src=("|')([^"']+)\1/ig,
-									match = []
-										;
-
-					while ( match = regex.exec(html) ) {
-						if ( app.script.test(match[2]) ) {
-							wappalyzer.register(tabId, appName);
-
-							break;
-						}
-					}
-				}
-
-				// Scan meta tags
-				if ( html && typeof app.meta != 'undefined' ) {
-					var
-						regex = /<meta[^>]+>/ig,
-									match = []
-										;
-
-					while ( match = regex.exec(html) ) {
-						for ( meta in app.meta ) {
-							if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
-								var content = match.toString().match(/content=("|')([^"']+)("|')/i);
-
-								if ( app.meta[meta].test(content[2]) ) {
-									wappalyzer.register(tabId, appName);
-
-									break;
-								}
-							}
-						}
-					}
-				}
-
-				// Scan url
-				if ( typeof(wappalyzer.tabCache[tabId].appsDetected[appName]) == 'undefined' ) {
-					if ( url && typeof(app.url) != 'undefined' ) {
-						var regex = app.url;
-
-						if ( regex.test(url) ) {
-							wappalyzer.register(tabId, appName);
-						}
-					}
-				}
-
-				// Scan environment variables
-				if ( typeof(wappalyzer.tabCache[tabId].appsDetected[appName]) == 'undefined' ) {
-					if ( environmentVars && typeof app.env != 'undefined' ) {
-						var regex = app.env;
-
-						for ( var i in environmentVars ) {
-							try {
-								if ( regex.test(environmentVars[i]) ) {
-									wappalyzer.register(tabId, appName);
-								}
-							}
-							catch(e) { }
-						}
-					}
-				}
-			}
-
-			html = null;
-		},
-
-		register: function(tabId, appName) {
-			wappalyzer.tabCache[tabId].appsDetected[appName] = {
-				cats: {},
-				name: appName
-			};
-
-			for ( cat in wappalyzer.apps[appName].cats ) {
-				wappalyzer.tabCache[tabId].appsDetected[appName].cats[cat] = wappalyzer.cats[wappalyzer.apps[appName].cats[cat]];
-			}
-
-			wappalyzer.tabCache[tabId].count = 0;
-
-			for ( i in wappalyzer.tabCache[tabId].appsDetected ) {
-				wappalyzer.tabCache[tabId].count ++;
-			}
-
-			chrome.browserAction.setBadgeText({ tabId: tabId, text: wappalyzer.tabCache[tabId].count.toString() });
-		}
 	};
 
-	return self;
+	w.init();
 })();
-*/
diff --git a/drivers/chrome/js/locale.js b/drivers/chrome/js/locale.js
new file mode 100644
index 000000000..d23261706
--- /dev/null
+++ b/drivers/chrome/js/locale.js
@@ -0,0 +1,31 @@
+categoryNames = {
+	 1: 'CMS',
+	 2: 'Message Board',
+	 3: 'Database Manager',
+	 4: 'Documentation Tool',
+	 5: 'Widget',
+	 6: 'Web Shop',
+	 7: 'Photo Gallery',
+	 8: 'Wiki',
+	 9: 'Hosting Panel',
+	10: 'Analytics',
+	11: 'Blog',
+	12: 'Javascript Framework',
+	13: 'Issue Tracker',
+	14: 'Video Player',
+	15: 'Comment System',
+	16: 'Captcha',
+	17: 'Font Script',
+	18: 'Web Framework',
+	19: 'Miscellaneous',
+	20: 'Editor',
+	21: 'LMS',
+	22: 'Web Server',
+	23: 'Cache Tool',
+	24: 'Rich Text Editor',
+	25: 'Javascript Graphics',
+	26: 'Mobile Framework',
+	27: 'Programming Language',
+	28: 'Operating System',
+	29: 'Search Engine'
+	};
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 9bba571d2..b65181fc9 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -4,7 +4,7 @@
 		"32": "images/icon_32.png",
 		"128": "images/icon_128.png"
 	},
-	"version": "0.6",
+	"version": "0.8",
 	"description": "Identifies software on the web",
 	"browser_action": {
 		"default_icon": "images/icon_32.png",
diff --git a/drivers/chrome/popup.html b/drivers/chrome/popup.html
index f72552fa8..ac734254f 100644
--- a/drivers/chrome/popup.html
+++ b/drivers/chrome/popup.html
@@ -6,66 +6,30 @@
 
 		<script>
 			var wappalyzer = {};
-
-			categoryNames = {
-				 1: 'CMS',
-				 2: 'Message Boards',
-				 3: 'Database Managers',
-				 4: 'Documentation Tools',
-				 5: 'Widgets',
-				 6: 'Web Shops',
-				 7: 'Photo Galleries',
-				 8: 'Wikis',
-				 9: 'Hosting Panels',
-				10: 'Analytics',
-				11: 'Blogs',
-				12: 'Javascript Frameworks',
-				13: 'Issue Trackers',
-				14: 'Video Players',
-				15: 'Comment Systems',
-				16: 'Captchas',
-				17: 'Font Scripts',
-				18: 'Web Frameworks',
-				19: 'Miscellaneous',
-				20: 'Editors',
-				21: 'LMS',
-				22: 'Web Servers',
-				23: 'Cache Tools',
-				24: 'Rich Text Editors',
-				25: 'Javascript Graphics',
-				26: 'Mobile Frameworks',
-				27: 'Programming Languages',
-				28: 'Operating Systems',
-				29: 'Search Engines'
-				};
 		</script>
 
+		<script src="js/lib/jquery.min.js"></script>
 		<script src="js/apps.js"></script>
+		<script src="js/locale.js"></script>
 	</head>
 	<body>
 		<div id="detected-apps"></div>
 
 		<script>
-			console.log('popup.html');
-
-			var detectedApps = document.getElementById('detected-apps');
-
-			detectedApps.innerHTML = '<div class="empty">No applications detected.</div>';
+			$('#detected-apps').html('<div class="empty">No applications detected.</div>');
 
 			chrome.tabs.getSelected(null, function(tab) {
-				chrome.extension.sendRequest({ msg: 'get_apps', tab: tab }, function(response) {
-					if ( response.tabCache.count ) {
-						while ( detectedApps.childNodes.length > 0 ) {
-							detectedApps.removeChild(detectedApps.childNodes.item(0));
-						}
+				chrome.extension.sendRequest({ id: 'get_apps', tab: tab }, function(response) {
+					if ( response.tabCache.count > 0 ) {
+						$('#detected-apps').html('');
 
 						response.tabCache.appsDetected.map(function(appName) {
 							html =
-								'<a target="_blank" href="http://wappalyzer.com/applications/' + encodeURIComponent(appName) + '">' +
-									'<img src="images/icons/' + appName + '.png"/>' +
-									'<span class="label">' + appName + '</span>' +
-								'</a>'
-								;
+								'<div class="detected-app">' +
+									'<a target="_blank" href="http://wappalyzer.com/applications/' + encodeURIComponent(appName) + '">' +
+										'<img src="images/icons/' + appName + '.png"/>' +
+										'<span class="label">' + appName + '</span>' +
+									'</a>';
 
 							wappalyzer.apps[appName].cats.map(function(cat) {
 								html +=
@@ -74,15 +38,11 @@
 									'</a>';
 							});
 
-							html += '</a>';
-
-							var e = document.createElement('div');
-
-							e.setAttribute('class', 'detected-app');
-
-							e.innerHTML = html;
+							html +=
+									'</a>' +
+								'</div>';
 
-							detectedApps.appendChild(e);
+							$('#detected-apps').append(html);
 						});
 					}
 				});
diff --git a/drivers/firefox/.gitignore b/drivers/firefox/.gitignore
new file mode 100644
index 000000000..3a203c535
--- /dev/null
+++ b/drivers/firefox/.gitignore
@@ -0,0 +1 @@
+wappalyzer.xpi
