Merge pull request #546 from hansott/master

 Use AST to verify whether regexes are safe
This commit is contained in:
Faisal Salman 2021-10-27 06:27:06 +07:00 committed by GitHub
commit b86860e850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions

View File

@ -160,6 +160,8 @@
]
},
"devDependencies": {
"@babel/parser": "7.15.8",
"@babel/traverse": "7.15.4",
"jshint": "~2.12.0",
"mocha": "~8.2.0",
"requirejs": "^2.3.2",

View File

@ -2,6 +2,8 @@ var fs = require('fs');
var safe = require('safe-regex');
var assert = require('assert');
var requirejs = require('requirejs');
var parseJS = require('@babel/parser').parse;
var traverse = require('@babel/traverse').default;
var UAParser = require('./../src/ua-parser');
var browsers = require('./browser-test.json');
var cpus = require('./cpu-test.json');
@ -137,12 +139,19 @@ describe('Testing regexes', function () {
var regexes;
// todo: use AST-based instead of grep
before('Read main js file', function (done) {
fs.readFile('src/ua-parser.js', 'utf8', function (err, data) {
regexes = data.match(/(\/.+\/[ig]+)(?=[,\s\n])/g);
done();
before('Read main js file', function () {
var code = fs.readFileSync('src/ua-parser.js', 'utf8').toString();
var ast = parseJS(code, { sourceType: "script" });
regexes = [];
traverse(ast, {
RegExpLiteral: (path) => {
regexes.push(path.node.pattern);
}
});
if (regexes.length === 0) {
throw new Error("Regexes cannot be empty!");
}
});
describe('Begin testing', function () {
@ -156,4 +165,4 @@ describe('Testing regexes', function () {
});
});
});
})
});