refactor: remove HTTPS server

This simplifies the way we use HTTP Echo Server by moving it to aegir
hooks and removing HTTPS version.

Context:
#514 (comment)

License: MIT
Signed-off-by: Marcin Rataj <[email protected]>

Author: lidel

src/files-regular/add-from-url.js

@@ -3,11 +3,7 @@
 
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const parallel = require('async/parallel')
-const EchoHttpServer = require('../utils/echo-http-server')
-const { isNode } = require('ipfs-utils/src/env')
-
-const httpServer = EchoHttpServer.createServer()
-const httpsServer = EchoHttpServer.createServer({ secure: true })
+const { echoUrl, redirectUrl } = require('../utils/echo-http-server')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -23,54 +19,21 @@ module.exports = (createCommon, options) => {
       // CI takes longer to instantiate the daemon, so we need to increase the
       // timeout for the before step
       this.timeout(60 * 1000)
-      // Instructs node to not reject our snake oil SSL certificate when it
-      // can't verify the certificate authority
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0
-      parallel([
-        cb => common.setup((err, factory) => {
+      common.setup((err, factory) => {
+        expect(err).to.not.exist()
+        factory.spawnNode((err, node) => {
           expect(err).to.not.exist()
-          factory.spawnNode((err, node) => {
-            expect(err).to.not.exist()
-            ipfs = node
-            cb()
-          })
-        }),
-        cb => httpServer.start(cb),
-        cb => httpsServer.start(cb)
-      ], done)
+          ipfs = node
+          done()
+        })
+      })
     })
 
