Fix sourceMap error, fix apps.json issues

main
Elbert Alias 5 years ago
parent 72f87404ca
commit 62f881127c

@ -41,12 +41,14 @@ set -e
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" src/drivers/npm/package.json
# WebExtension
echo "Building WebExtension..."
webextension_dir=src/drivers/webextension
pushd $webextension_dir > /dev/null
sed -i "/sourceMappingURL/d" node_modules/webextension-polyfill/dist/browser-polyfill.js
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" manifest.json
zip -qr ../../../build/wappalyzer_webextension.zip . \

@ -1,12 +1,12 @@
#!/usr/bin/env node
var
let
app,
json = require('../src/apps.json');
for (app in json.apps) {
['headers', 'html', 'env', 'meta', 'script'].forEach(function(type) {
var
['headers', 'html', 'env', 'meta', 'script'].forEach((type) => {
let
key,
patterns = json.apps[app][type];
@ -21,13 +21,11 @@ for ( app in json.apps ) {
}
}
patterns.forEach(function(pattern) {
var
patterns.forEach((pattern) => {
let
attrs = pattern.split('\\;'),
regex = '/' + attrs.shift().replace('/', '\/') + '/',
version = attrs.find( function (attr){
return attr.indexOf('version:')===0;
} ),
regex = `/${attrs.shift().replace('/', '\/')}/`,
version = attrs.find(attr => attr.indexOf('version:') === 0),
amountOfCaptureGroups,
captureGroupsNeeded,
amountOfCaptureGroupsNeeded,
@ -38,14 +36,11 @@ for ( app in json.apps ) {
new RegExp(regex);
// Actual amount of capture groups
amountOfCaptureGroups = ''.match(new RegExp('(?:'+pattern+')?')).length - 1;
amountOfCaptureGroups = ''.match(new RegExp(`(?:${pattern})?`)).length - 1;
// Capture groups of which the result is used
captureGroupsNeeded = version ? (version.match(/\\\d/g) || []).filter( function(value, index, self){
return self.indexOf(value) === index;
}).map( function(value){//Because Math.max needs the integers only
return parseInt(value.charAt(1), 10);//Will only work if backreferences cannot be any longer than a single digit
}) : [];
captureGroupsNeeded = version ? (version.match(/\\\d/g) || []).filter((value, index, self) => self.indexOf(value) === index).map(value => parseInt(value.charAt(1), 10), // Will only work if backreferences cannot be any longer than a single digit
) : [];
// Amount of capture groups needed
amountOfCaptureGroupsNeeded = captureGroupsNeeded.length;
@ -55,24 +50,24 @@ for ( app in json.apps ) {
// Report error
if (amountOfCaptureGroups > amountOfCaptureGroupsNeeded) {
throw new Error('The pattern uses more capture groups than needed. Use non-capturing groups where appropriate.\n' + app + ': ' + type + ': ' + pattern);
throw new Error(`The pattern uses more capture groups than needed. Use non-capturing groups where appropriate.\n${app}: ${type}: ${pattern}`);
} else if (amountOfCaptureGroups < amountOfCaptureGroupsNeeded) {
throw new Error('The version string references more capture groups than there are in the pattern! Remove any incorrect back references from the version string and/or add the missing capture groups to the pattern.\n' + app + ': ' + type + ': ' + pattern);
throw new Error(`The version string references more capture groups than there are in the pattern! Remove any incorrect back references from the version string and/or add the missing capture groups to the pattern.\n${app}: ${type}: ${pattern}`);
} else if (highestBackReference > amountOfCaptureGroups) {
throw new Error('The version string references one or more capture groups whose index is higher than the amount of capture groups in the pattern. Please use the correct index instead of \\\\'+highestBackReference+'.\n' + app + ': ' + type + ': ' + pattern);
throw new Error(`The version string references one or more capture groups whose index is higher than the amount of capture groups in the pattern. Please use the correct index instead of \\\\${highestBackReference}.\n${app}: ${type}: ${pattern}`);
}
if (/^\/(?:\^\$|\.\+|\.\*)\/$/.test(regex)) {
throw new Error('Pattern should be replaced with empty string.\n' + app + ': ' + type + ': ' + pattern);
throw new Error(`Pattern should be replaced with empty string.\n${app}: ${type}: ${pattern}`);
}
if (type === 'html') {
if (/\.(?:\+|\*)/.test(regex)) {
throw new Error('Avoid ".+" and ".*" in HTML patterns. Consider using "[^>]+" or "[^<]+" instead.\n' + app + ': ' + type + ': ' + pattern);
throw new Error(`Avoid ".+" and ".*" in HTML patterns. Consider using "[^>]+" or "[^<]+" instead.\n${app}: ${type}: ${pattern}`);
}
if (!/[<>]/.test(regex)) {
throw new Error('HTML patterns must contain "<" or ">".\n' + app + ': ' + type + ': ' + pattern);
throw new Error(`HTML patterns must contain "<" or ">".\n${app}: ${type}: ${pattern}`);
}
}
@ -84,14 +79,13 @@ for ( app in json.apps ) {
// would mean not detecting the un-escaped ".". Replacing the character class with an
// underscore instead gives /test._+/, which WOULD yield a warning about the unescaped ".".)
if (/(?:^\/|[^\\])\.(?:[^*+]|\/$)/.test(regex.replace(/([^\\]|^)\[[^\]]+\]/g, '$1_'))) {
console.warn('Suspicious period (".") in pattern. Should this have been escaped?\n\tApp: ' + app + '\n\tPattern: ' + type + ': ' + pattern);
console.warn(`Suspicious period (".") in pattern. Should this have been escaped?\n\tApp: ${app}\n\tPattern: ${type}: ${pattern}`);
}
});
}
});
if (!/^https?:\/\//i.test(json.apps[app].website)) {
throw new Error('Invalid website URL\n' + app + ': ' + json.apps[app].website);
throw new Error(`Invalid website URL\n${app}: ${json.apps[app].website}`);
}
}

@ -1180,7 +1180,7 @@
62
],
"headers": {
"X-Hacker": "(automattic.com/jobs|wpvip.com/careers)"
"X-Hacker": "(?:automattic.com/jobs|wpvip.com/careers)"
},
"icon": "automattic.png",
"implies": "WordPress",
@ -4173,7 +4173,10 @@
"<header class=\"navbar navbar-fixed-top navbar-gitlab with-horizontal-nav\">"
],
"icon": "GitLab.svg",
"implies": ["Ruby on Rails", "Vue.js"],
"implies": [
"Ruby on Rails",
"Vue.js"
],
"js": {
"GitLab": "",
"gl.dashboardOptions": ""
@ -14006,16 +14009,6 @@
"script": "/media/conv/js/jquery\\.js",
"website": "https://uknowva.com"
},
"Pytonik": {
"cats": [
18,
22
],
"html": "Pytonik ([0-9.]+);version:\\1",
"icon": "pytonik.png",
"implies": "Python",
"website": "https://pytonik.com"
},
"vBulletin": {
"cats": [
2
@ -14318,9 +14311,6 @@
"meta": {
"generator": "Varbase"
},
"html": [
"varbase_"
],
"cpe": "cpe:/a:vardot:varbase",
"icon": "varbase.png",
"implies": "Drupal",

@ -1,6 +1,6 @@
{
"name": "wappalyzer",
"version": "5.9.1",
"version": "5.9.18",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

@ -2,7 +2,7 @@
"name": "wappalyzer",
"description": "Uncovers the technologies used on websites",
"homepage": "https://github.com/AliasIO/Wappalyzer",
"version": "5.9.18",
"version": "5.9.4",
"author": "Elbert Alias",
"license": "GPL-3.0",
"repository": {

@ -4,7 +4,7 @@
"author": "Elbert Alias",
"homepage_url": "https://www.wappalyzer.com",
"description": "Identify web technologies",
"version": "5.9.3",
"version": "5.9.4",
"default_locale": "en",
"manifest_version": 2,
"icons": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB