Merge branch 'nodejs:main' into main

Author: Dolan Halbrook

.github/workflows/scorecard.yml

@@ -34,7 +34,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif

lib/interceptor/cache.js

@@ -20,7 +20,12 @@ const { AbortError } = require('../core/errors.js')
  */
 function needsRevalidation (result, cacheControlDirectives) {
   if (cacheControlDirectives?.['no-cache']) {
-    // Always revalidate requests with the no-cache directive
+    // Always revalidate requests with the no-cache request directive
+    return true
+  }
+
+  if (result.cacheControlDirectives?.['no-cache'] && !Array.isArray(result.cacheControlDirectives['no-cache'])) {
+    // Always revalidate requests with unqualified no-cache response directive
     return true
   }
 
@@ -233,7 +238,7 @@ function handleResult (
     }
 
     let headers = {
-      ...normaliseHeaders(opts),
+      ...opts.headers,
       'if-modified-since': new Date(result.cachedAt).toUTCString()
     }
 
@@ -319,6 +324,11 @@ module.exports = (opts = {}) => {
         return dispatch(opts, handler)
       }
 
+      opts = {
+        ...opts,
+        headers: normaliseHeaders(opts)
+      }
+
       const reqCacheControl = opts.headers?.['cache-control']
         ? parseCacheControlHeader(opts.headers['cache-control'])
         : undefined

lib/util/cache.js

@@ -12,13 +12,11 @@ function makeCacheKey (opts) {
     throw new Error('opts.origin is undefined')
   }
 
-  const headers = normaliseHeaders(opts)
-
   return {
     origin: opts.origin.toString(),
     method: opts.method,
     path: opts.path,
-    headers
+    headers: opts.headers
   }
 }
 

test/interceptors/cache.js

@@ -128,6 +128,45 @@ describe('Cache Interceptor', () => {
     }
   })
 
+  test('revalidates reponses with no-cache directive, regardless of cacheByDefault', async () => {
+    let requestCount = 0
+    const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
+      ++requestCount
+      res.setHeader('Vary', 'Accept-Encoding')
+      res.setHeader('cache-control', 'no-cache')
+      res.end(`Request count: ${requestCount}`)
+    }).listen(0)
+
+    after(async () => {
+      server.close()
+
+      await once(server, 'close')
+    })
+
+    await once(server, 'listening')
+
+    const client = new Client(`http://localhost:${server.address().port}`)
+      .compose(interceptors.cache({
+        cacheByDefault: 1000
+      }))
+
+    const request = {
+      origin: 'localhost',
+      method: 'GET',
+      path: '/'
+    }
+
+    const res1 = await client.request(request)
+    const body1 = await res1.body.text()
+    strictEqual(body1, 'Request count: 1')
+    strictEqual(requestCount, 1)
+
+    const res2 = await client.request(request)
+    const body2 = await res2.body.text()
+    strictEqual(body2, 'Request count: 2')
+    strictEqual(requestCount, 2)
+  })
+
   test('stale responses are revalidated before deleteAt (if-modified-since)', async () => {
     const clock = FakeTimers.install({
       shouldClearNativeTimers: true

test/issue-3904.js

@@ -0,0 +1,58 @@
+const { describe, test, after } = require('node:test')
+const assert = require('node:assert')
+const { createServer } = require('node:http')
+const { once } = require('node:events')
+const MemoryCacheStore = require('../lib/cache/memory-cache-store.js')
+const { Agent, interceptors, request, setGlobalDispatcher } = require('..')
+
+describe('Cache with cache-control: no-store request header', () => {
+  [
+    'CACHE-CONTROL',
+    'cache-control',
+    'Cache-Control'
+  ].forEach(headerName => {
+    test(`should not cache response for request with header: "${headerName}: no-store`, async () => {
+      const store = new MemoryCacheStore()
+      let requestCount = 0
+      const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
+        ++requestCount
+        res.setHeader('Vary', 'Accept-Encoding')
+        res.setHeader('Cache-Control', 'max-age=60')
+        res.end(`Request count: ${requestCount}`)
+      })
+
+      after(async () => {
+        server.close()
+
+        await once(server, 'close')
+      })
+
+      await new Promise(resolve => server.listen(0, resolve))
+      const { port } = server.address()
+      const url = `http://localhost:${port}`
+
+      const agent = new Agent()
+      setGlobalDispatcher(
+        agent.compose(
+          interceptors.cache({
+            store,
+            cacheByDefault: 1000,
+            methods: ['GET']
+          })
+        )
+      )
+
+      const res1 = await request(url, { headers: { [headerName]: 'no-store' } })
+      const body1 = await res1.body.text()
+      assert.strictEqual(body1, 'Request count: 1')
+      assert.strictEqual(requestCount, 1)
+
+      const res2 = await request(url)
+      const body2 = await res2.body.text()
+      assert.strictEqual(body2, 'Request count: 2')
+      assert.strictEqual(requestCount, 2)
+
+      await new Promise(resolve => server.close(resolve))
+    })
+  })
+})