Merge branch 'js-field'

bin/validate

@@ -6,7 +6,7 @@ set -eu
 
 echo "Validating apps.json..."
 
-jsonlint-cli -s schema.json src/apps.json
+jsonlint-cli -tps schema.json src/apps.json > /tmp/apps.json && mv /tmp/apps.json src/apps.json
 
 echo "Validating regular expressions..."
 

schema.json

@@ -35,9 +35,9 @@
 						},
 						"required": true
 					},
-					"env": {
+					"js": {
-						"type": [ "string", "array" ],
+						"type": "object",
-						"items": {
+						"additionalProperties": {
 							"type": "string"
 						}
 					},

src/drivers/npm/driver.js

@@ -38,6 +38,8 @@ class Driver {
     this.wappalyzer.apps = json.apps;
     this.wappalyzer.categories = json.categories;
 
+    this.wappalyzer.parseJsPatterns();
+
     this.wappalyzer.driver.log = (message, source, type) => this.log(message, source, type);
     this.wappalyzer.driver.displayApps = (detected, meta, context) => this.displayApps(detected, meta, context);
   }
@@ -123,6 +125,28 @@ class Driver {
               .finally(() => {
                 this.timer('browser.wait end');
 
+                const headers = this.getHeaders(browser);
+                const html    = this.getHtml(browser);
+                const scripts = this.getScripts(browser);
+                const js      = this.getJs(browser);
+
+                this.wappalyzer.analyze(pageUrl.hostname, pageUrl.href, {
+                  headers,
+                  html,
+                  js,
+                  scripts
+                });
+
+                const links = browser.body.getElementsByTagName('a');
+
+                resolve(links);
+              });
+          });
+        });
+    });
+  }
+
+  getHeaders(browser) {
     const headers = {};
 
     browser.resources['0'].response.headers._headers.forEach(header => {
@@ -133,6 +157,10 @@ class Driver {
       headers[header[0]].push(header[1]);
     });
 
+    return headers;
+  }
+
+  getHtml(browser) {
     let html = '';
 
     try {
@@ -141,26 +169,45 @@ class Driver {
       this.wappalyzer.log(error.message, 'browser', 'error');
     }
 
-                const vars = Object.getOwnPropertyNames(browser.window);
+    return html;
+  }
+
+  getScripts(browser) {
     const scripts = Array.prototype.slice
       .apply(browser.document.scripts)
       .filter(s => s.src)
       .map(s => s.src);
 
-                this.wappalyzer.analyze(pageUrl.hostname, pageUrl.href, {
+    return scripts;
-                  headers,
+  }
-                  html,
-                  env: vars,
-                  scripts
-                });
 
-                const links = browser.body.getElementsByTagName('a');
+  getJs(browser) {
+    const patterns = this.wappalyzer.jsPatterns;
+    const js = {};
 
-                resolve(links);
+    Object.keys(patterns).forEach(appName => {
-              });
+      js[appName] = {};
+
+      Object.keys(patterns[appName]).forEach(chain => {
+        js[appName][chain] = {};
+
+        patterns[appName][chain].forEach((pattern, index) => {
+          const properties = chain.split('.');
+
+          let value = properties.reduce((parent, property) => {
+            return parent && parent.hasOwnProperty(property) ? parent[property] : null;
+          }, browser.window);
+
+          value = typeof value === 'string' ? value : !!value;
+
+          if ( value ) {
+            js[appName][chain][index] = value;
+          }
         });
       });
     });
+
+    return js;
   }
 
   crawl(pageUrl, index = 1, depth = 1) {

src/drivers/webextension/js/content.js

@@ -1,58 +1,58 @@
 /** global: browser */
 
 if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) {
+  try {
     var html = document.documentElement.outerHTML;
 
     if ( html.length > 50000 ) {
       html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
     }
 
-  var scripts = Array.prototype.slice
+    const scripts = Array.prototype.slice
       .apply(document.scripts)
-      .filter(s => s.src)
+      .filter(script => script.src)
-      .map(s => s.src);
+      .map(script => script.src);
 
-  try {
     browser.runtime.sendMessage({
       id: 'analyze',
-      subject: { html },
+      subject: { html, scripts },
       source: 'content.js'
     });
 
+    const script = document.createElement('script');
+
+    script.onload = () => {
+      addEventListener('message', event => {
+        if ( event.data.id !== 'js' ) {
+          return;
+        }
+
         browser.runtime.sendMessage({
           id: 'analyze',
-      subject: { scripts },
+          subject: {
+            js: event.data.js
+          },
           source: 'content.js'
         });
+      }, true);
 
-    var container = document.createElement('wappalyzerData');
+      ( chrome || browser ).runtime.sendMessage({
-
+        id: 'init_js',
-    container.setAttribute('id',    'wappalyzerData');
+        subject: {},
-    container.setAttribute('style', 'display: none');
-
-    var script = document.createElement('script');
-
-    script.setAttribute('id', 'wappalyzerEnvDetection');
-    script.setAttribute('src', browser.extension.getURL('js/inject.js'));
-
-    container.addEventListener('wappalyzerEvent', (event => {
-      var env = event.target.childNodes[0].nodeValue;
-
-      document.documentElement.removeChild(container);
-      document.documentElement.removeChild(script);
-
-      env = env.split(' ').slice(0, 500);
-
-      browser.runtime.sendMessage({
-        id: 'analyze',
-        subject: { env },
         source: 'content.js'
+      }, response => {
+        postMessage({
+          id: 'patterns',
+          patterns: response.patterns
+        }, '*');
       });
-    }), true);
+    };
+
+    script.setAttribute('id', 'wappalyzer');
+    script.setAttribute('src', browser.extension.getURL('js/inject.js'));
 
-    document.documentElement.appendChild(container);
+    document.body.appendChild(script);
-    document.documentElement.appendChild(script);
+  } catch (e) {
-  } catch(e) {
     log(e);
   }
 }

src/drivers/webextension/js/driver.js

@@ -75,6 +75,8 @@ fetch('../apps.json')
     wappalyzer.apps = json.apps;
     wappalyzer.categories = json.categories;
 
+    wappalyzer.parseJsPatterns();
+
     categoryOrder = Object.keys(wappalyzer.categories).sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority);
   })
   .catch(error => {
@@ -191,6 +193,12 @@ browser.webRequest.onCompleted.addListener(request => {
           categories: wappalyzer.categories
         };
 
+        break;
+      case 'init_js':
+        response = {
+          patterns: wappalyzer.jsPatterns
+        };
+
         break;
       default:
     }

src/drivers/webextension/js/inject.js

@@ -1,16 +1,43 @@
 (function() {
 	try {
-		var i, environmentVars = '', e = document.createEvent('Events');
+    addEventListener('message', (event => {
+      if ( event.data.id !== 'patterns' ) {
+        return;
+      }
+
+      const patterns = event.data.patterns || {};
+
+      const js = {};
+
+      Object.keys(patterns).forEach(appName => {
+        js[appName] = {};
 
-		e.initEvent('wappalyzerEvent', true, false);
+        Object.keys(patterns[appName]).forEach(chain => {
+          js[appName][chain] = {};
 
-		for ( i in window ) {
+          patterns[appName][chain].forEach((pattern, index) => {
-			environmentVars += i + ' ';
+            const value = detectJs(chain);
+
+            if ( value ) {
+              js[appName][chain][index] = value;
             }
+          });
+        });
+      });
 
-		document.getElementById('wappalyzerData').appendChild(document.createComment(environmentVars));
+      postMessage({ id: 'js', js }, '*');
-		document.getElementById('wappalyzerData').dispatchEvent(e);
+    }), false);
   } catch(e) {
     // Fail quietly
   }
 }());
+
+function detectJs(chain) {
+  const properties = chain.split('.');
+
+  const value = properties.reduce((parent, property) => {
+    return parent && parent.hasOwnProperty(property) ? parent[property] : null;
+  }, window);
+
+  return typeof value === 'string' ? value : !!value;
+}

src/wappalyzer.js

@@ -18,6 +18,7 @@ class Wappalyzer {
     this.apps = {};
     this.categories = {};
     this.driver = {};
+    this.jsPatterns = {};
 
     this.detected = {};
     this.hostnameCache = {};
@@ -87,6 +88,12 @@ class Wappalyzer {
       }
     })
 
+    if ( data.js ) {
+      Object.keys(data.js).forEach(appName => {
+        this.analyzeJs(apps[appName], data.js[appName]);
+      });
+    }
+
     Object.keys(apps).forEach(appName => {
       var app = apps[appName];
 
@@ -249,6 +256,17 @@ class Wappalyzer {
     return parsed;
   }
 
+  /**
+   * Parse JavaScript patterns
+   */
+  parseJsPatterns() {
+    Object.keys(this.apps).forEach(appName => {
+      if ( this.apps[appName].js ) {
+        this.jsPatterns[appName] = this.parsePatterns(this.apps[appName].js);
+      }
+    });
+  }
+
   resolveExcludes(apps) {
     var excludes = [];
 
@@ -487,6 +505,25 @@ class Wappalyzer {
     }
   }
 
+  /**
+   * Analyze JavaScript variables
+   */
+  analyzeJs(app, results) {
+
+    console.log(app, results);
+
+    Object.keys(results).forEach(string => {
+      Object.keys(results[string]).forEach(index => {
+        const pattern = this.jsPatterns[app.name][string][index];
+        const value = results[string][index];
+
+        if ( pattern.regex.test(value) ) {
+          this.addDetected(app, pattern, 'js', value);
+        }
+      });
+    });
+  }
+
   /**
    * Analyze robots.txt
    */