From 531ee92dcbf41c7403f94e564d1daa7a43479ebd Mon Sep 17 00:00:00 2001 From: Beaudan Date: Mon, 25 Mar 2019 15:24:03 +1100 Subject: [PATCH 1/6] Updated messenger to work with slightly different storage server API and changed swarm requests to go through storage server --- config/default.json | 3 +- js/modules/loki_fetch.js | 93 ++++++++++++++++++++++++ js/modules/loki_message_api.js | 127 +++++---------------------------- js/modules/loki_snode_api.js | 72 ++++--------------- libtextsecure/errors.js | 15 ++++ main.js | 3 +- preload.js | 4 +- 7 files changed, 140 insertions(+), 177 deletions(-) create mode 100644 js/modules/loki_fetch.js diff --git a/config/default.json b/config/default.json index 8b7d786f9..0699b7a06 100644 --- a/config/default.json +++ b/config/default.json @@ -3,8 +3,7 @@ "localUrl": "localhost.loki", "cdnUrl": "random.snode", "localServerPort": "8081", - "messageServerPort": "8080", - "swarmServerPort": "8079", + "snodeServerPort": "8080", "disableAutoUpdate": false, "openDevTools": false, "buildExpiration": 0, diff --git a/js/modules/loki_fetch.js b/js/modules/loki_fetch.js new file mode 100644 index 000000000..c0b5eb378 --- /dev/null +++ b/js/modules/loki_fetch.js @@ -0,0 +1,93 @@ +/* global log, libloki, textsecure */ + +const nodeFetch = require('node-fetch'); +const { parse } = require('url'); + +const LOKI_EPHEMKEY_HEADER = 'X-Loki-EphemKey'; +const endpointBase = '/v1/storage_rpc'; + +// A small wrapper around node-fetch which deserializes response +const fetch = async (url, options = {}) => { + const timeout = options.timeout || 10000; + const method = options.method || 'GET'; + + const address = parse(url).hostname; + const doEncryptChannel = address.endsWith('.snode'); + if (doEncryptChannel) { + try { + // eslint-disable-next-line no-param-reassign + options.body = await libloki.crypto.snodeCipher.encrypt( + address, + options.body + ); + // eslint-disable-next-line no-param-reassign + options.headers = { + ...options.headers, + 'Content-Type': 'text/plain', + [LOKI_EPHEMKEY_HEADER]: libloki.crypto.snodeCipher.getChannelPublicKeyHex(), + }; + } catch (e) { + log.warn(`Could not encrypt channel for ${address}: `, e); + } + } + + try { + const response = await nodeFetch(url, { + ...options, + timeout, + method, + }); + + if (!response.ok) { + throw new textsecure.HTTPError(response); + } + + let result; + if (response.headers.get('Content-Type') === 'application/json') { + result = await response.json(); + } else if (options.responseType === 'arraybuffer') { + result = await response.buffer(); + } else { + result = await response.text(); + if (doEncryptChannel) { + try { + result = await libloki.crypto.snodeCipher.decrypt(address, result); + } catch (e) { + log.warn(`Could not decrypt response from ${address}`, e); + } + try { + result = result === '' ? {} : JSON.parse(result); + } catch (e) { + log.warn(`Could not parse string to json ${result}`, e); + } + } + } + + return result; + } catch (e) { + throw e; + } +}; + +// Wrapper for a JSON RPC request +const rpc = (address, port, method, params, options = {}) => { + const headers = options.headers || {}; + const url = `${address}${port}${endpointBase}`; + const body = { + method, + params, + }; + + const fetchOptions = { + method: 'POST', + ...options, + body: JSON.stringify(body), + headers, + }; + + return fetch(url, fetchOptions); +}; + +module.exports = { + rpc, +}; diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 4ec1b1b41..93b0e5011 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -1,21 +1,9 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-loop-func */ -/* global log, dcodeIO, window, callWorker, lokiP2pAPI, lokiSnodeAPI, libloki */ +/* global log, dcodeIO, window, callWorker, lokiP2pAPI, lokiSnodeAPI, textsecure */ -const nodeFetch = require('node-fetch'); const _ = require('lodash'); -const { parse } = require('url'); - -const endpointBase = '/v1/storage_rpc'; -const LOKI_EPHEMKEY_HEADER = 'X-Loki-EphemKey'; - -class HTTPError extends Error { - constructor(response) { - super(response.statusText); - this.name = 'HTTPError'; - this.response = response; - } -} +const { rpc } = require('./loki_fetch'); class NotFoundError extends Error { constructor() { @@ -24,98 +12,12 @@ class NotFoundError extends Error { } } -// A small wrapper around node-fetch which deserializes response -const fetch = async (url, options = {}) => { - const timeout = options.timeout || 10000; - const method = options.method || 'GET'; - - const address = parse(url).hostname; - const doEncryptChannel = address.endsWith('.snode'); - if (doEncryptChannel) { - try { - // eslint-disable-next-line no-param-reassign - options.body = await libloki.crypto.snodeCipher.encrypt( - address, - options.body - ); - // eslint-disable-next-line no-param-reassign - options.headers = { - ...options.headers, - 'Content-Type': 'text/plain', - [LOKI_EPHEMKEY_HEADER]: libloki.crypto.snodeCipher.getChannelPublicKeyHex(), - }; - } catch (e) { - log.warn(`Could not encrypt channel for ${address}: `, e); - } - } - - try { - const response = await nodeFetch(url, { - ...options, - timeout, - method, - }); - - if (!response.ok) { - throw new HTTPError(response); - } - - let result; - if (response.headers.get('Content-Type') === 'application/json') { - result = await response.json(); - } else if (options.responseType === 'arraybuffer') { - result = await response.buffer(); - } else { - result = await response.text(); - if (doEncryptChannel) { - try { - result = await libloki.crypto.snodeCipher.decrypt(address, result); - } catch (e) { - log.warn(`Could not decrypt response from ${address}`, e); - } - try { - result = JSON.parse(result); - } catch (e) { - log.warn(`Could not parse string to json ${result}`, e); - } - } - } - - return result; - } catch (e) { - if (e.code === 'ENOTFOUND') { - throw new NotFoundError(); - } - - throw e; - } -}; - -// Wrapper for a JSON RPC request -const rpc = (address, port, method, params, options = {}) => { - const headers = options.headers || {}; - const url = `${address}${port}${endpointBase}`; - const body = { - method, - params, - }; - - const fetchOptions = { - method: 'POST', - ...options, - body: JSON.stringify(body), - headers, - }; - - return fetch(url, fetchOptions); -}; - // Will be raised (to 3?) when we get more nodes const MINIMUM_SUCCESSFUL_REQUESTS = 2; class LokiMessageAPI { - constructor({ messageServerPort }) { - this.messageServerPort = messageServerPort ? `:${messageServerPort}` : ''; + constructor({ snodeServerPort }) { + this.snodeServerPort = snodeServerPort ? `:${snodeServerPort}` : ''; } async sendMessage(pubKey, data, messageTimeStamp, ttl, isPing = false) { @@ -195,7 +97,7 @@ class LokiMessageAPI { }; try { - await rpc(nodeUrl, this.messageServerPort, 'store', params); + await rpc(nodeUrl, this.snodeServerPort, 'store', params); nodeComplete(nodeUrl); successfulRequests += 1; @@ -203,7 +105,7 @@ class LokiMessageAPI { log.warn('Loki send message:', e); if (e instanceof NotFoundError) { canResolve = false; - } else if (e instanceof HTTPError) { + } else if (e instanceof textsecure.HTTPError) { // We mark the node as complete as we could still reach it nodeComplete(nodeUrl); } else { @@ -248,7 +150,7 @@ class LokiMessageAPI { await Promise.all( swarmNodes .splice(0, remainingRequests) - .map(nodeUrl => doRequest(nodeUrl)) + .map(nodeUrl => doRequest(`http://${nodeUrl}`)) ); } log.info(`Successful storage message to ${pubKey}`); @@ -270,21 +172,22 @@ class LokiMessageAPI { const doRequest = async (nodeUrl, nodeData) => { const params = { pubKey: ourKey, - lastHash: nodeData.lastHash, + lastHash: nodeData.lastHash || '', }; try { const result = await rpc( nodeUrl, - this.messageServerPort, + this.snodeServerPort, 'retrieve', params ); nodeComplete(nodeUrl); - if (result.lastHash) { - lokiSnodeAPI.updateLastHash(nodeUrl, result.lastHash); + if (Array.isArray(result.messages) && result.messages.length) { + const lastHash = [...result.messages].pop(); + lokiSnodeAPI.updateLastHash(nodeUrl, lastHash); callback(result.messages); } successfulRequests += 1; @@ -292,7 +195,7 @@ class LokiMessageAPI { log.warn('Loki retrieve messages:', e); if (e instanceof NotFoundError) { canResolve = false; - } else if (e instanceof HTTPError) { + } else if (e instanceof textsecure.HTTPError) { // We mark the node as complete as we could still reach it nodeComplete(nodeUrl); } else { @@ -335,7 +238,9 @@ class LokiMessageAPI { await Promise.all( Object.entries(ourSwarmNodes) .splice(0, remainingRequests) - .map(([nodeUrl, nodeData]) => doRequest(nodeUrl, nodeData)) + .map(([nodeUrl, nodeData]) => + doRequest(`http://${nodeUrl}`, nodeData) + ) ); } } diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js index 0f83e7cc3..ccd023121 100644 --- a/js/modules/loki_snode_api.js +++ b/js/modules/loki_snode_api.js @@ -1,10 +1,10 @@ /* eslint-disable class-methods-use-this */ /* global window, ConversationController */ -const fetch = require('node-fetch'); const is = require('@sindresorhus/is'); const dns = require('dns'); const process = require('process'); +const { rpc } = require('./loki_fetch'); // Will be raised (to 3?) when we get more nodes const MINIMUM_SWARM_NODES = 1; @@ -33,13 +33,13 @@ const resolveCname = url => }); class LokiSnodeAPI { - constructor({ serverUrl, localUrl, swarmServerPort }) { + constructor({ serverUrl, localUrl, snodeServerPort }) { if (!is.string(serverUrl)) { throw new Error('WebAPI.initialize: Invalid server url'); } this.serverUrl = serverUrl; this.localUrl = localUrl; - this.swarmServerPort = swarmServerPort ? `:${swarmServerPort}` : ''; + this.snodeServerPort = snodeServerPort ? `:${snodeServerPort}` : ''; this.swarmsPendingReplenish = {}; this.ourSwarmNodes = {}; this.contactSwarmNodes = {}; @@ -183,65 +183,17 @@ class LokiSnodeAPI { async getSwarmNodes(pubKey) { // TODO: Hit multiple random nodes and merge lists? - const node = await this.getRandomSnodeAddress(); - // TODO: Confirm final API URL and sensible timeout - const options = { - url: `http://${node}${this.swarmServerPort}/json_rpc`, - type: 'POST', - responseType: 'json', - timeout: 10000, - }; - - const body = { - jsonrpc: '2.0', - id: '0', - method: 'get_swarm_list_for_messenger_pubkey', - params: { - pubkey: pubKey, - }, - }; - - const fetchOptions = { - method: options.type, - body: JSON.stringify(body), - headers: { - 'Content-Type': 'application/json', - }, - timeout: options.timeout, - }; - - let response; - try { - response = await fetch(options.url, fetchOptions); - } catch (e) { - throw new window.textsecure.EmptySwarmError( - pubKey, - 'Could not retrieve swarm nodes' - ); - } + const nodeUrl = await this.getRandomSnodeAddress(); - let result; - if ( - options.responseType === 'json' && - response.headers.get('Content-Type') === 'application/json' - ) { - result = await response.json(); - } else if (options.responseType === 'arraybuffer') { - result = await response.buffer(); - } else { - result = await response.text(); - } - - // TODO: Handle wrong swarm error from snode - - if (!response.ok || !result.nodes || result.nodes === []) { - throw new window.textsecure.EmptySwarmError( + const result = await rpc( + `http://${nodeUrl}`, + this.snodeServerPort, + 'get_snodes_for_pubkey', + { pubKey, - 'Could not retrieve swarm nodes' - ); - } - - return result.nodes; + } + ); + return result.snodes; } } diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js index 12aee4d25..8a30f35d5 100644 --- a/libtextsecure/errors.js +++ b/libtextsecure/errors.js @@ -179,6 +179,20 @@ appendStack(this, resolutionError); } + function HTTPError(message, response) { + this.name = 'HTTPError'; + this.message = `${response.status} Error: ${message}`; + this.response = response; + + Error.call(this, message); + + // Maintains proper stack trace, where our error was thrown (only available on V8) + // via https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error + if (Error.captureStackTrace) { + Error.captureStackTrace(this); + } + } + window.textsecure.UnregisteredUserError = UnregisteredUserError; window.textsecure.SendMessageNetworkError = SendMessageNetworkError; window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError; @@ -191,4 +205,5 @@ window.textsecure.EmptySwarmError = EmptySwarmError; window.textsecure.DNSResolutionError = DNSResolutionError; window.textsecure.LokiIpError = LokiIpError; + window.textsecure.HTTPError = HTTPError; })(); diff --git a/main.js b/main.js index ebbed0fb8..fa4578769 100644 --- a/main.js +++ b/main.js @@ -147,8 +147,7 @@ function prepareURL(pathSegments, moreKeys) { serverUrl: config.get('serverUrl'), localUrl: config.get('localUrl'), cdnUrl: config.get('cdnUrl'), - messageServerPort: config.get('messageServerPort'), - swarmServerPort: config.get('swarmServerPort'), + snodeServerPort: config.get('snodeServerPort'), localServerPort: config.get('localServerPort'), certificateAuthority: config.get('certificateAuthority'), environment: config.environment, diff --git a/preload.js b/preload.js index 0942eaf55..64586c599 100644 --- a/preload.js +++ b/preload.js @@ -292,7 +292,7 @@ const LokiSnodeAPI = require('./js/modules/loki_snode_api'); window.lokiSnodeAPI = new LokiSnodeAPI({ serverUrl: config.serverUrl, localUrl: config.localUrl, - swarmServerPort: config.swarmServerPort, + snodeServerPort: config.snodeServerPort, }); window.LokiP2pAPI = require('./js/modules/loki_p2p_api'); @@ -301,7 +301,7 @@ const LokiMessageAPI = require('./js/modules/loki_message_api'); window.lokiMessageAPI = new LokiMessageAPI({ url: config.serverUrl, - messageServerPort: config.messageServerPort, + snodeServerPort: config.snodeServerPort, }); const LocalLokiServer = require('./libloki/modules/local_loki_server'); From 929d272fccfa86398d15490de27e5e312f3ae71a Mon Sep 17 00:00:00 2001 From: Beaudan Date: Mon, 25 Mar 2019 16:01:53 +1100 Subject: [PATCH 2/6] Fixed bugs with http being appended at wrong time and lastHash not being sent properly --- js/modules/loki_fetch.js | 2 +- js/modules/loki_message_api.js | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/js/modules/loki_fetch.js b/js/modules/loki_fetch.js index c0b5eb378..dcb2beac4 100644 --- a/js/modules/loki_fetch.js +++ b/js/modules/loki_fetch.js @@ -39,7 +39,7 @@ const fetch = async (url, options = {}) => { }); if (!response.ok) { - throw new textsecure.HTTPError(response); + throw new textsecure.HTTPError('Loki_fetch error', response); } let result; diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 93b0e5011..2a15beac7 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -97,7 +97,7 @@ class LokiMessageAPI { }; try { - await rpc(nodeUrl, this.snodeServerPort, 'store', params); + await rpc(`http://${nodeUrl}`, this.snodeServerPort, 'store', params); nodeComplete(nodeUrl); successfulRequests += 1; @@ -150,7 +150,7 @@ class LokiMessageAPI { await Promise.all( swarmNodes .splice(0, remainingRequests) - .map(nodeUrl => doRequest(`http://${nodeUrl}`)) + .map(nodeUrl => doRequest(nodeUrl)) ); } log.info(`Successful storage message to ${pubKey}`); @@ -177,7 +177,7 @@ class LokiMessageAPI { try { const result = await rpc( - nodeUrl, + `http://${nodeUrl}`, this.snodeServerPort, 'retrieve', params @@ -186,7 +186,7 @@ class LokiMessageAPI { nodeComplete(nodeUrl); if (Array.isArray(result.messages) && result.messages.length) { - const lastHash = [...result.messages].pop(); + const lastHash = [...result.messages].pop().hash; lokiSnodeAPI.updateLastHash(nodeUrl, lastHash); callback(result.messages); } @@ -238,9 +238,7 @@ class LokiMessageAPI { await Promise.all( Object.entries(ourSwarmNodes) .splice(0, remainingRequests) - .map(([nodeUrl, nodeData]) => - doRequest(`http://${nodeUrl}`, nodeData) - ) + .map(([nodeUrl, nodeData]) => doRequest(nodeUrl, nodeData)) ); } } From b09f2970fc8dadb22630faeff60edc5b58dc39a9 Mon Sep 17 00:00:00 2001 From: Beaudan Date: Mon, 25 Mar 2019 17:44:18 +1100 Subject: [PATCH 3/6] Move NotFoundError to errors.js --- js/modules/loki_fetch.js | 3 +++ js/modules/loki_message_api.js | 11 ++--------- libtextsecure/errors.js | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/js/modules/loki_fetch.js b/js/modules/loki_fetch.js index dcb2beac4..353992631 100644 --- a/js/modules/loki_fetch.js +++ b/js/modules/loki_fetch.js @@ -65,6 +65,9 @@ const fetch = async (url, options = {}) => { return result; } catch (e) { + if (e.code === 'ENOTFOUND') { + throw new textsecure.NotFoundError('Failed to resolve address', e); + } throw e; } }; diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 2a15beac7..c4953058a 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -5,13 +5,6 @@ const _ = require('lodash'); const { rpc } = require('./loki_fetch'); -class NotFoundError extends Error { - constructor() { - super('ENOTFOUND'); - this.name = 'NotFoundError'; - } -} - // Will be raised (to 3?) when we get more nodes const MINIMUM_SUCCESSFUL_REQUESTS = 2; @@ -103,7 +96,7 @@ class LokiMessageAPI { successfulRequests += 1; } catch (e) { log.warn('Loki send message:', e); - if (e instanceof NotFoundError) { + if (e instanceof textsecure.NotFoundError) { canResolve = false; } else if (e instanceof textsecure.HTTPError) { // We mark the node as complete as we could still reach it @@ -193,7 +186,7 @@ class LokiMessageAPI { successfulRequests += 1; } catch (e) { log.warn('Loki retrieve messages:', e); - if (e instanceof NotFoundError) { + if (e instanceof textsecure.NotFoundError) { canResolve = false; } else if (e instanceof textsecure.HTTPError) { // We mark the node as complete as we could still reach it diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js index 8a30f35d5..f3be62b07 100644 --- a/libtextsecure/errors.js +++ b/libtextsecure/errors.js @@ -179,6 +179,22 @@ appendStack(this, resolutionError); } + function NotFoundError(message, error) { + this.name = 'NotFoundError'; + this.message = message; + this.error = error; + + Error.call(this, message); + + // Maintains proper stack trace, where our error was thrown (only available on V8) + // via https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error + if (Error.captureStackTrace) { + Error.captureStackTrace(this); + } + + appendStack(this, error); + } + function HTTPError(message, response) { this.name = 'HTTPError'; this.message = `${response.status} Error: ${message}`; @@ -206,4 +222,5 @@ window.textsecure.DNSResolutionError = DNSResolutionError; window.textsecure.LokiIpError = LokiIpError; window.textsecure.HTTPError = HTTPError; + window.textsecure.NotFoundError = NotFoundError; })(); From 0f771d4db4aee3f6ba2e6c1a100dc2ea2248b72f Mon Sep 17 00:00:00 2001 From: Beaudan Date: Wed, 27 Mar 2019 11:32:48 +1100 Subject: [PATCH 4/6] Rename loki_fetch to loki_rpc --- js/modules/loki_message_api.js | 2 +- js/modules/{loki_fetch.js => loki_rpc.js} | 2 +- js/modules/loki_snode_api.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename js/modules/{loki_fetch.js => loki_rpc.js} (97%) diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index c4953058a..4bede184c 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -3,7 +3,7 @@ /* global log, dcodeIO, window, callWorker, lokiP2pAPI, lokiSnodeAPI, textsecure */ const _ = require('lodash'); -const { rpc } = require('./loki_fetch'); +const { rpc } = require('./loki_rpc'); // Will be raised (to 3?) when we get more nodes const MINIMUM_SUCCESSFUL_REQUESTS = 2; diff --git a/js/modules/loki_fetch.js b/js/modules/loki_rpc.js similarity index 97% rename from js/modules/loki_fetch.js rename to js/modules/loki_rpc.js index 353992631..23f9a01d5 100644 --- a/js/modules/loki_fetch.js +++ b/js/modules/loki_rpc.js @@ -39,7 +39,7 @@ const fetch = async (url, options = {}) => { }); if (!response.ok) { - throw new textsecure.HTTPError('Loki_fetch error', response); + throw new textsecure.HTTPError('Loki_rpc error', response); } let result; diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js index ccd023121..c89caa2a6 100644 --- a/js/modules/loki_snode_api.js +++ b/js/modules/loki_snode_api.js @@ -4,7 +4,7 @@ const is = require('@sindresorhus/is'); const dns = require('dns'); const process = require('process'); -const { rpc } = require('./loki_fetch'); +const { rpc } = require('./loki_rpc'); // Will be raised (to 3?) when we get more nodes const MINIMUM_SWARM_NODES = 1; From fa7042c04332ad9cc3fc97813daa48f910359aff Mon Sep 17 00:00:00 2001 From: Beaudan Date: Wed, 27 Mar 2019 15:15:49 +1100 Subject: [PATCH 5/6] Added wrong swarm error which gets thrown if we receive a 421 error, update the swarm lists if we get one of those errors --- js/modules/loki_message_api.js | 12 ++++++++++-- js/modules/loki_rpc.js | 20 ++++++++++++++++++++ js/modules/loki_snode_api.js | 9 +++++++++ libtextsecure/errors.js | 14 ++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 4bede184c..724d46bac 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -96,7 +96,11 @@ class LokiMessageAPI { successfulRequests += 1; } catch (e) { log.warn('Loki send message:', e); - if (e instanceof textsecure.NotFoundError) { + if (e instanceof textsecure.WrongSwarmError) { + const { newSwarm } = e; + await lokiSnodeAPI.updateSwarmNodes(pubKey, newSwarm); + completedNodes.push(nodeUrl); + } else if (e instanceof textsecure.NotFoundError) { canResolve = false; } else if (e instanceof textsecure.HTTPError) { // We mark the node as complete as we could still reach it @@ -186,7 +190,11 @@ class LokiMessageAPI { successfulRequests += 1; } catch (e) { log.warn('Loki retrieve messages:', e); - if (e instanceof textsecure.NotFoundError) { + if (e instanceof textsecure.WrongSwarmError) { + const { newSwarm } = e; + lokiSnodeAPI.updateOurSwarmNodes(newSwarm); + completedNodes.push(nodeUrl); + } else if (e instanceof textsecure.NotFoundError) { canResolve = false; } else if (e instanceof textsecure.HTTPError) { // We mark the node as complete as we could still reach it diff --git a/js/modules/loki_rpc.js b/js/modules/loki_rpc.js index 23f9a01d5..378f948a7 100644 --- a/js/modules/loki_rpc.js +++ b/js/modules/loki_rpc.js @@ -38,6 +38,26 @@ const fetch = async (url, options = {}) => { method, }); + if (response.status === 421) { + let newSwarm = await response.text(); + if (doEncryptChannel) { + try { + newSwarm = await libloki.crypto.snodeCipher.decrypt( + address, + newSwarm + ); + } catch (e) { + log.warn(`Could not decrypt response from ${address}`, e); + } + try { + newSwarm = newSwarm === '' ? {} : JSON.parse(newSwarm); + } catch (e) { + log.warn(`Could not parse string to json ${newSwarm}`, e); + } + } + throw new textsecure.WrongSwarmError(newSwarm); + } + if (!response.ok) { throw new textsecure.HTTPError('Loki_rpc error', response); } diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js index c89caa2a6..8edd758ba 100644 --- a/js/modules/loki_snode_api.js +++ b/js/modules/loki_snode_api.js @@ -139,6 +139,15 @@ class LokiSnodeAPI { } } + updateOurSwarmNodes(newNodes) { + this.ourSwarmNodes = {}; + newNodes.forEach(url => { + this.ourSwarmNodes[url] = { + failureCount: 0, + }; + }); + } + async getOurSwarmNodes() { if ( !this.ourSwarmNodes || diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js index f3be62b07..78f9fcfb1 100644 --- a/libtextsecure/errors.js +++ b/libtextsecure/errors.js @@ -209,6 +209,19 @@ } } + function WrongSwarmError(newSwarm) { + this.name = 'WrongSwarmError'; + this.newSwarm = newSwarm; + + Error.call(this, this.name); + + // Maintains proper stack trace, where our error was thrown (only available on V8) + // via https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error + if (Error.captureStackTrace) { + Error.captureStackTrace(this); + } + } + window.textsecure.UnregisteredUserError = UnregisteredUserError; window.textsecure.SendMessageNetworkError = SendMessageNetworkError; window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError; @@ -223,4 +236,5 @@ window.textsecure.LokiIpError = LokiIpError; window.textsecure.HTTPError = HTTPError; window.textsecure.NotFoundError = NotFoundError; + window.textsecure.WrongSwarmError = WrongSwarmError; })(); From f076f94e71eddf827794fa296f59251e58b6526d Mon Sep 17 00:00:00 2001 From: Beaudan Date: Mon, 8 Apr 2019 13:39:04 +1000 Subject: [PATCH 6/6] Clearer last hash line --- js/modules/loki_message_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 724d46bac..ca7404871 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -183,7 +183,7 @@ class LokiMessageAPI { nodeComplete(nodeUrl); if (Array.isArray(result.messages) && result.messages.length) { - const lastHash = [...result.messages].pop().hash; + const lastHash = _.last(result.messages).hash; lokiSnodeAPI.updateLastHash(nodeUrl, lastHash); callback(result.messages); }