Merge branch 'master' of github.com:AliasIO/Wappalyzer into feature/chorus-detection

src/apps.json

@@ -107,13 +107,27 @@
       },
       "website": "http://awstats.sourceforge.net"
     },
-    "Accelerated Mobile Pages": {
+    "AMP": {
       "cats": [
         12
       ],
-      "html": "<html[^>]* (?:amp|⚡)",
+      "html": "<html[^>]* (?:amp|⚡)[^-]",
       "icon": "Accelerated-Mobile-Pages.svg",
-      "website": "https://www.ampproject.org"
+      "website": "https://www.amp.dev"
+    },
+    "AMP Plugin": {
+      "cats": [
+        1,
+        5
+      ],
+      "icon": "Accelerated-Mobile-Pages.svg",
+      "implies": [
+        "WordPress"
+      ],
+      "meta": {
+        "generator": "^AMP Plugin v(\\d+\\.\\d+.*)$\\;version:\\1"
+      },
+      "website": "https://amp-wp.org"
     },
     "Azure": {
       "cats": [
@@ -774,9 +788,6 @@
         "<i class=\"anticon anticon-"
       ],
       "icon": "Ant Design.svg",
-      "implies": [
-        "React"
-      ],
       "js": {
         "antd": ""
       },
@@ -2431,6 +2442,24 @@
       "script": "dhtmlxcommon\\.js",
       "website": "http://dhtmlx.com"
     },
+    "DERAK.CLOUD": {
+      "cats": [
+        31
+      ],
+      "headers": {
+        "Server": "^DERAK.CLOUD$",
+        "Derak-Umbrage": ""
+      },
+      "icon": "DerakCloud.png",
+      "cookies": {
+        "__derak_auth": "",
+        "__derak_user": ""
+      },
+      "js": {
+        "derakCloud.init": ""
+      },
+      "website": "https://derak.cloud/"
+    },
     "DM Polopoly": {
       "cats": [
         1
@@ -3164,11 +3193,15 @@
     },
     "Essential JS 2": {
       "cats": [
-        12, 18, 59
+        12,
+        18,
+        59
       ],
       "icon": "syncfusion.svg",
       "website": "https://www.syncfusion.com/javascript-ui-controls",
-      "js": { "ej.base": "" },
+      "js": {
+        "ej.base": ""
+      },
       "html": "<[^<]* class=\"[^<]*\be-control\b[^-][^<]*\be-lib\b[^>]*\"[^>]*>"
     },
     "Etherpad": {
@@ -8912,6 +8945,8 @@
       ],
       "html": "<script[^>]*>\\s*Raven\\.config\\('[^']*', {\\s+release: '([0-9\\.]+)'\\;version:\\1",
       "js": {
+        "Sentry": "",
+        "Sentry.SDK_VERSION": "(.+)\\;version:\\1",
         "Raven.config": "",
         "ravenOptions.whitelistUrls": ""
       },
@@ -9341,8 +9376,8 @@
         "Shopify": "\\;confidence:25"
       },
       "headers": {
-        "x-shopid": "*\\;confidence:50",
-        "x-shopify-stage": "*\\;confidence:50"
+        "x-shopid": "\\;confidence:50",
+        "x-shopify-stage": "\\;confidence:50"
       },
       "url": "^https?//.+\\.myshopify\\.com",
       "website": "http://shopify.com"
@@ -11495,7 +11530,9 @@
     },
     "Wix": {
       "cats": [
-        1
+        1,
+        6,
+        11
       ],
       "cookies": {
         "Domain": "\\.wix\\.com"
@@ -11506,13 +11543,17 @@
         "X-Wix-Server-Artifact-Id": ""
       },
       "icon": "Wix.png",
+      "implies": [
+        "React"
+      ],
       "js": {
-        "wixData": "",
-        "wixErrors": "",
-        "wixEvents": ""
+        "wixBiSession": ""
       },
-      "script": "static\\.wixstatic\\.com",
-      "website": "http://wix.com"
+      "meta": {
+        "generator": "Wix\\.com Website Builder"
+      },
+      "script": "static\\.parastorage\\.com",
+      "website": "https://www.wix.com"
     },
     "Wolf CMS": {
       "cats": [
@@ -11582,7 +11623,6 @@
       ],
       "html": [
         "<link rel=[\"']stylesheet[\"'] [^>]+/wp-(?:content|includes)/",
-        "<div[^>]*class=[\"']amp-wp-",
         "<link[^>]+s\\d+\\.wp\\.com"
       ],
       "icon": "WordPress.svg",
@@ -13146,7 +13186,8 @@
       ],
       "html": [
         "<style[^>]*data-styled(?:-components)?[\\s\"]",
-        "<style[^>]+data-styled-version=\"([0-9]+)\"\\;version:\\1"
+        "<style[^>]+data-styled-version=\"([0-9]+)\"\\;version:\\1",
+        "<[^>]+sc-component-id: sc-"
       ],
       "icon": "styled-components.png",
       "implies": [
@@ -13320,10 +13361,12 @@
       "website": "https://webpack.js.org/"
     },
     "wisyCMS": {
-      "cats": [ "1" ],
+      "cats": [
+        "1"
+      ],
       "icon": "wisyCMS.svg",
       "meta": {
-            "generator": "^wisy CMS[ v]{0,3}([0-9.,]*)\\;version:\\1"
+        "generator": "^wisy CMS[ v]{0,3}([0-9.,]*)\\;version:\\1"
       },
       "website": "https://wisy.3we.de"
     },
