Merge pull request #472 from ipfs-shipyard/fix/wss-redirect

Skip HTTP GET of websocket handshake
ipfs · May 2, 2018 · 2de4726 · 2de4726
2 parents 0598d1f + 8176948
commit 2de4726
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/add-on/src/lib/ipfs-companion.js b/add-on/src/lib/ipfs-companion.js
@@ -99,6 +99,10 @@ module.exports = async function init () {
   // ===================================================================
 
   function onBeforeSendHeaders (request) {
+    // skip websocket handshake (not supported by HTTP2IPFS gateways)
+    if (request.type === 'websocket') {
+      return
+    }
     if (request.url.startsWith(state.apiURLString)) {
       // For some reason js-ipfs-api sent requests with "Origin: null" under Chrome
       // which produced '403 - Forbidden' error.

diff --git a/add-on/src/lib/ipfs-request.js b/add-on/src/lib/ipfs-request.js
@@ -13,6 +13,11 @@ function createRequestModifier (getState, dnsLink, ipfsPathValidator) {
       return
     }
 
+    // skip websocket handshake (not supported by HTTP2IPFS gateways)
+    if (request.type === 'websocket') {
+      return
+    }
+
     // skip all local requests
     if (request.url.startsWith('http://127.0.0.1:') || request.url.startsWith('http://localhost:') || request.url.startsWith('http://[::1]:')) {
       return