Merge branch 'master' of github.com:AliasIO/Wappalyzer

7 years ago · 41f10cac15
parent bffadd704f 5ae47cc9c6
commit 41f10cac15
11 changed files with 173 additions and 43 deletions
--- a/src/apps.json
+++ b/src/apps.json
@ -14,8 +14,8 @@
 				"1"
 			],
 			"headers": {
-				"Set-Cookie": "BITRIX_",
-				"X-Powered-CMS": "Bitrix Site Manager"
+				"Set-Cookie": "^BITRIX_",
+				"X-Powered-CMS": "^Bitrix Site Manager"
 			},
 			"html": "(?:<link[^>]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))",
 			"icon": "1C-Bitrix.png",
@ -589,7 +589,7 @@
 				"22"
 			],
 			"headers": {
-				"Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1+:",
+				"Server": "^Apache-Coyote(/1\\.1)?$\\;version:\\1?4.1+:",
 				"X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Apache Tomcat.svg",
@ -1225,7 +1225,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Powered-By": "Dragonfly CMS"
+				"X-Powered-By": "^Dragonfly CMS"
 			},
 			"icon": "CPG Dragonfly.png",
 			"implies": "PHP",
@ -1776,7 +1776,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Powered-By": "CppCMS/([\\d.]+)\\;version:\\1"
+				"X-Powered-By": "^CppCMS/([\\d.]+)$\\;version:\\1"
 			},
 			"icon": "CppCMS.png",
 			"implies": "C\\+\\+",
@ -1787,8 +1787,8 @@
 				"1"
 			],
 			"headers": {
-				"Set-Cookie": "CraftSessionId=",
-				"X-Powered-By": "Craft CMS"
+				"Set-Cookie": "^CraftSessionId=",
+				"X-Powered-By": "^Craft CMS$"
 			},
 			"icon": "Craft CMS.svg",
 			"implies": "Yii",
@ -1821,6 +1821,15 @@
 			"script": "tag\\.crsspxl\\.com/s1\\.js",
 			"website": "http://datadesk.crsspxl.com"
 		},
+    "Crypto-Loot": {
+			"cats": [
+				"19"
+			],
+			"env": "^CryptoLoot$",
+			"script": "^(?:https):?//crypto-loot\\.com/lib/",
+			"icon": "Crypto-Loot.png",
+			"website": "https://crypto-loot.com/"
+		},
 		"CubeCart": {
 			"cats": [
 				"6"
@ -2143,12 +2152,12 @@
 				"8"
 			],
 			"headers": {
-				"Set-Cookie": "DokuWiki="
+				"Set-Cookie": "^DokuWiki="
 			},
 			"icon": "DokuWiki.png",
 			"implies": "PHP",
 			"meta": {
-				"generator": "DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
+				"generator": "^DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
 			},
 			"website": "http://www.dokuwiki.org"
 		},
@ -2648,7 +2657,7 @@
 				"18"
 			],
 			"headers": {
-				"X-Powered-By": "Fat-Free Framework"
+				"X-Powered-By": "^Fat-Free Framework$"
 			},
 			"icon": "Fat-Free Framework.png",
 			"implies": "PHP",
@ -2722,7 +2731,7 @@
 			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
 			"icon": "FlexCMP.png",
 			"meta": {
-				"generator": "FlexCMP"
+				"generator": "^FlexCMP"
 			},
 			"website": "http://www.flexcmp.com/cms/home"
 		},
@ -2854,10 +2863,10 @@
 			"cats": [
 				"20"
 			],
-			"html": "<html[^>]+urn:schemas-microsoft-com:office:office",
 			"icon": "FrontPage.png",
 			"meta": {
-				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1"
+				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1",
+				"ProgId": "^FrontPage\\."
 			},
 			"website": "http://office.microsoft.com/frontpage"
 		},
@ -4236,6 +4245,15 @@
 			"url": "option=com_",
 			"website": "http://joomla.org"
 		},
+		"JSEcoin": {
+			"cats": [
+				"19"
+			],
+			"env": "^jseMine$",
+			"script": "^(?:https):?//load\\.jsecoin\\.com/server/load/",
+			"icon": "JSEcoin.png",
+			"website": "https://jsecoin.com/"
+		},
 		"K2": {
 			"cats": [
 				"19"
@ -5145,7 +5163,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Powered-By": "Medium"
+				"X-Powered-By": "^Medium$"
 			},
 			"icon": "Medium.svg",
 			"script": "medium\\.com",
@ -5229,6 +5247,18 @@
 			"icon": "Microsoft.svg",
 			"website": "http://microsoft.com"
 		},
