From b6dc8b8a7e4ac20b1fcb72dc743c3b1441c03140 Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Mon, 1 Jul 2019 11:45:12 +1000 Subject: [PATCH] Fix tests for https server --- libloki/modules/local_loki_server.js | 26 ++++++++++----- libloki/test/node/local_loki_server_test.js | 37 ++++++++++++++++----- package.json | 2 +- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/libloki/modules/local_loki_server.js b/libloki/modules/local_loki_server.js index d0878e202..394d11819 100644 --- a/libloki/modules/local_loki_server.js +++ b/libloki/modules/local_loki_server.js @@ -16,14 +16,21 @@ class LocalLokiServer extends EventEmitter { * Creates an instance of LocalLokiServer. * Sends out a `message` event when a new message is received. */ - constructor(pems) { + constructor(pems, options) { super(); - const options = { + const httpsOptions = { key: pems.private, cert: pems.cert, }; - this.upnpClient = natUpnp.createClient(); - this.server = https.createServer(options, (req, res) => { + // eslint-disable-next-line no-param-reassign + options = { + skipUpnp: false, + ...options, + }; + if (!options.skipUpnp) { + this.upnpClient = natUpnp.createClient(); + } + this.server = https.createServer(httpsOptions, (req, res) => { let body = []; const sendResponse = (statusCode, message = null) => { @@ -89,7 +96,7 @@ class LocalLokiServer extends EventEmitter { this.server.listen(port, ip, async (err) => { if (err) { rej(err); - } else { + } else if (this.upnpClient) { try { const publicPort = await this.punchHole(); res(publicPort); @@ -98,6 +105,8 @@ class LocalLokiServer extends EventEmitter { await this.close(); rej(e); } + } else { + res(port); } }); }); @@ -144,13 +153,13 @@ class LocalLokiServer extends EventEmitter { // eslint-disable-next-line no-await-in-loop await p; this.publicPort = publicPort; - setTimeout(() => { + this.timerHandler = setTimeout(() => { try { this.publicPort = this.punchHole(); } catch (e) { this.close(); } - }, ttl); + }, ttl * 1000); return publicPort; } catch (e) { throw new textsecure.HolePunchingError('Could not punch hole. Disabled upnp?', e); @@ -161,7 +170,8 @@ class LocalLokiServer extends EventEmitter { } // Async wrapper for http server close close() { - if (this.publicPort) { + clearInterval(this.timerHandler); + if (this.upnpClient) { this.upnpClient.portUnmapping({ public: this.publicPort, }); diff --git a/libloki/test/node/local_loki_server_test.js b/libloki/test/node/local_loki_server_test.js index 8229a303c..5a12c3f71 100644 --- a/libloki/test/node/local_loki_server_test.js +++ b/libloki/test/node/local_loki_server_test.js @@ -1,20 +1,39 @@ const axios = require('axios'); const { assert } = require('chai'); const LocalLokiServer = require('../../modules/local_loki_server'); +const selfsigned = require('selfsigned'); +const https = require('https'); + +class HolePunchingError extends Error { + constructor(message, err) { + super(message); + this.name = 'HolePunchingError'; + this.error = err; + } +} describe('LocalLokiServer', () => { before(async () => { - this.server = new LocalLokiServer(); + const attrs = [{ name: 'commonName', value: 'mypubkey' }]; + const pems = selfsigned.generate(attrs, { days: 365 * 10 }); + global.textsecure = {}; + global.textsecure.HolePunchingError = HolePunchingError; + this.server = new LocalLokiServer(pems, { skipUpnp: true }); await this.server.start(8000); + this.axiosClient = axios.create({ + httpsAgent: new https.Agent({ + rejectUnauthorized: false, + }), + }); }); - after(() => { - this.server.close(); + after(async () => { + await this.server.close(); }); it('should return 405 if not a POST request', async () => { try { - await axios.get('http://localhost:8000'); + await this.axiosClient.get('https://localhost:8000'); assert.fail('Got a successful response'); } catch (error) { if (error.response) { @@ -27,7 +46,7 @@ describe('LocalLokiServer', () => { it('should return 404 if no endpoint provided', async () => { try { - await axios.post('http://localhost:8000', { name: 'Test' }); + await this.axiosClient.post('https://localhost:8000', { name: 'Test' }); assert.fail('Got a successful response'); } catch (error) { if (error.response) { @@ -40,7 +59,7 @@ describe('LocalLokiServer', () => { it('should return 404 and a string if invalid enpoint is provided', async () => { try { - await axios.post('http://localhost:8000/invalid', { name: 'Test' }); + await this.axiosClient.post('https://localhost:8000/invalid', { name: 'Test' }); assert.fail('Got a successful response'); } catch (error) { if (error.response) { @@ -54,7 +73,9 @@ describe('LocalLokiServer', () => { describe('/store', async () => { it('should pass the POSTed data to the callback', async () => { - const server = new LocalLokiServer(); + const attrs = [{ name: 'commonName', value: 'mypubkey' }]; + const pems = selfsigned.generate(attrs, { days: 365 * 10 }); + const server = new LocalLokiServer(pems, { skipUpnp: true }); await server.start(8001); const messageData = { method: 'store', @@ -74,7 +95,7 @@ describe('LocalLokiServer', () => { }); try { - await axios.post('http://localhost:8001/storage_rpc/v1', messageData); + await this.axiosClient.post('https://localhost:8001/storage_rpc/v1', messageData); } catch (error) { assert.isNotOk(error, 'Error occured'); } diff --git a/package.json b/package.json index ca731dd87..ede638770 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "test-lib-view": "NODE_ENV=test-lib yarn run start", "test-loki-view": "NODE_ENV=test-loki yarn run start", "test-electron": "yarn grunt test", - "test-node": "mocha --recursive test/app test/modules ts/test libloki/test/node", + "test-node": "mocha --recursive --exit test/app test/modules ts/test libloki/test/node", "test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test libloki/test/node", "test-node-coverage-html": "nyc --reporter=lcov --reporter=html mocha --recursive test/app test/modules ts/test libloki/test/node", "eslint": "eslint .",