Skip to content

Security fix for ReDoS #1

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.

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

Merged
merged 12 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions lib/parsers/api.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var trim = require('../utils/trim');

function parse(content) {
content = trim(content);
content = content.trim();

// Search: type, url and title
// Example: {get} /user/:id Get User by ID.
Expand Down
3 changes: 1 addition & 2 deletions lib/parsers/api_define.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var trim = require('../utils/trim');
var unindent = require('../utils/unindent');

var ParameterError = require('../errors/parameter_error');
Expand All @@ -15,7 +14,7 @@ var _messages = {
function parse(content, source, messages) {
messages = messages || _messages;

content = trim(content);
content = content.trim();

var parseRegExp = /^(\w*)(.*?)(?:\s+|$)(.*)$/gm;
var matches = parseRegExp.exec(content);
Expand Down
3 changes: 1 addition & 2 deletions lib/parsers/api_deprecated.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var trim = require('../utils/trim');
var unindent = require('../utils/unindent');

function parse(content) {
var deprecated = trim(content);
var deprecated = content.trim();

if (deprecated.length > 0) {
return {
Expand Down
3 changes: 1 addition & 2 deletions lib/parsers/api_description.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var trim = require('../utils/trim');
var unindent = require('../utils/unindent');

function parse(content) {
var description = trim(content);
var description = content.trim();

if (description.length === 0)
return null;
Expand Down
3 changes: 1 addition & 2 deletions lib/parsers/api_example.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var trim = require('../utils/trim');
var unindent = require('../utils/unindent');

function parse(content, source) {
source = trim(source);
source = source.trim();

var title = '';
var text = '';
Expand Down
4 changes: 1 addition & 3 deletions lib/parsers/api_group.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var trim = require('../utils/trim');

function parse(content) {
var group = trim(content);
var group = content.trim();

if (group.length === 0)
return null;
Expand Down
4 changes: 1 addition & 3 deletions lib/parsers/api_name.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var trim = require('../utils/trim');

function parse(content) {
var name = trim(content);
var name = content.trim();

if(name.length === 0)
return null;
Expand Down
3 changes: 1 addition & 2 deletions lib/parsers/api_param.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var trim = require('../utils/trim');
var unindent = require('../utils/unindent');

var group = '';
Expand Down Expand Up @@ -69,7 +68,7 @@ var allowedValuesWithQuoteRegExp = new RegExp(/\'[^\']*[^\']\'/g);
var allowedValuesRegExp = new RegExp(/[^,\s]+/g);

function parse(content, source, defaultGroup) {
content = trim(content);
content = content.trim();

// replace Linebreak with Unicode
content = content.replace(/\n/g, '\uffff');
Expand Down
4 changes: 1 addition & 3 deletions lib/parsers/api_sample_request.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var trim = require('../utils/trim');

function parse(content) {
var url = trim(content);
var url = content.trim();

if(url.length === 0)
return null;
Expand Down
4 changes: 1 addition & 3 deletions lib/parsers/api_use.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var trim = require('../utils/trim');

function parse(content) {
var name = trim(content);
var name = content.trim();

if (name.length === 0)
return null;
Expand Down
4 changes: 1 addition & 3 deletions lib/parsers/api_version.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
var semver = require('semver');

var trim = require('../utils/trim');

var ParameterError = require('../errors/parameter_error');

function parse(content) {
content = trim(content);
content = content.trim();

if (content.length === 0)
return null;
Expand Down
9 changes: 0 additions & 9 deletions lib/utils/trim.js

This file was deleted.