diff --git a/src/apps.json b/src/apps.json index 11ccbb95d..f0676d3b4 100755 --- a/src/apps.json +++ b/src/apps.json @@ -2277,6 +2277,14 @@ }, "website": "fwpshop.org" }, + "Facebook": { + "cats": [ + 5 + ], + "icon": "Facebook.svg", + "script": "//connect\\.facebook\\.net/[^/]*/[a-z]*\\.js", + "website": "facebook.com" + }, "Fact Finder": { "cats": [ 29 @@ -2701,6 +2709,14 @@ "icon": "Google PageSpeed.png", "website": "developers.google.com/speed/pagespeed/mod" }, + "Google Plus": { + "cats": [ + 5 + ], + "icon": "Google Plus.svg", + "script": "apis\\.google\\.com/js/[a-z]*\\.js", + "website": "plus.google.com" + }, "Google Sites": { "cats": [ 1 @@ -3898,6 +3914,14 @@ "script": "^https?://cdn\\.linksmart\\.com/linksmart_([\\d.]+?)(?:\\.min)?\\.js\\;version:\\1", "website": "linksmart.com" }, + "Linkedin": { + "cats": [ + 5 + ], + "icon": "Linkedin.svg", + "script": "//platform\\.linkedin\\.com/in\\.js", + "website": "linkedin.com" + }, "List.js": { "cats": [ 12 @@ -5383,6 +5407,14 @@ ], "website": "pimcore.org" }, + "Pinterest": { + "cats": [ + 5 + ], + "icon": "Pinterest.svg", + "script": "//assets\\.pinterest\\.com/js/pinit\\.js", + "website": "pinterest.com" + }, "Piwik": { "cats": [ 10 @@ -6936,7 +6968,7 @@ "url": "/typo3/", "website": "www.typo3.org" }, - "TYPO3 Flow": { + "Neos Flow": { "cats": [ 18 ], @@ -6944,20 +6976,22 @@ "headers": { "X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1" }, - "icon": "TYPO3.svg", + "icon": "Neos.svg", "implies": "PHP", - "website": "flow.typo3.org" + "website": "flow.neos.io" }, - "TYPO3 Neos": { + "Neos CMS": { "cats": [ 1 ], "excludes": "TYPO3 CMS", - "html": "]+xmlns:typo3=\"[^\"]+Flow/Packages/Neos/", - "icon": "TYPO3.svg", + "headers": { + "X-Flow-Powered": "Neos/?(.+)?$\\;version:\\1" + }, + "icon": "Neos.svg", "implies": [ "PHP", - "TYPO3 Flow" + "Neos Flow" ], "url": "/neos/", "website": "neos.io" @@ -7214,6 +7248,14 @@ "icon": "TwistedWeb.png", "website": "twistedmatrix.com/trac/wiki/TwistedWeb" }, + "Twitter": { + "cats": [ + 5 + ], + "icon": "Twitter.svg", + "script": "//platform\\.twitter\\.com/widgets\\.js", + "website": "twitter.com" + }, "Twitter Bootstrap": { "cats": [ 18 @@ -9172,6 +9214,13 @@ "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": { diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js index c88b7cde1..74843cd9d 100644 --- a/src/drivers/npm/index.js +++ b/src/drivers/npm/index.js @@ -29,7 +29,7 @@ exports.detectFromHTML = function(options, data, cb) { /** * Do a actual request for the body & headers, then * run through detection -**/ +**/ exports.detectFromUrl = function(options, cb) { // ensure options and url were @@ -59,7 +59,7 @@ exports.detectFromUrl = function(options, cb) { exports.detect(options, data, cb); } - + }); } @@ -71,7 +71,7 @@ function getHTMLFromUrl(url, cb) { var data = { html: body, url: url, - headers: response + headers: response.headers }; cb(null, data); } else { diff --git a/src/drivers/ruby/wappalyzer.rb b/src/drivers/ruby/wappalyzer.rb index b0e4452fe..130c21006 100755 --- a/src/drivers/ruby/wappalyzer.rb +++ b/src/drivers/ruby/wappalyzer.rb @@ -3,13 +3,15 @@ require 'net/http' require 'v8' require 'json' +require 'openssl' +OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE Encoding.default_external = Encoding::UTF_8 class Wappalyzer def initialize @realdir = File.dirname(File.realpath(__FILE__)) - file = File.join(@realdir, '..', '..', 'share', 'apps.json') + file = File.join(@realdir, 'apps.json') @json = JSON.parse(IO.read(file)) @categories, @apps = @json['categories'], @json['apps'] end diff --git a/src/icons/Facebook.svg b/src/icons/Facebook.svg new file mode 100644 index 000000000..aaba01894 --- /dev/null +++ b/src/icons/Facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/Google Plus.svg b/src/icons/Google Plus.svg new file mode 100644 index 000000000..3db5d94ae --- /dev/null +++ b/src/icons/Google Plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/Linkedin.svg b/src/icons/Linkedin.svg new file mode 100644 index 000000000..f7ed76695 --- /dev/null +++ b/src/icons/Linkedin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/Neos.svg b/src/icons/Neos.svg new file mode 100644 index 000000000..d6fc9ac8d --- /dev/null +++ b/src/icons/Neos.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/Pinterest.svg b/src/icons/Pinterest.svg new file mode 100644 index 000000000..cf60b5531 --- /dev/null +++ b/src/icons/Pinterest.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/Twitter.svg b/src/icons/Twitter.svg new file mode 100644 index 000000000..dbd044201 --- /dev/null +++ b/src/icons/Twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/bubble.png b/src/icons/bubble.png new file mode 100644 index 000000000..924e733fe Binary files /dev/null and b/src/icons/bubble.png differ