canonical uris with private gateway enabled

ipfs · Feb 14, 2016 · 0b08570 · 0b08570
1 parent 20a53e2
commit 0b08570
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/lib/gateways.js b/lib/gateways.js
@@ -79,6 +79,12 @@ Object.defineProperty(exports, 'publicUri', {
   }
 })
 
+Object.defineProperty(exports, 'gwUri', {
+  get: function () {
+    return this.redirectEnabled ? CUSTOM_GATEWAY_URI : PUBLIC_GATEWAY_URI
+  }
+})
+
 Object.defineProperty(exports, 'publicHosts', {
   get: function () {
     return PUBLIC_GATEWAY_HOSTS

diff --git a/lib/protocols.js b/lib/protocols.js
@@ -109,8 +109,7 @@ CommonProtocolHandler.prototype = Object.freeze({
   newChannel2: function (aURI, loadInfo) {
     // console.info('Detected newChannel for IPFS protocol: ' + aURI.spec)
     let normalized = this.normalizedIpfsPath(this.pathPrefix + aURI.path)
-    let gwUri = gw.publicUri
-    let httpUri = ioservice.newURI(normalized, aURI.originCharset, gwUri)
+    let httpUri = ioservice.newURI(normalized, aURI.originCharset, gw.gwUri)
     let channel = null
 
     if (loadInfo !== null) {

diff --git a/test/test-canonical-fs-uris.js b/test/test-canonical-fs-uris.js
@@ -30,14 +30,21 @@ exports['test newURI'] = function (assert) {
 
 exports['test newChannel'] = function (assert) {
   require('sdk/simple-prefs').prefs.fsUris = true
+	gw.redirectEnabled = false
 
   let uri = fs.newURI('fs:///ipns/foo', null, null)
   let chan = fs.newChannel(uri)
 
   assert.equal(chan.originalURI.spec, 'fs:/ipns/foo', "keeps fs: URI as channel's originalURI")
 
   // double and triple slashes lead to gateway redirects, which cause CORS troubles -> check normalization
-  assert.equal(chan.URI.spec, 'https://ipfs.io/ipns/foo', 'channel has normalized http urls')
+  assert.equal(chan.URI.spec, 'https://ipfs.io/ipns/foo', 'redirect off, channel has normalized http urls')
+
+	gw.redirectEnabled = true
+
+	chan = fs.newChannel(uri)
+
+	assert.equal(chan.URI.spec, 'http://127.0.0.1:8080/ipns/foo', 'redirect on, channel has normalized http urls')
 }
 
 // https://github.com/lidel/ipfs-firefox-addon/issues/3