fix: do not redirect preload requests

HTTP HEAD is often used for preloading data at arbitrary gateways. It should arrive at original destination, no matter what hostname is used.
ipfs · Jun 4, 2018 · 1492d8d · 1492d8d
1 parent 231df22
commit 1492d8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/add-on/src/lib/ipfs-request.js b/add-on/src/lib/ipfs-request.js
@@ -49,7 +49,7 @@ function createRequestModifier (getState, dnsLink, ipfsPathValidator) {
     // handle redirects to custom gateway
     if (state.redirect) {
       // Ignore preload requests
-      if (request.method === 'HEAD' && state.preloadAtPublicGateway && request.url.startsWith(state.pubGwURLString)) {
+      if (request.method === 'HEAD') {
         return
       }
       // Ignore XHR requests for which redirect would fail due to CORS bug in Firefox

diff --git a/test/functional/lib/ipfs-request.test.js b/test/functional/lib/ipfs-request.test.js
@@ -73,6 +73,11 @@ describe('modifyRequest', function () {
           const request = url2request('https://google.com/ipfs/notacid?argTest#hashTest')
           expect(modifyRequest(request)).to.equal(undefined)
         })
+        it(`should be left untouched if its is a preload request (${nodeType} node)`, function () {
+          // HTTP HEAD is often used for preloading data at arbitrary gateways - it should arrive at original destination
+          const headRequest = {url: 'https://google.com/ipfs/QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR?argTest#hashTest', method: 'HEAD'}
+          expect(modifyRequest(headRequest)).to.equal(undefined)
+        })
       })
     })
   })