From 14dc82375630657ce0e98f2a1b1e750356d8d2cf Mon Sep 17 00:00:00 2001
From: Laurent Cherpit <lcherpit@ttree.ch>
Date: Sun, 25 May 2014 11:44:14 +0200
Subject: [PATCH 1/8] [FIX] Adding an exclusion for "TYPO3 CMS" when "TYPO3
 Flow" detected

---
 share/apps.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/apps.json b/share/apps.json
index a9c7ea49f..fa8fd4574 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -2974,7 +2974,8 @@
 			"website": "flow.typo3.org",
 			"cats": [ 18 ],
 			"headers": { "X-Flow-Powered": "Flow\\/(.+)?$\\;version:\\1" },
-			"implies": "PHP"
+			"implies": "PHP",
+			"excludes": "TYPO3 CMS"
 		},
 		"TYPO3 Neos": {
 			"website": "neos.typo3.org",

From 3797137c832e8fdb4e0ab03297846a40ea5eee08 Mon Sep 17 00:00:00 2001
From: Laurent Cherpit <lcherpit@ttree.ch>
Date: Sun, 25 May 2014 14:01:30 +0200
Subject: [PATCH 2/8] Enhance "TYPO3 CMS" detection

For unknown versions or when the meta generator tag was removed.
---
 share/apps.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/apps.json b/share/apps.json
index a9c7ea49f..1d661c27b 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -2967,6 +2967,7 @@
 			"website": "www.typo3.org",
 			"cats": [ 1 ],
 			"meta": { "generator": "TYPO3\\s+(?:CMS\\s+)?([\\d.]+)?(?:\\s+CMS)?\\;version:\\1" },
+			"html": "<(?:script[^>]+ src|link[^>]+ href)=[^>]+typo3temp/",
 			"url": "/typo3/",
 			"implies": "PHP"
 		},

From d9180bcdd2c2cf56641b93083219d1d044316fea Mon Sep 17 00:00:00 2001
From: Laurent Cherpit <lcherpit@ttree.ch>
Date: Sun, 25 May 2014 14:04:21 +0200
Subject: [PATCH 3/8] No need to escape slashes twice.

Wappalyzer.js already takes care of that.
---
 share/apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/apps.json b/share/apps.json
index b8bca1a81..9bfaa832f 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -2974,14 +2974,14 @@
 		"TYPO3 Flow": {
 			"website": "flow.typo3.org",
 			"cats": [ 18 ],
-			"headers": { "X-Flow-Powered": "Flow\\/(.+)?$\\;version:\\1" },
+			"headers": { "X-Flow-Powered": "Flow/(.+)?$\\;version:\\1" },
 			"implies": "PHP",
 			"excludes": "TYPO3 CMS"
 		},
 		"TYPO3 Neos": {
 			"website": "neos.typo3.org",
 			"cats": [ 1 ],
-			"html": "xmlns:typo3=\\\"http:\\/\\/www\\.typo3\\.org\\/ns\\/[\\d]{4}\\/Flow\\/Packages\\/Neos\\/Content\\/",
+			"html": "xmlns:typo3=\\\"http://www\\.typo3\\.org/ns/[\\d]{4}/Flow/Packages/Neos/Content/",
 			"url": "/neos/",
 			"implies": [ "PHP", "TYPO3 Flow" ],
 			"excludes": "TYPO3 CMS"

From cfdb0ce44e049d51aa96fc341a571ccb276fd335 Mon Sep 17 00:00:00 2001
From: q-- <io7io@ya.ru>
Date: Sat, 31 May 2014 12:40:01 +0200
Subject: [PATCH 4/8] Detect Bonfire session cookie

---
 share/apps.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/apps.json b/share/apps.json
index 9bfaa832f..3608c11d1 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -361,6 +361,7 @@
 		"Bonfire": {
 			"website": "cibonfire.com",
 			"cats": [ 18 ],
+			"headers": { "Set-Cookie": "bf_session=" },
 			"html": "Powered by <a[^>]+href=\"https?://(?:www\\.)?cibonfire\\.com[^>]*>Bonfire v([^<]+)\\;version:\\1",
 			"implies": "CodeIgniter"
 		},

From fc55f5dcebad71d2ce102133144d098387ff0566 Mon Sep 17 00:00:00 2001
From: q-- <io7io@ya.ru>
Date: Sat, 31 May 2014 12:55:35 +0200
Subject: [PATCH 5/8] Detect CodeIgniter CSRF token cookie

---
 share/apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/apps.json b/share/apps.json
index 3608c11d1..ba8808925 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -524,7 +524,7 @@
 		"CodeIgniter": {
 			"website": "codeigniter.com",
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_session)" },
+			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_(?:session|(csrf_token)))\\;version:\\1?2+:" },
 			"html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
 			"implies": "PHP"
 		},

