Merge pull request #120 from ready-research/master

Security fix for ReDoS

Author: NicolasCARPi

lib/parsers/api.js

@@ -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.

lib/parsers/api_define.js

@@ -1,4 +1,3 @@
-var trim     = require('../utils/trim');
 var unindent = require('../utils/unindent');
 
 var ParameterError = require('../errors/parameter_error');
@@ -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);

lib/parsers/api_deprecated.js

@@ -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 {

lib/parsers/api_description.js

@@ -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;

lib/parsers/api_example.js

@@ -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 = '';

lib/parsers/api_group.js

@@ -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;

lib/parsers/api_name.js

@@ -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;

lib/parsers/api_param.js

@@ -1,4 +1,3 @@
-var trim     = require('../utils/trim');
 var unindent = require('../utils/unindent');
 
 var group = '';
@@ -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');

lib/parsers/api_sample_request.js

@@ -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;

lib/parsers/api_use.js

@@ -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;

lib/parsers/api_version.js

@@ -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;