fix: handle invalid url

lib/fourOhFour.js

@@ -34,10 +34,10 @@ const fourOhFourContext = {
  * kFourOhFourContext: the context in the reply object where the handler will be executed
  */
 function fourOhFour (options) {
-  const { logger, genReqId } = options
+  const { logger, genReqId, disableRequestLogging } = options
 
   // 404 router, used for handling encapsulated 404 handlers
-  const router = FindMyWay({ defaultRoute: fourOhFourFallBack })
+  const router = FindMyWay({ onBadUrl: onBadUrl, defaultRoute: fourOhFourFallBack })
 
   return { router, setNotFoundHandler, setContext, arrange404 }
 
@@ -58,6 +58,26 @@ function fourOhFour (options) {
     })
   }
 
+  function onBadUrl (path, req, res) {
+    const { url, method } = req
+    const message = `Route ${method}:${url} not found`
+    const body = `{"error":"Not Found","message":"${message}","statusCode":404}`
+
+    // simulate normal route logging
+    if (!disableRequestLogging) {
+      const id = genReqId(req)
+      const childLogger = logger.child({ reqId: id })
+      childLogger.info({ req }, 'incoming request')
+      childLogger.info({ req }, message)
+    }
+
+    res.writeHead(404, {
+      'Content-Type': 'application/json',
+      'Content-Length': body.length
+    })
+    res.end(body)
+  }
+
   function setContext (instance, context) {
     const _404Context = Object.assign({}, instance[kFourOhFourContext])
     _404Context.onSend = context.onSend

test/404s.test.js

@@ -1738,6 +1738,41 @@ test('400 in case of bad url (pre find-my-way v2.2.0 was a 404)', t => {
     })
   })
 
+  t.test('No route registered', t => {
+    t.plan(3)
+    const fastify = Fastify()
+    fastify.inject({
+      url: '/%c0',
+      method: 'GET'
+    }, (err, response) => {
+      t.error(err)
+      t.equal(response.statusCode, 404)
+      t.same(JSON.parse(response.payload), {
+        error: 'Not Found',
+        message: 'Route GET:/%c0 not found',
+        statusCode: 404
+      })
+    })
+  })
+
+  t.test('Only / is registered', t => {
+    t.plan(3)
+    const fastify = Fastify({ logger: true })
+    fastify.get('/', () => t.fail('we should not be here'))
+    fastify.inject({
+      url: '/%c0',
+      method: 'GET'
+    }, (err, response) => {
+      t.error(err)
+      t.equal(response.statusCode, 404)
+      t.same(JSON.parse(response.payload), {
+        error: 'Not Found',
+        message: 'Route GET:/%c0 not found',
+        statusCode: 404
+      })
+    })
+  })
+
   t.end()
 })
 

test/logger.test.js

@@ -1481,6 +1481,25 @@ test('should not log incoming request and outgoing response when disabled', t =>
   })
 })
 
+test('should not log incoming request and outgoing response for 404 onBadUrl when disabled', t => {
+  t.plan(1)
+  const lines = []
+  const dest = new stream.Writable({
+    write: function (chunk, enc, cb) {
+      lines.push(JSON.parse(chunk))
+      cb()
+    }
+  })
+  const fastify = Fastify({ disableRequestLogging: true, logger: { level: 'info', stream: dest } })
+
+  fastify.inject({
+    url: '/%c0',
+    method: 'GET'
+  }, (e, res) => {
+    t.same(lines.length, 0)
+  })
+})
+
 test('should pass when using unWritable props in the logger option', t => {
   t.plan(1)
   Fastify({