From cb1d8ecca29b2d2c5f892cb839b8ee808241cd96 Mon Sep 17 00:00:00 2001
From: Dan Walker <danrwalker1@gmail.com>
Date: Mon, 2 Jun 2014 14:14:28 +0100
Subject: [PATCH 6/8] Added detection for TwistPHP Framework

---
 share/apps.json                 |   6 ++++++
 share/images/icons/TwistPHP.png | Bin 0 -> 1722 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 share/images/icons/TwistPHP.png

diff --git a/share/apps.json b/share/apps.json
index 9bfaa832f..d52e8ecac 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -2944,6 +2944,12 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-CMS": "Twilight CMS" }
 		},
+		"TwistPHP": {
+			"website": "twistphp.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "TwistPHP" },
+			"implies": "PHP"
+		},
 		"Twitter Bootstrap": {
 			"website": "getbootstrap.com",
 			"cats": [ 18 ],
diff --git a/share/images/icons/TwistPHP.png b/share/images/icons/TwistPHP.png
new file mode 100644
index 0000000000000000000000000000000000000000..34b70d83bc798fc96fdfa3450c437ecbf78de18f
GIT binary patch
literal 1722
zcmbVNc~BEq7+(+&u_#oninXkZqm_Z|=1!J`n2-<xEJa8SDma8>fea)YHwz?41#xO|
z@M!CSibqSeAdZeLwiLvpDu@S)77?{Yg9b04C~De@V>cYOe>irgJG1-V_ulvWefR8|
z_&BAnPk;{q0KTdyc>=wHuGia({#x?$pVG^8N|8h*66sW)mc#+6o=C$%l~J34C*WGW
zZP{5|1OQ{w4eBH+35!K_gpr|j=`gHDGmQoSk;H1&>auVOOv5t_CNcE;k>e0((2F4r
z7eg>}1fFS#$|v!}{5Z8PKT9XnLy~Y%WJPHLBTi{St1;VTL9JqFh!>^zu45Pihg7I6
zF*NK{5*80e5F`$A8AzxO;UOT8$zZZMd_F$}WFbrhMp!VD70TqJY!-?j;K&2f)<}Ii
znjnuHu|-Q_D3hYhC=BQ2<uUTu41&ynnL?q^#ld2Q(i))_n~Bm|Lrs>TQ3g3~(UAr-
zWgtwTi&2|K<WORW_H;M|qZz|q6Pqj}iK0^mTeW7G$v|ME(G}N_wuMT-|8e7u+7`9V
zjKc}Ig~%awbUo68M!|IM-fqaHNPB~RL>lO#XtU*nF2{(QD3x3c(KigeL60I#0m5YR
zIS8MH@B~bzKrWNXBRN8zl+BG)$ate1Z^H7qJSm6GjZm=oGA2{O7Rsbt0bedfkVpYX
zpx}>URVE9iHR<qCy9V0s2v+u1EE+-LT8bdm1d%=30r8mxMOZQkGZ>M`1u?D8U~<W>
z@(f2S$4Nsju8$-MBRG^_)bIxT{~h-*R{wu;2Gh>KuIBhxvy2|m9q8J=ZhcyKJv_LH
zo*0rI4bgxz6ad^Gs^n6&^+tmR%bX;gykgv5u-k7+<Er~!M{VYbkaux8R5ewlSU#ys
z;Ro+(E0sKuPJSe9uo;&3r(WgMm6U8%`z^Q}64e;3YQJ)rdAYBtTY@!h!+7a6HIhwn
z;nwo&*IOEhW6t#F>&DOWV3dtt3U}JOS%JdV2mqasI*{;}D)5#mrlYH);;!?`&xd3)
zny+GCsh41THwU(6^NQTOw@uIXkB#K`fhT4+l~?&EU!41O{1^NSmc0v$$)jy`%Bp>v
zvKpJ66x0?|)LaJk#x8Y#;H-TPD5`F|t?v<kGsAjwPGCXG_LY~$!{{gbr+Bsp<W&Az
zFy^<sGr1{~nB$<$pSM)nW1bx7>s>xq=^GUCauHCsb;$-K?GI6u>D(&6x;@|5oS3%p
zZW>thG3ayp7xGK)%5lMN#g%~{gs1k1iXECV2heNiBNi_?-!Cc&Q3lwF>Tm5$F_H`E
zUAZ0=i%%J!oLtcE)8X%z)U<Tt?&#Z31&R02KU>K8%A(WiQ}@?wwL3ZnJ$^iU@#tY_
zu~5_B6O`*gJ+6(ZO14*S+`~TI89dgby?nzwxA$KG5%=ERA~970H4aU(S6{!U&ez^o
zHt1+~2B$^?=WnI7WPkXuam(e&xz1(J+kFnLEyNv#EhPhBtH!hB>AGrL#gRp40y7HX
zDj%e@@M_Y{V2=CxuHB(gtB>{W5^wpAIQZbv{OlD0Zptvwcu8_N3<wkLNO@uyJLT02
zCFLoY>rsC^KY%weU)!U0AAC_<zk)Sz(4pKh!HHg*8G9qAsCB|;hPdRJ+ZSeF*iYNt
z^KQMfKidD^xq>soZFQM84triKN7j)0-fZ@q9JkudmEFya8R0*KUfMV75M@#o$x5zy
z+q`PMHLFi{z6^UN!`95QLY)bYSI<<v(8U9#p0ZT&w9=i9$Az%2ylKwVY8LA3C`A@f
zgFLX|j_1y`caq$~8e*`=&O1TXvQHHy$Lc##YlnR|Fa~I=kk!W)XuMs26O|%Peo&TL
F{5P_El1%^r

literal 0
HcmV?d00001


From 2a8cb0437899dd987be01828fcd1c706cfc03095 Mon Sep 17 00:00:00 2001
From: Facundo Farias <faf@changeyourflight.com>
Date: Tue, 3 Jun 2014 18:11:43 +0200
Subject: [PATCH 7/8] Added BugSense to the apps.json list

---
 share/apps.json                 |   6 ++++++
 share/images/icons/BugSense.png | Bin 0 -> 336 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 share/images/icons/BugSense.png

diff --git a/share/apps.json b/share/apps.json
index f3a963847..77c5e95ff 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -381,6 +381,12 @@
 			"html": "href=\"enter_bug\\.cgi\">",
 			"implies": "Perl"
 		},
+		"BugSense": {
+			"website": "bugsense.com",
+			"cats": [ 10 ],
+			"script": "bugsense\\.js",
+			"env": "^BugSense$"
+		},
 		"Burning Board": {
 			"website": "www.woltlab.com",
 			"cats": [ 2 ],
diff --git a/share/images/icons/BugSense.png b/share/images/icons/BugSense.png
new file mode 100644
index 0000000000000000000000000000000000000000..d02b2b4f8c2785b418257f0fe9f87cfd089a9446
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipSBACkNkTd{2g-nY8B2ov
zf*Bm1-ADs*lDyqr7&=&GJ%Aj}0*}aI1_o|n5N2eUHAey{$X?><>&kwQjah($&nu|&
z98hScr;B5V#`&`otoaTZ2)Jx_Zc1AJO1h;wV2RtJf^MaScMe!G>5ATFeR4y%-fUtG
zlf=oRHobc`dw&U*^~s*^C-uNB!pEhI*}#HrQJwz-naCSSpM{Sd_%yHlf#QpIKit0Z
zwCnJjajmj@V6`XsLE{A#xtF3FuIO)C>096|qh&GGRbjgJ#ek~khBBPqr_SD5RIfVO
gjQI;w+rJ>~;H5ckr`r?5fR1GFboFyt=akR{02U8=p#T5?

literal 0
HcmV?d00001


From f7efb994dac30e9e31a8eb7c5174ed0205f9ad7d Mon Sep 17 00:00:00 2001
From: Facundo Farias <faf@changeyourflight.com>
Date: Tue, 3 Jun 2014 18:35:08 +0200
Subject: [PATCH 8/8] Added Flask to the apps.json list

---
 share/apps.json              |   6 ++++++
 share/images/icons/flask.png | Bin 0 -> 2027 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 share/images/icons/flask.png

diff --git a/share/apps.json b/share/apps.json
index 77c5e95ff..4c90d5562 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -1007,6 +1007,12 @@
 			"cats": [ 28 ],
 			"headers": { "Server": "Fedora" }
 		},
+		"Flask": {
+			"website": "flask.pocoo.org/",
+			"cats": [ 18, 22 ],
+			"headers": { "Server": "Werkzeug\\/?([\\d\\.]+)?\\;version:\\1" },
+			"implies": "Python"
+		},
 		"FlashCom": {
 			"website": "???",
 			"cats": [ 22 ],
diff --git a/share/images/icons/flask.png b/share/images/icons/flask.png
new file mode 100644
index 0000000000000000000000000000000000000000..234404b3cccc9f116fedcd91ddcbf126473c95eb
GIT binary patch
literal 2027
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
JPDHLkV1go8!L|SZ

literal 0
HcmV?d00001