From a656a3947507b4352f32bcd9d80aad6ba7037675 Mon Sep 17 00:00:00 2001 From: Moss Harris Date: Tue, 9 Aug 2016 16:52:47 +0800 Subject: [PATCH 1/7] Update wappalyzer.rb fix SSL_connect returned=1 errno=0 state=error: certificate verify failed (OpenSSL::SSL::SSLError) --- src/drivers/ruby/wappalyzer.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/drivers/ruby/wappalyzer.rb b/src/drivers/ruby/wappalyzer.rb index b0e4452fe..d7c7a70f4 100755 --- a/src/drivers/ruby/wappalyzer.rb +++ b/src/drivers/ruby/wappalyzer.rb @@ -3,7 +3,9 @@ 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 From 24d0c4c1d2a172f71ec1eb414ed4292511b8a925 Mon Sep 17 00:00:00 2001 From: Emmanuel Straschnov Date: Fri, 12 Aug 2016 18:10:22 -0400 Subject: [PATCH 2/7] Adding Bubble to the list Adding bubble.is to the list --- src/apps.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index f4ad3a9b2..c2adaf42d 100755 --- a/src/apps.json +++ b/src/apps.json @@ -9126,6 +9126,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": { @@ -9181,4 +9188,4 @@ "50": "Document Management Systems", "51": "Landing Page Builders" } -} \ No newline at end of file +} From c043438d3eeb68d2bc9b581fba73dead5876e91a Mon Sep 17 00:00:00 2001 From: Emmanuel Straschnov Date: Fri, 12 Aug 2016 18:11:49 -0400 Subject: [PATCH 3/7] Adding the icon --- src/icons/bubble.png | Bin 0 -> 2075 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/icons/bubble.png diff --git a/src/icons/bubble.png b/src/icons/bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..924e733fea77b516fd3b486e141cee9659854414 GIT binary patch literal 2075 zcmY*ad05if8vd!IBQB(tCTS@tDx)A`E(9*)S}B^jLnW?>3k0}9I!L2QOtzVWN{d>V zkuvFIZj`y?GBw>N)686RbkwXgm)yz=)$QJUp68tNo%egc_dVbF=kR<99%^7H7ytmZ zy`HXq(%nEde^8XJ3>Irax`ASxy`2Hz&KZ?;@+Mg_!qd+i09bGU;QRsrt5S$F2>?l! z05BZ}09XM4=+K1q2XNAaGR-rD0RSpmvMC1?3bz4(Tu7{cFf-WO3mZXAK$0V=;Zexc z1e%l$0Jv1FG)#zMk_}Q5;u9IzR6Ohp11pVXFbZbyg~E)(!-Bni4P2=7D1+TdYosO2 z0c>DkfTKr7WBpv+zm-c*c-T=UlZHj1Qc_ZoDHtS`9)m*L+uNfotx#507E*=U#*C#V8pw3X;nXB19tM*ceIH-%$&8KuuTvu9TU*iwQL+pQ zjkH94*Or#zWGL2$9vdZfmgzg7abKAKhkf(Gp=9R&bD6K5enF+JI)HJg@6YA{_G&f> z0RTnwy{^vw!OE9{I?rs0(n}BM>3I`BsDM%bg&h27x8a;qGY1ae;gxd$iBRU*mU=)Q zO%4_*DR@9W%TY?)38b8o9D?d2UAdDS&uxVvg*Seis;CzofB(h|R`6~rF$2?cH+}fy z(ECsMx2l}jZyVxT&PC5eG_m+)YqcQ*+$Z>y1pe%;mM8OapCOb{R>+^tAq_8A{}$Oo z25S08<`{Det>@h9fML-|g`M(~+!l*rRhoDz0#4aQCLWzD6sU(~>hppVDXNRjtloQX zbrRB$v;CiXpbz&{n$50(9EHhq4`(dl5jI^FO=qD1$;DzgZWSbMb+0LFi@h`|If6;8YgR4 z1o9cW{cHm*vb15$Ax7W|qgmo{(YCWbHWzuO@^fX|j%9OrjQobx-Y?UB0@xPi4)+*JP|aNJS9- zMtg=d2jO(RT}q6?mCub_=(uCY@`faITvbJ_W>y)2d4eeSyF>`P zRGB~)Z8lZvujp&0lxJogSLn{GC)jL7%oEFbPd`8IUemq>s-%l+8)j6-4xAsollS*K zjW>LbqFJ%gCwg)2(~Sh?}fZ**=3r zUhZ_6PYSP+G%GH=EB>`pDQcxz0?yx?8^ANcpmEh0a%4~~LO35+!?kNqs=f?b$S<+* zrfL_Yp0q9OxCYDSSWTP89a==GYFM@FiEYdI8~L=lNwU(#*JpEYtWQ(w%k9LN${>ov zWqp2lj&VRVY5NSqYrn$HOHICJL$3VK5_L{X3jV*g_Wcvwa4!tc2tqqNKs#u&QMl{Z$T zGT8NkHX5kQ7L42OwDw}0dv1T3126$f?4x=xmz&pCEv zKJ-yT0aLiBCJgN;{R=I2#AlbXvzPr|M`ZGD>RdQ*zDLWq>Z81lN)h>Zq|mU5-sKy( zxC|W=uLkP)$D15PP6(7JR&A6ENkdlRi3mMWMsXWxNbF|kA}B18*ykK8-VG1soq5SC zzG+x&{vyXbLU;`vq&wCV2YLL;hu3K`>&(e=>n5VBYFwW5=R)Oin3q2vOH)`m6|>Jv zRV)s$ydtU|??3*&`uFD4H!5Zeq#u_OTC4lSi)2QxK9pT{xTD9@w0x6M-C;}dtXwrq z!jarwLr6&Bkh7YjFV5bFxWxl)cN^i)2cFXgM0x*I*xqkM57LGER|7Fu_D`^{>#KK` zMs}C_FIxDWYHi}ktDU~AHL!#*?o-c=#S51wmgLe+Kg`9)9*j+AHOujn&r2Z5x0Eaz!U`n2L~n!F$~Zu9ZK9asLejw2~?S literal 0 HcmV?d00001 From e4e3706c240dd060d58e57454393f79c7b7b2ee5 Mon Sep 17 00:00:00 2001 From: aninder Date: Tue, 16 Aug 2016 23:26:53 +1000 Subject: [PATCH 4/7] fix app.json file path in ruby driver --- src/drivers/ruby/wappalyzer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/ruby/wappalyzer.rb b/src/drivers/ruby/wappalyzer.rb index b0e4452fe..670536347 100755 --- a/src/drivers/ruby/wappalyzer.rb +++ b/src/drivers/ruby/wappalyzer.rb @@ -9,7 +9,7 @@ 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 From fa1f08ed107cfe76334ea81db0b86926fdcd3e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Petit?= Date: Tue, 16 Aug 2016 19:25:00 +0200 Subject: [PATCH 5/7] Adding social network widgets (twitter, facebook, linkedin, g+, pinterest) --- src/apps.json | 40 +++++++++++++++++++++++++++++++++++++++ src/icons/Facebook.svg | 1 + src/icons/Google Plus.svg | 1 + src/icons/Linkedin.svg | 1 + src/icons/Pinterest.svg | 1 + src/icons/Twitter.svg | 1 + 6 files changed, 45 insertions(+) create mode 100644 src/icons/Facebook.svg create mode 100644 src/icons/Google Plus.svg create mode 100644 src/icons/Linkedin.svg create mode 100644 src/icons/Pinterest.svg create mode 100644 src/icons/Twitter.svg diff --git a/src/apps.json b/src/apps.json index f4ad3a9b2..c66c6b58e 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 @@ -5367,6 +5391,14 @@ ], "website": "pimcore.org" }, + "Pinterest": { + "cats": [ + 5 + ], + "icon": "Pinterest.svg", + "script": "//assets\\.pinterest\\.com/js/pinit\\.js", + "website": "pinterest.com" + }, "Piwik": { "cats": [ 10 @@ -7179,6 +7211,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 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/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 From 289f1547ab26bbfb9e45f6c4ce4a55cdb146188d Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 29 Aug 2016 16:10:46 +0200 Subject: [PATCH 6/7] Use headers instead of whole response --- src/drivers/npm/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 { From 48eeb1298c845f53f97296cb17662364ec7a1970 Mon Sep 17 00:00:00 2001 From: Johannes Steu Date: Thu, 1 Sep 2016 14:27:56 +0200 Subject: [PATCH 7/7] TASK: Update vendor vor Neos CMS and Neos Flow --- src/apps.json | 16 +++++++++------- src/icons/Neos.svg | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 src/icons/Neos.svg diff --git a/src/apps.json b/src/apps.json index 0c1570878..33e79726a 100755 --- a/src/apps.json +++ b/src/apps.json @@ -6925,7 +6925,7 @@ "url": "/typo3/", "website": "www.typo3.org" }, - "TYPO3 Flow": { + "Neos Flow": { "cats": [ 18 ], @@ -6933,20 +6933,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" 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