[#94] Backend

https://project.mdnd-it.cc/work_packages/94

SerpentRace_Backend/node_modules/body-parser/lib/read.js

@@ -12,12 +12,10 @@
  */
 
 var createError = require('http-errors')
-var destroy = require('destroy')
 var getBody = require('raw-body')
 var iconv = require('iconv-lite')
 var onFinished = require('on-finished')
-var unpipe = require('unpipe')
-var zlib = require('zlib')
+var zlib = require('node:zlib')
 
 /**
  * Module exports.
@@ -42,9 +40,6 @@ function read (req, res, next, parse, debug, options) {
   var opts = options
   var stream
 
-  // flag as parsed
-  req._body = true
-
   // read options
   var encoding = opts.encoding !== null
     ? opts.encoding
@@ -93,8 +88,8 @@ function read (req, res, next, parse, debug, options) {
 
       // unpipe from stream and destroy
       if (stream !== req) {
-        unpipe(req)
-        destroy(stream, true)
+        req.unpipe()
+        stream.destroy()
       }
 
       // read off entire request
@@ -125,7 +120,7 @@ function read (req, res, next, parse, debug, options) {
       str = typeof body !== 'string' && encoding !== null
         ? iconv.decode(body, encoding)
         : body
-      req.body = parse(str)
+      req.body = parse(str, encoding)
     } catch (err) {
       next(createError(400, err, {
         body: str,
@@ -151,7 +146,6 @@ function read (req, res, next, parse, debug, options) {
 function contentstream (req, debug, inflate) {
   var encoding = (req.headers['content-encoding'] || 'identity').toLowerCase()
   var length = req.headers['content-length']
-  var stream
 
   debug('content-encoding "%s"', encoding)
 
@@ -162,29 +156,40 @@ function contentstream (req, debug, inflate) {
     })
   }
 
+  if (encoding === 'identity') {
+    req.length = length
+    return req
+  }
+
+  var stream = createDecompressionStream(encoding, debug)
+  req.pipe(stream)
+  return stream
+}
+
+/**
+ * Create a decompression stream for the given encoding.
+ * @param {string} encoding
+ * @param {function} debug
+ * @return {object}
+ * @api private
+ */
+function createDecompressionStream (encoding, debug) {
   switch (encoding) {
     case 'deflate':
-      stream = zlib.createInflate()
       debug('inflate body')
-      req.pipe(stream)
-      break
+      return zlib.createInflate()
     case 'gzip':
-      stream = zlib.createGunzip()
       debug('gunzip body')
-      req.pipe(stream)
-      break
-    case 'identity':
-      stream = req
-      stream.length = length
-      break
+      return zlib.createGunzip()
+    case 'br':
+      debug('brotli decompress body')
+      return zlib.createBrotliDecompress()
     default:
       throw createError(415, 'unsupported content encoding "' + encoding + '"', {
         encoding: encoding,
         type: 'encoding.unsupported'
       })
   }
-
-  return stream
 }
 
 /**

SerpentRace_Backend/node_modules/body-parser/lib/types/json.js

@@ -12,12 +12,12 @@
  * @private
  */
 
-var bytes = require('bytes')
-var contentType = require('content-type')
 var createError = require('http-errors')
 var debug = require('debug')('body-parser:json')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
+var { getCharset, normalizeOptions } = require('../utils')
 
 /**
  * Module exports.
@@ -51,25 +51,10 @@ var JSON_SYNTAX_REGEXP = /#+/g
  */
 
 function json (options) {
-  var opts = options || {}
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'application/json')
 
-  var limit = typeof opts.limit !== 'number'
-    ? bytes.parse(opts.limit || '100kb')
-    : opts.limit
-  var inflate = opts.inflate !== false
-  var reviver = opts.reviver
-  var strict = opts.strict !== false
-  var type = opts.type || 'application/json'
-  var verify = opts.verify || false
-
-  if (verify !== false && typeof verify !== 'function') {
-    throw new TypeError('option verify must be function')
-  }
-
-  // create the appropriate type checking function
-  var shouldParse = typeof type !== 'function'
-    ? typeChecker(type)
-    : type
+  var reviver = options?.reviver
+  var strict = options?.strict !== false
 
   function parse (body) {
     if (body.length === 0) {
@@ -99,13 +84,15 @@ function json (options) {
   }
 
   return function jsonParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     // skip requests without bodies
     if (!typeis.hasBody(req)) {
@@ -137,9 +124,9 @@ function json (options) {
     // read
     read(req, res, next, parse, debug, {
       encoding: charset,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
+      inflate,
+      limit,
+      verify
     })
   }
 }
@@ -193,21 +180,6 @@ function firstchar (str) {
     : undefined
 }
 
-/**
- * Get the charset of a request.
- *
- * @param {object} req
- * @api private
- */
-
-function getCharset (req) {
-  try {
-    return (contentType.parse(req).parameters.charset || '').toLowerCase()
-  } catch (e) {
-    return undefined
-  }
-}
-
 /**
  * Normalize a SyntaxError for JSON.parse.
  *
@@ -232,16 +204,3 @@ function normalizeJsonSyntaxError (error, obj) {
 
   return error
 }
-
-/**
- * Get the simple type checker.
- *
- * @param {string} type
- * @return {function}
- */
-
-function typeChecker (type) {
-  return function checkType (req) {
-    return Boolean(typeis(req, type))
-  }
-}

SerpentRace_Backend/node_modules/body-parser/lib/types/raw.js

@@ -10,10 +10,11 @@
  * Module dependencies.
  */
 
-var bytes = require('bytes')
 var debug = require('debug')('body-parser:raw')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
+var { normalizeOptions } = require('../utils')
 
 /**
  * Module exports.
@@ -30,36 +31,22 @@ module.exports = raw
  */
 
 function raw (options) {
-  var opts = options || {}
-
-  var inflate = opts.inflate !== false
-  var limit = typeof opts.limit !== 'number'
-    ? bytes.parse(opts.limit || '100kb')
-    : opts.limit
-  var type = opts.type || 'application/octet-stream'
-  var verify = opts.verify || false
-
-  if (verify !== false && typeof verify !== 'function') {
-    throw new TypeError('option verify must be function')
-  }
-
-  // create the appropriate type checking function
-  var shouldParse = typeof type !== 'function'
-    ? typeChecker(type)
-    : type
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'application/octet-stream')
 
   function parse (buf) {
     return buf
   }
 
   return function rawParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     // skip requests without bodies
     if (!typeis.hasBody(req)) {
@@ -80,22 +67,9 @@ function raw (options) {
     // read
     read(req, res, next, parse, debug, {
       encoding: null,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
+      inflate,
+      limit,
+      verify
     })
   }
 }
-
-/**
- * Get the simple type checker.
- *
- * @param {string} type
- * @return {function}
- */
-
-function typeChecker (type) {
-  return function checkType (req) {
-    return Boolean(typeis(req, type))
-  }
-}

SerpentRace_Backend/node_modules/body-parser/lib/types/text.js

@@ -10,11 +10,11 @@
  * Module dependencies.
  */
 
-var bytes = require('bytes')
-var contentType = require('content-type')
 var debug = require('debug')('body-parser:text')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
+var { getCharset, normalizeOptions } = require('../utils')
 
 /**
  * Module exports.
@@ -31,37 +31,24 @@ module.exports = text
  */
 
 function text (options) {
-  var opts = options || {}
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'text/plain')
 
-  var defaultCharset = opts.defaultCharset || 'utf-8'
-  var inflate = opts.inflate !== false
-  var limit = typeof opts.limit !== 'number'
-    ? bytes.parse(opts.limit || '100kb')
-    : opts.limit
-  var type = opts.type || 'text/plain'
-  var verify = opts.verify || false
-
-  if (verify !== false && typeof verify !== 'function') {
-    throw new TypeError('option verify must be function')
-  }
-
-  // create the appropriate type checking function
-  var shouldParse = typeof type !== 'function'
-    ? typeChecker(type)
-    : type
+  var defaultCharset = options?.defaultCharset || 'utf-8'
 
   function parse (buf) {
     return buf
   }
 
   return function textParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     // skip requests without bodies
     if (!typeis.hasBody(req)) {
@@ -85,37 +72,9 @@ function text (options) {
     // read
     read(req, res, next, parse, debug, {
       encoding: charset,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
+      inflate,
+      limit,
+      verify
     })
   }
 }
-
-/**
- * Get the charset of a request.
- *
- * @param {object} req
- * @api private
- */
-
-function getCharset (req) {
-  try {
-    return (contentType.parse(req).parameters.charset || '').toLowerCase()
-  } catch (e) {
-    return undefined
-  }
-}
-
-/**
- * Get the simple type checker.
- *
- * @param {string} type
- * @return {function}
- */
-
-function typeChecker (type) {
-  return function checkType (req) {
-    return Boolean(typeis(req, type))
-  }
-}

SerpentRace_Backend/node_modules/body-parser/lib/types/urlencoded.js

@@ -12,13 +12,13 @@
  * @private
  */
 
-var bytes = require('bytes')
-var contentType = require('content-type')
 var createError = require('http-errors')
 var debug = require('debug')('body-parser:urlencoded')
-var deprecate = require('depd')('body-parser')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
+var qs = require('qs')
+var { getCharset, normalizeOptions } = require('../utils')
 
 /**
  * Module exports.
@@ -26,12 +26,6 @@ var typeis = require('type-is')
 
 module.exports = urlencoded
 
-/**
- * Cache of parser modules.
- */
-
-var parsers = Object.create(null)
-
 /**
  * Create a middleware to parse urlencoded bodies.
  *
@@ -41,52 +35,32 @@ var parsers = Object.create(null)
  */
 
 function urlencoded (options) {
-  var opts = options || {}
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'application/x-www-form-urlencoded')
 
-  // notice because option default will flip in next major
-  if (opts.extended === undefined) {
-    deprecate('undefined extended: provide extended option')
-  }
-
-  var extended = opts.extended !== false
-  var inflate = opts.inflate !== false
-  var limit = typeof opts.limit !== 'number'
-    ? bytes.parse(opts.limit || '100kb')
-    : opts.limit
-  var type = opts.type || 'application/x-www-form-urlencoded'
-  var verify = opts.verify || false
-  var depth = typeof opts.depth !== 'number'
-    ? Number(opts.depth || 32)
-    : opts.depth
-
-  if (verify !== false && typeof verify !== 'function') {
-    throw new TypeError('option verify must be function')
+  var defaultCharset = options?.defaultCharset || 'utf-8'
+  if (defaultCharset !== 'utf-8' && defaultCharset !== 'iso-8859-1') {
+    throw new TypeError('option defaultCharset must be either utf-8 or iso-8859-1')
   }
 
   // create the appropriate query parser
-  var queryparse = extended
-    ? extendedparser(opts)
-    : simpleparser(opts)
+  var queryparse = createQueryParser(options)
 
-  // create the appropriate type checking function
-  var shouldParse = typeof type !== 'function'
-    ? typeChecker(type)
-    : type
-
-  function parse (body) {
+  function parse (body, encoding) {
     return body.length
-      ? queryparse(body)
+      ? queryparse(body, encoding)
       : {}
   }
 
   return function urlencodedParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     // skip requests without bodies
     if (!typeis.hasBody(req)) {
@@ -105,8 +79,8 @@ function urlencoded (options) {
     }
 
     // assert charset
-    var charset = getCharset(req) || 'utf-8'
-    if (charset !== 'utf-8') {
+    var charset = getCharset(req) || defaultCharset
+    if (charset !== 'utf-8' && charset !== 'iso-8859-1') {
       debug('invalid charset')
       next(createError(415, 'unsupported charset "' + charset.toUpperCase() + '"', {
         charset: charset,
@@ -117,12 +91,10 @@ function urlencoded (options) {
 
     // read
     read(req, res, next, parse, debug, {
-      debug: debug,
       encoding: charset,
-      inflate: inflate,
-      limit: limit,
-      verify: verify,
-      depth: depth
+      inflate,
+      limit,
+      verify
     })
   }
 }
@@ -133,15 +105,14 @@ function urlencoded (options) {
  * @param {object} options
  */
 
-function extendedparser (options) {
-  var parameterLimit = options.parameterLimit !== undefined
-    ? options.parameterLimit
+function createQueryParser (options) {
+  var extended = Boolean(options?.extended)
+  var parameterLimit = options?.parameterLimit !== undefined
+    ? options?.parameterLimit
     : 1000
-
-  var depth = typeof options.depth !== 'number'
-    ? Number(options.depth || 32)
-    : options.depth
-  var parse = parser('qs')
+  var charsetSentinel = options?.charsetSentinel
+  var interpretNumericEntities = options?.interpretNumericEntities
+  var depth = extended ? (options?.depth !== undefined ? options?.depth : 32) : 0
 
   if (isNaN(parameterLimit) || parameterLimit < 1) {
     throw new TypeError('option parameterLimit must be a positive number')
@@ -155,7 +126,7 @@ function extendedparser (options) {
     parameterLimit = parameterLimit | 0
   }
 
-  return function queryparse (body) {
+  return function queryparse (body, encoding) {
     var paramCount = parameterCount(body, parameterLimit)
 
     if (paramCount === undefined) {
@@ -165,16 +136,19 @@ function extendedparser (options) {
       })
     }
 
-    var arrayLimit = Math.max(100, paramCount)
+    var arrayLimit = extended ? Math.max(100, paramCount) : 0
 
-    debug('parse extended urlencoding')
+    debug('parse ' + (extended ? 'extended ' : '') + 'urlencoding')
     try {
-      return parse(body, {
+      return qs.parse(body, {
         allowPrototypes: true,
         arrayLimit: arrayLimit,
         depth: depth,
-        strictDepth: true,
-        parameterLimit: parameterLimit
+        charsetSentinel: charsetSentinel,
+        interpretNumericEntities: interpretNumericEntities,
+        charset: encoding,
+        parameterLimit: parameterLimit,
+        strictDepth: true
       })
     } catch (err) {
       if (err instanceof RangeError) {
@@ -188,21 +162,6 @@ function extendedparser (options) {
   }
 }
 
-/**
- * Get the charset of a request.
- *
- * @param {object} req
- * @api private
- */
-
-function getCharset (req) {
-  try {
-    return (contentType.parse(req).parameters.charset || '').toLowerCase()
-  } catch (e) {
-    return undefined
-  }
-}
-
 /**
  * Count the number of parameters, stopping once limit reached
  *
@@ -212,96 +171,7 @@ function getCharset (req) {
  */
 
 function parameterCount (body, limit) {
-  var count = 0
-  var index = 0
+  var len = body.split('&').length
 
-  while ((index = body.indexOf('&', index)) !== -1) {
-    count++
-    index++
-
-    if (count === limit) {
-      return undefined
-    }
-  }
-
-  return count
-}
-
-/**
- * Get parser for module name dynamically.
- *
- * @param {string} name
- * @return {function}
- * @api private
- */
-
-function parser (name) {
-  var mod = parsers[name]
-
-  if (mod !== undefined) {
-    return mod.parse
-  }
-
-  // this uses a switch for static require analysis
-  switch (name) {
-    case 'qs':
-      mod = require('qs')
-      break
-    case 'querystring':
-      mod = require('querystring')
-      break
-  }
-
-  // store to prevent invoking require()
-  parsers[name] = mod
-
-  return mod.parse
-}
-
-/**
- * Get the simple query parser.
- *
- * @param {object} options
- */
-
-function simpleparser (options) {
-  var parameterLimit = options.parameterLimit !== undefined
-    ? options.parameterLimit
-    : 1000
-  var parse = parser('querystring')
-
-  if (isNaN(parameterLimit) || parameterLimit < 1) {
-    throw new TypeError('option parameterLimit must be a positive number')
-  }
-
-  if (isFinite(parameterLimit)) {
-    parameterLimit = parameterLimit | 0
-  }
-
-  return function queryparse (body) {
-    var paramCount = parameterCount(body, parameterLimit)
-
-    if (paramCount === undefined) {
-      debug('too many parameters')
-      throw createError(413, 'too many parameters', {
-        type: 'parameters.too.many'
-      })
-    }
-
-    debug('parse urlencoding')
-    return parse(body, undefined, undefined, { maxKeys: parameterLimit })
-  }
-}
-
-/**
- * Get the simple type checker.
- *
- * @param {string} type
- * @return {function}
- */
-
-function typeChecker (type) {
-  return function checkType (req) {
-    return Boolean(typeis(req, type))
-  }
+  return len > limit ? undefined : len - 1
 }

SerpentRace_Backend/node_modules/body-parser/lib/utils.js

@@ -0,0 +1,83 @@
+'use strict'
+
+/**
+ * Module dependencies.
+ */
+
+var bytes = require('bytes')
+var contentType = require('content-type')
+var typeis = require('type-is')
+
+/**
+ * Module exports.
+ */
+
+module.exports = {
+  getCharset,
+  normalizeOptions
+}
+
+/**
+ * Get the charset of a request.
+ *
+ * @param {object} req
+ * @api private
+ */
+
+function getCharset (req) {
+  try {
+    return (contentType.parse(req).parameters.charset || '').toLowerCase()
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Get the simple type checker.
+ *
+ * @param {string | string[]} type
+ * @return {function}
+ */
+
+function typeChecker (type) {
+  return function checkType (req) {
+    return Boolean(typeis(req, type))
+  }
+}
+
+/**
+ * Normalizes the common options for all parsers.
+ *
+ * @param {object} options options to normalize
+ * @param {string | string[] | function} defaultType default content type(s) or a function to determine it
+ * @returns {object}
+ */
+function normalizeOptions (options, defaultType) {
+  if (!defaultType) {
+    // Parsers must define a default content type
+    throw new TypeError('defaultType must be provided')
+  }
+
+  var inflate = options?.inflate !== false
+  var limit = typeof options?.limit !== 'number'
+    ? bytes.parse(options?.limit || '100kb')
+    : options?.limit
+  var type = options?.type || defaultType
+  var verify = options?.verify || false
+
+  if (verify !== false && typeof verify !== 'function') {
+    throw new TypeError('option verify must be function')
+  }
+
+  // create the appropriate type checking function
+  var shouldParse = typeof type !== 'function'
+    ? typeChecker(type)
+    : type
+
+  return {
+    inflate,
+    limit,
+    verify,
+    shouldParse
+  }
+}