From 70b30f961367d4cc16bc8baefabf1a4ad29ab84c Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 1 Jun 2013 16:11:22 -0600 Subject: [PATCH 1/2] Now detects e107 v1.x and v2.x --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 882a5c203..4cbc4c622 100644 --- a/share/apps.json +++ b/share/apps.json @@ -676,7 +676,7 @@ "website": "e107.org", "cats": [ 1 ], "script": "e107\\.js", - "headers": { "Set-Cookie": "e107_td[^;]+=" }, + "headers": { "Set-Cookie": "e107_tz[^;]+=", "X-Powered-By": "e107" }, "implies": "PHP" }, "EdgeCast": { From ca2baf4eb3126ecb644ec755d138ca1bde6a69bb Mon Sep 17 00:00:00 2001 From: Sebastian Lopienski Date: Thu, 6 Jun 2013 11:56:06 +0200 Subject: [PATCH 2/2] new apps --- share/apps.json | 275 +++++++++++++++++- share/images/icons/3DM.png | Bin 0 -> 633 bytes share/images/icons/3ware.png | Bin 0 -> 633 bytes share/images/icons/ATEN.png | Bin 0 -> 651 bytes share/images/icons/Apache HBase.png | Bin 0 -> 185 bytes share/images/icons/Apache Hadoop.png | Bin 0 -> 588 bytes share/images/icons/BaseHTTP.png | Bin 0 -> 624 bytes share/images/icons/Boa.png | Bin 0 -> 714 bytes share/images/icons/Brother.png | Bin 0 -> 238 bytes share/images/icons/Canon.png | Bin 0 -> 680 bytes share/images/icons/Catwalk.png | Bin 0 -> 680 bytes share/images/icons/CherryPy.png | Bin 0 -> 375 bytes share/images/icons/Cloudera.png | Bin 0 -> 501 bytes share/images/icons/CompaqHTTPServer.png | Bin 0 -> 598 bytes share/images/icons/Darwin.png | Bin 0 -> 303 bytes share/images/icons/Dell.png | Bin 0 -> 503 bytes share/images/icons/ELOG HTTP.png | Bin 0 -> 252 bytes share/images/icons/ELOG.png | Bin 0 -> 252 bytes share/images/icons/EWS-NIC4.png | Bin 0 -> 503 bytes share/images/icons/Erlang.png | Bin 0 -> 312 bytes share/images/icons/FlashCom.png | Bin 0 -> 714 bytes share/images/icons/Grandstream.png | Bin 0 -> 390 bytes share/images/icons/HP ProCurve.png | Bin 0 -> 598 bytes share/images/icons/Highstock.png | Bin 0 -> 477 bytes share/images/icons/Indico.png | Bin 0 -> 485 bytes share/images/icons/Jetty.png | Bin 0 -> 743 bytes share/images/icons/KS_HTTP.png | Bin 0 -> 680 bytes share/images/icons/LabVIEW.png | Bin 0 -> 230 bytes share/images/icons/Logitech Media Server.png | Bin 0 -> 255 bytes share/images/icons/MOBOTIX.png | Bin 0 -> 718 bytes share/images/icons/MiniServ.png | Bin 0 -> 714 bytes share/images/icons/PerfSONAR-PS.png | Bin 0 -> 649 bytes share/images/icons/Sentinel Keys Server.png | Bin 0 -> 88 bytes .../images/icons/Sentinel License Monitor.png | Bin 0 -> 88 bytes .../icons/Sentinel Protection Server.png | Bin 0 -> 88 bytes share/images/icons/Splunk.png | Bin 0 -> 437 bytes share/images/icons/Splunkd.png | Bin 0 -> 437 bytes share/images/icons/SunOS.png | Bin 0 -> 219 bytes share/images/icons/TWiki.png | Bin 0 -> 318 bytes share/images/icons/Wowza Media Server.png | Bin 0 -> 519 bytes share/images/icons/XAMPP.png | Bin 0 -> 556 bytes share/images/icons/Zabbix.png | Bin 0 -> 125 bytes share/images/icons/debut.png | Bin 0 -> 238 bytes share/images/icons/default.png | Bin 0 -> 714 bytes share/images/icons/dwhttpd.png | Bin 0 -> 714 bytes share/images/icons/eHTTP.png | Bin 0 -> 714 bytes share/images/icons/libwww-perl-daemon.png | Bin 0 -> 263 bytes share/images/icons/mod_auth_pam.png | Bin 0 -> 582 bytes share/images/icons/mod_jk.png | Bin 0 -> 582 bytes share/images/icons/mod_perl.png | Bin 0 -> 408 bytes 50 files changed, 270 insertions(+), 5 deletions(-) create mode 100755 share/images/icons/3DM.png create mode 100755 share/images/icons/3ware.png create mode 100755 share/images/icons/ATEN.png create mode 100644 share/images/icons/Apache HBase.png create mode 100755 share/images/icons/Apache Hadoop.png create mode 100755 share/images/icons/BaseHTTP.png create mode 100644 share/images/icons/Boa.png create mode 100755 share/images/icons/Brother.png create mode 100755 share/images/icons/Canon.png create mode 100755 share/images/icons/Catwalk.png create mode 100755 share/images/icons/CherryPy.png create mode 100755 share/images/icons/Cloudera.png create mode 100755 share/images/icons/CompaqHTTPServer.png create mode 100755 share/images/icons/Darwin.png create mode 100755 share/images/icons/Dell.png create mode 100644 share/images/icons/ELOG HTTP.png create mode 100644 share/images/icons/ELOG.png create mode 100755 share/images/icons/EWS-NIC4.png create mode 100755 share/images/icons/Erlang.png create mode 100644 share/images/icons/FlashCom.png create mode 100755 share/images/icons/Grandstream.png create mode 100755 share/images/icons/HP ProCurve.png create mode 100755 share/images/icons/Highstock.png create mode 100755 share/images/icons/Indico.png create mode 100755 share/images/icons/Jetty.png create mode 100755 share/images/icons/KS_HTTP.png create mode 100755 share/images/icons/LabVIEW.png create mode 100755 share/images/icons/Logitech Media Server.png create mode 100755 share/images/icons/MOBOTIX.png create mode 100644 share/images/icons/MiniServ.png create mode 100755 share/images/icons/PerfSONAR-PS.png create mode 100755 share/images/icons/Sentinel Keys Server.png create mode 100755 share/images/icons/Sentinel License Monitor.png create mode 100755 share/images/icons/Sentinel Protection Server.png create mode 100755 share/images/icons/Splunk.png create mode 100755 share/images/icons/Splunkd.png create mode 100755 share/images/icons/SunOS.png create mode 100644 share/images/icons/TWiki.png create mode 100755 share/images/icons/Wowza Media Server.png create mode 100755 share/images/icons/XAMPP.png create mode 100755 share/images/icons/Zabbix.png create mode 100755 share/images/icons/debut.png create mode 100644 share/images/icons/default.png create mode 100644 share/images/icons/dwhttpd.png create mode 100644 share/images/icons/eHTTP.png create mode 100755 share/images/icons/libwww-perl-daemon.png create mode 100755 share/images/icons/mod_auth_pam.png create mode 100755 share/images/icons/mod_jk.png create mode 100755 share/images/icons/mod_perl.png diff --git a/share/apps.json b/share/apps.json index 4cbc4c622..3002cb2b1 100644 --- a/share/apps.json +++ b/share/apps.json @@ -35,7 +35,11 @@ "33": "web-server-extensions", "34": "databases", "35": "maps", - "36": "advertising-networks" + "36": "advertising-networks", + "37": "network-devices", + "38": "media-servers", + "39": "webcams", + "40": "printers" }, "apps": { "1C-Bitrix": { @@ -63,6 +67,17 @@ "headers": { "X-Powered-By": "3DCART" }, "script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)" }, + "3DM": { + "website": "www.3ware.com", + "cats": [ 19 ], + "html": "3ware 3DM([\\d\\.]+)?\\;version:\\1", + "implies": "3ware" + }, + "3ware": { + "website": "www.3ware.com", + "cats": [ 22 ], + "headers": { "Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1" } + }, "Accessible Portal": { "website": "www.accessibleportal.com", "cats": [ 1 ], @@ -154,6 +169,16 @@ "cats": [ 22 ], "headers": { "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1" } }, + "Apache Hadoop": { + "website": "hadoop.apache.org", + "cats": [ 34 ], + "html": "type=\"text/css\" href=\"/static/hadoop.css\"" + }, + "Apache HBase": { + "website": "hbase.apache.org", + "cats": [ 34 ], + "html": "type=\"text/css\" href=\"/static/hbase.css\"" + }, "Apache JSPWiki": { "website": "jspwiki.org", "cats": [ 8 ], @@ -182,6 +207,11 @@ "meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" }, "env": "^asciidoc$" }, + "ATEN": { + "website": "www.aten.com", + "cats": [ 22 ], + "headers": { "Server": "ATEN HTTP Server(\\(V?([\\d\\.]+)\\))?\\;version:\\2" } + }, "ATG Web Commerce": { "website": "oracle.com/us/products/applications/web-commerce/atg", "cats": [ 6 ], @@ -224,6 +254,12 @@ "html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(?:v([\\d.]+))?\\;version:\\1", "implies": "PHP" }, + "BaseHTTP": { + "website": "docs.python.org/2/library/basehttpserver.html", + "cats": [ 22 ], + "headers": { "Server": "BaseHTTP\\/?([\\d\\.]+)?\\;version:\\1" }, + "implies": "Python" + }, "BIGACE": { "website": "bigace.de", "cats": [ 1 ], @@ -270,6 +306,15 @@ "meta": { "generator": "blogger" }, "url": "\\.blogspot\\.com" }, + "Boa": { + "website": "www.boa.org", + "cats": [ 22 ], + "headers": { "Server": "Boa\\/?([\\d\\.a-z]+)?\\;version:\\1" } + }, + "Brother": { + "website": "www.brother.com", + "cats": [ 40 ] + }, "BrowserCMS": { "website": "browsercms.org", "cats": [ 1 ], @@ -294,6 +339,10 @@ "script": "CatalystScripts", "html": "<!-- BC_OBNW -->" }, + "Canon": { + "website": "www.canon.com", + "cats": [ 40 ] + }, "CakePHP": { "website": "cakephp.org", "cats": [ 18 ], @@ -309,6 +358,12 @@ "html": "<link [^>]+Cargo feed", "implies": "PHP" }, + "Catwalk": { + "website": "www.canon.com", + "cats": [ 22 ], + "headers": { "Server": "Catwalk\\/?([\\d\\.]+)?\\;version:\\1" }, + "implies": "Canon" + }, "CentOS": { "website": "centos.org", "cats": [ 28 ], @@ -348,12 +403,23 @@ "cats": [ 22 ], "headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" } }, + "CherryPy": { + "website": "www.cherrypy.org", + "cats": [ 18, 22 ], + "headers": { "Server": "CherryPy\\/?([\\d\\.]+)?\\;version:\\1" }, + "implies": "Python" + }, "CKEditor": { "website": "ckeditor.com", "cats": [ 24 ], "env": "^CKEDITOR$", "implies": "PHP" }, + "Cloudera": { + "website": "www.cloudera.com", + "cats": [ 34 ], + "headers": { "Server": "cloudera" } + }, "ClickHeat": { "website": "www.labsmedia.com/clickheat/index.html", "cats": [ 10 ], @@ -364,6 +430,7 @@ "ClickTale": { "website": "www.clicktale.com", "cats": [ 10 ], + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -410,7 +477,12 @@ "website": "commerceserver.net", "cats": [ 6 ], "headers": { "COMMERCE-SERVER-SOFTWARE": ".+" }, - "implies": [ "Microsoft ASP.NET" ] + "implies": "Microsoft ASP.NET" + }, + "CompaqHTTPServer": { + "website": "www.hp.com", + "cats": [ 22 ], + "headers": { "Server": "CompaqHTTPServer\\/?([\\d\\.]+)?\\;version:\\1" } }, "comScore": { "website": "comscore.com", @@ -546,6 +618,11 @@ "meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" }, "implies": [ "Apache", "PHP" ] }, + "Darwin": { + "website": "opensource.apple.com", + "cats": [ 28 ], + "headers": { "Server": "Darwin", "X-Powered-By": "Darwin" } + }, "DataLife Engine": { "website": "dle-news.ru", "cats": [ 1 ], @@ -563,6 +640,12 @@ "cats": [ 28 ], "headers": { "Server": "Debian", "X-Powered-By": "(?:Debian|dotdeb|(sarge|etch|lenny|squeeze|wheezy|jessie))\\;version:\\1" } }, + "debut": { + "website": "www.brother.com", + "cats": [ 22 ], + "headers": { "Server": "debut\\/?([\\d\\.]+)?\\;version:\\1" }, + "implies": "Brother" + }, "DedeCMS": { "website": "dedecms.com", "cats": [ 1 ], @@ -570,6 +653,10 @@ "script": "dedeajax", "implies": "PHP" }, + "Dell": { + "website": "dell.com", + "cats": [ 40 ] + }, "Demandware": { "website": "demandware.com", "cats": [ 6 ], @@ -665,6 +752,11 @@ "html": "(?:id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)", "implies": "Drupal" }, + "dwhttpd": { + "website": "???", + "cats": [ 22 ], + "headers": { "Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1" } + }, "Dynamicweb": { "website": "www.dynamicweb.dk", "cats": [ 1, 6, 10 ], @@ -685,6 +777,23 @@ "headers": { "Server": "^EC(?:S|Acc)" }, "url": "https?://(?:[^/]+\\.)?edgecastcdn\\.net/" }, + "eHTTP": { + "website": "???", + "cats": [ 22 ], + "headers": { "Server": "\\beHTTP( v?([\\d\\.]+))?\\;version:\\2" }, + "implies": [ "HP ProCurve"] + }, + "ELOG": { + "website": "midas.psi.ch/elog", + "cats": [ 19 ], + "html": "<title>ELOG Logbook Selection" + }, + "ELOG HTTP": { + "website": "midas.psi.ch/elog", + "cats": [ 22 ], + "headers": { "Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1" }, + "implies": "ELOG" + }, "Eloqua": { "website": "eloqua.com", "cats": [ 32 ], @@ -712,7 +821,7 @@ "cats": [ 1 ], "meta": { "generator": "EPiServer" }, "headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" }, - "implies": [ "Microsoft ASP.NET" ] + "implies": "Microsoft ASP.NET" }, "EPrints": { "website": "www.eprints.org", @@ -721,6 +830,11 @@ "env": "^EPJS_menu_template$", "implies": "Perl" }, + "Erlang": { + "website": "www.erlang.org", + "cats": [ 27 ], + "headers": { "Server": "Erlang( OTP/([\\-\\d\\.ABR]+))?\\;version:\\1" } + }, "eSyndiCat": { "website": "esyndicat.com", "cats": [ 1 ], @@ -729,6 +843,12 @@ "env": "^esyndicat$", "implies": [ "PHP" ] }, + "EWS-NIC4": { + "website": "dell.com", + "cats": [ 22 ], + "headers": { "Server": "EWS-NIC4(\\/([\\d\\.a-z]+))?\\;version:\\2" }, + "implies": "Dell" + }, "Exhibit": { "website": "simile-widgets.org/exhibit/", "cats": [ 25 ], @@ -784,6 +904,11 @@ "cats": [ 28 ], "headers": { "Server": "Fedora" } }, + "FlashCom": { + "website": "???", + "cats": [ 22 ], + "headers": { "Server": "FlashCom\\/?([\\d\\.]+)?\\;version:\\1" } + }, "FlexCMP": { "website": "http://www.flexcmp.com/cms/home", "cats": [ 1 ], @@ -921,6 +1046,11 @@ "script": "/graffiti\\.js", "headers": { "Set-Cookie": "graffitibot[^;]=" } }, + "Grandstream": { + "website": "www.grandstream.com", + "cats": [ 22, 39 ], + "headers": { "Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1" } + }, "Gravatar": { "website": "gravatar.com", "cats": [ 19 ], @@ -958,6 +1088,11 @@ "script": "highcharts.*\\.js", "env": "^Highcharts$" }, + "Highstock": { + "website": "highcharts.com/products/highstock", + "cats": [ 25 ], + "script": "highstock(\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\2" + }, "Hogan.js": { "website": "twitter.github.com/hogan.js", "cats": [ 12 ], @@ -969,6 +1104,10 @@ "meta": { "generator": "Hotaru CMS" }, "headers": { "Set-Cookie": "hotaru_mobile=" } }, + "HP ProCurve": { + "website": "hp.com/networking", + "cats": [ 37 ] + }, "HubSpot": { "website": "hubspot.com", "cats": [ 32 ], @@ -1033,6 +1172,12 @@ "html": "<(?:link|a href) [^>]+ndxz-studio", "implies": [ "PHP", "Apache", "Exhibit" ] }, + "Indico": { + "website": "indico-software.org", + "cats": [ 1 ], + "headers": { "Set-cookie": "MAKACSESSION" }, + "html": "Powered by\\s+(CERN )?(CDS )?Indico( [\\d\\.]+)?\\;version:\\4" + }, "InstantCMS": { "website": "www.instantcms.ru", "cats": [ 1 ], @@ -1106,6 +1251,12 @@ "headers": { "X-Powered-By": "Servlet(?:/([\\d.]+))?\\;version:\\1" }, "implies": "Java" }, + "Jetty": { + "website": "www.eclipse.org/jetty", + "cats": [ 22 ], + "headers": { "Server": "Jetty(\\(([\\d\\.]+\\d+))?\\;version:\\2" }, + "implies": "Java" + }, "Jirafe": { "website": "jirafe.com", "cats": [ 10, 32 ], @@ -1248,6 +1399,17 @@ "meta": { "generator": "Koobi" }, "html": "