fs: handler tuning (cookies, cache validation)

- no-cookies for `/ip(f|n)s/` - no-cache-validation for `/ipfs/` - closes #72
ipfs · Feb 18, 2016 · c75a05d · the8472 · Feb 18, 2016 · the8472
1 parent 7a46ecd
commit c75a05d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 54 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -7,7 +7,6 @@ const parent = require('sdk/remote/parent')
 
 exports.main = function (options, callbacks) { // eslint-disable-line no-unused-vars
   require('./redirects.js')
-  require('./request-fix.js')
   require('./peer-watch.js')
   protocols.register()
   parent.remoteRequire('./child-main.js', module)

diff --git a/lib/protocols.js b/lib/protocols.js
@@ -121,14 +121,18 @@ CommonProtocolHandler.prototype = Object.freeze({
     if (gw.fsUris && this.scheme === FS_SCHEME) {
       channel.originalURI = aURI
       channel.loadFlags &= ~Ci.nsIChannel.LOAD_REPLACE
-    // channel.loadFlags |= Ci.nsIChannel.LOAD_ANONYMOUS
-    }
 
-    channel.loadInfo = loadInfo
+      // Cookies make no sense in the ipfs context
+      // unless we have Suborigin header support.
+      // Until https://git.io/vgAMj is resolved
+      // we don't want to carry different gateway cookies into the page
+      channel.loadFlags |= Ci.nsIRequest.LOAD_ANONYMOUS
 
-    channel.QueryInterface(Ci.nsIWritablePropertyBag)
-    channel.QueryInterface(Ci.nsIWritablePropertyBag2)
-    channel.setPropertyAsAString('ipfs-uri', aURI.spec)
+      if (isIPFS.ipfsPath(aURI.path)) {
+        // no revalidation for /ipfs/ from cache, those are immutable
+        channel.loadFlags |= Ci.nsIRequest.VALIDATE_NEVER
+      }
+    }
 
     // console.info('newChannel routed to HTTP gateway:  ' + channel.URI.spec)
     return channel

diff --git a/lib/request-fix.js b/lib/request-fix.js