From 766bf4df7f71f47ea99f2a66ae4dd5db5f83f75b Mon Sep 17 00:00:00 2001 From: q-- Date: Mon, 21 Sep 2015 13:33:50 +0200 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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 +}