-    after((done) => {
-      // Reinstate unauthorised SSL cert rejection
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1
-      parallel([
-        cb => httpServer.stop(cb),
-        cb => httpsServer.stop(cb),
-        cb => common.teardown(cb)
-      ], done)
-    })
+    after((done) => common.teardown(done))
 
     it('should add from a HTTP URL', (done) => {
       const text = `TEST${Date.now()}`
-      const url = httpServer.echoUrl(text)
-      parallel({
-        result: (cb) => ipfs.addFromURL(url, cb),
-        expectedResult: (cb) => ipfs.add(Buffer.from(text), cb)
-      }, (err, { result, expectedResult }) => {
-        expect(err).to.not.exist()
-        expect(result.err).to.not.exist()
-        expect(expectedResult.err).to.not.exist()
-        expect(result[0].hash).to.equal(expectedResult[0].hash)
-        expect(result[0].size).to.equal(expectedResult[0].size)
-        expect(result[0].path).to.equal(text)
-        done()
-      })
-    })
-
-    it('should add from a HTTPS URL', function (done) {
-      if (!isNode) return this.skip() // unable to do self-signed HTTPS in browser
-      const text = `TEST${Date.now()}`
-      const url = httpsServer.echoUrl(text)
+      const url = echoUrl(text)
       parallel({
         result: (cb) => ipfs.addFromURL(url, cb),
         expectedResult: (cb) => ipfs.add(Buffer.from(text), cb)
@@ -87,31 +50,10 @@ module.exports = (createCommon, options) => {
 
     it('should add from a HTTP URL with redirection', (done) => {
       const text = `TEST${Date.now()}`
-      const url = httpServer.echoUrl(text) + '?foo=bar#buzz'
-      const redirectUrl = httpServer.redirectUrl(url)
-
-      parallel({
-        result: (cb) => ipfs.addFromURL(redirectUrl, cb),
-        expectedResult: (cb) => ipfs.add(Buffer.from(text), cb)
-      }, (err, { result, expectedResult }) => {
-        expect(err).to.not.exist()
-        expect(result.err).to.not.exist()
-        expect(expectedResult.err).to.not.exist()
-        expect(result[0].hash).to.equal(expectedResult[0].hash)
-        expect(result[0].size).to.equal(expectedResult[0].size)
-        expect(result[0].path).to.equal(text)
-        done()
-      })
-    })
-
-    it('should add from a HTTPS URL with redirection', function (done) {
-      if (!isNode) return this.skip() // unable to do self-signed HTTPS in browser
-      const text = `TEST${Date.now()}`
-      const url = httpsServer.echoUrl(text) + '?foo=bar#buzz'
-      const redirectUrl = httpsServer.redirectUrl(url)
+      const url = echoUrl(text) + '?foo=bar#buzz'
 
       parallel({
-        result: (cb) => ipfs.addFromURL(redirectUrl, cb),
+        result: (cb) => ipfs.addFromURL(redirectUrl(url), cb),
         expectedResult: (cb) => ipfs.add(Buffer.from(text), cb)
       }, (err, { result, expectedResult }) => {
         expect(err).to.not.exist()
@@ -126,7 +68,7 @@ module.exports = (createCommon, options) => {
 
     it('should add from a URL with only-hash=true', (done) => {
       const text = `TEST${Date.now()}`
-      const url = httpServer.echoUrl(text)
+      const url = echoUrl(text)
       ipfs.addFromURL(url, { onlyHash: true }, (err, res) => {
         expect(err).to.not.exist()
 
@@ -147,7 +89,7 @@ module.exports = (createCommon, options) => {
 
     it('should add from a URL with wrap-with-directory=true', (done) => {
       const filename = `TEST${Date.now()}.txt` // also acts as data
-      const url = httpServer.echoUrl(filename) + '?foo=bar#buzz'
+      const url = echoUrl(filename) + '?foo=bar#buzz'
       const addOpts = { wrapWithDirectory: true }
       parallel({
         result: (cb) => ipfs.addFromURL(url, addOpts, cb),
@@ -163,7 +105,7 @@ module.exports = (createCommon, options) => {
 
     it('should add from a URL with wrap-with-directory=true and URL-escaped file name', (done) => {
       const filename = `320px-Domažlice,_Jiráskova_43_(${Date.now()}).jpg` // also acts as data
-      const url = httpServer.echoUrl(filename) + '?foo=bar#buzz'
+      const url = echoUrl(filename) + '?foo=bar#buzz'
       const addOpts = { wrapWithDirectory: true }
       parallel({
         result: (cb) => ipfs.addFromURL(url, addOpts, cb),

src/utils/echo-http-server.js

@@ -2,38 +2,15 @@
 'use strict'
 
 const http = require('http')
-const https = require('https')
 const URL = require('url').URL || self.URL
-const { isNode } = require('ipfs-utils/src/env')
 
-const loadFixture = require('aegir/fixtures')
-const sslOpts = Object.freeze({
-  key: loadFixture('test/fixtures/ssl/privkey.pem', 'interface-ipfs-core'),
-  cert: loadFixture('test/fixtures/ssl/cert.pem', 'interface-ipfs-core')
-})
-
-const httpPort = 11080
-const httpsPort = 11443
+const defaultPort = 11080
 
 // Create a mock of remote HTTP server that can return arbitrary text in response
 // or redirect to other URL. Used in tests of ipfs.addFromURL etc
-module.exports.createServer = (opts) => {
-  const secure = opts && opts.secure
-  const defaultPort = secure ? httpsPort : httpPort
-
-  // Web browser is not able to start HTTP server
-  // We return noop here and start it from Node via .aegir.js/hooks/browser/pre|post instead (eg. in js-ipfs)
-  if (!isNode) {
-    const noopServer = {
-      start: (cb) => cb(),
-      stop: (cb) => cb(),
-      url: () => `${secure ? 'https' : 'http'}://127.0.0.1:${defaultPort}`,
-      echoUrl: (text) => `${noopServer.url()}/echo/${encodeURIComponent(text)}`,
-      redirectUrl: (url) => `${noopServer.url()}/302/${encodeURI(url)}`
-    }
-    return Object.freeze(noopServer)
-  }
-
+// It needs to be available to tests run in browsers:
+// start it from Node via .aegir.js/hooks/browser/pre|post (example in js-ipfs)
+module.exports.createServer = () => {
   const handler = (req, res) => {
     // Relaxed CORS to enable use in tests in web browser with fetch
     res.setHeader('Access-Control-Allow-Origin', '*')
@@ -64,9 +41,7 @@ module.exports.createServer = (opts) => {
     res.end()
   }
 
-  const server = secure
-    ? https.createServer(sslOpts, handler)
-    : http.createServer(handler)
+  const server = http.createServer(handler)
 
   server.start = (opts, cb) => {
     if (typeof opts === 'function') {
@@ -78,9 +53,10 @@ module.exports.createServer = (opts) => {
 
   server.stop = (cb) => server.close(cb)
 
-  server.url = () => `${secure ? 'https' : 'http'}://127.0.0.1:${server.address().port}`
-  server.echoUrl = (text) => `${server.url()}/echo/${encodeURIComponent(text)}`
-  server.redirectUrl = (url) => `${server.url()}/302/${encodeURI(url)}`
-
   return server
 }
+
+module.exports.defaultPort = defaultPort
+module.exports.url = `http://127.0.0.1:${module.exports.defaultPort}`
+module.exports.echoUrl = (text) => `${module.exports.url}/echo/${encodeURIComponent(text)}`
+module.exports.redirectUrl = (url) => `${module.exports.url}/302/${encodeURI(url)}`