From 4adc73a3f33b5a2909d3f6f0e7b5ce2a2984bbb3 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Sat, 5 Apr 2014 11:34:58 +1100 Subject: [PATCH] Added 'excludes' field, added JBoss --- share/apps.json | 25 ++++-- .../images/icons/JBoss Application Server.png | Bin 0 -> 1875 bytes share/images/icons/JBoss Web.png | Bin 0 -> 1509 bytes share/images/icons/OpenSSL.png | Bin 248 -> 693 bytes share/js/wappalyzer.js | 71 ++++++++++-------- 5 files changed, 59 insertions(+), 37 deletions(-) create mode 100644 share/images/icons/JBoss Application Server.png create mode 100644 share/images/icons/JBoss Web.png diff --git a/share/apps.json b/share/apps.json index 4500a4245..e8f3e560d 100644 --- a/share/apps.json +++ b/share/apps.json @@ -94,7 +94,6 @@ "AdInfinity": { "website": "adinfinity.com.au", "cats": [ 36 ], - "env": [ "" ], "script": [ "adinfinity\\.com\\.au" ] }, "Adobe ColdFusion": { @@ -1061,8 +1060,8 @@ "website": "google.com/adsense", "cats": [ 36 ], "env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ], - "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ] - "env": [ "^google_ad_" ], + "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ], + "env": "^google_ad_", "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick.net" ] }, "Google App Engine": { @@ -1351,9 +1350,21 @@ "Java Servlet": { "website": "www.oracle.com/technetwork/java/index-jsp-135475.html", "cats": [ 18 ], - "headers": { "X-Powered-By": "Servlet(?:/([\\d.]+))?\\;version:\\1" }, + "headers": { "X-Powered-By": "Servlet(?:.([\\d.]+))?\\;version:\\1" }, "implies": "Java" }, + "JBoss Application Server": { + "website": "jboss.org/jbossas.html", + "cats": [ 22 ], + "headers": { "X-Powered-By": "JBoss(?:-([\\d.]+))?\\;version:\\1" } + }, + "JBoss Web": { + "website": "jboss.org/jbossweb", + "cats": [ 22 ], + "headers": { "X-Powered-By": "JBossWeb(?:-([\\d.]+))?\\;version:\\1" }, + "implies": "JBoss Application Server", + "excludes": "Apache Tomcat" + }, "Jetty": { "website": "www.eclipse.org/jetty", "cats": [ 22 ], @@ -1786,7 +1797,7 @@ "website": "perl.apache.org", "cats": [ 33 ], "headers": { "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1" }, - "implies": [ "Perl", "Apache" ] + "implies": [ "Apache" ] }, "mod_python": { "website": "www.modpython.org", @@ -2254,7 +2265,7 @@ "Project Wonderful": { "website": "projectwonderful.com", "cats": [ 36 ], - "html": "]+id=\"pw_adbox_" + "html": "]+id=\"pw_adbox_", "script": "^https?://(?:www\\.)?projectwonderful\\.com/(?:pwa\\.js|gen\\.php)", "env": "^pw_adloader$" }, @@ -2339,7 +2350,7 @@ "Red Hat": { "website": "redhat.com", "cats": [ 28 ], - "headers": { "Server": "(?:.*rhel(\\d+)|Red Hat)\\;version:\\1", "X-Powered-By": "Red Hat" } + "headers": { "Server": "Red Hat", "X-Powered-By": "Red Hat" } }, "Reddit": { "website": "code.reddit.com", diff --git a/share/images/icons/JBoss Application Server.png b/share/images/icons/JBoss Application Server.png new file mode 100644 index 0000000000000000000000000000000000000000..5690cfd3afab07d7aeddeae753e78dadd2f95de2 GIT binary patch literal 1875 zcmV-Z2dwysP)&%U8v?JWxVOK%uoaD4s#*(H%$NL6*XqGdg^JR=8Y>0I8jJ`cLd>i_7bAk}*lXRnRPUPJrBwj)f5x&F zPo_>6%YLy^tx@)CRH`*9&3n08r{dSKreVD*L>#;4+H|3|UwptL} zW_9DgAPh;wBDhY&PRAPJQEyK+9n*&f;OM#0orQAM+)A1T097y|L_HVBn#S75;j&+U zf5noHhX=r~2S2LT>WC^TG_6;{Kxs`Uh)2Df9!bWducQ;P@*S0T`{MgQ-@RdMa{9%o z*@ACf7h^19Eyfy*F^EVbZKRQH)|zl~W`02RRw-(O@$g)iWITd34foF%OT2gD#QM3p zyaj3tR>7_xzEB#Unv1!fM|WpCz1^LJ&{S>^W2pE(mnUY(7fa+aX?nZ6aIGbmNs^35 z2vyNgNhjlU!hCj~wHzzaOH1WzVj**36!te)l=O%LC(6voT{V$wZ8AeerV) ztzUCb*T1y)O)gL7iMkHo+%ZHhom_BVxmx4&$TiMg7{>Q~{F?vx^j!Yc8-2!Eptb;E zayrjDM^2$AA{GRqp2s6S9dxv$c>c@V_}R;^^VG(Ea_J<6a+UL=;{+O#NyJISA{Y^_ z=ZjppG{)5IETJl4NT8u|k0caC424pKU+#IGKm}tRtm9%`ms+Uo7#if;JGYREMaZQS zENN>&70wJ_;ibKA(Uoms<3KN&WSmfycr3#E7l$d8DhP5H^Er1Jk0K&;x98X}u!>A7 ziR-u+V^9%tnH09!sXWhNI$xkGm!T`0;pt5SWYbAjFYlsW4+&M7E0h?%bcIT_+Dzh) z0C2-G>12%OpM8c+Yx{7Wdp9Q6TK;Tl4fYbTFwoRGG8p+#{;Su1HIjy0E|sc@#>!saCveD$8kY~?v5-w zo*1Mh8D}bAU@AY)vGXI0T$^NUVg>}lP>Fahn+I0X*VDn$t~R0(kNkZBgdsstXEt8| zpsgj%)0@_D?A!>(T0&L&mUZ!&!G2m&aW0IFQ?B?#JQsk;*?gn>8AD%BC%H_cH0S1v z)at>4LAVP*&98Id=qbLseJhz{oUeT0NuK@u(Cr-%YZ}}>IzG)0zPH;<+x4V>$7`D81e7 zOgFuC16({BA?mqQ%09!Fuk!o9yvxC(r;w)N)^svV#-l7q#lLuY@9{tGKfKm)954n| z0TGNbgsQCUS!()vmkZ6w#&a!Ga|I@*^B5y^W;1LZ>?anDaPr*6@U=JI4oju7IF5sA z$ddM)-L>cF-10&V9Q`X=|qe$RE%&r7WKZfZe`D(?sx8@=Yf2&upQAg z4eN!uLXok_88Y!0kFV<^lZ+DtAtHh?@!=ZkC}SjCd|7J{a7 zP{eR0;yG_F*0YNO5U6fcScVa-V>v%M&SR^W)6TlVHVM7+BuDZ?ORG8-nqf zxfIGOr7>jA&6il#k!4w1_NHRF)lG|zHSavgOnF}b9WCjiHIg^dpt*R&qoXy2m|LuN z^QX*Y;?dV01i*bmAR^)D#Po~hO4SclcZx{*9-nP0uy0vc+nEOe@Lw#~*MA{0*!Tbd N002ovPDHLkV1gDRg=PQ% literal 0 HcmV?d00001 diff --git a/share/images/icons/JBoss Web.png b/share/images/icons/JBoss Web.png new file mode 100644 index 0000000000000000000000000000000000000000..179c0f569f2561238bfb75c4ca83deb4a6ff502f GIT binary patch literal 1509 zcmV5pYs))r9~znPu6_ntl9 z_xm2d@0<@9g&245QfoEI)9(Fl*t}`{U$YZB|4y7~H)L;4dk|gZVU4$DtXMX1wc&dJ zkOT!^i#l5#>s-^N&fRA-bgl*fLYTgo3-y5`>0=%ifZfn}0E7U9fH(F$O(_j>u5s$f zA}R_1rQo8Xsvbn&eF3zjFGw(bdpOiBWGq_>O6lM;2q8Vrwa}d0lm0ViCCVo~m8L#= zJayD5FdaVN*Zoaim(bTI1IvO730)fbb5TA3=o4RNMWr;K^7atjwa z`6tc{r-b$zeE=x#Yl-7Pl)k+WMMKLkC&Og(7qpG!MRWYr4FJ9x(OZcGY~W+peInEw zRQnH=jmUxrG44ntV+X^)<8P3%AOutt!5e!f_19f0{Wmu!001OT9bH?qRQ-+DUf{-0 zxS`s2uy#!H%d!JpNN6?~hESW$&)(hjF%<-WVQ{;uayx*HlELnl-dA4wBemOM)9av5 zUvNNOaPoEU5fH2TMBx|CSM9u{6#K3282|uL>~KZErqkv+kr4paR(+y4tgySlR#8GnQD-C;F zRxHhR0hm~FE=3X)bcXfw?`4&~wd0m7o6^2I-vX{-{k1$=((^2n?3%jceRk5Owyq6xYs*>S3J{`uh#`E<+$Fg}J_7 z0RZyYDKjlijZUvIG@5RGrLNX8Bs!zJ59k)9?y$ABW(}s!0zv$e+HISuC<2s1F*VL? zzS5u=jDVdBk2ni}P^%SuuTdjf92kgHN@IS%#JDx0mgS3+ZzjF?iGK0I)dR;1q#nyU zJbaH6y=XSeM61PN8~|7r^2n&Qt|Al!sa2;0o_8)5o?Qn zIbm6VQn3C3mWkz+a!(-I*RP)5fBDaRh++h_+d-sK5Feiw|Ci=0ht(Q>yQX@-r(;JP z7%(ut%GTf&8S4XH%WQH1Fn+dOeXHP@4nqS%DYyvr7m+`mdi%aqqcoBbqVwuFwsdyH zd!P_Rvw8B!OdGv%7l0?$tSco_&V5A`!G(nv;}MIa5yeh5`9wypA`I)IkR&L$IPB}Z z&xii`)|PjDDW%LKMbx!5EB#Kt%OlT!E#|cI zlHza9nf1D`+|ypo1p`+vXSx|5EYN}Grj@P;ZF=iTbA4?g<@vi85K7U1p{B@kx=`sA0HLoh zV3PHf{{cv)O+y$HKWv{6#c5svh&WnM!iA^` zT!##$V3bNzR9WRLmlCD#vElZ!a>b!B8BTk5?Tj)vHDv)fr`mV$2e(3fW3AFuchN)z z!ObB?CgYSy@u00000 LNkvXXu0mjfNu|D5 literal 0 HcmV?d00001 diff --git a/share/images/icons/OpenSSL.png b/share/images/icons/OpenSSL.png index 7615a29f1d0a11cbb4975b42838bee3b1b4ce68c..d37845a7172068d07f30ddd0382a6c748b063f8b 100644 GIT binary patch literal 693 zcmV;m0!safP)tf3LM#puizC>KFf4m_vme<9j@_Akcb;e8ubUYoBaBrM zun61$rhy3P0Iz{pQs{n`^~N%i9|K+jrw5q;H>J=Ur3)}tO#>f*i4ms1fy+|pwbBF_ ztHy!PKqK+!zq{ka{7+y;3f&#Gb`VexHIY28(4j_g81Kjb#0?;ZW1Pk7MTMGSgkf9XX0B^mi ztAzv@t72fzn|c!<*teN7R!tP~z$CEG8*c^(NZK@p8OI|QJDeOFt7b>MQ%{VK*YtHCTYLssVgT@jzbu1dRRK(`73 zaawmXR@H#5*a4me3vlPV>%fl^$a}ywDReJW6-c4K z0rNn+0J#Cqrfo!m%1{cu?L;iO#0*8(HLH_S=r3g*P9xwPa0NI8OnEK2=dyeqcn7=> bJ*NKy1-Ok9OH9GS00000NkvXXu0mjfjd&ni literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#oJ8Lo7}wCrI=(uy(}Gl$5Ay z_@bnc$CBinWNOT~Q8wVSjmA8NMU6?a4r_dR7-IsY9nE$#Z4?k_XX2fC_|yRb{!-aE zg_b8ddMjpFT(LfpRPlGeOh@;{Bi0Kf>>F-vk@4_nn-#)$Siw%fpK&AS%#DmsSQk8+ z>0l$= 20 ) { driver('ping'); } + if ( Object.keys(w.ping.hostnames).length >= 20 ) { + driver('ping'); + } apps = null; data = null;