From c5bc63af407f3d81b06adcb203331641e172d65b Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Wed, 30 Jan 2013 13:54:10 +0100 Subject: [PATCH 1/5] Also detect Django using the csrfmiddlewaretoken in HTML forms. --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 7bfb9fd13..afe36b6cb 100755 --- a/share/apps.json +++ b/share/apps.json @@ -482,7 +482,7 @@ }, "Django": { "cats": [ 18 ], - "html": "powered by ]+>Django", + "html": "powered by ]+>Django|
", "implies": "Python" }, "Django CMS": { From a87e3b4347cc5a5e637961ba7957c1931814f51c Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Wed, 30 Jan 2013 14:06:48 +0100 Subject: [PATCH 2/5] Detect the Django admin consistently with `window.__admin_media_prefix__` --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index afe36b6cb..533aa57ee 100755 --- a/share/apps.json +++ b/share/apps.json @@ -482,7 +482,7 @@ }, "Django": { "cats": [ 18 ], - "html": "powered by ]+>Django|
", + "html": "powered by ]+>Django|window.__admin_media_prefix__|
", "implies": "Python" }, "Django CMS": { From 9dd638c9666513d6d820e46e391b08021785d26d Mon Sep 17 00:00:00 2001 From: Vasily Bezruchkin Date: Thu, 31 Jan 2013 10:04:59 +0600 Subject: [PATCH 3/5] eSyndiCat Directory Script signatures added. Official website: http://www.esyndicat.com --- share/apps.json | 5 +++++ share/images/icons/eSyndiCat.png | Bin 0 -> 836 bytes 2 files changed, 5 insertions(+) create mode 100755 share/images/icons/eSyndiCat.png diff --git a/share/apps.json b/share/apps.json index 75e3d6649..7ce58b536 100755 --- a/share/apps.json +++ b/share/apps.json @@ -567,6 +567,11 @@ "meta": { "generator": "EPrints" }, "implies": [ "Perl" ] }, + "eSyndiCat": { + "cats": [ 1 ], + "headers": { "X-Drectory-Script": "^eSyndiCat" }, + "implies": [ "PHP" ] + }, "Exhibit": { "cats": [ 25 ], "script": "exhibit.*\\.js", diff --git a/share/images/icons/eSyndiCat.png b/share/images/icons/eSyndiCat.png new file mode 100755 index 0000000000000000000000000000000000000000..4efd96fdb9a8997aab1513b99d144db944597824 GIT binary patch literal 836 zcmV-K1H1f*P){L`PaD9Ap$`}|8H zldKr`!AGyY{R2At4U)?~0C5RW?7;E^kEY4-vnFU5$V-ZSdC$uJ?+-&(oauKrBgrR< z5a6YJdS3$id3Yp()G9?`q8i*Q_c@amhMq!6c&osQ^V7X$H9pzr}u zjDY0L6WoP`RQPVN3vy3j*HN?n@$Ptx7$5gPpzC*l4bYU~-MIDqE6@LojAG18j0=E5 zE0Dv(+f))1s1ZO6Nd(XZIvoJGVK++flq=JC1(gb1=1##~8 z#wtQ=HrgU@rGz+V!}9{z6~Y|*thGf|c{o_!KsB?dNbw|y@pGu!>xwbzD)9dTM(bsu z)G;953B>oo8bP@cicNvI3y7JZd=?y-n>;%NzNNVAjk<#o85MTfseG@`vQT7o4 O0000 Date: Thu, 31 Jan 2013 06:40:24 +0100 Subject: [PATCH 4/5] Include `window.__admin_media_prefix__` as real variable detection. As suggested by @ElbertF --- share/apps.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 533aa57ee..5c8a527af 100755 --- a/share/apps.json +++ b/share/apps.json @@ -482,7 +482,8 @@ }, "Django": { "cats": [ 18 ], - "html": "powered by ]+>Django|window.__admin_media_prefix__|
", + "html": "powered by ]+>Django|
", + "env": "__admin_media_prefix__", "implies": "Python" }, "Django CMS": { From 69ee584c62e0bfd8da51320290628b797ca34b9d Mon Sep 17 00:00:00 2001 From: Camille Barneaud Date: Sat, 2 Feb 2013 01:15:33 +0100 Subject: [PATCH 5/5] Version detection patterns Add patern to detect version for the first quarter of the apps.json --- share/apps.json | 69 ++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/share/apps.json b/share/apps.json index 694e4acf0..09ddb9b86 100755 --- a/share/apps.json +++ b/share/apps.json @@ -52,7 +52,7 @@ }, "2z Project": { "cats": [ 1 ], - "meta": { "generator": "2z project" } + "meta": { "generator": "2z project ([\\d\\.]+);version:\\1" } }, "3dCart": { "cats": [ 1, 6 ], @@ -66,7 +66,7 @@ }, "AddThis": { "cats": [ 5 ], - "script": "addthis\\.com/js", + "script": "addthis\\.com/js/(\d+)?;version:\\1", "env": "^addthis" }, "Adobe CQ5": { @@ -101,12 +101,12 @@ "Amiro.CMS": { "cats": [ 1 ], "meta": { "generator": "Amiro" }, - "html": "system_js\\.php\\?script=", + "html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2", "implies": "PHP" }, "AMPcms": { "cats": [ 1 ], - "headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" }, + "headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" }, "env": "^amp_js_init$", "implies": "PHP" }, @@ -116,7 +116,7 @@ }, "AOLserver": { "cats": [ 22 ], - "headers": { "Server": "AOLserver" } + "headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" } }, "Apache": { "cats": [ 22 ], @@ -130,11 +130,11 @@ }, "Apache Tomcat": { "cats": [ 22 ], - "headers": { "Server": "Apache-Coyote" } + "headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" } }, "Apache Traffic Server": { "cats": [ 22 ], - "headers": { "Server": "YTS" } + "headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" } }, "Arc Forum": { "cats": [ 2 ], @@ -142,12 +142,12 @@ }, "AsciiDoc": { "cats": [ 1, 20, 27 ], - "meta": { "generator": "^AsciiDoc" }, + "meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" }, "env": "^asciidoc$" }, "ATG Web Commerce": { "cats": [ 6 ], - "headers": { "X-ATG-Version": "ATG" }, + "headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" }, "html": "<[^>]+_DARGS" }, "Atlassian Confluence": { @@ -167,7 +167,7 @@ }, "AWStats": { "cats": [ 10 ], - "meta": { "generator": "AWStats" }, + "meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" }, "implies": "Perl" }, "Backbone.js": { @@ -178,12 +178,12 @@ }, "Banshee": { "cats": [ 1, 18 ], - "html": "Built upon the ]+banshee-php\\.org", + "html": "Built upon the ]+banshee-php\\.org/\">[a-z]+(v([\\d\\.]+))?\\;version:\\2", "implies": "PHP" }, "BIGACE": { "cats": [ 1 ], - "meta": { "generator": "BIGACE" }, + "meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" }, "html": "Powered by ]+BIGACE|