From 2a7aea96a4e030d6ac2b12e458da0cdeac9c557c Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 11 Aug 2021 07:30:19 +1000
Subject: [PATCH] Add WorldPay detection

---
 src/drivers/npm/driver.js                     | 42 ++++++++++---------
 .../webextension/images/icons/WorldPay.svg    |  3 ++
 src/technologies.json                         | 19 +++++++--
 3 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 src/drivers/webextension/images/icons/WorldPay.svg

diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 26feedd2b..10412f193 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -580,7 +580,7 @@ class Site {
 
     try {
       await this.promiseTimeout(
-        page.goto(url.href, { waitUntil: 'domcontentloaded' }),
+        page.goto(url.href),
         undefined,
         'Timeout (navigation)'
       )
@@ -592,28 +592,30 @@ class Site {
       // page.on('console', (message) => this.log(message.text()))
 
       // Links
-      const links = await this.promiseTimeout(
-        (
-          await this.promiseTimeout(
-            page.evaluateHandle(() =>
-              Array.from(document.getElementsByTagName('a')).map(
-                ({ hash, hostname, href, pathname, protocol, rel }) => ({
-                  hash,
-                  hostname,
-                  href,
-                  pathname,
-                  protocol,
-                  rel,
-                })
+      const links = !this.options.recursive
+        ? []
+        : await this.promiseTimeout(
+            (
+              await this.promiseTimeout(
+                page.evaluateHandle(() =>
+                  Array.from(document.getElementsByTagName('a')).map(
+                    ({ hash, hostname, href, pathname, protocol, rel }) => ({
+                      hash,
+                      hostname,
+                      href,
+                      pathname,
+                      protocol,
+                      rel,
+                    })
+                  )
+                ),
+                { jsonValue: () => [] },
+                'Timeout (links)'
               )
-            ),
-            { jsonValue: () => [] },
+            ).jsonValue(),
+            [],
             'Timeout (links)'
           )
-        ).jsonValue(),
-        [],
-        'Timeout (links)'
-      )
 
       // CSS
       const css = await this.promiseTimeout(
diff --git a/src/drivers/webextension/images/icons/WorldPay.svg b/src/drivers/webextension/images/icons/WorldPay.svg
new file mode 100644
index 000000000..6e3470330
--- /dev/null
+++ b/src/drivers/webextension/images/icons/WorldPay.svg
@@ -0,0 +1,3 @@
+<svg width="61" height="59" viewBox="0 0 61 59" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.9 51.9C40.3 50.8 43 49.5 45.5 48C43.1 50.8 40.4 51.5 37.9 51.9ZM32.1 56.9C31.9 56.9 29.8 56.9 29.8 56.2C29.8 55.8 30.5 54.5 31 54.3C32.2 53.8 34.9 53.1 35.1 53.1C35.3 53.1 37.5 53.4 37.7 53.4C37.9 53.4 39.4 53.3 40.4 53.1C41.5 52.8 42.8 52.4 44 51.6C45.2 50.9 47.1 49.3 47.9 48C48.4 47.3 48.6 46.3 49.2 45.6C49.9 44.6 51.4 43.8 52.5 42.7C53.7 41.5 54.8 40.3 55.9 39C53.7 49.3 40.1 56.9 32.1 56.9ZM37.1 0.5C41.3 1.4 46.1 3.2 50.3 7.3C51.6 8.6 52.8 10.4 53.3 11.8C53.5 12.4 53.5 13.3 54 13.9C54.7 14.9 55.8 15.7 56.6 16.8C57.7 17.9 58.3 19.2 58.9 20.5C59.1 20.9 59.2 21.5 59.5 22C59.8 22.7 60.4 25.8 60.4 26.9C60.4 29.3 59.6 32.2 58.5 34.5C58.5 34.6 58.6 34.6 58.6 34.8V36.9C57.7 49.6 42.4 58.7 32.7 58.7C31.5 58.7 28.2 58.5 28.2 56.2C28.2 55.9 28.4 55.2 28.5 54.6C26.7 54.9 23.1 55.5 21 55.5C19.4 55.5 12.2 55.4 12.2 51.6C12.2 48 18.7 47.7 19.9 47.7C23.4 47.7 27 48.7 30.6 50.3C30 50.5 28.9 50.8 28.8 50.8C28.5 50.8 28.2 50.5 27.9 50.5C25.6 49.7 22.9 49.2 20.5 49.2C19.1 49.2 18.8 49.1 17.2 49.5C17 49.5 14.1 50.2 14.1 51.4C14.1 52.2 16.4 52.7 16.9 52.8C17.9 53 20 53.1 20.1 53.1C34.9 53.1 57.7 40.9 57.7 26.4C57.7 23.7 56.5 19.8 54 17.3C53.8 18.4 53.6 19.5 53.2 20.7C53 21.4 52.3 22.8 52.3 22.9C52.3 22.9 56.4 27.4 56.4 28.4C56.4 29 55.5 31.5 55.5 31.6C54.7 29.4 53.5 27.2 51.2 24.9C50.9 25.2 50.5 25.7 50.2 26.1C49.8 26.7 49.3 27.2 48.8 27.8C47.7 29 45.2 31.2 45.2 31.4C45.2 31.4 48.2 34.4 49.2 37.8C49.4 38.3 49.6 39.3 49.6 39.4C49.6 39.9 47.9 41 47.9 41C47.8 38.2 46.7 35.2 43.6 32.4C40 35 36.3 37.2 32.7 38.9C34.9 40.7 36.1 43.3 36.1 45.2C36.1 46.1 35.6 48.1 35.2 48.3C34.7 48.6 34.1 48.8 33.5 49C34.2 48.2 34.7 46.3 34.7 45.5C34.7 44 33.7 41.7 32 40.5C31.6 40.3 31 39.7 30.8 39.7C30.6 39.7 28.5 40.6 27.3 41C26 41.5 24.6 41.9 23.2 42.3C19 43.5 15 44.3 10.9 44.3C9.3 44.3 2.4 44.1 2.4 40.4C2.4 34.9 15.2 34.4 16.9 34.4C20.7 34.4 24.4 34.8 28.3 36.5C27.6 36.7 26.1 37.3 26 37.3C25.8 37.3 21.4 36.1 17.6 36.1C15.9 36.1 13.7 36.3 12.1 36.6C10.8 36.9 9.4 37.2 8.3 37.7C7.9 37.8 4.8 39.1 4.8 40.3C4.8 40.5 5.3 40.8 5.6 41C7.3 41.8 8.8 41.7 10.4 41.7C26.1 41.7 50.1 29.4 51.5 16.7V14.6C50.8 6.3 37.8 0.9 31.5 0.9C31.3 0.9 30.3 1 29.6 1.1C30 1.3 30.5 1.3 30.9 1.4C31.2 1.5 31.6 1.7 32.1 1.8C32.8 2.1 33.9 2.6 34.7 3.3C35.3 3.8 35.6 4.5 36.2 4.9C36.6 5.3 37.4 5.2 38.1 5.5C40.3 6.2 42.9 7.1 45.1 8.1C46 8.6 47.2 9.1 48.2 9.7C48.5 10 48.8 10.4 49 10.8C49.4 11.5 49.9 12.5 50.1 13.4C45.8 10.2 41.5 8.5 37.2 7.1H37C37.2 9.3 36.3 11.5 34.7 13.8C39.4 15 44.4 16.8 49.3 20.2C49 20.8 48.7 21.4 48.3 22C46.2 20.5 44 19.4 41.9 18.4C41.4 18.2 34.4 15.6 33.4 15.6C33.1 15.6 31.5 17.2 30.6 18C28.4 19.8 26.1 21.2 23.9 22.5C29.9 23.3 36 24.6 42 28.6C41.6 29 40.7 29.8 40.4 29.8C40.2 29.8 38.7 28.7 37.7 28.2C33.5 26.1 25.4 24.2 20.5 24.2C20.1 24.2 15.3 26.3 14.1 26.6C10.7 27.6 7 28.8 3.5 28.8C2.3 28.8 0 28.7 0 26.8C0 23.1 13.2 22.2 14.1 22.2H17.4C15.3 23 12.8 23.9 10.9 24.4C9 24.9 7 25.2 5.2 25.8C4.9 25.9 4.5 26.1 4.2 26.3C4.2 26.3 4.1 26.4 4.4 26.4C4.6 26.4 7.3 26 8.8 25.7C16.3 23.9 24.5 20.9 31.9 14.1C33.7 12.4 35 10.2 35.5 8.3V7.4C35.2 5.6 32.6 3.7 30.9 3.2C29.7 2.8 27.7 2.4 27.4 2.4C27 2.4 26.4 2.6 26 3.3C28.6 3.9 31.7 3.3 34 6.6C34 6.6 34.1 6.7 34 6.8C33.3 6.6 25.2 4.7 23.9 4.7C23.4 4.7 19.5 7.4 18.6 8C16.1 9.5 13.5 10.9 11.1 12.1L19.6 12.2C23.3 12.4 27.6 12.9 31.4 13.7C31.2 13.8 29.7 15.3 29.4 15.3C29.2 15.3 26.6 14.8 25.3 14.6C22.9 14.3 20.4 14.2 17.9 14L7.1 14.2C6.5 14.1 5.4 14 5.4 13.1C5.4 12.4 6.3 11.9 7 11.6C7.5 11.4 8.1 11.1 8.6 10.9C13.9 8.7 19.4 5.7 24.8 2.3C24.5 2.4 24.2 2.4 24 2.4C23.8 2.4 23.1 2.5 22.6 2.6C22.7 2.7 22.8 2.7 22.8 2.7C22.1 3.1 20.8 3.9 20.6 3.9C20 3.9 19.2 3.2 19.2 2.7C19.2 1.2 22.6 1.1 22.8 1.1C26.2 1 26.4 1.2 26.7 1.2C26.9 1.2 28.3 0.499999 29.2 0.299999C30.5 -7.7486e-07 31.2 0 32.4 0C33.9 0 35.5 0.2 37.1 0.5Z" fill="#F11E15"/>
+</svg>
diff --git a/src/technologies.json b/src/technologies.json
index 8323a7620..3cd781004 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -3606,9 +3606,6 @@
         "<link[^>]* href=[^>]*?bootstrap(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.css\\;version:\\1"
       ],
       "icon": "Bootstrap.svg",
-      "implies": [
-        "jQuery\\;confidence:50"
-      ],
       "js": {
         "bootstrap.Alert.VERSION": "^(.+)$\\;version:\\1",
         "jQuery.fn.tooltip.Constructor.VERSION": "^(.+)$\\;version:\\1"
@@ -15814,6 +15811,7 @@
         "paypalClientId": "",
         "paypalJs": ""
       },
+      "xhr": "\\.paypal\\.com",
       "pricing": [
         "payg"
       ],
@@ -20906,6 +20904,19 @@
       "icon": "Strikingly.png",
       "website": "https://strikingly.com"
     },
+    "WorldPay": {
+      "cats": [
+        41
+      ],
+      "description": "",
+      "icon": "WorldPay.svg",
+      "dom": "img[src*='secure.worldpay.com'], img[alt='Powered by WorldPay'], a[href*='worldpay.com'][target='_blank']",
+      "pricing": [
+        "payg"
+      ],
+      "saas": true,
+      "website": "https://online.worldpay.com"
+    },
     "Stripe": {
       "cats": [
         41
@@ -26699,4 +26710,4 @@
       "website": "https://www.xt-commerce.com"
     }
   }
-}
\ No newline at end of file
+}