diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index 24e0f788c..8cd9e48c1 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -24,7 +24,7 @@ node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZ echo "Compressing PNG and SVG icons..." -node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* $WAPPALYZER_ROOT/src/icons +node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons echo "Converting SVG icons to PNG..." diff --git a/docker/Dockerfile b/docker/Dockerfile index e4834db06..2cacdfee6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,9 +8,9 @@ ENV WAPPALYZER_ROOT /home/wappalyzer/synced ENV WAPPALYZER_NODE_PATH /home/wappalyzer/node # Install packages -RUN apt-get update && apt-get install -y sudo curl bzip2 zip libfreetype6 libfontconfig +RUN apt-get update && apt-get install -y sudo curl RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - -RUN apt-get install -y nodejs +RUN apt-get install -y nodejs bzip2 zip libfreetype6 libfontconfig RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -39,7 +39,6 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH" ADD node/package.json $WAPPALYZER_NODE_PATH/package.json -RUN ln -s -f /usr/local/bin/npm /usr/bin/npm RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i" diff --git a/src/apps.json b/src/apps.json index f0676d3b4..1c96fdc39 100755 --- a/src/apps.json +++ b/src/apps.json @@ -899,6 +899,18 @@ }, "website": "browsercms.org" }, + "Bubble": { + "cats": [ + 1, + 3, + 18, + 22 + ], + "env": "^appquery$", + "icon": "bubble.png", + "implies": "Node.js", + "website": "bubble.is" + }, "BugSense": { "cats": [ 10 @@ -4761,6 +4773,34 @@ "icon": "Nedstat.png", "website": "www.nedstat.com" }, + "Neos CMS": { + "cats": [ + 1 + ], + "excludes": "TYPO3 CMS", + "headers": { + "X-Flow-Powered": "Neos/?(.+)?$\\;version:\\1" + }, + "icon": "Neos.svg", + "implies": [ + "PHP", + "Neos Flow" + ], + "url": "/neos/", + "website": "neos.io" + }, + "Neos Flow": { + "cats": [ + 18 + ], + "excludes": "TYPO3 CMS", + "headers": { + "X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1" + }, + "icon": "Neos.svg", + "implies": "PHP", + "website": "flow.neos.io" + }, "Nepso": { "cats": [ 1 @@ -6968,34 +7008,6 @@ "url": "/typo3/", "website": "www.typo3.org" }, - "Neos Flow": { - "cats": [ - 18 - ], - "excludes": "TYPO3 CMS", - "headers": { - "X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1" - }, - "icon": "Neos.svg", - "implies": "PHP", - "website": "flow.neos.io" - }, - "Neos CMS": { - "cats": [ - 1 - ], - "excludes": "TYPO3 CMS", - "headers": { - "X-Flow-Powered": "Neos/?(.+)?$\\;version:\\1" - }, - "icon": "Neos.svg", - "implies": [ - "PHP", - "Neos Flow" - ], - "url": "/neos/", - "website": "neos.io" - }, "Taiga": { "cats": [ 13 @@ -9214,13 +9226,6 @@ "icon": "xui.png", "script": "[^a-z]xui.*\\.js", "website": "xuijs.com" - }, - "Bubble": { - "website": "bubble.is", - "cats": [ 1, 3, 18, 22 ], - "env": "^appquery$", - "implies": "Node.js", - "icon": "bubble.png" } }, "categories": { @@ -9277,4 +9282,4 @@ "51": "Landing Page Builders", "52": "Live Chat" } -} +} \ No newline at end of file diff --git a/src/drivers/chrome/js/driver.js b/src/drivers/chrome/js/driver.js index 0ddfd9045..724068861 100644 --- a/src/drivers/chrome/js/driver.js +++ b/src/drivers/chrome/js/driver.js @@ -216,7 +216,7 @@ */ ping: function() { if ( Object.keys(w.ping.hostnames).length && localStorage['tracking'] ) { - w.driver.post(w.config.websiteURL + 'ping/v2/', w.ping); + w.driver.post('http://ping.wappalyzer.com/ping/v2/', w.ping); w.log('w.driver.ping: ' + JSON.stringify(w.ping)); diff --git a/src/drivers/chrome/manifest.json b/src/drivers/chrome/manifest.json index 868d48120..7ef03d0a2 100644 --- a/src/drivers/chrome/manifest.json +++ b/src/drivers/chrome/manifest.json @@ -1,7 +1,7 @@ { "name": "Wappalyzer", "homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context", "description": "Identifies software on the web", - "version": "2.48", + "version": "2.49", "default_locale": "en", "manifest_version": 2, "icons": { diff --git a/src/drivers/firefox/driver.js b/src/drivers/firefox/driver.js index 71ef1a2d7..6c4cc29c5 100644 --- a/src/drivers/firefox/driver.js +++ b/src/drivers/firefox/driver.js @@ -448,13 +448,13 @@ }).post(); }; - post(w.config.websiteURL + 'ping/v2/', w.ping); + post('http://ping.wappalyzer.com/ping/v2/', w.ping); w.log('w.driver.ping: ' + JSON.stringify(w.ping)); w.ping = { hostnames: {} }; - post('http://ad.wappalyzer.com/log/wp/', w.adCache); + post('https://ad.wappalyzer.com/log/wp/', w.adCache); w.adCache = []; } diff --git a/src/drivers/firefox/package.json b/src/drivers/firefox/package.json index c46c45a8a..ea9e811de 100644 --- a/src/drivers/firefox/package.json +++ b/src/drivers/firefox/package.json @@ -8,7 +8,7 @@ "description": "Identifies software on the web", "author": "Elbert Alias", "license": "GPLv3", - "version": "3.2.6", + "version": "3.2.7", "main": "driver.js", "preferences": [{ "name": "tracking", diff --git a/src/icons/ArvanCloud.png b/src/icons/ArvanCloud.png index b8eb19159..c9ec8e0ed 100644 Binary files a/src/icons/ArvanCloud.png and b/src/icons/ArvanCloud.png differ diff --git a/src/icons/Asymptix PHP Framework.png b/src/icons/Asymptix PHP Framework.png index 72dacb36b..cc8d5eeac 100644 Binary files a/src/icons/Asymptix PHP Framework.png and b/src/icons/Asymptix PHP Framework.png differ diff --git a/src/icons/BEM.png b/src/icons/BEM.png index 172170eb3..78356f4cf 100644 Binary files a/src/icons/BEM.png and b/src/icons/BEM.png differ diff --git a/src/icons/Bigcommerce.png b/src/icons/Bigcommerce.png index 30ec67fa2..edd047e96 100644 Binary files a/src/icons/Bigcommerce.png and b/src/icons/Bigcommerce.png differ diff --git a/src/icons/Blesta.png b/src/icons/Blesta.png index e43ded809..a2294b68f 100644 Binary files a/src/icons/Blesta.png and b/src/icons/Blesta.png differ diff --git a/src/icons/Chartbeat.png b/src/icons/Chartbeat.png index c26f01c79..75f35303e 100644 Binary files a/src/icons/Chartbeat.png and b/src/icons/Chartbeat.png differ diff --git a/src/icons/DTG.png b/src/icons/DTG.png index e2134e1f5..fff0ad86e 100644 Binary files a/src/icons/DTG.png and b/src/icons/DTG.png differ diff --git a/src/icons/Fireblade.png b/src/icons/Fireblade.png index e34ef1313..aff85b1c0 100644 Binary files a/src/icons/Fireblade.png and b/src/icons/Fireblade.png differ diff --git a/src/icons/Font Awesome.png b/src/icons/Font Awesome.png index 8666a591f..4a9568af1 100644 Binary files a/src/icons/Font Awesome.png and b/src/icons/Font Awesome.png differ diff --git a/src/icons/Ink.png b/src/icons/Ink.png index 813119b4d..94e2a885c 100644 Binary files a/src/icons/Ink.png and b/src/icons/Ink.png differ diff --git a/src/icons/Ionicons.png b/src/icons/Ionicons.png index bddc79c12..ace620764 100644 Binary files a/src/icons/Ionicons.png and b/src/icons/Ionicons.png differ diff --git a/src/icons/Lighty.png b/src/icons/Lighty.png index e0e3dd27a..fa64c37af 100644 Binary files a/src/icons/Lighty.png and b/src/icons/Lighty.png differ diff --git a/src/icons/List.js.png b/src/icons/List.js.png index d2b027856..b58fefb76 100644 Binary files a/src/icons/List.js.png and b/src/icons/List.js.png differ diff --git a/src/icons/ManyContacts.png b/src/icons/ManyContacts.png index 570450fe5..c4510a6e1 100644 Binary files a/src/icons/ManyContacts.png and b/src/icons/ManyContacts.png differ diff --git a/src/icons/Materialize CSS.png b/src/icons/Materialize CSS.png index 12be1b4a9..833bd0f07 100644 Binary files a/src/icons/Materialize CSS.png and b/src/icons/Materialize CSS.png differ diff --git a/src/icons/Mono.net.png b/src/icons/Mono.net.png index c66e40185..74b1d85dc 100644 Binary files a/src/icons/Mono.net.png and b/src/icons/Mono.net.png differ diff --git a/src/icons/Moodle.png b/src/icons/Moodle.png index 6721efe77..3afa9c9fe 100644 Binary files a/src/icons/Moodle.png and b/src/icons/Moodle.png differ diff --git a/src/icons/NVD3.png b/src/icons/NVD3.png index 9e1b4f8d4..d5bfdb177 100644 Binary files a/src/icons/NVD3.png and b/src/icons/NVD3.png differ diff --git a/src/icons/Neos.svg b/src/icons/Neos.svg index d6fc9ac8d..5fff5a8c2 100644 --- a/src/icons/Neos.svg +++ b/src/icons/Neos.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/OpenSSL.png b/src/icons/OpenSSL.png index 3f4a6f7b9..837b4e973 100644 Binary files a/src/icons/OpenSSL.png and b/src/icons/OpenSSL.png differ diff --git a/src/icons/Prospector.png b/src/icons/Prospector.png index fba2daee9..2a694ae38 100644 Binary files a/src/icons/Prospector.png and b/src/icons/Prospector.png differ diff --git a/src/icons/Public CMS.png b/src/icons/Public CMS.png index 7a25b47fe..9a8e084ed 100644 Binary files a/src/icons/Public CMS.png and b/src/icons/Public CMS.png differ diff --git a/src/icons/Pure CSS.png b/src/icons/Pure CSS.png index 52fa6fed8..a137a80e8 100644 Binary files a/src/icons/Pure CSS.png and b/src/icons/Pure CSS.png differ diff --git a/src/icons/RD Station.png b/src/icons/RD Station.png index 710260214..627231ba2 100644 Binary files a/src/icons/RD Station.png and b/src/icons/RD Station.png differ diff --git a/src/icons/Rubicon Project.png b/src/icons/Rubicon Project.png index 2aec17ef4..fe5a3f3bf 100644 Binary files a/src/icons/Rubicon Project.png and b/src/icons/Rubicon Project.png differ diff --git a/src/icons/Sitecore.png b/src/icons/Sitecore.png index b5b3faf8f..31f2b6e9a 100644 Binary files a/src/icons/Sitecore.png and b/src/icons/Sitecore.png differ diff --git a/src/icons/Sitefinity.svg b/src/icons/Sitefinity.svg index e15f960a1..a2a2275eb 100644 --- a/src/icons/Sitefinity.svg +++ b/src/icons/Sitefinity.svg @@ -1 +1 @@ -Progress_symbol_primary_RGB \ No newline at end of file +Progress_symbol_primary_RGB \ No newline at end of file diff --git a/src/icons/Stamplay.png b/src/icons/Stamplay.png index 264699655..8f5b25759 100644 Binary files a/src/icons/Stamplay.png and b/src/icons/Stamplay.png differ diff --git a/src/icons/Telescope.png b/src/icons/Telescope.png index b3eed1b7d..65f03875a 100644 Binary files a/src/icons/Telescope.png and b/src/icons/Telescope.png differ diff --git a/src/icons/ThinkPHP.png b/src/icons/ThinkPHP.png index 4f8c577ac..5851c4a74 100644 Binary files a/src/icons/ThinkPHP.png and b/src/icons/ThinkPHP.png differ diff --git a/src/icons/Woltlab Community Framework.png b/src/icons/Woltlab Community Framework.png index d226be408..680ffe468 100644 Binary files a/src/icons/Woltlab Community Framework.png and b/src/icons/Woltlab Community Framework.png differ diff --git a/src/icons/Yaws.png b/src/icons/Yaws.png index 34b078442..5b8c597c2 100644 Binary files a/src/icons/Yaws.png and b/src/icons/Yaws.png differ diff --git a/src/icons/a-blog cms.png b/src/icons/a-blog cms.png index e85d5e1d5..ed6b25e89 100644 Binary files a/src/icons/a-blog cms.png and b/src/icons/a-blog cms.png differ diff --git a/src/icons/anchorCache.png b/src/icons/anchorCache.png index 9e160bce5..fc0e13c33 100644 Binary files a/src/icons/anchorCache.png and b/src/icons/anchorCache.png differ diff --git a/src/icons/bubble.png b/src/icons/bubble.png index 924e733fe..16ec01d91 100644 Binary files a/src/icons/bubble.png and b/src/icons/bubble.png differ diff --git a/src/icons/question2answer.png b/src/icons/question2answer.png index 53f6e571b..4b58a3c6f 100644 Binary files a/src/icons/question2answer.png and b/src/icons/question2answer.png differ diff --git a/src/icons/spin.js.png b/src/icons/spin.js.png index 69e9c1a53..4d79611b6 100644 Binary files a/src/icons/spin.js.png and b/src/icons/spin.js.png differ diff --git a/src/icons/xonic.png b/src/icons/xonic.png index a49fffc98..77f6d9e17 100644 Binary files a/src/icons/xonic.png and b/src/icons/xonic.png differ