From 35ac51c382ccc53196f28338ec93e532f5451804 Mon Sep 17 00:00:00 2001 From: Alexey Berezuev Date: Tue, 18 Aug 2015 13:29:16 +0300 Subject: [PATCH 01/19] adding osticket.com Osticket is a popular helpdesk (ticket-system) Github repo is: https://github.com/osTicket/osTicket-1.8 --- src/apps.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 3a346964d..d3a5ddc12 100755 --- a/src/apps.json +++ b/src/apps.json @@ -4261,6 +4261,16 @@ }, "website": "orchardproject.net" }, + "osTicket": { + "cats": [ + 51 + ], + "implies": "PHP", + "headers": { + "Set-Cookie": "OSTSESSID" + }, + "website": "osticket.com" + }, "Outbrain": { "cats": [ 5 @@ -7571,6 +7581,7 @@ "47": "dev-tools", "48": "network-storage", "49": "feed-readers", - "50": "document-management-systems" + "50": "document-management-systems", + "51": "helpdesks" } } From 29e3a5bc982a8385bc7f99d812dd0c2af4d09d21 Mon Sep 17 00:00:00 2001 From: Alexey Berezuev Date: Tue, 18 Aug 2015 13:42:02 +0300 Subject: [PATCH 02/19] adding osticket icon --- src/icons/osTicket.png | Bin 0 -> 1024 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 src/icons/osTicket.png diff --git a/src/icons/osTicket.png b/src/icons/osTicket.png new file mode 100755 index 0000000000000000000000000000000000000000..a6f9a1e2cd41f9d56af64ebd6a11053ecdbd1891 GIT binary patch literal 1024 zcmV+b1poVqP)RKyeyRzFZMI#0bqL|pE ztAPC=m_Sf4@g*iDK{U3;7y+q7SxV>S&dkp2?A*t*x3cN(&Q{tk-AR7Qea@VF&U5G9 zJB%ko-NtBGGxmhVYQgt}ZN9tdxIG-ao$+LoZtM=DCL}}S%t$r~BbgVg4=vti#t0c0 zZbGeKMq;fn;v`ms(RDBq#W7~=A_Kcf+-l-sc#Z}0$je1>#$zGDV{5Tw@&!I@gLy0l z>*QOoJ|6^se+&4VVgG!Ji(D4QM;%3R#s|s35Q&?_Jn{;1=?f5^2fxR&4cOn0mCdt` z$03A(r_aJT6e+|R-$@4EAn|`BTHyXQg`0icE7RcbwbDG=_d^|W^#zlBmR8>^>oWd2 z8Q4h;79+k6-nBnb&BvackhPiqT1e0C zp$|}_3K(PC3k7oORk@GLYEEZH-`iSNpXvQ%pr1qq+?ikI_w*lfyrX$p20SMN|KfhY+-hVGv);AX-1M`SGXHV85SKl07pi$4{`a(1S8 zf7LX_8w>BvqY3bR?a-pls8n|$OzR;7y(CH*+8`Sk2YU-Kb8MjKvunvs@SVE^n6`}! zyg;G^eSep1#NU2OYV&B4zDQ2SvX`f!4Q_znyrsglE;7(fq6G8UKG{s`zZcf&F}dPA zW-121{N=*b=Ng3id=RC$=^46GvvTa|*JX45K@@(uD}kwBbl;Ww^=u}V0u{-k{ z{ku=VFK?wV^%*kINp4E;43+NoCOOVd|3C+D2!44hg{kdpgxW!F7SesU{QIfBEmCKH zodkb(8_M#k02v4hHA3PBPlu4D{m+~^Jg?j7Jp6qLYEKJ_@~Q;=2ksL_Y7|=EdT7HD zmFUPDYQUm7D}X7F*9m1yJ!%D;Ypt`D%_M5T+~zum3yEjN ufz<5AfOGxPdaMq0&fH^x)RhPByzO6*T1IssLnZkD0000 Date: Sun, 23 Aug 2015 14:45:18 +0300 Subject: [PATCH 03/19] change category to 'issue-trackers' --- src/apps.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/apps.json b/src/apps.json index d3a5ddc12..d171b6f44 100755 --- a/src/apps.json +++ b/src/apps.json @@ -4263,9 +4263,12 @@ }, "osTicket": { "cats": [ - 51 + 13 + ], + "implies": [ + "PHP", + "MySQL", ], - "implies": "PHP", "headers": { "Set-Cookie": "OSTSESSID" }, @@ -7581,7 +7584,6 @@ "47": "dev-tools", "48": "network-storage", "49": "feed-readers", - "50": "document-management-systems", - "51": "helpdesks" + "50": "document-management-systems" } } From d8ff005a4fce8a9dcf388b689e14400340b052e5 Mon Sep 17 00:00:00 2001 From: Alexey Berezuev Date: Sun, 23 Aug 2015 14:55:11 +0300 Subject: [PATCH 04/19] Update apps.json --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index d171b6f44..06c3b162d 100755 --- a/src/apps.json +++ b/src/apps.json @@ -4267,7 +4267,7 @@ ], "implies": [ "PHP", - "MySQL", + "MySQL" ], "headers": { "Set-Cookie": "OSTSESSID" From 7430bf3775e3d42f7290afe7ee5efaaa23f81c9b Mon Sep 17 00:00:00 2001 From: Noor Hammad Date: Tue, 15 Sep 2015 11:49:21 +1000 Subject: [PATCH 05/19] Add Stackla Social Hub CMS --- src/apps.json | 7 +++++++ src/icons/Stackla Social Hub.png | Bin 0 -> 718 bytes 2 files changed, 7 insertions(+) create mode 100644 src/icons/Stackla Social Hub.png diff --git a/src/apps.json b/src/apps.json index b3921c4c0..6d0bcdd00 100755 --- a/src/apps.json +++ b/src/apps.json @@ -5602,6 +5602,13 @@ "script": "assetscdn\\.stackla\\.com\\/media\\/js\\/widget\\/(?:[a-zA-Z0-9.]+)?\\.js", "website": "stackla.com/" }, + "Stackla Social Hub": { + "cats": [ + 1 + ], + "env": "^stacklaSocialHub$", + "website": "stackla.com/" + }, "Starlet": { "cats": [ 22 diff --git a/src/icons/Stackla Social Hub.png b/src/icons/Stackla Social Hub.png new file mode 100644 index 0000000000000000000000000000000000000000..189cd66acf48be11b3944462d74d1d2205e1e92f GIT binary patch literal 718 zcmV;<0x|uGP)wFQxgXul@G)qT7ZGJ z-~kX{0OEKk*Pa6lQDgD3*_UWCE7;fF;00#eGuvj6`k+<%00L9qJivp0LpkQ7y z^#Oyi-ZvDvXD?ZCIt-)_1V9d{D}IhQJ+NT2)ZX$7I0%t_$%AG{|4eZ(jUNBl90W=a zpyOP{ecqAw!TI66E~>OrN{N4NemXz{ucc{|Uvs zg{y=aI;Kbf)pDVP0M2p%l*&O4K+o^!0G11oQ~8&#Okhhvh0wv{JQ&eMR5|b&Xh>79 zB#>r?$1#>v3@>_-0jM;L$yQ)ku|W{8V`&zk!1l<~#ocWpL1g;{Wp(X0T6b<^WiF;Nkg;;V^0dq8tE951+r%rtLD?BpY=A z$N?V)(Ebk~2TUA52TWu{>z>oApZEdRJqHLd0I3lI(*^Vh(EtDd07*qoM6N<$f|3>~ A5C8xG literal 0 HcmV?d00001 From ecea17513b61952d96c0018d96d1b2e2bc12c79d Mon Sep 17 00:00:00 2001 From: q-- Date: Wed, 16 Sep 2015 18:24:30 +0200 Subject: [PATCH 06/19] Added RainLoop --- src/apps.json | 16 ++++++++++++++++ src/icons/RainLoop.png | Bin 0 -> 533 bytes 2 files changed, 16 insertions(+) create mode 100644 src/icons/RainLoop.png diff --git a/src/apps.json b/src/apps.json index b3921c4c0..c9df20f82 100755 --- a/src/apps.json +++ b/src/apps.json @@ -4784,6 +4784,22 @@ }, "website": "???" }, + "RainLoop": { + "cats": [ + 30 + ], + "env": "^rainloop", + "headers": { + "Server": "RainLoop" + }, + "html": [ + "]*(?:content=\"([^\"]+)[^>]+ id=\"rlAppVersion\"|id=\"rlAppVersion\"[^>]+ content=\"([^\"]+))\\;version:\\1?\\1:\\2", + "]* href=\"[^\"]*rainloop/v/([^/]+)\\;version:\\1" + ], + "implies": "PHP", + "script": "rainloop/v/([^/]+))\\;version:\\1", + "website": "rainloop.net" + }, "RBS Change": { "cats": [ 1, diff --git a/src/icons/RainLoop.png b/src/icons/RainLoop.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ebb1002ce53dcc81047eea7077e4e5ab00f579 GIT binary patch literal 533 zcmV+w0_y#VP)4=fvf(Dh#l^Zw_NwwX;7Y3%7Z=u&7M``MC?t2BT%=M`+#Mxs zNYCzy)za5xrlx6j_KRn>((|cls?U%2`_uGoX6VF!9!X5mGlatRu%vFXP_w;|-(1Mw zDw%P=Q1duJ0KCH$e8aUu<1QS+BD!!LA9B5LI?W|`i<6VE@fCP1 zQwW$r3j)qzYy~7T_$V%C0$0%ljMpfU!A}92nE>nsKqhgaMmWIpr5ZAci#5VwRaIj< zB&y(1@h=jSvGCh9NW{Pg00KtPE{WL9@8Tc?OhgQxK)|I4_?d`#)A$OXmJvv>4zu`K zA(6os)0sWX2;4vmHew7_@cGoX2WJs51%NvUIEfATfiKHQ?8AbH%`JfF|2J@e-FS*8*jX|oFVXv_9})d2cqw>nL`m$Z2_7x+3)=wghF3|9q5%O-^wk6} zljz1YUNv%?zX1%UMWM|C@394IQdS?fLO{R_x=?p?=N4=!InM#Z$j54Y%;jH{3_ekq zF$91FYcYp>&1`}_IDmiz5AYHIa2Nwf@Ezw1`9U1T0vfo7*M*v6=tTl(;8Ew-sT02e X7D~0=^p%v200000NkvXXu0mjfCNb;& literal 0 HcmV?d00001 From 8610531fd8a603a12bd222b10ba40abebde196f9 Mon Sep 17 00:00:00 2001 From: rtatol Date: Wed, 16 Sep 2015 21:33:32 +0200 Subject: [PATCH 07/19] Added DataTables --- src/apps.json | 8 ++++++++ src/icons/DataTables.png | Bin 0 -> 2942 bytes 2 files changed, 8 insertions(+) create mode 100644 src/icons/DataTables.png diff --git a/src/apps.json b/src/apps.json index b3921c4c0..8306f4dc9 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1424,6 +1424,14 @@ }, "website": "dle-news.ru" }, + "DataTables": { + "cats": [ + 12 + ], + "implies": "jQuery", + "script": "dataTables.*\\.js", + "website": "datatables.net" + }, "David Webbox": { "cats": [ 22 diff --git a/src/icons/DataTables.png b/src/icons/DataTables.png new file mode 100644 index 0000000000000000000000000000000000000000..7b9a86c31f1fd679a66695c52a1daa61aa354dee GIT binary patch literal 2942 zcmV-^3xV{BP)oo_c>WH8sWZ@-hJX_dld7m5LZs5id+FE}VXFWqIL~t=8JD z{XshFoFJkR5x}C9Ck*vQ9M|5el*j+6RNi*b+GIIRH&nONRh{mJ2hcjed;32D%*@O% zKR*w^XFl^=dV0sT{_@JD`r^W=-#>fy#2+-9tCKnym$C7i)!4*`s8)A*qerlXVbJT+ z?Of2Cn}_LiUYDY{pyD`OEte<$G7LxmB980rwbhe4>1}~fN+aUm128!`Nwe7m;J|@T zn^LLnI-SiApE+~5521Ad;rOHdaUQ4HG&u=lH06~>XC7ycfDfaK*&w~%{H>Gmj zbvm059Y6NQ*B2HpS8u=T_v~%^9@cTGs%??sokK+7ouSABicFKGhHRk8Q-iZHN|o`h z;}{Exw(_3RIa*SFZtEC-aPcp z<&{C{frtLaedyL-2~fEb8DIjB2{eM>r2sO(;YDyRKqNpb!MhB^sELWY_2}q6x3>0t zlx6D=I45sA=MO8TH6S3Ur=NbBC!TmhUvb5>FA9ItYp=cd+{H_s(FY&?x}Tc9UR#@B z3}_RO=NZaxGCFLT9FM72BS6#dL$j$^IA3DvVuK>9ptaz=BMPf@lb`xSuOHBZ!E(o# z%KaktWf8AMtXH$Mv+Cf%gR*1S_2%A>-~P<8V<$iHOTYG4ZsyvLnWE?tMFyn}MYhJ3 z(;2tSPBDGOC|U<(xx+b+5|8ti_GZe-lLKCUsmju&QKAUED+r@1t7|`SuO52XcwZa} z!{J}Bw$}!y)P48eXKK}|8>IPfzxwJ6U%lqW-*lh2|MSKc9l}tfO@Oz{eDu~bx8HUR zX{I@IuET{(37hR4YdxXSj0{EWoDLZqHLSP#Jo^L9v7_Te5jbawq6%{-A9Zsl|J-OD zf5H3wF{O+)zw_D8%GCCo%Fq4iyI&n-m2LNb@=JuFRzUzk7~t(??!B|l?YGTxZlT9> zFE^P#-=p2Ne%OQyyank-Hkt|#rKJ#fFe)0^+w?%AD(6IOq&;9TgN(2 zsiX-5g)s`PL2Dr}f^(X;&joC@3a;E~*tyek@gnq+5?U9;@u*U|@0XXKAM@VNiDW-D zQE2IOlFzj^26x=^^Pl&%T0?8&0mW#&#l0WDhP4gHi-*<-0!0+5_ga_;!aKVc5D1Ln z;)Mz#DKj&MFtD6ESHYOAdvV}^mfS2%WZ6YGR90IeY~3ZoTDDMW;#aHMHLub( zOpXS0IvLh_ob!0=an|9i#afFkEUxf43nCDPilWdIg`-p!f78(e?&5K-VsQ%jLs^1L9=-dSlzkz0zwV2coA45hLr zj4UD^?=>a>V+0Y0Qu#ZRK&;j(SW}9Ax7)-!FCvO0@vN_T@>J1HDjYe!$;gml*Y*;F zenFAvOJEhZ-VSUW_s84$%55kcvcJU@>JEn|X9`uQJys~twA!>#ps78e(#-v{x6D-?OA zafN2JS>vrE9mYm9V~rB)%_`lE2CcOQt1ESyDLxoJ!W<* z`U$i*6iFMhRM1MO)*Ow7B?xOMS?7-14drr`Q>QCvBY4SiPVoK+8yjZ<4h6=qYEZqX+$th$y`Gh!?z5Xa%dQHI5$dv3;&JAIU z%k10N!B= z$Wu+4X@cMtId$?YDou-j4#VI{t>aDOz2Ew`LFI(C*#qlq$0oK--Q~;GN#$Gt-n`Qn zG@VY!aASkLdjiJCHW?Y-V0^U2&g~oAaDB=RH`EA%I>(MzI59T@Xo_6ZA85j8*OS(bU(&VOmC6+s=OVldDDn^yp;~dov7j|rt0{^A z=M6@CtS#vG9BJl>qNenczm_*%e_H2-`lig25AF2T`jy%kjnGd4F{+4JhmyY|@%U@P+ zzWF^}Sp99S)t`CqPXYOVs^a%MqfY;V0_{cI548@G!Ju{5(#2;>HgEcJb;3vSsM0!C zTaHNKJyt&S4KRkYSvo01MT zNxGY)nePCHmD1l2g7AmdX7eJn0sp@i;sauf4H1A^ZER>T=+8Qr?E^mx>;Q%U4RnDO z;EdMM(J%^5I-9Ln>k`1KEt$ao8^HU|jEs!S7ryu?iwg@peelV0nhxsDxhf)oQYzP4 o2Hv}VmZh27^5F8WWc#4_5BVpQ>nmVTx&QzG07*qoM6N<$f*8HnoB#j- literal 0 HcmV?d00001 From defd234456d5192e75abe8c079311534eef30a10 Mon Sep 17 00:00:00 2001 From: q-- Date: Thu, 17 Sep 2015 13:32:45 +0200 Subject: [PATCH 08/19] Fixed Doxygen URL The domain name must be prefixed with "www." --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index b3921c4c0..dc65a117d 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1639,7 +1639,7 @@ "meta": { "generator": "Doxygen ([\\d.]+)\\;version:\\1" }, - "website": "stack.nl/~dimitri/doxygen" + "website": "www.stack.nl/~dimitri/doxygen/" }, "DreamWeaver": { "cats": [ From 766bf4df7f71f47ea99f2a66ae4dd5db5f83f75b Mon Sep 17 00:00:00 2001 From: q-- Date: Mon, 21 Sep 2015 13:33:50 +0200 Subject: [PATCH 09/19] Check if patterns are valid regular expressions --- bin/wappalyzer-validate-regex | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/wappalyzer-validate-regex b/bin/wappalyzer-validate-regex index 2f72564e1..e55e70648 100755 --- a/bin/wappalyzer-validate-regex +++ b/bin/wappalyzer-validate-regex @@ -27,6 +27,11 @@ for ( app in json.apps ) { attrs = pattern.split('\\;'), regex = '/' + attrs.shift().replace('/', '\/') + '/'; + //Check if the pattern is a valid RegExp + //Note: unlike when used in Wappalyzer, the modifier i isn't added here + new RegExp(regex); + + if ( /^\/(?:\^\$|\.\+|\.\*)\/$/.test(regex) ) { throw new Error('Pattern should be replaced with empty string.\n' + app + ': ' + type + ': ' + pattern); } From 1d0b218ce20eaed54ff1a7cc81a289beb8152f28 Mon Sep 17 00:00:00 2001 From: q-- Date: Mon, 21 Sep 2015 13:45:03 +0200 Subject: [PATCH 10/19] Fixed RainLoop regular expression --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 301b1c136..9e7a1b09b 100755 --- a/src/apps.json +++ b/src/apps.json @@ -4818,7 +4818,7 @@ "]* href=\"[^\"]*rainloop/v/([^/]+)\\;version:\\1" ], "implies": "PHP", - "script": "rainloop/v/([^/]+))\\;version:\\1", + "script": "rainloop/v/([^/]+)\\;version:\\1", "website": "rainloop.net" }, "RBS Change": { From 99c5f7b1f3ede75ca6533c74fa71efa6796e5a44 Mon Sep 17 00:00:00 2001 From: Mitchell R Date: Mon, 21 Sep 2015 20:21:40 +0200 Subject: [PATCH 11/19] Updated M.R. Inc Product names. Updated icons as well. --- src/apps.json | 16 ++++++++++++---- ....R. Inc Wild CMS.png => M.R. Inc BoxyOS.png} | Bin src/icons/M.R. Inc SiteFrame.png | Bin 0 -> 1049 bytes 3 files changed, 12 insertions(+), 4 deletions(-) rename src/icons/{M.R. Inc Wild CMS.png => M.R. Inc BoxyOS.png} (100%) create mode 100644 src/icons/M.R. Inc SiteFrame.png diff --git a/src/apps.json b/src/apps.json index 301b1c136..154570c3a 100755 --- a/src/apps.json +++ b/src/apps.json @@ -3477,6 +3477,12 @@ ], "website": "lucene.apache.org/core/" }, + "M.R. Inc BoxyOS": { + "cats": [ + 28 + ], + "website": "mrincworld.com" + }, "M.R. Inc Webserver": { "cats": [ 22 @@ -3484,15 +3490,17 @@ "headers": { "Server": "M\\.R\\. Inc Webserver" }, + "implies": [ + "M.R. Inc BoxyOS" + ], "website": "mrincworld.com" }, - "M.R. Inc Wild CMS": { + "M.R. Inc SiteFrame": { "cats": [ - 1, - 6 + 18 ], "headers": { - "X-Powered-By": "M\\.R\\. Inc Wild CMS" + "Powered-By": "M\\.R\\. Inc SiteFrame" }, "website": "mrincworld.com" }, diff --git a/src/icons/M.R. Inc Wild CMS.png b/src/icons/M.R. Inc BoxyOS.png similarity index 100% rename from src/icons/M.R. Inc Wild CMS.png rename to src/icons/M.R. Inc BoxyOS.png diff --git a/src/icons/M.R. Inc SiteFrame.png b/src/icons/M.R. Inc SiteFrame.png new file mode 100644 index 0000000000000000000000000000000000000000..1e3e20e1bc39002aaa9bb64355798ed103ca96fd GIT binary patch literal 1049 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V7wdP6XN>+|9`vmjrJKE-+%g< z+;YIXXq$P`Iv_W>^?-5Q8VfKx1;~zH15pN)0wVK7kQ%IL>CW3gaUi*L2Z%9c^%Wo+ zqSw1{+cK~$&}5+C*&DCnCM?;03uuKs*d<1BYk=Z*85`ey{0T7%$cCtd7!G7Z+ygWg zh>IDX}OU`CU2!jks-w0$w0vW;pvb7^tPFQj2 z)7M|QJx3Co_5&jVZYD5-fLss)GFlD*<0Yzg&&u6*fRP9^4XD>Tbpy~AU;ygJtTu^X z`$;0Q0T|yiN`m}?fwUmQbA~5CnwNngitS(&L(;>~iylAww}xR;KEpJI0^g%A@_#B6 zG9CGCT=4CR3B$Z>p<_;mcNBV=-M+yb!6EGR{B`Biq_2W#2o$LUyif80uy7fr;B4qMcmu7SEHmE1==2-*^t9>LQmlMtOtID22Jg5I(n*PHabocz}p{aR9I z%QmyUAyK#ES)lb9etApvOt1czlF|<*H8Gw~%9G Date: Thu, 24 Sep 2015 09:27:25 +0200 Subject: [PATCH 12/19] Fixed dead link Backbone.js --- src/apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps.json b/src/apps.json index 301b1c136..c8ac9cdda 100755 --- a/src/apps.json +++ b/src/apps.json @@ -586,7 +586,7 @@ "env": "^Backbone$", "implies": "Underscore.js", "script": "backbone.*\\.js", - "website": "documentcloud.github.com/backbone" + "website": "backbonejs.org" }, "Backdrop": { "cats": [ @@ -7764,4 +7764,4 @@ "50": "document-management-systems", "51": "landing-page-builders" } -} \ No newline at end of file +} From c98a2a120b594a7d409518c34ace3f4641c1cd3c Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Thu, 24 Sep 2015 20:48:16 -0500 Subject: [PATCH 13/19] Update GitLab icon --- src/icons/GitLab.png | Bin 856 -> 1694 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/icons/GitLab.png b/src/icons/GitLab.png index d65722d94592bc501e0d1d37540362f8baba0954..570136642189a67a43be9c7e774940660696c9d8 100644 GIT binary patch delta 1689 zcmV;K24?x#2A&O&8Gi-<0047(dh`GQ24zV^K~z}7wO4&m6lEB{-8&B84p5Ji15kvx zz1;(oDQj|4`TjP)N;&(QRGAS))N-^Ya~f$ZGV=?CLPHQxORaJGr)C;ws;OqQtkOm& z1wjE#0Z}3D_V(VMXK&y0j;}y-$7kHx_j!K5=lT8KclS`K27kF2`5(P~u!~|bBf(-B z6^sAphX>DE6>E4^ex`CiyH9etwj|cDF3T94=gl!}11FxC^i_MN^|nsU293D;Atn#j zu=?v+)}G^2W4=^4)Wa4;1^7k$nPR!wnVmp##s}x%Gd07gN813cnFVUz0<5#i+;vlc zCVa?&Xu%87V}D*m@{X(ovLhj~@p+z42Rc@AtaYBl2q3`7eSM1~f0XD7z&^>9-u=9og}-O7RK(|KnLY(R|0bY8rjn@HZ_O_3oo?zPEos%eIP`oBkq6;|SXg=eyfi|!=A?iS9Mk2YC%!`*(V0wtg6hUfFvy$(g zia+beGVFiZK-c_PM)Sk8`15U0+XNUC53!MBr+*N&&u3qa)v>`%w)oaN1#nz!ysOK` z6YuC=#5+HjVk%!77q)4G*;u+h-ne@Qi#?aV}S2Q0ahGep1|<~Uxq$~AIrKRo0> zu7AA8bXlGT_7|Ee$O(b;Z8eL|B1l>VQG73?5{}$m#))vAM-)AUoQO5v7&0bcBL{L- zE(zZ)lZOPdy2c%Gf008LA~tZ6bF(|qS)vpvfq?D#JZVma4V6B4;9C1EUe5Kdm9Y@B zlp_w{K(341V=w6a;VnDoaghHokk@i9=YK&+s)KkPVue=|#cuh!Y!-Pl$-BCL0~zj( z*0spumb%!Be1(FE*uVi?1e?f9(q*a+6-QK)BRp}`!t}7;qT1a!+ z&k|bVI2<*g!lyi`S#GLQo!S!fJ^368tIZBs0c_$BL^;IDet%Lz zwB-$MgDihOKfpQ}V-G}wf(;zVg`7W@PCTia9IfSldpG81@`XU`HD*zyN?;RZUi(3@ zp|gM=Xakks<|RM%y-dNv$pITVkn7Brm{SQ+T29`GL0ZPYYDsuGIVONi7Ri3V?3C5O zuHU-X1WMbxY;YTzz2&Fmn-mPdl7BH9ED|}!lgd}ZcLw+|TKBt~Rk0BA+pyrt;CWs9 z%^l<@Px`7sjXKzvH2|Srsw zYUFmmLKzjKQM+G@v0;AE-)@}njoT7Vbku<*ANih!&V^n!DDtBS8O(b$47jh2#lCko4fq~DnYV&-fio29-34fd>PYsyE{v_}JRil;|^y<*#C6R~m*f{Drr+q!=bU_0h z3*E=@G6de^Gy4Y4i8+}2*{X>8aXNK~NAmmmBL_DM?YcO9OkrO=*GuYoVqa|*dlp+f z3gEqc4NMJdy>(nqQEKRtdupmi{foN4B_1`BqW!IZY@PHAsR2utn}5YCS%T|I7VqjS z0`gjc{Q7>(>B*5=3!R!}9{f)`&qbRE)G*qLrQ>&!3ZDEuN04sJd8Gi%-007x@vVQ;o10P95K~xwS-N0>3)CB;?@!#FyAv(QU5MfS@ z77R^nSu~c_v@kHp2^c5qT?^wN*66DFC)nL*fXjzvpIe)Ztm2R*p(rt=On7L|l zs!hYDYursw=jI-snlVj7Qgv%iF-LtHzDY`xNg)%=iSY|cYU_<>?V6z&g_!SNP=4Tq zzua$Io}eLfbl2iCPcs8lcR!vdTU_$ewWSR^P9Jog2ReOwPnXxND4I4?anBVy&Ut7j zZy@QR+cjjOEPu(H&+MWXC>xyDxV!6=;U$ufGseE|%$Dt5@UVpqol(uU!cWi%>j=&{wueE=UJW;2B(_7LJ`6A2{qAd_e$=(zWh7d9z^Nt%<}fnyaWy4ql;xb6r(V!WX&!(;{Kis9jg!W&+1k!t`U&%J0Wdg6fG{`vXrt7jTVgfBEXAi( zwYO8vCBoXMWE-7?`Pol1HNPgN&(ptXQ2LXO3x7@Q$4|&fp5Pg}32UH^9|jh^tWlX4 zzIxDE%K^gvb?)pE#YF2WOp+xd z=kwpH=m6Z*)4(O*4?g45-bJq~+M;VSr9HZ_^%Hsk0|RhTL2hSimMr>jiju$InG$5Ua_yxT1G|cQVMfzJ&L6vsq(jp8CK#$NIx}W-3bmn@u Date: Sat, 26 Sep 2015 18:26:48 -0500 Subject: [PATCH 14/19] Compress icons, use new NodeJS, remove Travis sudo --- .travis.yml | 8 ++------ bin/wappalyzer-build | 4 ++++ docker/Dockerfile | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d716a33ab..5cd23ac6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,12 @@ language: node_js node_js: - - "0.10" -sudo: required + - "0.12" before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR - export PATH=$PATH:$TRAVIS_BUILD_DIR/bin install: - - sudo apt-get update -y - - sudo apt-get install -y curl zip sudo -y --force-yes - - sudo apt-get clean - - npm install jsonlint jpm -g + - npm install jsonlint jpm imagemin-cli -g - ln -s docker/node/package.json package.json && npm install - mkdir phantomjs && curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 | tar xvjC phantomjs && ln -s $WAPPALYZER_ROOT/phantomjs/phantomjs-*-linux-x86_64/bin/phantomjs bin/phantomjs script: wappalyzer build diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index 0cbc8fe86..b1f8db04b 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -15,6 +15,10 @@ echo "Prettifying apps.json..." jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json +echo "Compressing icons..." + +imagemin-cli $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 + wappalyzer links # Npm Module diff --git a/docker/Dockerfile b/docker/Dockerfile index 42c665280..09fe180ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,9 +7,10 @@ ENV DEBIAN_FRONTEND noninteractive ENV WAPPALYZER_ROOT /home/wappalyzer/synced ENV WAPPALYZER_NODE_PATH /home/wappalyzer/node - # Install packages -RUN apt-get update && apt-get install -y curl nodejs npm zip libfreetype6 libfontconfig +RUN apt-get update && apt-get install -y curl zip libfreetype6 libfontconfig +RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash - +RUN apt-get install -y nodejs RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN ln -s /usr/bin/nodejs /usr/bin/node @@ -33,7 +34,7 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH" ADD node/package.json $WAPPALYZER_NODE_PATH/package.json -RUN npm install jsonlint jpm -g && su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm install" +RUN npm install jsonlint jpm imagemin-cli -g && su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm install" # PhantomJS From 89bac15d5087dc8016c1dc5cc72e0b68d5a9ba94 Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:32:02 -0500 Subject: [PATCH 15/19] Upgrade to new Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5cd23ac6d..62527435c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - "0.12" +sudo: false before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR From ce69382111085a5cd7355eedb8fab4e826fbad8c Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:32:02 -0500 Subject: [PATCH 16/19] Upgrade to new Travis --- .travis.yml | 1 + bin/wappalyzer-build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5cd23ac6d..62527435c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - "0.12" +sudo: false before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index b1f8db04b..5aedbf510 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -17,7 +17,7 @@ jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json echo "Compressing icons..." -imagemin-cli $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 +imagemin $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 wappalyzer links From af012384ad9929557f89103a466bd6c186b00e7c Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:38:58 -0500 Subject: [PATCH 17/19] Remove 'node' link in Dockerfile --- docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 09fe180ad..142804515 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,8 +13,6 @@ RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash - RUN apt-get install -y nodejs RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN ln -s /usr/bin/nodejs /usr/bin/node - # Add user RUN useradd -ms /bin/bash wappalyzer && usermod -a -G docker_env wappalyzer && echo "wappalyzer:wappalyzer" | chpasswd From 45558235368a8507787e0fc27e01dff50deeb1fe Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:49:31 -0500 Subject: [PATCH 18/19] Update .gitignore --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 36d3e091e..a8d724d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - .vagrant build/* @@ -6,6 +5,11 @@ build/* drivers/npm/node_modules drivers/npm/npm-debug.log +node_modules/ + Thumbs.db +ehthumbs.db +Desktop.ini +$RECYCLE.BIN/ !.gitkeep From 6cc26537d81d8812cf422293fbaf58ebaabd9980 Mon Sep 17 00:00:00 2001 From: Pavel Levin Date: Sun, 27 Sep 2015 18:12:31 +0300 Subject: [PATCH 19/19] Optimize headers parsing The server can not follow the RFC and use \n as separator instead \r\n --- src/drivers/php/Wappalyzer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/php/Wappalyzer.php b/src/drivers/php/Wappalyzer.php index d05ad19e9..2fcdd93d3 100644 --- a/src/drivers/php/Wappalyzer.php +++ b/src/drivers/php/Wappalyzer.php @@ -133,11 +133,11 @@ class Wappalyzer $headers = trim(substr($response, 0, $headerSize)); $headers = preg_split('/^\s*$/m', $headers); $headers = end($headers); - $lines = array_slice(explode("\r\n", $headers), 1); + $lines = array_slice(explode("\n", $headers), 1); foreach ( $lines as $line ) { if ( strpos(trim($line), ': ') !== false ) { - list($key, $value) = explode(': ', $line); + list($key, $value) = explode(': ', trim($line, "\r")); $result->headers[strtolower($key)] = $value; }