+		"Microsoft Excel": {
+			"cats": [
+				"20"
+			],
+			"icon": "Microsoft Excel.svg",
+			"html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:excel\"|<!--\\s*(?:START|END) OF OUTPUT FROM EXCEL PUBLISH AS WEB PAGE WIZARD\\s*-->|<div [^>]*x:publishsource=\"?Excel\"?)",
+			"meta": {
+				"generator": "Microsoft Excel( [\\d.]+)?\\;version:\\1",
+				"ProgId": "^Excel\\."
+			},
+			"website": "https://office.microsoft.com/excel"
+		},
 		"Microsoft SharePoint": {
 			"cats": [
 				"1"
@ -5246,6 +5276,18 @@
 			},
 			"website": "http://sharepoint.microsoft.com"
 		},
+		"Microsoft Word": {
+			"cats": [
+				"20"
+			],
+			"icon": "Microsoft Word.svg",
+			"html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:word\"|<w:WordDocument>|<div [^>]*class=\"?WordSection1[\" >]|<style[^>]*>[^>]*@page WordSection1)",
+			"meta": {
+				"generator": "Microsoft Word( [\\d.]+)?\\;version:\\1",
+				"ProgId": "^Word\\."
+			},
+			"website": "https://office.microsoft.com/word"
+		},
 		"Mietshop": {
 			"cats": [
 				"6"
@ -5373,7 +5415,8 @@
 				"18"
 			],
 			"headers": {
-				"x-powered-by": "mojolicious"
+				"x-powered-by": "mojolicious",
+				"server": "^mojolicious"
 			},
 			"icon": "Mojolicious.png",
 			"implies": "Perl",
@ -5747,7 +5790,7 @@
 			"env": "^Nette$",
 			"headers": {
 				"Set-Cookie": "nette-browser=",
-				"X-Powered-By": "Nette Framework"
+				"X-Powered-By": "^Nette Framework"
 			},
 			"html": [
 				"<input[^>]+data-nette-rules",
@ -6235,8 +6278,8 @@
 			],
 			"headers": {
 				"Server": "php/?([\\d.]+)?\\;version:\\1",
-				"Set-Cookie": "PHPSESSID",
-				"X-Powered-By": "php/?([\\d.]+)?\\;version:\\1"
+				"Set-Cookie": "^PHPSESSID",
+				"X-Powered-By": "^php/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "PHP.svg",
 			"url": "\\.php(?:$|\\?)",
@ -6454,7 +6497,7 @@
 				"18"
 			],
 			"headers": {
-				"X-Powered-By": "pimcore"
+				"X-Powered-By": "^pimcore$"
 			},
 			"icon": "pimcore.svg",
 			"implies": "PHP",
@ -6675,6 +6718,15 @@
 			"script": "^https?://(?:www\\.)?projectwonderful\\.com/(?:pwa\\.js|gen\\.php)",
 			"website": "http://projectwonderful.com"
 		},
+		"ProjectPoi": {
+			"cats": [
+				"19"
+			],
+			"env": "^ProjectPoi$",
+			"script": "^(?:https):?//ppoi\\.org/lib/",
+			"icon": "ProjectPoi.png",
+			"website": "https://ppoi.org/"
+		},
 		"Prospector": {
 			"cats": [
 				"36"
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@ -18,8 +18,8 @@
    console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
  };

-  function getEnvironmentVars() {
-    wappalyzer.log('func: getEnvironmentVars');
+  function getPageContent() {
+    wappalyzer.log('func: getPageContent');

    var env = [];

@ -27,9 +27,15 @@
      env.push(i);
    }

+    var scripts = Array.prototype.slice
+      .apply(document.scripts)
+      .filter(s => s.src)
+      .map(s => s.src);
+
    wappalyzer.analyze(domain, url, {
      html: document.documentElement.innerHTML,
-      env: env
+      env: env,
+      scripts: scripts
    });
  }

@ -56,7 +62,10 @@
              name  = line.substring(0, line.indexOf(': '));
              value = line.substring(line.indexOf(': ') + 2, line.length - 1);

-              responseHeaders[name.toLowerCase()] = value;
+              if ( !responseHeaders[name.toLowerCase()] ){
+                responseHeaders[name.toLowerCase()] = []
+              }
+              responseHeaders[name.toLowerCase()].push(value);
            }
          });

@ -139,6 +148,6 @@
    return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
  }

-  getEnvironmentVars();
+  getPageContent();
  getResponseHeaders();
 })();
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@ -72,18 +72,26 @@ const driver = options => {
              const headers = {};

              browser.resources['0'].response.headers._headers.forEach(header => {
-                headers[header[0]] = header[1];
+                if ( !headers[header[0]] ){
+                  headers[header[0]] = [];
+                }
+                headers[header[0]].push(header[1]);
              });

              const vars = Object.getOwnPropertyNames(browser.window);
              const html = browser.html();
+              const scripts = Array.prototype.slice
+                .apply(browser.document.scripts)
+                .filter(s => s.src)
+                .map(s => s.src);

            const hostname = wappalyzer.parseUrl(url).hostname;

              wappalyzer.analyze(hostname, url, {
                headers,
                html,
-                env: vars
+                env: vars,
+                scripts
              });
            });
        });
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@ -7,6 +7,11 @@ if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) {
    html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
  }

