Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix an inefficient regex in autoInject #1767

Merged
merged 7 commits into from Dec 2, 2021
Merged

Fix an inefficient regex in autoInject #1767

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c89420f
Fix an inefficient regex in autoInject
meekdenzo Nov 5, 2021
c2a8508
'properly strip comments in argument definitions' test failure
meekdenzo Nov 23, 2021
49cb68b
Update test/autoInject.js
meekdenzo Nov 25, 2021
8f9e8f5
Update on url-comments lib/autoInject.js
meekdenzo Nov 25, 2021
42f5a38
move new tests test/autoInject.js
meekdenzo Nov 28, 2021
0e03457
Merge branch 'caolan:master' into perf
meekdenzo Nov 28, 2021
ff1ac43
indentation fix test/autoInject.js
meekdenzo Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/autoInject.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ var FN_ARGS = /^(?:async\s+)?(?:function)?\s*\w*\s*\(\s*([^)]+)\s*\)(?:\s*{)/;
var ARROW_FN_ARGS = /^(?:async\s+)?\(?\s*([^)=]+)\s*\)?(?:\s*=>)/;
var FN_ARG_SPLIT = /,/;
var FN_ARG = /(=.+)?(\s*)$/;
var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
var STRIP_COMMENTS = /(\/\*(?:[^/]|\/(?!\*))*\*\/)|([^:]|^)\/\/.*$/mg;
meekdenzo marked this conversation as resolved.
Show resolved Hide resolved

function parseParams(func) {
const src = func.toString().replace(STRIP_COMMENTS, '');
Expand Down
30 changes: 30 additions & 0 deletions test/autoInject.js
View file
Open in desktop
Expand Up @@ -4,6 +4,36 @@ var {expect} = require('chai');

describe('autoInject', () => {

it('should not be subject to ReDoS', () => {
// This test will timeout if the bug is present.
var someComments = 'text/*'.repeat(1000000)
expect(() => async.autoInject({
someComments,
a () {}
})).to.throw()
});

it('should properly strip comments in argument definitions', () => {
var foo =
`(inline /* remove me */) => {return a}` +
`(
// remove this
singleline
) => {return a}`
expect (() => async.autoInject({
ab (a) {
a = foo
return a;
}
})).to.deep.eql(
`(inline ) => {return a}` +
`(

singleline
) => {return a}`
)
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a test that will fail if either halves of the regular expression are not working:

Suggested change
it('should properly strip comments in argument definitions', () => {
var foo =
`(inline /* remove me */) => {return a}` +
`(
// remove this
singleline
) => {return a}`
expect (() => async.autoInject({
ab (a) {
a = foo
return a;
}
})).to.deep.eql(
`(inline ) => {return a}` +
`(
singleline
) => {return a}`
)
});
it('should properly strip comments in argument definitions', (done) => {
async.autoInject({
task1: function(task2, /* ) */ callback) {
callback(null, true);
},
task2: function task2(task3 // )
,callback) {
callback(null, true);
},
task3: function task3(callback) {
callback(null, true);
}
},
(err, result) => {
expect(err).to.eql(null);
expect(result).to.deep.eql({task1: true, task2: true, task3: true});
done();
});
});

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your input @Trott
This looks so much better!


it("basics", (done) => {
var callOrder = [];
async.autoInject({
Expand Down