fastify 3.29.4 → 3.29.5

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '3.29.4'
+const VERSION = '3.29.5'
 
 const Avvio = require('avvio')
 const http = require('http')

package/lib/contentTypeParser.js

@@ -6,7 +6,7 @@ let lru = require('tiny-lru')
 // See https://github.com/fastify/fastify/issues/2356
 // and https://github.com/fastify/fastify/discussions/2907.
 lru = typeof lru === 'function' ? lru : lru.default
-const { parse: parseContentType } = require('content-type')
+const { safeParse: safeParseContentType, defaultContentType } = require('fast-content-type-parse')
 
 const secureJson = require('secure-json-parse')
 const {
@@ -72,6 +72,7 @@ ContentTypeParser.prototype.add = function (contentType, opts, parserFn) {
     if (contentTypeIsString) {
       this.parserList.unshift(new ParserListItem(contentType))
     } else {
+      contentType.isEssence = contentType.source.indexOf(';') === -1
       this.parserRegExpList.unshift(contentType)
     }
     this.customParsers.set(contentType.toString(), parser)
@@ -107,7 +108,7 @@ ContentTypeParser.prototype.getParser = function (contentType) {
 
   // dummyContentType always the same object
   // we can use === for the comparsion and return early
-  if (parsed === dummyContentType) {
+  if (parsed === defaultContentType) {
     return this.customParsers.get('')
   }
 
@@ -313,6 +314,7 @@ function buildContentTypeParser (c) {
   contentTypeParser[kDefaultJsonParse] = c[kDefaultJsonParse]
   contentTypeParser.customParsers = new Map(c.customParsers.entries())
   contentTypeParser.parserList = c.parserList.slice()
+  contentTypeParser.parserRegExpList = c.parserRegExpList.slice()
   return contentTypeParser
 }
 
@@ -364,17 +366,6 @@ function removeAllContentTypeParsers () {
   this[kContentTypeParser].removeAll()
 }
 
-// dummy here to prevent repeated object creation
-const dummyContentType = { type: '', parameters: Object.create(null) }
-
-function safeParseContentType (contentType) {
-  try {
-    return parseContentType(contentType)
-  } catch (err) {
-    return dummyContentType
-  }
-}
-
 function compareContentType (contentType, parserListItem) {
   if (parserListItem.isEssence) {
     // we do essence check
@@ -395,7 +386,7 @@ function compareContentType (contentType, parserListItem) {
 }
 
 function compareRegExpContentType (contentType, essenceMIMEType, regexp) {
-  if (regexp.source.indexOf(';') === -1) {
+  if (regexp.isEssence) {
     // we do essence check
     return regexp.test(essenceMIMEType)
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "3.29.4",
+  "version": "3.29.5",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -158,9 +158,9 @@
     "ienoopen": "^1.1.0",
     "JSONStream": "^1.3.5",
     "license-checker": "^25.0.1",
-    "pem": "^1.14.4",
     "proxyquire": "^2.1.3",
     "pump": "^3.0.0",
+    "self-cert": "^2.0.0",
     "send": "^0.17.1",
     "serve-static": "^1.14.1",
     "simple-get": "^4.0.0",
@@ -181,13 +181,13 @@
     "@fastify/error": "^2.0.0",
     "abstract-logging": "^2.0.0",
     "avvio": "^7.1.2",
+    "fast-content-type-parse": "^1.0.0",
     "fast-json-stringify": "^2.5.2",
     "find-my-way": "^4.5.0",
     "flatstr": "^1.0.12",
     "light-my-request": "^4.2.0",
     "pino": "^6.13.0",
     "process-warning": "^1.0.0",
-    "content-type": "^1.0.4",
     "proxy-addr": "^2.0.7",
     "rfdc": "^1.1.4",
     "secure-json-parse": "^2.0.0",

package/test/build-certificate.js

@@ -1,19 +1,18 @@
 'use strict'
 
-const util = require('util')
-const pem = require('pem')
-
-const createCertificate = util.promisify(pem.createCertificate)
+const selfCert = require('self-cert')
 
 async function buildCertificate () {
   // "global" is used in here because "t.context" is only supported by "t.beforeEach" and "t.afterEach"
   // For the test case which execute this code which will be using `t.before` and it can reduce the
   // number of times executing it.
   if (!global.context || !global.context.cert || !global.context.key) {
-    const keys = await createCertificate({ days: 1, selfSigned: true })
+    const certs = selfCert({
+      expires: new Date(Date.now() + 86400000)
+    })
     global.context = {
-      cert: keys.certificate,
-      key: keys.serviceKey
+      cert: certs.certificate,
+      key: certs.privateKey
     }
   }
 }

package/test/content-parser.test.js

@@ -542,3 +542,46 @@ test('content-type fail when parameters not match - regexp', async t => {
 
   t.same(response.statusCode, 415)
 })
+
+// Refs: https://github.com/fastify/fastify/issues/4495
+test('content-type regexp list should be cloned when plugin override', async t => {
+  t.plan(6)
+
+  const fastify = Fastify()
+
+  fastify.addContentTypeParser(/^image\/.*/, { parseAs: 'buffer' }, (req, payload, done) => {
+    done(null, payload)
+  })
+
+  fastify.register(function plugin (fastify, options, done) {
+    fastify.post('/', function (request, reply) {
+      reply.type(request.headers['content-type']).send(request.body)
+    })
+
+    done()
+  })
+
+  {
+    const { payload, headers, statusCode } = await fastify.inject({
+      method: 'POST',
+      path: '/',
+      payload: 'jpeg',
+      headers: { 'content-type': 'image/jpeg' }
+    })
+    t.same(statusCode, 200)
+    t.same(headers['content-type'], 'image/jpeg')
+    t.same(payload, 'jpeg')
+  }
+
+  {
+    const { payload, headers, statusCode } = await fastify.inject({
+      method: 'POST',
+      path: '/',
+      payload: 'png',
+      headers: { 'content-type': 'image/png' }
+    })
+    t.same(statusCode, 200)
+    t.same(headers['content-type'], 'image/png')
+    t.same(payload, 'png')
+  }
+})