From d51b87a8562b076a977f33a85db6f8d01d067483 Mon Sep 17 00:00:00 2001 From: Camille Barneaud Date: Sat, 2 Mar 2013 22:14:04 +0100 Subject: [PATCH] Add ?: where it's needed Change capture group to non capture group where it can be done as @q-- recommend there https://github.com/ElbertF/Wappalyzer/commit/f5f17df693134520eb8151f0d347d79cf58b26e2#commitcomment-2726854 --- share/apps.json | 283 ++++++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 141 deletions(-) diff --git a/share/apps.json b/share/apps.json index ff08b98fa..2d3d4aa5c 100644 --- a/share/apps.json +++ b/share/apps.json @@ -42,7 +42,7 @@ "website": "www.1c-bitrix.ru", "cats": [ 1 ], "headers": { "X-Powered-CMS": "Bitrix Site Manager", "Set-Cookie": "BITRIX_" }, - "html": "(]+components/bitrix|(src|href)=\"/bitrix/(js|templates))", + "html": "(?:]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))", "script": "1c-bitrix", "implies": "PHP" }, @@ -61,7 +61,7 @@ "website": "www.3dcart.com", "cats": [ 1, 6 ], "headers": { "X-Powered-By": "3DCART" }, - "script": "(twlh(track)?\\.asp|3d_upsell\\.js)" + "script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)" }, "Accessible Portal": { "website": "www.accessibleportal.com", @@ -94,7 +94,7 @@ "Adobe GoLive": { "website": "www.adobe.com/products/golive", "cats": [ 20 ], - "meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" } + "meta": { "generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1" } }, "Advanced Web Stats": { "website": "www.advancedwebstats.com", @@ -110,7 +110,7 @@ "Amaya": { "website": "www.w3.org/Amaya", "cats": [ 20 ], - "meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" } + "meta": { "generator": "Amaya(?: V?([\\d.]+[a-z]))?\\;version:\\1" } }, "amCharts": { "website": "amcharts.com", @@ -121,7 +121,7 @@ "Ametys": { "website": "ametys.org", "cats": [ 1 ], - "meta": { "generator": "(Ametys|Anyware Technologies)" }, + "meta": { "generator": "(?:Ametys|Anyware Technologies)" }, "script": "STools\\.js", "implies": "Java" }, @@ -129,7 +129,7 @@ "website": "amirocms.com", "cats": [ 1 ], "meta": { "generator": "Amiro" }, - "html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2", + "html": "system_(?:js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\1", "implies": "PHP" }, "AMPcms": { @@ -152,7 +152,7 @@ "Apache": { "website": "apache.org", "cats": [ 22 ], - "headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" } + "headers": { "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1" } }, "Apache JSPWiki": { "website": "jspwiki.org", @@ -185,13 +185,13 @@ "ATG Web Commerce": { "website": "oracle.com/us/products/applications/web-commerce/atg", "cats": [ 6 ], - "headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" }, + "headers": { "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1" }, "html": "<[^>]+_DARGS" }, "Atlassian Confluence": { "website": "www.atlassian.com/software/confluence/overview/team-collaboration-software", "cats": [ 8 ], - "html": "Powered by ]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence ([\\d.]+))?\\;version:\\2", + "html": "Powered by ]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence ([\\d.]+))?\\;version:\\1", "headers": { "X-Confluence-Request-Time": ".*" }, "meta": { "confluence-request-time": ".*" }, "implies": "Java" @@ -202,13 +202,13 @@ "env": "^jira$", "script": "/jira/s/", "url": "/secure/Dashboard\\.jspa", - "html": "Powered by\\s+]+atlassian\\.com/(software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA([^v]*v(ersion: )?(\\d+\\.\\d+(\\.\\d+)?))?\\;version:\\4", + "html": "Powered by\\s+]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(\\.\\d+)?))?\\;version:\\1", "implies": "Java" }, "AWStats": { "website": "awstats.sourceforge.net", "cats": [ 10 ], - "meta": { "generator": "AWStats ([\\d.]+( \\(build [\\d.]+\\))?)\\;version:\\1" }, + "meta": { "generator": "AWStats ([\\d.]+(?: \\(?:build [\\d.]+\\))?)\\;version:\\1" }, "implies": "Perl" }, "Backbone.js": { @@ -221,14 +221,14 @@ "Banshee": { "website": "www.banshee-php.org", "cats": [ 1, 18 ], - "html": "Built upon the ]+banshee-php\\.org/\">[a-z]+(v([\\d.]+))?\\;version:\\2", + "html": "Built upon the ]+banshee-php\\.org/\">[a-z]+(?:v([\\d.]+))?\\;version:\\1", "implies": "PHP" }, "BIGACE": { "website": "bigace.de", "cats": [ 1 ], "meta": { "generator": "BIGACE ([\\d.]+)\\;version:\\1" }, - "html": "(Powered by ]+BIGACE||]+(typolight|contao)\\.css)", + "html": "(?:|]+(?:typolight|contao)\\.css)", "implies": "PHP" }, "Contenido": { @@ -501,13 +501,13 @@ "website": "www.cs-cart.com", "cats": [ 6 ], "env": "^fn_compare_strings$", - "html": " Powered by (]+cs-cart\\.com|CS-Cart)", + "html": " Powered by (?:]+cs-cart\\.com|CS-Cart)", "implies": "PHP" }, "CubeCart": { "website": "www.cubecart.com", "cats": [ 6 ], - "html": "(Powered by ]+cubecart\\.com|]+>Powered by CubeCart)", + "html": "(?:Powered by ]+cubecart\\.com|]+>Powered by CubeCart)", "meta": { "generator": "cubecart" }, "implies": "PHP" }, @@ -520,7 +520,7 @@ "d3": { "website": "mbostock.github.com/d3", "cats": [ 25 ], - "script": "d3(\\.v2)?(\\.min)?\\.js" + "script": "d3(?:\\.v2)?(?:\\.min)?\\.js" }, "Dancer": { "website": "perldancer.org", @@ -550,7 +550,7 @@ "Debian": { "website": "debian.org", "cats": [ 28 ], - "headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" } + "headers": { "Server": "Debian", "X-Powered-By": "(?:Debian|dotdeb|(sarge|etch|lenny|squeeze|wheezy|jessie))\\;version:\\1" } }, "DedeCMS": { "website": "dedecms.com", @@ -588,7 +588,7 @@ "Django": { "website": "djangoproject.com", "cats": [ 18 ], - "html": "(powered by ]+>Django ?([\\d.]+)?|
)\\;version:\\2", + "html": "(?:powered by ]+>Django ?([\\d.]+)?|
)\\;version:\\1", "env": "^__admin_media_prefix__", "implies": "Python" }, @@ -602,14 +602,14 @@ "Dojo": { "website": "dojotoolkit.org", "cats": [ 12 ], - "script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1", + "script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1", "env": "^dojo$" }, "Dokeos": { "website": "dokeos.com", "cats": [ 21 ], "meta": { "generator": "Dokeos" }, - "html": "(Portal ]+>Dokeos|@import \"[^\"]+dokeos_blue)", + "html": "(?:Portal ]+>Dokeos|@import \"[^\"]+dokeos_blue)", "headers": { "X-Powered-By": "Dokeos" }, "implies": [ "PHP", "Xajax", "jQuery", "CKEditor" ] }, @@ -632,26 +632,26 @@ "Doxygen": { "website": "stack.nl/~dimitri/doxygen", "cats": [ 4 ], - "html": "()", + "html": "(?:]* href=\"templates/gambio/|]content\\.php\\?coID=\\d|)", "implies": "PHP" }, "Gauges": { @@ -850,7 +850,7 @@ "website": "google.com/analytics", "cats": [ 10 ], "html": "_gaq\\.push\\(\\['_setAccount", - "script": "(\\.google-analytics\\.com/ga\\.js|google-analytics\\.com/urchin\\.js)", + "script": "(?:\\.google-analytics\\.com/ga\\.js|google-analytics\\.com/urchin\\.js)", "headers": { "Set-Cookie": "__utma" }, "env": "^gaGlobal$" }, @@ -874,7 +874,7 @@ "Google Maps": { "website": "maps.google.com", "cats": [ 35 ], - "script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3" + "script": "(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1" }, "Google PageSpeed": { "website": "developers.google.com/speed/pagespeed/mod", @@ -900,7 +900,7 @@ "GoStats": { "website": "gostats.com", "cats": [ 10 ], - "env": "^_go(stats|_track)" + "env": "^_go(?:stats|_track)" }, "Graffiti CMS": { "website": "graffiticms.codeplex.com", @@ -927,7 +927,7 @@ "GX WebManager": { "website": "www.gxsoftware.com/en/products/web-content-management.htm", "cats": [ 1 ], - "meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" }, + "meta": { "generator": "GX WebManager(?: ([\\d.]+))?\\;version:\\1" }, "html": "", + "html": "", "env": "^_?owa_" }, "OneStat": { @@ -1567,7 +1568,7 @@ "OpenCart": { "website": "www.opencart.com", "cats": [ 6 ], - "html": "(index\\.php\\?route=[a-z]+/|Powered By ]+OpenCart)", + "html": "(?:index\\.php\\?route=[a-z]+/|Powered By ]+OpenCart)", "implies": "PHP" }, "openEngine": { @@ -1579,7 +1580,7 @@ "website": "hub.opensolaris.org/bin/view/Project+opengrok/WebHome", "cats": [ 19 ], "headers": { "Set-Cookie": "OpenGrok" }, - "meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" }, + "meta": { "generator": "OpenGrok(?: v?([\\d.]+))?\\;version:\\1" }, "implies": "Java" }, "OpenGSE": { @@ -1602,7 +1603,7 @@ "OpenSSL": { "website": "openssl.org", "cats": [ 33 ], - "headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" } + "headers": { "Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1" } }, "OpenText Web Solutions": { "website": "websolutions.opentext.com", @@ -1618,7 +1619,7 @@ "Oracle Application Server": { "website": "www.oracle.com/technetwork/middleware/ias/overview/index.html", "cats": [ 22 ], - "headers": { "Server": "Oracle(-| )Application(-| )Server((-| )(\\d+[a-z]?))?\\;version:\\5" } + "headers": { "Server": "Oracle\\bApplication\\bServer(?:\\b(\\d+[a-z]?))?\\;version:\\1" } }, "Oracle Recommendations On Demand": { "website": "www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html", @@ -1628,7 +1629,7 @@ "osCommerce": { "website": "www.oscommerce.com", "cats": [ 6 ], - "html": "(]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce|<[^]+class=\"[^>]*infoBoxHeading)", + "html": "(?:]*(?:\\?|&)osCsid|Powered by (?:<[^]+>)?osCommerce|<[^]+class=\"[^>]*infoBoxHeading)", "headers": { "Set-Cookie": "osCsid=" } }, "osCSS": { @@ -1640,13 +1641,13 @@ "website": "outbrain.com", "cats": [ 5 ], "script": "widgets\\.outbrain\\.com/outbrain\\.js", - "env": "^(OutbrainPermaLink|OB_releaseVer)$" + "env": "^(?:OutbrainPermaLink|OB_releaseVer)$" }, "OXID eShop": { "website": "oxid-esales.com", "cats": [ 6 ], "html": "