From fc00373897c7f1de89cba4cca3c7bd3783f11d7d Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Thu, 19 Sep 2019 16:14:06 +1000 Subject: [PATCH 1/8] Change LokiPublicChatAPI to LokiAppDotNetAPI, add annotations getter and setter --- js/modules/loki_public_chat_api.js | 159 ++++++++++++++++++++--------- 1 file changed, 108 insertions(+), 51 deletions(-) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index 4823b0c1d..7d7dbfdd1 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -10,8 +10,7 @@ const PUBLICCHAT_CHAN_POLL_EVERY = 20 * 1000; // 20s const PUBLICCHAT_DELETION_POLL_EVERY = 5 * 1000; // 5s const PUBLICCHAT_MOD_POLL_EVERY = 30 * 1000; // 30s -// singleton to relay events to libtextsecure/message_receiver -class LokiPublicChatAPI extends EventEmitter { +class LokiAppDotNetAPI extends EventEmitter { constructor(ourKey) { super(); this.ourKey = ourKey; @@ -24,8 +23,8 @@ class LokiPublicChatAPI extends EventEmitter { server => server.baseServerUrl === serverUrl ); if (!thisServer) { - log.info(`LokiPublicChatAPI creating ${serverUrl}`); - thisServer = new LokiPublicServerAPI(this, serverUrl); + log.info(`LokiAppDotNetAPI creating ${serverUrl}`); + thisServer = new LokiAppDotNetServerAPI(this, serverUrl); this.servers.push(thisServer); } return thisServer; @@ -57,7 +56,7 @@ class LokiPublicChatAPI extends EventEmitter { } } -class LokiPublicServerAPI { +class LokiAppDotNetServerAPI { constructor(chatAPI, url) { this.chatAPI = chatAPI; this.channels = []; @@ -76,7 +75,7 @@ class LokiPublicServerAPI { channel => channel.channelId === channelId ); if (!thisChannel) { - log.info(`LokiPublicChatAPI creating channel ${conversationId}`); + log.info(`LokiAppDotNetAPI creating channel ${conversationId}`); thisChannel = new LokiPublicChannelAPI(this, channelId, conversationId); this.channels.push(thisChannel); } @@ -198,58 +197,19 @@ class LokiPublicServerAPI { return false; } } -} -class LokiPublicChannelAPI { - constructor(serverAPI, channelId, conversationId) { - // properties - this.serverAPI = serverAPI; - this.channelId = channelId; - this.baseChannelUrl = `channels/${this.channelId}`; - this.conversationId = conversationId; - this.conversation = ConversationController.get(conversationId); - this.lastGot = null; - this.modStatus = false; - this.deleteLastId = 1; - this.timers = {}; - this.running = true; - // end properties - - log.info(`registered LokiPublicChannel ${channelId}`); - // start polling - this.pollForMessages(); - this.pollForDeletions(); - this.pollForChannel(); - this.pollForModerators(); - } - - stop() { - this.running = false; - if (this.timers.channel) { - clearTimeout(this.timers.channel); - } - if (this.timers.moderator) { - clearTimeout(this.timers.moderator); - } - if (this.timers.delete) { - clearTimeout(this.timers.delete); - } - if (this.timers.message) { - clearTimeout(this.timers.message); - } - } // make a request to the server async serverRequest(endpoint, options = {}) { const { params = {}, method, objBody, forceFreshToken = false } = options; - const url = new URL(`${this.serverAPI.baseServerUrl}/${endpoint}`); + const url = new URL(`${this.baseServerUrl}/${endpoint}`); if (params) { url.search = new URLSearchParams(params); } let result; - let { token } = this.serverAPI; + let { token } = this; if (!token) { - token = await this.serverAPI.getOrRefreshServerToken(); + token = await this.getOrRefreshServerToken(); if (!token) { log.error('NO TOKEN'); return { @@ -260,7 +220,7 @@ class LokiPublicChannelAPI { try { const fetchOptions = {}; const headers = { - Authorization: `Bearer ${this.serverAPI.token}`, + Authorization: `Bearer ${this.token}`, }; if (method) { fetchOptions.method = method; @@ -281,7 +241,7 @@ class LokiPublicChannelAPI { try { response = await result.json(); } catch (e) { - log.info(`serverRequest json arpse ${e}`); + log.warn(`serverRequest json arpse ${e}`); return { err: e, statusCode: result.status, @@ -310,6 +270,103 @@ class LokiPublicChannelAPI { }; } + async getUserAnnotations(pubKey) { + if (!pubKey){ + log.warn('No pubkey provided to getUserAnnotations!'); + return []; + } + const res = await this.serverRequest(`users/@${pubKey}`, { + method: 'GET', + params: { + include_user_annotations: 1, + }, + }); + + if (res.err || !res.response || !res.response.data) { + if (res.err) { + log.error(`Error ${res.err}`); + } + return []; + } + + return res.response.data.annotations || []; + } + + // Only one annotation at a time + async setSelfAnnotation(type, value) { + let annotation; + const doDelete = !value; + + if (doDelete) { + // to delete annotation, omit the "value" field + annotation = { + type, + }; + } else { + annotation = { + type, + value, + }; + } + + const res = await this.serverRequest('users/me', { + method: 'PATCH', + objBody: { + annotations: [annotation], + }, + }); + + if (!res.err && res.response) { + return res.response; + } + + return false; + } +} + +class LokiPublicChannelAPI { + constructor(serverAPI, channelId, conversationId) { + // properties + this.serverAPI = serverAPI; + this.channelId = channelId; + this.baseChannelUrl = `channels/${this.channelId}`; + this.conversationId = conversationId; + this.conversation = ConversationController.get(conversationId); + this.lastGot = null; + this.modStatus = false; + this.deleteLastId = 1; + this.timers = {}; + this.running = true; + // end properties + + log.info(`registered LokiPublicChannel ${channelId}`); + // start polling + this.pollForMessages(); + this.pollForDeletions(); + this.pollForChannel(); + this.pollForModerators(); + } + + stop() { + this.running = false; + if (this.timers.channel) { + clearTimeout(this.timers.channel); + } + if (this.timers.moderator) { + clearTimeout(this.timers.moderator); + } + if (this.timers.delete) { + clearTimeout(this.timers.delete); + } + if (this.timers.message) { + clearTimeout(this.timers.message); + } + } + + serverRequest(endpoint, options = {}) { + return this.serverAPI.serverRequest(endpoint, options); + } + // get moderation actions async pollForModerators() { try { @@ -669,4 +726,4 @@ class LokiPublicChannelAPI { } } -module.exports = LokiPublicChatAPI; +module.exports = LokiAppDotNetAPI; From 33ea259d45f4383b1d968f909878c8e3b4ef3e4b Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Thu, 19 Sep 2019 16:16:32 +1000 Subject: [PATCH 2/8] Rename file --- js/modules/{loki_public_chat_api.js => loki_app_dot_net_api.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename js/modules/{loki_public_chat_api.js => loki_app_dot_net_api.js} (100%) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_app_dot_net_api.js similarity index 100% rename from js/modules/loki_public_chat_api.js rename to js/modules/loki_app_dot_net_api.js From dc6d3b5ca2dc0bef805c7012b9bac9dd84205ec1 Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Thu, 19 Sep 2019 16:17:19 +1000 Subject: [PATCH 3/8] Add LokiPublicChatAPI (extends LokiAppDotNetAPI) --- js/modules/loki_public_chat_api.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 js/modules/loki_public_chat_api.js diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js new file mode 100644 index 000000000..e90d89744 --- /dev/null +++ b/js/modules/loki_public_chat_api.js @@ -0,0 +1,5 @@ +const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); + +class LokiPublicChatAPI extends LokiAppDotNetAPI {} + +module.exports = LokiPublicChatAPI; From e07f81c1503f0127e572ddec067ffcbf76dd8224 Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Thu, 19 Sep 2019 16:36:19 +1000 Subject: [PATCH 4/8] Add LokiFileServerAPI --- config/default.json | 3 ++- js/background.js | 3 +++ js/modules/loki_file_server_api.js | 40 ++++++++++++++++++++++++++++++ main.js | 1 + preload.js | 5 ++++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 js/modules/loki_file_server_api.js diff --git a/config/default.json b/config/default.json index 31462adf2..ee40150e8 100644 --- a/config/default.json +++ b/config/default.json @@ -31,5 +31,6 @@ "-----BEGIN CERTIFICATE-----\nMIID7zCCAtegAwIBAgIJAIm6LatK5PNiMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD\nVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j\naXNjbzEdMBsGA1UECgwUT3BlbiBXaGlzcGVyIFN5c3RlbXMxHTAbBgNVBAsMFE9w\nZW4gV2hpc3BlciBTeXN0ZW1zMRMwEQYDVQQDDApUZXh0U2VjdXJlMB4XDTEzMDMy\nNTIyMTgzNVoXDTIzMDMyMzIyMTgzNVowgY0xCzAJBgNVBAYTAlVTMRMwEQYDVQQI\nDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMR0wGwYDVQQKDBRP\ncGVuIFdoaXNwZXIgU3lzdGVtczEdMBsGA1UECwwUT3BlbiBXaGlzcGVyIFN5c3Rl\nbXMxEzARBgNVBAMMClRleHRTZWN1cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\nggEKAoIBAQDBSWBpOCBDF0i4q2d4jAXkSXUGpbeWugVPQCjaL6qD9QDOxeW1afvf\nPo863i6Crq1KDxHpB36EwzVcjwLkFTIMeo7t9s1FQolAt3mErV2U0vie6Ves+yj6\ngrSfxwIDAcdsKmI0a1SQCZlr3Q1tcHAkAKFRxYNawADyps5B+Zmqcgf653TXS5/0\nIPPQLocLn8GWLwOYNnYfBvILKDMItmZTtEbucdigxEA9mfIvvHADEbteLtVgwBm9\nR5vVvtwrD6CCxI3pgH7EH7kMP0Od93wLisvn1yhHY7FuYlrkYqdkMvWUrKoASVw4\njb69vaeJCUdU+HCoXOSP1PQcL6WenNCHAgMBAAGjUDBOMB0GA1UdDgQWBBQBixjx\nP/s5GURuhYa+lGUypzI8kDAfBgNVHSMEGDAWgBQBixjxP/s5GURuhYa+lGUypzI8\nkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB+Hr4hC56m0LvJAu1R\nK6NuPDbTMEN7/jMojFHxH4P3XPFfupjR+bkDq0pPOU6JjIxnrD1XD/EVmTTaTVY5\niOheyv7UzJOefb2pLOc9qsuvI4fnaESh9bhzln+LXxtCrRPGhkxA1IMIo3J/s2WF\n/KVYZyciu6b4ubJ91XPAuBNZwImug7/srWvbpk0hq6A6z140WTVSKtJG7EP41kJe\n/oF4usY5J7LPkxK3LWzMJnb5EIJDmRvyH8pyRwWg6Qm6qiGFaI4nL8QU4La1x2en\n4DGXRaLMPRwjELNgQPodR38zoCMuA8gHZfZYYoZ7D7Q1wNUiVHcxuFrEeBaYJbLE\nrwLV\n-----END CERTIFICATE-----\n", "import": false, "serverTrustRoot": "BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx", - "defaultPublicChatServer": "https://chat.lokinet.org/" + "defaultPublicChatServer": "https://chat.lokinet.org/", + "defaultFileServer": "https://file.lokinet.org" } diff --git a/js/background.js b/js/background.js index 5e656247c..3f6e34673 100644 --- a/js/background.js +++ b/js/background.js @@ -229,7 +229,10 @@ const ourKey = textsecure.storage.user.getNumber(); window.feeds = []; window.lokiMessageAPI = new window.LokiMessageAPI(ourKey); + // singleton to relay events to libtextsecure/message_receiver window.lokiPublicChatAPI = new window.LokiPublicChatAPI(ourKey); + // singleton to interface the File server + window.lokiFileServerAPI = new window.LokiFileServerAPI(ourKey); window.lokiP2pAPI = new window.LokiP2pAPI(ourKey); window.lokiP2pAPI.on('pingContact', pubKey => { const isPing = true; diff --git a/js/modules/loki_file_server_api.js b/js/modules/loki_file_server_api.js new file mode 100644 index 000000000..a07d20f5d --- /dev/null +++ b/js/modules/loki_file_server_api.js @@ -0,0 +1,40 @@ +/* global storage: false */ +/* global libloki: false */ +/* global Signal: false */ + +const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); + +const DEVICE_MAPPING_ANNOTATION_KEY = 'network.loki.messenger.devicemapping'; + +// returns the LokiFileServerAPI constructor with the serverUrl already consumed +function LokiFileServerAPIWrapper(serverUrl) { + return LokiFileServerAPI.bind(null, serverUrl); +} + +class LokiFileServerAPI { + constructor(serverUrl, ourKey) { + this.ourKey = ourKey; + this._adnApi = new LokiAppDotNetAPI(ourKey); + this._server = this._adnApi.findOrCreateServer(serverUrl); + } + + async getUserDeviceMapping(pubKey) { + const annotations = await this._server.getUserAnnotations(pubKey); + return annotations.find( + annotation => annotation.type === DEVICE_MAPPING_ANNOTATION_KEY + ); + } + + setOurDeviceMapping(authorisations, isPrimary) { + const content = { + isPrimary: isPrimary ? '1' : '0', + authorisations, + }; + return this._server.setSelfAnnotation( + DEVICE_MAPPING_ANNOTATION_KEY, + content + ); + } +} + +module.exports = LokiFileServerAPIWrapper; diff --git a/main.js b/main.js index 8b545fafc..f5e608004 100644 --- a/main.js +++ b/main.js @@ -166,6 +166,7 @@ function prepareURL(pathSegments, moreKeys) { contentProxyUrl: config.contentProxyUrl, importMode: importMode ? true : undefined, // for stringify() serverTrustRoot: config.get('serverTrustRoot'), + defaultFileServer: config.get('defaultFileServer'), ...moreKeys, }, }); diff --git a/preload.js b/preload.js index fc5b12ca0..39ffb5bc2 100644 --- a/preload.js +++ b/preload.js @@ -326,6 +326,11 @@ window.LokiMessageAPI = require('./js/modules/loki_message_api'); window.LokiPublicChatAPI = require('./js/modules/loki_public_chat_api'); +const LokiFileServerAPIWrapper = require('./js/modules/loki_file_server_api'); + +// bind first argument as we have it here already +window.LokiFileServerAPI = LokiFileServerAPIWrapper(config.defaultFileServer); + window.LokiRssAPI = require('./js/modules/loki_rss_api'); window.LocalLokiServer = require('./libloki/modules/local_loki_server'); From 3b450e28da5ee453c45aeee39146c5b370945026 Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Fri, 20 Sep 2019 10:55:08 +1000 Subject: [PATCH 5/8] lint --- js/modules/loki_app_dot_net_api.js | 3 +-- js/modules/loki_file_server_api.js | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 7d7dbfdd1..bfea9a312 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -198,7 +198,6 @@ class LokiAppDotNetServerAPI { } } - // make a request to the server async serverRequest(endpoint, options = {}) { const { params = {}, method, objBody, forceFreshToken = false } = options; @@ -271,7 +270,7 @@ class LokiAppDotNetServerAPI { } async getUserAnnotations(pubKey) { - if (!pubKey){ + if (!pubKey) { log.warn('No pubkey provided to getUserAnnotations!'); return []; } diff --git a/js/modules/loki_file_server_api.js b/js/modules/loki_file_server_api.js index a07d20f5d..5b110e199 100644 --- a/js/modules/loki_file_server_api.js +++ b/js/modules/loki_file_server_api.js @@ -1,7 +1,3 @@ -/* global storage: false */ -/* global libloki: false */ -/* global Signal: false */ - const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); const DEVICE_MAPPING_ANNOTATION_KEY = 'network.loki.messenger.devicemapping'; From e2e2d1e8458c8d4dc21310740d90a6f0ebf8eb6a Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Tue, 24 Sep 2019 15:55:15 +1000 Subject: [PATCH 6/8] address review --- js/modules/loki_app_dot_net_api.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 49076f868..3b032b3c2 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -294,19 +294,11 @@ class LokiAppDotNetServerAPI { // Only one annotation at a time async setSelfAnnotation(type, value) { - let annotation; - const doDelete = !value; + const annotation = { type }; - if (doDelete) { - // to delete annotation, omit the "value" field - annotation = { - type, - }; - } else { - annotation = { - type, - value, - }; + // to delete annotation, omit the "value" field + if (value) { + annotation.value = value; } const res = await this.serverRequest('users/me', { From a28c5816662d6cac9e8b80e603a5f4546bd846a6 Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Wed, 25 Sep 2019 14:11:34 +1000 Subject: [PATCH 7/8] return early if signature is not a string --- js/modules/loki_app_dot_net_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index c028810f8..142fc5e44 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -602,7 +602,7 @@ class LokiPublicChannelAPI { const noteValue = adnMessage.annotations[0].value; // signatures now required - if (!noteValue.sig) { + if (!noteValue.sig || typeof noteValue.sig !== 'string') { return false; } From 7549c45716b422a8bbc04734c3c3c9364504ff8b Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Wed, 25 Sep 2019 14:11:41 +1000 Subject: [PATCH 8/8] yarn lint --- js/modules/loki_app_dot_net_api.js | 35 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 142fc5e44..ca5bb3ade 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -594,18 +594,21 @@ class LokiPublicChannelAPI { more = res.response.meta.more && res.response.data.length >= params.count; } } - + async getMessengerData(adnMessage) { - if (!Array.isArray(adnMessage.annotations) || adnMessage.annotations.length === 0) { + if ( + !Array.isArray(adnMessage.annotations) || + adnMessage.annotations.length === 0 + ) { return false; } const noteValue = adnMessage.annotations[0].value; - + // signatures now required if (!noteValue.sig || typeof noteValue.sig !== 'string') { return false; } - + // timestamp is the only required field we've had since the first deployed version const { timestamp, quote } = noteValue; @@ -615,7 +618,7 @@ class LokiPublicChannelAPI { // try to verify signature const { sig, sigver } = noteValue; - const annoCopy = [ ...adnMessage.annotations ]; + const annoCopy = [...adnMessage.annotations]; // strip out sig and sigver annoCopy[0] = _.omit(annoCopy[0], ['value.sig', 'value.sigver']); const verifyObj = { @@ -626,10 +629,8 @@ class LokiPublicChannelAPI { if (adnMessage.reply_to) { verifyObj.reply_to = adnMessage.reply_to; } - - const pubKeyBin = StringView.hexToArrayBuffer( - adnMessage.user.username - ); + + const pubKeyBin = StringView.hexToArrayBuffer(adnMessage.user.username); const sigBin = StringView.hexToArrayBuffer(sig); try { await libsignal.Curve.async.verifySignature( @@ -664,12 +665,12 @@ class LokiPublicChannelAPI { log.error(`Unhandled message signature validation error ${e.message}`); return false; } - + return { timestamp, quote, - } - } + }; + } // get channel messages async pollForMessages() { @@ -706,7 +707,6 @@ class LokiPublicChannelAPI { if (!res.err && res.response) { let receivedAt = new Date().getTime(); res.response.data.reverse().forEach(async adnMessage => { - // still update our last received if deleted, not signed or not valid this.lastGot = !this.lastGot ? adnMessage.id @@ -722,7 +722,7 @@ class LokiPublicChannelAPI { ) { return; // Invalid or delete message } - + const messengerData = await this.getMessengerData(adnMessage); if (messengerData === false) { return; @@ -732,7 +732,7 @@ class LokiPublicChannelAPI { if (!timestamp) { return; // Invalid message } - + // Duplicate check const isDuplicate = message => { // The username in this case is the users pubKey @@ -760,9 +760,9 @@ class LokiPublicChannelAPI { timestamp, }, ].splice(-5); - + const from = adnMessage.user.name; // profileName - + const messageData = { serverId: adnMessage.id, clientVerified: true, @@ -802,7 +802,6 @@ class LokiPublicChannelAPI { // now process any user meta data updates // - update their conversation with a potentially new avatar - }); this.conversation.setLastRetrievedMessage(this.lastGot); }