@fastify/static 9.1.1 → 9.1.2

package/index.js

@@ -122,7 +122,7 @@ async function fastifyStatic (fastify, opts) {
         method: ['HEAD', 'GET'],
         path: prefix + '*',
         handler (req, reply) {
-          const pathname = getPathnameForSend(req.raw.url, prefix)
+          const pathname = getPathnameForSend(req.raw.url, req.routeOptions.url)
           if (!pathname) {
             return reply.callNotFound()
           }
@@ -570,25 +570,23 @@ function getEncodingHeader (headers, checked) {
 
 /**
  * @param {string} url
- * @param {string} prefix
+ * @param {string} route
  * @returns {string|undefined}
  */
-function getPathnameForSend (url, prefix) {
+function getPathnameForSend (url, route) {
   const questionMark = url.indexOf('?')
   let pathname = questionMark === -1 ? url : url.slice(0, questionMark)
 
-  if (prefix !== '/') {
-    const routePrefix = prefix.endsWith('/')
-      ? prefix.slice(0, -1)
-      : prefix
+  const routePrefix = route.endsWith('*')
+    ? route.slice(0, -1)
+    : route
 
-    if (!pathname.startsWith(routePrefix)) {
-      return
-    }
-
-    pathname = pathname.slice(routePrefix.length)
+  if (routePrefix !== '/' && !pathname.startsWith(routePrefix)) {
+    return
   }
 
+  pathname = pathname.slice(routePrefix.length)
+
   if (pathname === '') {
     pathname = '/'
   } else if (!pathname.startsWith('/')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/static",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "description": "Plugin for serving static files as fast as possible.",
   "main": "index.js",
   "type": "commonjs",

package/test/static.test.js

@@ -6,6 +6,7 @@ const path = require('node:path')
 const fs = require('node:fs')
 const url = require('node:url')
 const http = require('node:http')
+const Module = require('node:module')
 const { test } = require('node:test')
 const Fastify = require('fastify')
 const compress = require('@fastify/compress')
@@ -81,6 +82,16 @@ if (typeof Promise.withResolvers === 'undefined') {
   }
 }
 
+function loadInternalPathnameForSend () {
+  const modulePath = require.resolve('../index.js')
+  const source = fs.readFileSync(modulePath, 'utf8') + '\nmodule.exports.__getPathnameForSend = getPathnameForSend\n'
+  const testModule = new Module(modulePath)
+  testModule.filename = modulePath
+  testModule.paths = module.paths
+  testModule._compile(source, modulePath)
+  return testModule.exports.__getPathnameForSend
+}
+
 test('register /static prefixAvoidTrailingSlash', async t => {
   t.plan(11)
 
@@ -3590,6 +3601,51 @@ test(
   }
 )
 
+test('getPathnameForSend returns undefined for mismatched and malformed routes', (t) => {
+  t.plan(3)
+
+  const getPathnameForSend = loadInternalPathnameForSend()
+
+  t.assert.deepStrictEqual(getPathnameForSend('/nested/public/index.css', '/public/*'), undefined)
+  t.assert.deepStrictEqual(getPathnameForSend('/static/%E0%A4%A', '/static/*'), undefined)
+  t.assert.deepStrictEqual(getPathnameForSend('/static/index.css', '/static'), '/index.css')
+})
+
+test('wildcard handler falls back to not found when the raw url does not match the route prefix', async (t) => {
+  t.plan(2)
+
+  const fastify = Fastify()
+  let wildcardHandler
+
+  fastify.addHook('onRoute', (route) => {
+    if (route.url === '/static/*') {
+      wildcardHandler = route.handler
+    }
+  })
+
+  fastify.register(fastifyStatic, {
+    root: path.join(__dirname, '/static'),
+    prefix: '/static'
+  })
+
+  t.after(() => fastify.close())
+
+  await fastify.ready()
+  t.assert.ok(wildcardHandler)
+
+  let notFoundCalled = false
+  wildcardHandler({
+    raw: { url: '/nested/static/index.css' },
+    routeOptions: { url: '/static/*' }
+  }, {
+    callNotFound () {
+      notFoundCalled = true
+    }
+  })
+
+  t.assert.deepStrictEqual(notFoundCalled, true)
+})
+
 test('does not serve static files with encoded path separators', async (t) => {
   t.plan(4)
 
@@ -3620,6 +3676,31 @@ test('does not serve static files with encoded path separators', async (t) => {
   t.assert.deepStrictEqual(encodedPathResponse.json().message, 'Route GET:/deep%2Fpath/for/test/purpose/foo.html not found')
 })
 
+test('serves wildcard files when registered in an encapsulated context', async (t) => {
+  t.plan(3)
+
+  const fastify = Fastify()
+
+  t.after(() => fastify.close())
+
+  fastify.register(async function (childContext) {
+    childContext.register(fastifyStatic, {
+      root: path.join(__dirname, '/static'),
+      prefix: '/public',
+      decorateReply: false
+    })
+  }, { prefix: '/nested' })
+
+  const response = await fastify.inject({
+    method: 'GET',
+    url: '/nested/public/index.css'
+  })
+
+  t.assert.deepStrictEqual(response.statusCode, 200)
+  t.assert.deepStrictEqual(response.headers['content-type'], 'text/css; charset=utf-8')
+  t.assert.deepStrictEqual(response.body, fs.readFileSync(path.join(__dirname, '/static/index.css'), 'utf8'))
+})
+
 test('content-length in head route should not return zero when using wildcard', async t => {
   t.plan(5)
 

package/test/static/shallow/no-link

@@ -1 +0,0 @@
-/none

package/test/static-symbolic-link/dir/symlink

@@ -1 +0,0 @@
-../origin