@@ -13396,13 +13439,12 @@
         1,
         11
       ],
-      "html": [
-        "<link rel=[\"']stylesheet[\"'] [^>]+/halo-(?:backend|frontend|common)/"
-      ],
       "icon": "Halo.svg",
+      "meta": {
+        "generator": "Halo ([\\d.]+)?\\;version:\\1"
+      },
       "implies": "Java",
-      "script": "/halo-(?:backend|frontend|common)/",
-      "website": "https://github.com/ruibaby/halo"
+      "website": "https://halo.run"
     },
     "Rocket": {
       "cats": [
@@ -13436,7 +13478,9 @@
       "website": "https://zipkin.io/"
     },
     "RX Web Server": {
-      "cats": [22],
+      "cats": [
+        22
+      ],
       "headers": {
         "X-Powered-By": "RX-WEB"
       },

src/drivers/npm/Dockerfile

@@ -8,11 +8,14 @@ RUN apk update && apk add --no-cache \
 	nodejs \
 	nodejs-npm
 
-RUN mkdir -p "$WAPPALYZER_ROOT"
+RUN mkdir -p "$WAPPALYZER_ROOT/browsers"
 
 WORKDIR "$WAPPALYZER_ROOT"
 
 ADD apps.json .
+ADD browser.js .
+ADD browsers/zombie.js ./browsers
+ADD cli.js .
 ADD driver.js .
 ADD index.js .
 ADD package.json .
@@ -20,4 +23,4 @@ ADD wappalyzer.js .
 
 RUN npm i
 
-ENTRYPOINT ["node", "index.js"]
+ENTRYPOINT ["node", "cli.js"]

src/drivers/npm/driver.js

@@ -242,7 +242,15 @@ class Driver {
 
     const reducedLinks = Array.prototype.reduce.call(
       browser.links, (results, link) => {
-        if (link.protocol.match(/https?:/) && link.hostname === this.origPageUrl.hostname && extensions.test(link.pathname)) {
+        if (
+          results
+          && Object.prototype.hasOwnProperty.call(results, 'push')
+          && link.protocol
+          && link.protocol.match(/https?:/)
+          && link.rel !== 'nofollow'
+          && link.hostname === this.origPageUrl.hostname
+          && extensions.test(link.pathname)
+        ) {
           link.hash = '';
 
           results.push(url.parse(link.href));

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": "5.8.2",
+  "version": "5.8.3",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {

src/drivers/webextension/manifest.json

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

src/icons/Nuxt.js.svg

@@ -1,10 +1,7 @@
-<svg width="486px" height="346px" viewBox="0 0 486 346" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Nuxt Logo</title>
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g fill-rule="nonzero">
-            <polygon id="Shape" fill="#42B883" points="200 0 400 346 0 346"></polygon>
-            <polygon id="Shape" fill="#3C8171" points="311 43 486 346 136 346"></polygon>
-            <polygon id="Shape" fill="#35495E" points="267.945522 117 400 345.454247 136 345.454247"></polygon>
-        </g>
-    </g>
+<svg width="400" height="400" viewBox="0 0 400 400" version="1" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(0 49)" fill="none" fill-rule="evenodd">
+    <path d="M123 292l-1-1c-2-4-2-8-2-12H25L167 27l59 107 19-14-59-107c-1-2-8-13-20-13-5 0-13 2-19 13L4 268c-1 2-7 14-1 24 2 5 8 10 21 10h120c-13 0-19-5-21-10z" fill="#00C58E"/>
+    <path d="M395 269L280 62c-2-2-8-13-20-13-5 0-12 2-19 13l-15 24v48l34-59 114 204h-43a20 20 0 0 1-2 12v1c-6 10-19 10-21 10h68c2 0 15 0 21-10 2-5 4-13-2-23z" fill="#108775"/>
+    <path d="M332 292v-1l1-2c1-3 2-7 1-10l-4-11-90-158-13-24h-1l-13 24-91 158-3 11a21 21 0 0 0 2 13c3 5 9 10 21 10h168c3 0 16 0 22-10zM226 134l83 145H144l82-145z" fill="#2F495E" fill-rule="nonzero"/>
+  </g>
 </svg>