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

fix: Regular Expression Denial of Service (ReDoS) #6132

Merged
merged 11 commits into from
Dec 26, 2023
Merged

fix: Regular Expression Denial of Service (ReDoS) #6132

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7792907
test: failed test to ReDoS attack
WillianAgostini Dec 14, 2023
e4df674
fix: optimized regex of combineURLs
WillianAgostini Dec 14, 2023
5c975f4
test: increase ReDoS min execution time
WillianAgostini Dec 14, 2023
c36fdfe
style: ajust identation
WillianAgostini Dec 14, 2023
762c86a
perf: add Regex instance on combineURLs
WillianAgostini Dec 14, 2023
3b1d773
perf: add Regex instance on combineURLs
WillianAgostini Dec 14, 2023
918286c
fix(combineURL): regex for ReDoS attack
WillianAgostini Dec 20, 2023
fd4f547
Merge branch 'v1.x' into fix/6131
WillianAgostini Dec 20, 2023
ae9f303
perf: optimize regex and remove unnecessary regex
WillianAgostini Dec 26, 2023
290b89f
fix: removed multiple slash replacement;
DigitalBrainJS Dec 26, 2023
f108716
Merge branch 'fix/6131' of https://github.com/WillianAgostini/axios i…
DigitalBrainJS Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/helpers/combineURLs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
* @returns {string} The combined URL
*/
export default function combineURLs(baseURL, relativeURL) {
return relativeURL
? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
: baseURL;
if (!relativeURL) return baseURL;

return baseURL.replace(/\/{3,}/, '').replace(/\/+$/, '')
Fixed Show fixed Hide fixed
+ '/'
+ relativeURL.replace(/\/{3,}/, '').replace(/^\/+/, '');
}
16 changes: 15 additions & 1 deletion test/specs/defaults.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,24 @@ describe('defaults', function () {
const instance = axios.create();
axios.defaults.baseURL = 'http://example.org/';

instance.get('/foo/users');

getAjaxRequest().then(function (request) {
expect(request.url).toBe('/foo/users');
done();
});
});

it('should resistent to ReDoS attack', function (done) {
const instance = axios.create();
const start = performance.now();
instance.defaults.baseURL = '/'.repeat(100000) + 'bar/';
instance.get('/foo');

getAjaxRequest().then(function (request) {
expect(request.url).toBe('/foo');
const elapsedTimeMs = performance.now() - start;
expect(elapsedTimeMs).toBeLessThan(20);
expect(request.url).toBe('bar/foo');
done();
});
});
Expand Down