+  var scripts = Array.prototype.slice
+      .apply(document.scripts)
+      .filter(s => s.src)
+      .map(s => s.src);
+
  try {
    browser.runtime.sendMessage({
      id: 'analyze',
@ -14,6 +19,12 @@ if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) {
      source: 'content.js'
    });

+    browser.runtime.sendMessage({
+      id: 'analyze',
+      subject: { scripts },
+      source: 'content.js'
+    });
+
    var container = document.createElement('wappalyzerData');

    container.setAttribute('id',    'wappalyzerData');
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@ -138,20 +138,23 @@ browser.webRequest.onCompleted.addListener(request => {
    var url = wappalyzer.parseUrl(request.url);

    request.responseHeaders.forEach(function(header) {
-      responseHeaders[header.name.toLowerCase()] = header.value || '' + header.binaryValue;
+      if ( !responseHeaders[header.name.toLowerCase()] ) {
+        responseHeaders[header.name.toLowerCase()] = []
+      }
+      responseHeaders[header.name.toLowerCase()].push(header.value || '' + header.binaryValue);
    });

    if ( headersCache.length > 50 ) {
      headersCache = {};
    }

-    if ( /text\/html/.test(responseHeaders['content-type']) ) {
+    if ( /text\/html/.test(responseHeaders['content-type'][0]) ) {
      if ( headersCache[url.canonical] === undefined ) {
        headersCache[url.canonical] = {};
      }

      Object.keys(responseHeaders).forEach(header => {
-        headersCache[url.canonical][header] = responseHeaders[header];
+        headersCache[url.canonical][header] = responseHeaders[header].slice();
      });
    }
  }
--- a/src/icons/Crypto-Loot.png
+++ b/src/icons/Crypto-Loot.png
--- a/src/icons/JSEcoin.png
+++ b/src/icons/JSEcoin.png
--- a/src/icons/Microsoft
+++ b/src/icons/Microsoft
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="110.03758" height="107.5" viewBox="0 0 88.030066 86" version="1.1" id="svg2" inkscape:version="0.48.3.1 r9886" sodipodi:docname="word.svg">
+  <metadata id="metadata126">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs124"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" inkscape:window-height="960" id="namedview122" showgrid="false" inkscape:zoom="1.0905983" inkscape:cx="344.89442" inkscape:cy="53.75" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"/>
+  <path d="m 46.04,0 5.94,0 c 0,2.67 0,5.33 0,8 10.01,0 20.02,0.02 30.03,-0.03 1.69,0.07 3.55,-0.05 5.02,0.96 1.03,1.48 0.91,3.36 0.98,5.06 -0.05,17.36 -0.03,34.71 -0.02,52.06 -0.05,2.91 0.27,5.88 -0.34,8.75 -0.4,2.08 -2.9,2.13 -4.57,2.2 -10.36,0.03 -20.73,-0.02 -31.1,0 0,3 0,6 0,9 l -6.21,0 C 30.53,83.23 15.26,80.67 0,78 0,54.67 0,31.34 0,8.01 15.35,5.34 30.7,2.71 46.04,0 z" id="path10" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 51.98,11 c 11,0 22,0 33,0 0,21 0,42 0,63 -11,0 -22,0 -33,0 0,-2 0,-4 0,-6 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-2 0,-4 0,-6 z" id="path48" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 63.98,17 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path58" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 29.62,26.37 c 2.26,-0.16 4.53,-0.3 6.8,-0.41 -2.67,5.47 -5.35,10.94 -8.07,16.39 2.75,5.6 5.56,11.16 8.32,16.76 -2.41,-0.14 -4.81,-0.29 -7.22,-0.46 -1.7,-4.17 -3.77,-8.2 -4.99,-12.56 -1.36,4.06 -3.3,7.89 -4.86,11.87 -2.19,-0.03 -4.38,-0.12 -6.57,-0.21 2.57,-5.03 5.05,-10.1 7.7,-15.1 -2.25,-5.15 -4.72,-10.2 -7.04,-15.32 2.2,-0.13 4.4,-0.26 6.6,-0.38 1.49,3.91 3.12,7.77 4.35,11.78 1.32,-4.25 3.29,-8.25 4.98,-12.36 z" id="path72" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 63.98,28 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path90" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 63.98,39 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path108" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 63.98,50 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path114" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 63.98,61 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path120" inkscape:connector-curvature="0" style="fill:#207245"/>
+</svg>
--- a/src/icons/Microsoft
+++ b/src/icons/Microsoft
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="110.03056" height="107.5" viewBox="0 0 88.024445 86" version="1.1" id="svg2" inkscape:version="0.48.3.1 r9886" sodipodi:docname="Microsoft-Office-2013-lineup.svg">
+  <metadata id="metadata126">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs124"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" inkscape:window-height="960" id="namedview122" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="1.0905983" inkscape:cx="321.51598" inkscape:cy="53.75" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2"/>
+  <g id="g3103" transform="translate(-21.015556,0)">
+    <path id="path6" d="M 67.02,0 73,0 c 0,2.67 0,5.33 0,8 10.7,0.06 21.39,-0.11 32.08,0.06 2.28,-0.23 4.07,1.54 3.86,3.82 0.17,19.7 -0.04,39.41 0.1,59.11 -0.1,2.02 0.2,4.26 -0.97,6.05 -1.46,1.04 -3.35,0.91 -5.05,0.99 C 93.01,77.98 83.01,78 73,78 c 0,2.67 0,5.33 0,8 l -6.25,0 C 51.53,83.22 36.27,80.67 21.02,78 21.01,54.67 21.02,31.34 21.02,8.02 36.35,5.34 51.69,2.73 67.02,0 z" inkscape:connector-curvature="0" style="fill:#2a5699"/>
+    <path id="path46" d="m 73,11 c 11,0 22,0 33,0 0,21.33 0,42.67 0,64 -11,0 -22,0 -33,0 0,-2.67 0,-5.33 0,-8 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-2.33 0,-4.67 0,-7 z" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+    <path id="path88" d="m 41.68,28.67 c 1.9,-0.11 3.8,-0.19 5.7,-0.29 1.33,6.75 2.69,13.49 4.13,20.21 1.13,-6.94 2.38,-13.86 3.59,-20.79 2,-0.07 4,-0.18 5.99,-0.3 -2.26,9.69 -4.24,19.46 -6.71,29.09 -1.67,0.87 -4.17,-0.04 -6.15,0.1 -1.33,-6.62 -2.88,-13.2 -4.07,-19.85 -1.17,6.46 -2.69,12.86 -4.03,19.28 -1.92,-0.1 -3.85,-0.22 -5.78,-0.35 -1.66,-8.8 -3.61,-17.54 -5.16,-26.36 1.71,-0.08 3.43,-0.15 5.14,-0.21 1.03,6.37 2.2,12.71 3.1,19.09 1.41,-6.54 2.85,-13.08 4.25,-19.62 z" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  </g>
+</svg>
--- a/src/icons/ProjectPoi.png
+++ b/src/icons/ProjectPoi.png
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@ -62,10 +62,13 @@ class Wappalyzer {

      if ( data.html ) {
        this.analyzeHtml(app, data.html);
-        this.analyzeScript(app, data.html);
        this.analyzeMeta(app, data.html);
      }

+      if ( data.scripts ) {
+        this.analyzeScripts(app, data.scripts);
+      }
+      
      if ( data.headers ) {
        this.analyzeHeaders(app, data.headers);
      }
@ -396,20 +399,19 @@ class Wappalyzer {
  /**
   * Analyze script tag
   */
-  analyzeScript(app, html) {
-    var regex = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
+  analyzeScripts(app, scripts) {
    var patterns = this.parsePatterns(app.props.script);

    if ( patterns.length ) {
      patterns.forEach(pattern => {
        var match;

-        while ( ( match = regex.exec(html) ) ) {
-          if ( pattern.regex.test(match[2]) ) {
-            this.addDetected(app, pattern, 'script', match[2]);
-          }
+        scripts.forEach(uri => {
+          if ( pattern.regex.test(uri) ) {
+            this.addDetected(app, pattern, 'script', uri);
          }
        });
+      });
    }
  }

@ -444,12 +446,16 @@ class Wappalyzer {
    var patterns = this.parsePatterns(app.props.headers);

    if ( headers ) {
-      Object.keys(patterns).forEach(header => {
-        patterns[header].forEach(pattern => {
-          header = header.toLowerCase();
+      Object.keys(patterns).forEach(headerName => {
+        patterns[headerName].forEach(pattern => {
+          headerName = headerName.toLowerCase();

-          if ( header in headers && pattern.regex.test(headers[header]) ) {
-            this.addDetected(app, pattern, 'headers', headers[header], header);
+          if ( headerName in headers ) {
+            headers[headerName].forEach(headerValue => {
+              if ( pattern.regex.test(headerValue) ) {
+                this.addDetected(app, pattern, 'headers', headerValue, headerName);
+              }
+            });
          }
        });
      });