From 2f7e62a865afd5b68a6769cc054cb8e0e63ae373 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:24:49 +1000 Subject: [PATCH] Add array support in js detection --- src/apps.json | 19 +++++++++--------- src/drivers/npm/driver.js | 9 +++++---- src/drivers/npm/package.json | 4 ++-- .../icons/adobe_experience_platform.png | Bin 2350 -> 0 bytes .../webextension/images/icons/securepay.png | Bin 2312 -> 0 bytes .../webextension/images/icons/zip_pay.svg | 13 ++++++++++++ src/drivers/webextension/manifest.json | 2 +- src/package.json | 2 +- 8 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 src/drivers/webextension/images/icons/adobe_experience_platform.png delete mode 100644 src/drivers/webextension/images/icons/securepay.png create mode 100644 src/drivers/webextension/images/icons/zip_pay.svg diff --git a/src/apps.json b/src/apps.json index 29b7a7797..fc0715d45 100644 --- a/src/apps.json +++ b/src/apps.json @@ -5427,7 +5427,7 @@ 6 ], "cpe": "cpe:/a:ibm:websphere_commerce_suite", - "html": "<(?:a|link|script)[^>]*(?:href|src)=\".*(/wcsstore/|webapp\\/wcs)", + "html": "<(?:a|link|script)[^>]*(?:href|src)=\".*(?:/wcsstore/|webapp\\/wcs)", "icon": "IBM.svg", "implies": "Java", "url": "/wcs/", @@ -7741,7 +7741,7 @@ 1 ], "icon": "Mono.net.png", - "implies": "Matomo", + "implies": "Matomo Analytics", "js": { "_monoTracker": "" }, @@ -9745,8 +9745,8 @@ "cats": [ 68 ], - "html": "api\\.reciteme\\.com/asset/js", "icon": "Recite Me.png", + "script": "api\\.reciteme\\.com/asset/js", "website": "https://reciteme.com/" }, "Recurly": { @@ -10304,8 +10304,7 @@ "Server": "Demandware eCommerce Server" }, "html": [ - "<[^>]+demandware\\.edgesuite", - "/demandware\\.static/" + "<[^>]+demandware\\.edgesuite" ], "icon": "Salesforce.svg", "js": { @@ -11194,8 +11193,10 @@ 10 ], "icon": "splitbee.svg", + "js": { + "splitbee": "" + }, "script": "^https://cdn\\.splitbee\\.io/sb\\.js", - "js": { "splitbee": "" }, "website": "https://splitbee.io" }, "Splunk": { @@ -11393,7 +11394,6 @@ "website": "https://strikingly.com" }, "Stripe": { - "description": "Stripe offers online payment processing for internet businesses.", "cats": [ 41 ], @@ -11401,6 +11401,7 @@ "__stripe_mid": "", "__stripe_sid": "" }, + "description": "Stripe offers online payment processing for internet businesses.", "html": "]+data-stripe", "icon": "Stripe.png", "js": { @@ -12706,10 +12707,10 @@ "website": "https://www.volusion.com" }, "Vue.js": { - "description": "Vue is a progressive framework for building user interfaces.", "cats": [ 12 ], + "description": "Vue is a progressive framework for building user interfaces.", "html": "<[^>]+\\sdata-v(?:ue)?-", "icon": "vue.svg", "js": { @@ -13821,7 +13822,7 @@ 41 ], "html": "]*src=\"[^/]*//[^/]*eway\\.com", - "icon": "zip_pay.png", + "icon": "zip_pay.svg", "script": [ "static\\.zipmoney\\.com\\.au", "zip\\.co" diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js index 62879c536..3bfd47b93 100644 --- a/src/drivers/npm/driver.js +++ b/src/drivers/npm/driver.js @@ -230,6 +230,8 @@ class Site { await page.setRequestInterception(true) + page.on('console', (msg) => console.log('PAGE LOG:', msg._text)) + page.on('dialog', (dialog) => dialog.dismiss()) page.on('error', (error) => this.error(error)) @@ -366,13 +368,12 @@ class Site { (technologies) => { return technologies.reduce((technologies, { name, chains }) => { chains.forEach((chain) => { + chain = chain.replace(/\[([^\]]+)\]/g, '.$1') + const value = chain .split('.') .reduce( - (value, method) => - value && value.hasOwnProperty(method) - ? value[method] - : undefined, + (value, method) => (value ? value[method] : undefined), window ) diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json index 0b2641eca..40256719d 100644 --- a/src/drivers/npm/package.json +++ b/src/drivers/npm/package.json @@ -13,7 +13,7 @@ "software" ], "homepage": "https://www.wappalyzer.com", - "version": "6.2.3", + "version": "6.2.4", "author": "Wappalyzer", "license": "MIT", "repository": { @@ -38,4 +38,4 @@ "languagedetect": "^2.0.0", "puppeteer": "^2.0.0" } -} +} \ No newline at end of file diff --git a/src/drivers/webextension/images/icons/adobe_experience_platform.png b/src/drivers/webextension/images/icons/adobe_experience_platform.png deleted file mode 100644 index 1b0217d2e45d5f47bba0078e3807c39e92fe0e51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 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 H_n7|xZwuIZ diff --git a/src/drivers/webextension/images/icons/zip_pay.svg b/src/drivers/webextension/images/icons/zip_pay.svg new file mode 100644 index 000000000..23c929c37 --- /dev/null +++ b/src/drivers/webextension/images/icons/zip_pay.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json index 460b609ea..b0f17eea3 100644 --- a/src/drivers/webextension/manifest.json +++ b/src/drivers/webextension/manifest.json @@ -4,7 +4,7 @@ "author": "Wappalyzer", "homepage_url": "https://www.wappalyzer.com", "description": "Identify web technologies", - "version": "6.2.3", + "version": "6.2.4", "default_locale": "en", "manifest_version": 2, "icons": { diff --git a/src/package.json b/src/package.json index 44de03fa4..4c3ce89e7 100644 --- a/src/package.json +++ b/src/package.json @@ -13,7 +13,7 @@ "software" ], "homepage": "https://www.wappalyzer.com", - "version": "6.2.3", + "version": "6.2.4", "author": "Wappalyzer", "license": "MIT", "repository": {