@fastify/compress 9.2.1 → 9.2.2

package/index.js

@@ -570,15 +570,30 @@ function compress (params) {
 }
 
 function setVaryHeader (reply) {
-  if (reply.hasHeader('Vary')) {
-    const rawHeaderValue = reply.getHeader('Vary')
-    const headerValueArray = Array.isArray(rawHeaderValue) ? rawHeaderValue : [rawHeaderValue]
-    if (!headerValueArray.some((h) => h.includes('accept-encoding'))) {
-      reply.header('Vary', headerValueArray.concat('accept-encoding').join(', '))
+  const current = reply.getHeader('vary')
+
+  if (current === undefined) {
+    reply.header('vary', 'accept-encoding')
+    return
+  }
+
+  const value = Array.isArray(current) ? current.join(', ') : String(current)
+
+  // Walk the comma-separated tokens without splitting the string.
+  const headerLength = value.length
+  let start = 0
+  for (let i = 0; i <= headerLength; i++) {
+    if (i === headerLength || value[i] === ',') {
+      const token = value.slice(start, i).trim().toLowerCase()
+      // A `Vary: *` already covers every request header.
+      if (token === 'accept-encoding' || token === '*') {
+        return
+      }
+      start = i + 1
     }
-  } else {
-    reply.header('Vary', 'accept-encoding')
   }
+
+  reply.header('vary', value + ', accept-encoding')
 }
 
 function onEnd (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/compress",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "description": "Fastify compression utils",
   "main": "index.js",
   "type": "commonjs",

package/test/global-compress.test.js

@@ -3167,6 +3167,55 @@ test('It should not add `accept-encoding` to `Vary` reply header if already pres
   })
 })
 
+test('It should handle case-insensitivity, substring safety, and wildcard in Vary header', async (t) => {
+  t.plan(3)
+
+  const fastify = Fastify()
+  await fastify.register(compressPlugin, { global: true })
+
+  fastify.get('/case', (_request, reply) => {
+    reply
+      .header('vary', 'Accept-Encoding')
+      .type('text/plain')
+      .compress(createReadStream('./package.json'))
+  })
+
+  fastify.get('/substring', (_request, reply) => {
+    reply
+      .header('vary', 'x-accept-encoding')
+      .type('text/plain')
+      .compress(createReadStream('./package.json'))
+  })
+
+  fastify.get('/wildcard', (_request, reply) => {
+    reply
+      .header('vary', '*')
+      .type('text/plain')
+      .compress(createReadStream('./package.json'))
+  })
+
+  const res1 = await fastify.inject({
+    url: '/case',
+    method: 'GET',
+    headers: { 'accept-encoding': 'deflate' }
+  })
+  t.assert.equal(res1.headers.vary, 'Accept-Encoding')
+
+  const res2 = await fastify.inject({
+    url: '/substring',
+    method: 'GET',
+    headers: { 'accept-encoding': 'deflate' }
+  })
+  t.assert.equal(res2.headers.vary, 'x-accept-encoding, accept-encoding')
+
+  const res3 = await fastify.inject({
+    url: '/wildcard',
+    method: 'GET',
+    headers: { 'accept-encoding': 'deflate' }
+  })
+  t.assert.equal(res3.headers.vary, '*')
+})
+
 test('It should follow the `Accept-Encoding` request header encoding order', async (t) => {
   t.plan(3)