diff --git a/.travis.yml b/.travis.yml index cf4351c55..4f3a3bc7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "4.2.2" + - "4.2" sudo: false before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index f55ab112e..8eb689945 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -17,11 +17,11 @@ jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json echo "Compressing PNG icons..." -imagemin $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 +imagemin $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 7 echo "Compressing SVG icons..." -svgo -f $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons +svgo -q -f $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons wappalyzer links diff --git a/docker/node/package.json b/docker/node/package.json index e3174ad53..9855b7b74 100644 --- a/docker/node/package.json +++ b/docker/node/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "file-type": "3.1.*", + "file-type": "3.3.*", "is-svg": "1.1.*", "read-chunk": "1.0.*" } diff --git a/src/apps.json b/src/apps.json index 74f463d6b..a982eb047 100755 --- a/src/apps.json +++ b/src/apps.json @@ -412,7 +412,7 @@ "headers": { "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1" }, - "icon": "Apache.png", + "icon": "Apache.svg", "website": "apache.org" }, "Apache HBase": { @@ -680,7 +680,7 @@ 3 ], "html": " + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/BigDump.png b/src/icons/BigDump.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/BigDump.png and /dev/null differ diff --git a/src/icons/Boa.png b/src/icons/Boa.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Boa.png and /dev/null differ diff --git a/src/icons/Boba.js.png b/src/icons/Boba.js.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Boba.js.png and /dev/null differ diff --git a/src/icons/CMSimple.png b/src/icons/CMSimple.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/CMSimple.png and /dev/null differ diff --git a/src/icons/CompaqHTTPServer.png b/src/icons/CompaqHTTPServer.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/CompaqHTTPServer.png and /dev/null differ diff --git a/src/icons/Decorum.png b/src/icons/Decorum.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Decorum.png and /dev/null differ diff --git a/src/icons/DoubleClick Ad Exchange (AdX).png b/src/icons/DoubleClick Ad Exchange (AdX).png deleted file mode 100644 index 68b6cba63..000000000 Binary files a/src/icons/DoubleClick Ad Exchange (AdX).png and /dev/null differ diff --git a/src/icons/DoubleClick Campaign Manager (DCM).png b/src/icons/DoubleClick Campaign Manager (DCM).png deleted file mode 100644 index 68b6cba63..000000000 Binary files a/src/icons/DoubleClick Campaign Manager (DCM).png and /dev/null differ diff --git a/src/icons/DoubleClick Floodlight.png b/src/icons/DoubleClick Floodlight.png deleted file mode 100644 index 68b6cba63..000000000 Binary files a/src/icons/DoubleClick Floodlight.png and /dev/null differ diff --git a/src/icons/DoubleClick for Publishers (DFP).png b/src/icons/DoubleClick for Publishers (DFP).png deleted file mode 100644 index 68b6cba63..000000000 Binary files a/src/icons/DoubleClick for Publishers (DFP).png and /dev/null differ diff --git a/src/icons/DoubleClick.svg b/src/icons/DoubleClick.svg new file mode 100644 index 000000000..bfc1bd635 --- /dev/null +++ b/src/icons/DoubleClick.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/Epoch.png b/src/icons/Epoch.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Epoch.png and /dev/null differ diff --git a/src/icons/FlashCom.png b/src/icons/FlashCom.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/FlashCom.png and /dev/null differ diff --git a/src/icons/HP ChaiServer.png b/src/icons/HP ChaiServer.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/HP ChaiServer.png and /dev/null differ diff --git a/src/icons/HP Compact Server.png b/src/icons/HP Compact Server.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/HP Compact Server.png and /dev/null differ diff --git a/src/icons/HP ProCurve.png b/src/icons/HP ProCurve.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/HP ProCurve.png and /dev/null differ diff --git a/src/icons/HP System Management.png b/src/icons/HP System Management.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/HP System Management.png and /dev/null differ diff --git a/src/icons/HP iLO.png b/src/icons/HP iLO.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/HP iLO.png and /dev/null differ diff --git a/src/icons/HP.png b/src/icons/HP.png deleted file mode 100755 index 44629e6f9..000000000 Binary files a/src/icons/HP.png and /dev/null differ diff --git a/src/icons/HP.svg b/src/icons/HP.svg new file mode 100644 index 000000000..5ba0da41d --- /dev/null +++ b/src/icons/HP.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/HTTP Kit.png b/src/icons/HTTP Kit.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/HTTP Kit.png and /dev/null differ diff --git a/src/icons/HTTP-Server.png b/src/icons/HTTP-Server.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/HTTP-Server.png and /dev/null differ diff --git a/src/icons/Happy ICS Server.png b/src/icons/Happy ICS Server.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Happy ICS Server.png and /dev/null differ diff --git a/src/icons/IBM Coremetrics.png b/src/icons/IBM Coremetrics.png deleted file mode 100644 index 26106b25f..000000000 Binary files a/src/icons/IBM Coremetrics.png and /dev/null differ diff --git a/src/icons/IBM HTTP Server.png b/src/icons/IBM HTTP Server.png deleted file mode 100644 index 26106b25f..000000000 Binary files a/src/icons/IBM HTTP Server.png and /dev/null differ diff --git a/src/icons/IBM Tivoli Storage Manager.png b/src/icons/IBM Tivoli Storage Manager.png deleted file mode 100644 index 26106b25f..000000000 Binary files a/src/icons/IBM Tivoli Storage Manager.png and /dev/null differ diff --git a/src/icons/IBM WebSphere Commerce.png b/src/icons/IBM WebSphere Commerce.png deleted file mode 100644 index 26106b25f..000000000 Binary files a/src/icons/IBM WebSphere Commerce.png and /dev/null differ diff --git a/src/icons/IBM WebSphere Portal.png b/src/icons/IBM WebSphere Portal.png deleted file mode 100644 index 26106b25f..000000000 Binary files a/src/icons/IBM WebSphere Portal.png and /dev/null differ diff --git a/src/icons/IBM.svg b/src/icons/IBM.svg new file mode 100644 index 000000000..4cc18f87e --- /dev/null +++ b/src/icons/IBM.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/icons/Indexhibit.png b/src/icons/Indexhibit.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Indexhibit.png and /dev/null differ diff --git a/src/icons/Indy.png b/src/icons/Indy.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Indy.png and /dev/null differ diff --git a/src/icons/Java Servlet.png b/src/icons/Java Servlet.png deleted file mode 100644 index 0160cf61c..000000000 Binary files a/src/icons/Java Servlet.png and /dev/null differ diff --git a/src/icons/JavaServer Pages.png b/src/icons/JavaServer Pages.png deleted file mode 100644 index 0160cf61c..000000000 Binary files a/src/icons/JavaServer Pages.png and /dev/null differ diff --git a/src/icons/Kolibri CMS.png b/src/icons/Kolibri CMS.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Kolibri CMS.png and /dev/null differ diff --git a/src/icons/Lazy.js.png b/src/icons/Lazy.js.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Lazy.js.png and /dev/null differ diff --git a/src/icons/Marionette.js.svg b/src/icons/Marionette.js.svg index 188428e46..2c042b8bf 100644 --- a/src/icons/Marionette.js.svg +++ b/src/icons/Marionette.js.svg @@ -1 +1 @@ -marionette \ No newline at end of file +marionette \ No newline at end of file diff --git a/src/icons/Microsoft HTTPAPI.png b/src/icons/Microsoft HTTPAPI.png deleted file mode 100644 index deabbd57e..000000000 Binary files a/src/icons/Microsoft HTTPAPI.png and /dev/null differ diff --git a/src/icons/Microsoft.svg b/src/icons/Microsoft.svg new file mode 100644 index 000000000..0b11ed103 --- /dev/null +++ b/src/icons/Microsoft.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/icons/MiniServ.png b/src/icons/MiniServ.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/MiniServ.png and /dev/null differ diff --git a/src/icons/MochiWeb.png b/src/icons/MochiWeb.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/MochiWeb.png and /dev/null differ diff --git a/src/icons/Motion-httpd.png b/src/icons/Motion-httpd.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Motion-httpd.png and /dev/null differ diff --git a/src/icons/Oracle Application Server.png b/src/icons/Oracle Application Server.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle Application Server.png and /dev/null differ diff --git a/src/icons/Oracle Commerce Cloud.png b/src/icons/Oracle Commerce Cloud.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle Commerce Cloud.png and /dev/null differ diff --git a/src/icons/Oracle Commerce.png b/src/icons/Oracle Commerce.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle Commerce.png and /dev/null differ diff --git a/src/icons/Oracle Dynamic Monitoring Service.png b/src/icons/Oracle Dynamic Monitoring Service.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle Dynamic Monitoring Service.png and /dev/null differ diff --git a/src/icons/Oracle HTTP Server.png b/src/icons/Oracle HTTP Server.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle HTTP Server.png and /dev/null differ diff --git a/src/icons/Oracle Recommendations On Demand.png b/src/icons/Oracle Recommendations On Demand.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle Recommendations On Demand.png and /dev/null differ diff --git a/src/icons/Oracle Web Cache.png b/src/icons/Oracle Web Cache.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/Oracle Web Cache.png and /dev/null differ diff --git a/src/icons/Eloqua.png b/src/icons/Oracle.png similarity index 100% rename from src/icons/Eloqua.png rename to src/icons/Oracle.png diff --git a/src/icons/PDF.js.svg b/src/icons/PDF.js.svg index c12931280..b842fa701 100644 --- a/src/icons/PDF.js.svg +++ b/src/icons/PDF.js.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/Paths.js.png b/src/icons/Paths.js.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Paths.js.png and /dev/null differ diff --git a/src/icons/Penguin.png b/src/icons/Penguin.png deleted file mode 100644 index 4535f55de..000000000 Binary files a/src/icons/Penguin.png and /dev/null differ diff --git a/src/icons/Penguin.svg b/src/icons/Penguin.svg new file mode 100644 index 000000000..edf330b32 --- /dev/null +++ b/src/icons/Penguin.svg @@ -0,0 +1 @@ +penguin 2 \ No newline at end of file diff --git a/src/icons/Protovis.png b/src/icons/Protovis.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Protovis.png and /dev/null differ diff --git a/src/icons/RAID HTTPServer.png b/src/icons/RAID HTTPServer.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/RAID HTTPServer.png and /dev/null differ diff --git a/src/icons/Rapid Logic.png b/src/icons/Rapid Logic.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Rapid Logic.png and /dev/null differ diff --git a/src/icons/Rickshaw.png b/src/icons/Rickshaw.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Rickshaw.png and /dev/null differ diff --git a/src/icons/Select2.png b/src/icons/Select2.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Select2.png and /dev/null differ diff --git a/src/icons/SimpleHTTP.png b/src/icons/SimpleHTTP.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/SimpleHTTP.png and /dev/null differ diff --git a/src/icons/SunOS.png b/src/icons/SunOS.png deleted file mode 100644 index 435d816e1..000000000 Binary files a/src/icons/SunOS.png and /dev/null differ diff --git a/src/icons/TYPO3 CMS.png b/src/icons/TYPO3 CMS.png deleted file mode 100644 index bdca08681..000000000 Binary files a/src/icons/TYPO3 CMS.png and /dev/null differ diff --git a/src/icons/TYPO3 Flow.png b/src/icons/TYPO3 Flow.png deleted file mode 100644 index bdca08681..000000000 Binary files a/src/icons/TYPO3 Flow.png and /dev/null differ diff --git a/src/icons/TYPO3 Neos.png b/src/icons/TYPO3 Neos.png deleted file mode 100644 index bdca08681..000000000 Binary files a/src/icons/TYPO3 Neos.png and /dev/null differ diff --git a/src/icons/TYPO3.svg b/src/icons/TYPO3.svg new file mode 100644 index 000000000..db4a3369b --- /dev/null +++ b/src/icons/TYPO3.svg @@ -0,0 +1,26 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/icons/Twitter Emoji (Twemoji).png b/src/icons/Twitter Emoji (Twemoji).png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Twitter Emoji (Twemoji).png and /dev/null differ diff --git a/src/icons/Virata EmWeb.png b/src/icons/Virata EmWeb.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Virata EmWeb.png and /dev/null differ diff --git a/src/icons/Windows CE.png b/src/icons/Windows CE.png deleted file mode 100644 index deabbd57e..000000000 Binary files a/src/icons/Windows CE.png and /dev/null differ diff --git a/src/icons/Windows Server.png b/src/icons/Windows Server.png deleted file mode 100644 index deabbd57e..000000000 Binary files a/src/icons/Windows Server.png and /dev/null differ diff --git a/src/icons/Winstone Servlet Container.png b/src/icons/Winstone Servlet Container.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/Winstone Servlet Container.png and /dev/null differ diff --git a/src/icons/WordPress Super Cache.png b/src/icons/WordPress Super Cache.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/WordPress Super Cache.png and /dev/null differ diff --git a/src/icons/default.png b/src/icons/default.png index 2e51915b0..0e1e1fb0c 100644 Binary files a/src/icons/default.png and b/src/icons/default.png differ diff --git a/src/icons/dwhttpd.png b/src/icons/dwhttpd.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/dwhttpd.png and /dev/null differ diff --git a/src/icons/eHTTP.png b/src/icons/eHTTP.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/eHTTP.png and /dev/null differ diff --git a/src/icons/jQuery Sparklines.png b/src/icons/jQuery Sparklines.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/jQuery Sparklines.png and /dev/null differ diff --git a/src/icons/mod_auth_pam.png b/src/icons/mod_auth_pam.png deleted file mode 100755 index 117b485d4..000000000 Binary files a/src/icons/mod_auth_pam.png and /dev/null differ diff --git a/src/icons/mod_dav.png b/src/icons/mod_dav.png deleted file mode 100644 index 117b485d4..000000000 Binary files a/src/icons/mod_dav.png and /dev/null differ diff --git a/src/icons/mod_fastcgi.png b/src/icons/mod_fastcgi.png deleted file mode 100644 index 117b485d4..000000000 Binary files a/src/icons/mod_fastcgi.png and /dev/null differ diff --git a/src/icons/mod_jk.png b/src/icons/mod_jk.png deleted file mode 100755 index 117b485d4..000000000 Binary files a/src/icons/mod_jk.png and /dev/null differ diff --git a/src/icons/shine.js.png b/src/icons/shine.js.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/shine.js.png and /dev/null differ diff --git a/src/icons/viennaCMS.png b/src/icons/viennaCMS.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/viennaCMS.png and /dev/null differ diff --git a/src/icons/xCharts.png b/src/icons/xCharts.png deleted file mode 100644 index 2e51915b0..000000000 Binary files a/src/icons/xCharts.png and /dev/null differ