make internal extended: true array limit dynamic

closes #42 closes #43 closes #46 closes #58 closes #60 closes #61 closes #65
expressjs · Nov 22, 2014 · e54219e · e54219e
1 parent 810c089
commit e54219e
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 16 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * make internal `extended: true` array limit dynamic
+
 1.9.3 / 2014-11-21
 ==================
 

diff --git a/lib/types/urlencoded.js b/lib/types/urlencoded.js
@@ -110,35 +110,33 @@ function extendedparser(options) {
     parameterLimit = parameterLimit | 0
   }
 
-  var opts = {
-    arrayLimit: 100,
-    parameterLimit: parameterLimit
-  }
-
   return function queryparse(body) {
-    if (overlimit(body, parameterLimit)) {
+    var paramCount = parameterCount(body, parameterLimit)
+
+    if (paramCount === undefined) {
       var err = new Error('too many parameters')
       err.status = 413
       throw err
     }
 
-    return parse(body, opts)
+    var arrayLimit = Math.max(100, paramCount)
+
+    return parse(body, {
+      arrayLimit: arrayLimit,
+      parameterLimit: parameterLimit
+    })
   }
 }
 
 /**
- * Determine if the parameter count is over the limit.
+ * Count the number of parameters, stopping once limit reached
  *
  * @param {string} body
  * @param {number} limit
  * @api private
  */
 
-function overlimit(body, limit) {
-  if (limit === Infinity) {
-    return false
-  }
-
+function parameterCount(body, limit) {
   var count = 0
   var index = 0
 
@@ -147,11 +145,11 @@ function overlimit(body, limit) {
     index++
 
     if (count === limit) {
-      return true
+      return undefined
     }
   }
 
-  return false
+  return count
 }
 
 /**
@@ -196,7 +194,9 @@ function simpleparser(options) {
   }
 
   return function queryparse(body) {
-    if (overlimit(body, parameterLimit)) {
+    var paramCount = parameterCount(body, parameterLimit)
+
+    if (paramCount === undefined) {
       var err = new Error('too many parameters')
       err.status = 413
       throw err

diff --git a/test/urlencoded.js b/test/urlencoded.js
@@ -121,6 +121,34 @@ describe('bodyParser.urlencoded()', function(){
         .expect(200, '{"user":{"name":{"first":"Tobi"}}}', done)
       })
 
+      it('should parse array index notation', function(done){
+        request(server)
+        .post('/')
+        .set('Content-Type', 'application/x-www-form-urlencoded')
+        .send('foo[0]=bar&foo[1]=baz')
+        .expect(200, '{"foo":["bar","baz"]}', done)
+      })
+
+      it('should parse array index notation with large array', function(done){
+        var str = 'f[0]=0'
+
+        for (var i = 1; i < 500; i++) {
+          str += '&f[' + i + ']=' + i.toString(16)
+        }
+
+        request(server)
+        .post('/')
+        .set('Content-Type', 'application/x-www-form-urlencoded')
+        .send(str)
+        .expect(function (res) {
+          var obj = JSON.parse(res.text)
+          assert.equal(Object.keys(obj).length, 1)
+          assert.equal(Array.isArray(obj.f), true)
+          assert.equal(obj.f.length, 500)
+        })
+        .expect(200, done)
+      })
+
       it('should parse array of objects syntax', function(done){
         request(server)
         .post('/')