From abb68e6d992718501f5127d503922ecf128cc09f Mon Sep 17 00:00:00 2001 From: Mihail Lukin Date: Mon, 23 Sep 2013 20:24:39 +0400 Subject: [PATCH 01/16] Added detection of Windows 64-bit Server --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index cca45f633..d1ba4b75c 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2788,7 +2788,7 @@ "Windows Server": { "website": "microsoft.com/windowsserver", "cats": [ 28 ], - "headers": { "Server": "Win32" } + "headers": { "Server": "Win32|Win64" } }, "Wink": { "website": "winktoolkit.org", From 3898fedb7b21a80a226184f24663b68b4e73d41c Mon Sep 17 00:00:00 2001 From: Mihail Lukin Date: Tue, 24 Sep 2013 01:13:25 +0400 Subject: [PATCH 02/16] Detect nginx version --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index d1ba4b75c..75c2be4a9 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1804,7 +1804,7 @@ "Nginx": { "website": "nginx.org", "cats": [ 22 ], - "headers": { "Server": "nginx" } + "headers": { "Server": "nginx(?:/([\\d.]+))?\\;version:\\1" } }, "node.js": { "website": "nodejs.org", From 480908d6e2744e7ded208338fe62359a4d6db52f Mon Sep 17 00:00:00 2001 From: Fernando Paredes Garcia Date: Tue, 24 Sep 2013 19:52:01 -0500 Subject: [PATCH 03/16] include Ophal platform detection Logo: http://cloud.ohloh.net/attachments/64274/ophalproject_med.png --- share/apps.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/apps.json b/share/apps.json index 75c2be4a9..8faa257b4 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2973,6 +2973,11 @@ "website": "livestreetcms.com", "cats": [ 1 ], "headers": { "X-Powered-By": "LiveStreet CMS" } + }, + "Ophal": { + "website": "ophal.org", + "cats": [ 1, 11, 18 ], + "headers": { "X-Powered-By": "Ophal.*" } } } } From 17e87663cc446761c1b2ea01394840ce361c76fe Mon Sep 17 00:00:00 2001 From: Fernando Paredes Garcia Date: Wed, 25 Sep 2013 21:49:11 -0500 Subject: [PATCH 04/16] Better regular expression to detect Ophal. --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 8faa257b4..d327c6e5b 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2977,7 +2977,7 @@ "Ophal": { "website": "ophal.org", "cats": [ 1, 11, 18 ], - "headers": { "X-Powered-By": "Ophal.*" } + "headers": { "X-Powered-By": "^Ophal/" } } } } From d7b80c252f6cba25e36c7c248a854fb2b2da5a5b Mon Sep 17 00:00:00 2001 From: Fernando Paredes Garcia Date: Thu, 26 Sep 2013 09:18:30 -0500 Subject: [PATCH 05/16] Add Ophal icon. --- share/images/icons/Ophal.png | Bin 0 -> 469 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 share/images/icons/Ophal.png diff --git a/share/images/icons/Ophal.png b/share/images/icons/Ophal.png new file mode 100644 index 0000000000000000000000000000000000000000..896f0f1905d0427b226d22892d6a2b01053102f6 GIT binary patch literal 469 zcmV;`0V@89P)~zmYQz(J2eF^QA>hD z+#rDlfuQ|u2^vF(q#1;YoIR=d3 zECw-v4_L)iT{UkZgkaa-#FXPHyuvK5;49|v12?dea=hE~1}Vo2c#1E$gy(hDbXxEs zJi`HuOinB>bpa{Iqj-%^7_F;jt=G;e$D4S7`N@gp^X(O8uou_=WiB&cbP#_sNI9Ow z5EkmHS^Q7%>-dF3T>!2YebmRx9Vx!`HejUaN*{pZMVmI@Ab#RqAApNRAGZPDu^W4~ zbEX_m;46$~>Qsr^n!m(1Sk9dQZxL;Szw@p7W1UsJJ-tcWCo=M4800000 LNkvXXu0mjf`Ekk6 literal 0 HcmV?d00001 From 23a337d06194a8908e3407cba208dd8699f2a2a5 Mon Sep 17 00:00:00 2001 From: "q-- https://github.com/q--" Date: Fri, 27 Sep 2013 14:08:01 +0200 Subject: [PATCH 06/16] Renamed Alloy -> AlloyUI, updated icon, improved rule --- share/apps.json | 6 ++++-- share/images/icons/Alloy.png | Bin 267 -> 0 bytes share/images/icons/AlloyUI.png | Bin 0 -> 509 bytes 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 share/images/icons/Alloy.png create mode 100644 share/images/icons/AlloyUI.png diff --git a/share/apps.json b/share/apps.json index 75c2be4a9..ab661bbb8 100644 --- a/share/apps.json +++ b/share/apps.json @@ -117,10 +117,12 @@ "html": "aws\\.src = [^<]+caphyon-analytics", "implies": "Java" }, - "Alloy": { + "AlloyUI": { "website": "www.alloyui.com", "cats": [ 12 ], - "env": "^AUI$" + "env": "^AUI$", + "url": "^https?://cdn\\.alloyui.com/", + "implies": [ "Twitter Bootstrap", "YUI" ] }, "Amaya": { "website": "www.w3.org/Amaya", diff --git a/share/images/icons/Alloy.png b/share/images/icons/Alloy.png deleted file mode 100644 index 56a9952fde0f0dc05c6c570ecc7b167a94b56750..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmV+m0rdWfP)Z~ z&xju~3=Rb|Lg$C~aL(%f&p1hYZh9s2)XaIi=ggi}Ip4R#a7Hyl4r|xRzOzlj-IxC} zwmA0AZLseKG7e$r=6%;y_&n<~9oA{qG&$N7JS#@C{ z(2AI?DYc2=v4`UyN6w618+Sc=ef-PF?%1O#iLtS9jX(tfrh&`>tfAI9#fAMPozWBh zJN>KuSNqrcy88zE`NDnC#@uGz=HBKQZ|iIAYwF|dYwGLlYw4ptXhIS{1OUqW^^|%h RBw_#n002ovPDHLkV1mzMfzki~ diff --git a/share/images/icons/AlloyUI.png b/share/images/icons/AlloyUI.png new file mode 100644 index 0000000000000000000000000000000000000000..a81d5d297831ed1e1cc0150298758b93d9c83e43 GIT binary patch literal 509 zcmVK)o?D;cLfXkS z2-Tdz5{}C*8kSA**!&od+%`RQU4Peg?QIZRf7f}{HC`EIs0Q7eQZ1-%V88md-MV{Li!Yc?*lsa(uaaL9 zpS&8-JO!^<(e{yAYiYmiBbN%gu5F6b@11V<`$i&aZzC}wrSMYQLi zS1IU+I+RU7M0MgG_4yZ&k=mpKvh~X#Y|VM+Ri_@}l#oY6g_vi&;;d7ObIwAL+N{$u z>1}YX{LB-QVfiRA&B($kU$;zt<|!ajoP1b3u})^%aoJg?fk Date: Fri, 27 Sep 2013 14:23:23 +0200 Subject: [PATCH 07/16] Fixed AlloyUI icon transparency --- share/images/icons/AlloyUI.png | Bin 509 -> 615 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/images/icons/AlloyUI.png b/share/images/icons/AlloyUI.png index a81d5d297831ed1e1cc0150298758b93d9c83e43..ab2a6a5845e691d931c888d69c215bdf5a352ab7 100644 GIT binary patch delta 601 zcmV-f0;c`_1Lp*g8Gi-<001BJ|6u?C0xn5JK~y-)rBgjfm0=Wq&ij7f{jRqw2!&HE za;Io;h<+@BKtxDN#G$~^DI6Rcq(K@*BEmr$8lt5@8X5$VmcoRrhA2cTbTg6A;Of2i zd%yG3kk{_TY^VdzaL#+q!}Gr9dCANO{}EARGBEe8B%l=|a({;nBpgO&uAG>z=lhLA zvuk;9I%Z}LsyGZa@^@~`uC*N?sIra)LpvMrHwfrhMQOY~M`lLXpMN>NWqvs#n>U{f zG)h)enD8$J0N@+|gjUkdXV*$A5di$ibi(3Xk%bEk0bn2zm@s1KV(jA$BZ>fkR5TUt z*a7YX=%v1yPk$H6NEXa{Ky`;C+ki@;NH!HYnll1tik@AcjKKL0G6Pgnd`-u>i5hp3gbu}>AXH0z@7M{mz=nqQ1_Nz?8f^M6t+NpIemw<*3Ad~Uq)JPRp~ zlJt?8(V2&D9@pah&;kD_zl)eFh@wq)(O|tSDoD6C|9<#fZv+5&$XGe8_FJx{*v#Ng zXGS}0`0Do7=*%FY%55H_`$l>-+_j!4PlhZYi0s3%45Z-&t990El`KV~{9s}D{7RD( zTcDFZtx~SmABjR>&8kn!F4xDZU{$2T@M*f0Cp0^;o}8L~*}toFJA$pVT3f~WOEG?b n)=UNMPDekET%P(P!N0^$!5wD{0e%m200000NkvXXu0mjfkk%Ws delta 494 zcmV?XF zJ#<}v*LCe}5L$oNdDS&u8D*#j-Mns>4G#>f=Q?h9;JD$w(|_7Kj;n5%HZ3tKnQT-s z1BA+^nsu!+s+t8-EvRl_zxuY_x_efOFPKi)ZZUPQl3x;^yc*Cv1+Q4sDSLrZ_G|Cj zEV*P*GD$$qfWfeFiS?>mR;zCVk#5CI(@A?7n3&+MHJZ2+A_YV?D{rc&HZbVaEHGPs z-D1TJAhKM3U4Of961S`h)Nf)k5OD|sD${RW!@#GctvmO$@zSesq*=Fwg^QP&gG(kb z16f>e{yAYiYmiBbN%gu5F6b@11V<`$i&aZzC}wrSMYQLiS1IU+I+RU7M0MgG_4yZ& zk=mpKvh~X#Y|VM+Ri_@}l#oY6g_vi&;;d7ObIwAL+GniOGU;t_uKdgsl41EMG0n)r zDqpuueJQk;BPJh4t@+Hu)gr-4Xn=1KYXP0U<8=*fv!-$t@zrbKFsL~g&>i_@% From 1ce852b0a3cfb08342317568e200cbe32750a3c1 Mon Sep 17 00:00:00 2001 From: "q-- https://github.com/q--" Date: Fri, 27 Sep 2013 14:50:56 +0200 Subject: [PATCH 08/16] Updated Google Font API icon --- share/images/icons/Google Font API.png | Bin 799 -> 475 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/images/icons/Google Font API.png b/share/images/icons/Google Font API.png index f4a82184d1a03189d0ee803a06d1352cbed4ea9e..59c87b22d2030b750c23d3f781618eadfeab70c9 100644 GIT binary patch delta 450 zcmV;z0X_bo2HOLWBYy#+NklL-Sg}GdOPp?J|E}# z9pJA^6Lz(UD}DR`vGY6uAv|p&b#_nQr|*I0gVRO<$jDs8E`J=-RYA{yDdC{yIB0Y_ zX!Hg!oJlyb|6E}Ob{UmbVvNNw4GbewVWS{Dip&-;l;HL164&c1DC1+21}oT7mSBSG zABJyj73udkXjm;;m)!78PavI0hyroNeKu=bO~6o9=lmiP_jibgLwLD37r|Mh1fRT& zVU%J0^pkrTkAM4nNX25P9~yzFwhp$APLceVo|J)9h9(EhqhknCg6N?aHLe~UO^xS? z6m-B^D^WhT0PpN1LfalxcXcD^*@8SBlJ_5|2#n4aJO}(pL?W;_oG7htz|HPXZaT=d znnX2)_mg8(4UV9FV-v|}1iqO`@R^K)faHQEg{P2;JUig5uNMzrJTf0i1&B!D(^b07*qoM6N<$fSQQo3LZb}TttrcNnPyotwzl2(-0p2|Q&;q8rF}mEWg(E~ z)x`zZxelCjB>XOC|ASgc`yPJ=V(ER`r)LNU(!K7gS5?9^hq4WJf+x(B)p z5Ih3@{ovn?&zy$Ov;@>#kXIv|%c;>PZ;~WQlA6l0%6|im`TPi96GW~;@DRK;Ak;!o z_tN9o%*z|`_)N(NITPIJ;97>Oa!#itNs?qU6|~ZI9l|>B7ZYm8BKmv_gieC50K8iv zkk6}|(?MASt~78a)6*J{@#69nsZu+xknY>y+W~=HbUa=~d({GdgmloJ51u?wvT@(j z5V9nKdw(f762UoJyeXejFTJSPHdJjsfbite>&iu`SOCg;MDRFxHiD83p0#+ZG<>zC zAnXaE#~O!RI*e!6XWac|rE!OhcQapX>4Yo`K~4u}>Ms{O>-gT9NVIk=_FE%q(vLD# zoSm5)`N;o&T&U7cEGBXaessaKyvwN#b+;2;|Zjo?MzxF=(M)*X#@7o(HxGgsX>RH;krHA6Hg+ zVNqs(bfc>E-vqUnlM34IOlvY~$LzD-+cmv^A5qMMKK= Date: Mon, 30 Sep 2013 10:37:25 +0200 Subject: [PATCH 09/16] Fix: "url" should be "script" in AlloyUI rule --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index ab661bbb8..e08fe056f 100644 --- a/share/apps.json +++ b/share/apps.json @@ -121,7 +121,7 @@ "website": "www.alloyui.com", "cats": [ 12 ], "env": "^AUI$", - "url": "^https?://cdn\\.alloyui.com/", + "script": "^https?://cdn\\.alloyui.com/", "implies": [ "Twitter Bootstrap", "YUI" ] }, "Amaya": { From daf0e2984b74d25f343008ef3e7c56708802e617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=20Di=C3=A9guez?= Date: Mon, 7 Oct 2013 11:31:59 +0200 Subject: [PATCH 10/16] Detect Opennemas CMS from meta generator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fran DiƩguez --- share/apps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/share/apps.json b/share/apps.json index 37e06a7a7..a087885a8 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1870,6 +1870,7 @@ "OpenNemas": { "website": "openhost.es/en/opennemas", "cats": [ 1 ], + "meta": { "generator": "OpenNemas(.*)" }, "headers": { "X-Powered-By": "OpenNemas" } }, "OpenSSL": { From b983e643231636c5b455643ae7de8bbe284e7690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=20Di=C3=A9guez?= Date: Mon, 7 Oct 2013 11:36:25 +0200 Subject: [PATCH 11/16] Change Opennemas website URL --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index a087885a8..b0c746e47 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1868,7 +1868,7 @@ "env": "^OpenLayers$" }, "OpenNemas": { - "website": "openhost.es/en/opennemas", + "website": "www.opennemas.com", "cats": [ 1 ], "meta": { "generator": "OpenNemas(.*)" }, "headers": { "X-Powered-By": "OpenNemas" } From e7c4477186633691adda5baed3ae8fb27b7b874a Mon Sep 17 00:00:00 2001 From: "Tobias \"ToBeFree\" Frei" Date: Fri, 11 Oct 2013 21:51:55 +0200 Subject: [PATCH 12/16] Improved CloudFlare detection, added Zope Wappalyzer now detects the Zope webserver (zope.org - often used with Plone), and it detects CloudFlare even if just a single external ressource (.css, for example, or an image) is fetched from the CloudFlare CDN. --- share/apps.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 37e06a7a7..00dc6260b 100644 --- a/share/apps.json +++ b/share/apps.json @@ -449,7 +449,7 @@ "CloudFlare": { "website": "www.cloudflare.com", "cats": [ 31 ], - "headers": { "Server": "cloudflare" }, + "headers": { "Server": "cloudflare", "Set-Cookie": "__cfduid=" }, "env": "^CloudFlare$" }, "CMS Made Simple": { @@ -2966,6 +2966,11 @@ "html": "", "implies": "Java" }, + "Zope": { + "website": "zope.org", + "cats": [ 22 ], + "headers": { "Server": "^Zope/" } + }, "ZURB Foundation": { "website": "foundation.zurb.com", "cats": [ 18 ], From 7252d426e0f85d72a432c0721b5f74d0c36e1570 Mon Sep 17 00:00:00 2001 From: Tobias Frei Date: Fri, 11 Oct 2013 22:03:34 +0200 Subject: [PATCH 13/16] (added Zope logo) --- share/images/icons/Zope.png | Bin 0 -> 602 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 share/images/icons/Zope.png diff --git a/share/images/icons/Zope.png b/share/images/icons/Zope.png new file mode 100644 index 0000000000000000000000000000000000000000..461ed894029d568c5a585528a7d6900d05fb38cc GIT binary patch literal 602 zcmV-g0;T@N$93oG5@~10gjV7?2^+Z8rdb zkDtttMb_BRDVjkyxpT&~^pmvI(_G((jC*PztRfds0)nhv<)n{tj zNdW+X3A4cp+RuUH7yt;hW2kNV|3>$@+~*GhfCe+&EmIiG<)SxZ8%(qE`7YT}Kae<} z8E^`7l`M zlC+rRa;!X-V>cna;MJbV*)+RMH)2bRY-ojkBTl6Ai$Fr;BGe7M4udkMG? zfO}tAUxDNg&|a|INtK_Li7W@+&~SG!;v38Ao&Q~r7eccgRYoI9{Y!)LTt#p zVuHH@B)@>=i#y=bbtbt~ATsANrL)_bl_-#W0^A$yA%V=qYFZgMINh*8J+JAt{y@7< z*-$sKt(qr5yH(E8h}38@w>sOX5INV2WF-xBUiNx5lyNa;BxO6%!=6sM+z9!;59MB_ oI$KzsE?8Qba?>k~?fB$>0Y_kW1Ax=y*#H0l07*qoM6N<$f}G$GGynhq literal 0 HcmV?d00001 From ddc66d2f040e11ad84b5d477f85e813a19fc09bc Mon Sep 17 00:00:00 2001 From: "Tobias \"ToBeFree\" Frei" Date: Sat, 12 Oct 2013 12:22:39 +0200 Subject: [PATCH 14/16] Removed the new CloudFlare cookie detection ...because it wouldn't actually change anything --- share/apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/apps.json b/share/apps.json index 00dc6260b..58e20b9b9 100644 --- a/share/apps.json +++ b/share/apps.json @@ -220,7 +220,7 @@ "headers": { "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1" }, "html": "<[^>]+_DARGS" }, - "Atlassian Confluence": { + "Atlassian Confluence": {c "website": "www.atlassian.com/software/confluence/overview/team-collaboration-software", "cats": [ 8 ], "html": "Powered by ]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence ([\\d.]+))?\\;version:\\1", @@ -449,7 +449,7 @@ "CloudFlare": { "website": "www.cloudflare.com", "cats": [ 31 ], - "headers": { "Server": "cloudflare", "Set-Cookie": "__cfduid=" }, + "headers": { "Server": "cloudflare" }, "env": "^CloudFlare$" }, "CMS Made Simple": { From 402ca8049cb171c264b685cf28ffbd46e992a698 Mon Sep 17 00:00:00 2001 From: "Tobias \"ToBeFree\" Frei" Date: Sat, 12 Oct 2013 12:25:01 +0200 Subject: [PATCH 15/16] removed a typo - must have happened when I did a quick search for "cloudflare" sorry. :-/ --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 58e20b9b9..836ca0ed5 100644 --- a/share/apps.json +++ b/share/apps.json @@ -220,7 +220,7 @@ "headers": { "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1" }, "html": "<[^>]+_DARGS" }, - "Atlassian Confluence": {c + "Atlassian Confluence": { "website": "www.atlassian.com/software/confluence/overview/team-collaboration-software", "cats": [ 8 ], "html": "Powered by ]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence ([\\d.]+))?\\;version:\\1", From addce3073f5d74090a72e390c23703fa3cd814d5 Mon Sep 17 00:00:00 2001 From: "Tobias \"ToBeFree\" Frei" Date: Sun, 13 Oct 2013 14:32:57 +0200 Subject: [PATCH 16/16] Improved Plentymarkets detection Example website where the detection did not work before: http://www.schuhplus.com/ Also, there was no data for this application on wappalyzer.com, so I assume it didn't detect anything at all.^^ --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index b046eb564..75c11d2b3 100644 --- a/share/apps.json +++ b/share/apps.json @@ -2038,7 +2038,7 @@ "Plentymarkets": { "website": "plentymarkets.eu", "cats": [ 6 ], - "meta": { "generator": "^www\\.plentyMarkets" } + "meta": { "generator": "plentymarkets" } }, "Plesk": { "website": "parallels.com/products/plesk",