diff --git a/customize.dist/pages.js b/customize.dist/pages.js index fc3ee6175..4b62ff785 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -107,7 +107,7 @@ define([ ])*/ ]) ]), - h('div.cp-version-footer', "CryptPad v3.10.0 (Kouprey)") + h('div.cp-version-footer', "CryptPad v3.11.0 (LabradorDuck)") ]); }; diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 05a46c25d..709afa7c8 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -135,7 +135,7 @@ @colortheme_oocell-bg: #40865c; @colortheme_oocell-color: #FFF; -@colortheme_oocell-warn: #cd2532; +@colortheme_oocell-warn: #ffbcc0; @colortheme_kanban-bg: #8C4; @colortheme_kanban-color: #000; diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less index ebe93399b..8fb1c8857 100644 --- a/customize.dist/src/less2/include/fileupload.less +++ b/customize.dist/src/less2/include/fileupload.less @@ -14,9 +14,11 @@ right: 10vw; bottom: 10vh; box-sizing: border-box; - z-index: 1000000; //Z file upload table container + z-index: 100000; //Z file upload table container display: none; color: darken(@colortheme_drive-bg, 10%); + max-height: 180px; + overflow-y: auto; @media screen and (max-width: @browser_media-medium-screen) { left: 5vw; right: 5vw; bottom: 5vw; @@ -26,6 +28,9 @@ display: flex; background-color: darken(@colortheme_modal-bg, 10%); font-weight: bold; + position: sticky; + top: 0; + z-index: 1; .cp-fileupload-header-title { padding: 0.25em 0.5em; flex-grow: 1; diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 59ea22c76..7961e1bee 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -1,6 +1,7 @@ @import (reference) "/customize/src/less2/include/colortheme-all.less"; @import (reference) "/customize/src/less2/include/leftside-menu.less"; @import (reference) "/customize/src/less2/include/buttons.less"; +@import (reference) "/customize/src/less2/include/browser.less"; @sidebar_button-width: 400px; @@ -73,6 +74,7 @@ padding: 5px 20px; color: @rightside-color; overflow: auto; + padding-bottom: 200px; // Following rules are only in settings .cp-sidebarlayout-element { @@ -96,7 +98,7 @@ } } margin-bottom: 20px; - .buttons_main(); + .buttons_main(); } [type="text"], [type="password"], button { vertical-align: middle; @@ -107,6 +109,7 @@ .cp-sidebarlayout-input-block { display: inline-flex; width: @sidebar_button-width; + max-width: 100%; input { flex: 1; //border-radius: 0.25em 0 0 0.25em; @@ -118,6 +121,7 @@ //border: 1px solid #adadad; border-left: 0px; height: @variables_input-height; + margin: 0 !important; } } &>div { @@ -162,6 +166,25 @@ } */ } + @media screen and (max-width: @browser_media-medium-screen) { + flex-flow: column; + overflow: auto; + #cp-sidebarlayout-leftside { + width: 100% !important; // Override "narrow" mode + padding-bottom: 20px; + .cp-sidebarlayout-categories { + .cp-sidebarlayout-category { + margin: 0; + span.cp-sidebar-layout-category-name { + display: inline !important; // override "narrow" mode + } + } + } + } + #cp-sidebarlayout-rightside { + overflow: unset; + } + } } } diff --git a/docs/example.nginx.conf b/docs/example.nginx.conf index bef853d26..6d45b8198 100644 --- a/docs/example.nginx.conf +++ b/docs/example.nginx.conf @@ -106,7 +106,7 @@ server { if ($uri ~ ^\/common\/onlyoffice\/.*\/index\.html.*$) { set $unsafe 1; } # everything except the sandbox domain is a privileged scope, as they might be used to handle keys - if ($host != sandbox.cryptpad.info) { set $unsafe 0; } + if ($host != $sandbox_domain) { set $unsafe 0; } # privileged contexts allow a few more rights than unprivileged contexts, though limits are still applied if ($unsafe) { diff --git a/lib/api.js b/lib/api.js index bbfefa4b8..bd5c99629 100644 --- a/lib/api.js +++ b/lib/api.js @@ -1,75 +1,48 @@ /* jshint esversion: 6 */ -const nThen = require("nthen"); const WebSocketServer = require('ws').Server; const NetfluxSrv = require('chainpad-server'); module.exports.create = function (config) { - const wsConfig = { - server: config.httpServer, - }; + // asynchronously create a historyKeeper and RPC together + require('./historyKeeper.js').create(config, function (err, historyKeeper) { + if (err) { throw err; } - nThen(function (w) { - require('../storage/file').create(config, w(function (_store) { - config.store = _store; - })); - }).nThen(function (w) { - // XXX embed this in historyKeeper - require("../storage/tasks").create(config, w(function (e, tasks) { - if (e) { - throw e; - } - config.tasks = tasks; - if (config.disableIntegratedTasks) { return; } + var log = config.log; - config.intervals = config.intervals || {}; - config.intervals.taskExpiration = setInterval(function () { - tasks.runAll(function (err) { - if (err) { - // either TASK_CONCURRENCY or an error with tasks.list - // in either case it is already logged. - } - }); - }, 1000 * 60 * 5); // run every five minutes - })); - }).nThen(function () { - // asynchronously create a historyKeeper and RPC together - require('./historyKeeper.js').create(config, function (err, historyKeeper) { - if (err) { throw err; } - - var log = config.log; - - // spawn ws server and attach netflux event handlers - NetfluxSrv.create(new WebSocketServer(wsConfig)) - .on('channelClose', historyKeeper.channelClose) - .on('channelMessage', historyKeeper.channelMessage) - .on('channelOpen', historyKeeper.channelOpen) - .on('sessionClose', function (userId, reason) { - if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) { - return void log.error('SESSION_CLOSE_WITH_ERROR', { - userId: userId, - reason: reason, - }); - } - log.verbose('SESSION_CLOSE_ROUTINE', { + // spawn ws server and attach netflux event handlers + NetfluxSrv.create(new WebSocketServer({ server: config.httpServer})) + .on('channelClose', historyKeeper.channelClose) + .on('channelMessage', historyKeeper.channelMessage) + .on('channelOpen', historyKeeper.channelOpen) + .on('sessionClose', function (userId, reason) { + if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) { + if (reason && reason.code === 'ECONNRESET') { return; } + return void log.error('SESSION_CLOSE_WITH_ERROR', { userId: userId, reason: reason, }); - }) - .on('error', function (error, label, info) { - if (!error) { return; } - /* labels: - SEND_MESSAGE_FAIL, SEND_MESSAGE_FAIL_2, FAIL_TO_DISCONNECT, - FAIL_TO_TERMINATE, HANDLE_CHANNEL_LEAVE, NETFLUX_BAD_MESSAGE, - NETFLUX_WEBSOCKET_ERROR - */ - log.error(label, { - code: error.code, - message: error.message, - stack: error.stack, - info: info, - }); - }) - .register(historyKeeper.id, historyKeeper.directMessage); - }); + } + + if (reason && reason === 'SOCKET_CLOSED') { return; } + log.verbose('SESSION_CLOSE_ROUTINE', { + userId: userId, + reason: reason, + }); + }) + .on('error', function (error, label, info) { + if (!error) { return; } + /* labels: + SEND_MESSAGE_FAIL, SEND_MESSAGE_FAIL_2, FAIL_TO_DISCONNECT, + FAIL_TO_TERMINATE, HANDLE_CHANNEL_LEAVE, NETFLUX_BAD_MESSAGE, + NETFLUX_WEBSOCKET_ERROR + */ + log.error(label, { + code: error.code, + message: error.message, + stack: error.stack, + info: info, + }); + }) + .register(historyKeeper.id, historyKeeper.directMessage); }); }; diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js index 3c328611b..a3bb071ad 100644 --- a/lib/commands/admin-rpc.js +++ b/lib/commands/admin-rpc.js @@ -2,7 +2,7 @@ const BatchRead = require("../batch-read"); const nThen = require("nthen"); const getFolderSize = require("get-folder-size"); -const Util = require("../common-util"); +//const Util = require("../common-util"); var Fs = require("fs"); @@ -94,8 +94,8 @@ var getDiskUsage = function (Env, cb) { Admin.command = function (Env, safeKey, data, cb, Server) { var admins = Env.admins; - var unsafeKey = Util.unescapeKeyCharacters(safeKey); - if (admins.indexOf(unsafeKey) === -1) { + //var unsafeKey = Util.unescapeKeyCharacters(safeKey); + if (admins.indexOf(safeKey) === -1) { return void cb("FORBIDDEN"); } diff --git a/lib/commands/channel.js b/lib/commands/channel.js index bbb83b45a..88404a9b2 100644 --- a/lib/commands/channel.js +++ b/lib/commands/channel.js @@ -6,7 +6,7 @@ const nThen = require("nthen"); const Core = require("./core"); const Metadata = require("./metadata"); -Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb) { +Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb, Server) { if (typeof(channelId) !== 'string' || channelId.length !== 32) { return cb('INVALID_ARGUMENTS'); } @@ -20,19 +20,46 @@ Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb) { return void cb('INSUFFICIENT_PERMISSIONS'); } return void Env.msgStore.clearChannel(channelId, function (e) { - cb(e); + if (e) { return void cb(e); } + cb(); + + const channel_cache = Env.historyKeeper.channel_cache; + + const clear = function () { + // delete the channel cache because it will have been invalidated + delete channel_cache[channelId]; + }; + + nThen(function (w) { + Server.getChannelUserList(channelId).forEach(function (userId) { + Server.send(userId, [ + 0, + Env.historyKeeper.id, + 'MSG', + userId, + JSON.stringify({ + error: 'ECLEARED', + channel: channelId + }) + ], w()); + }); + }).nThen(function () { + clear(); + }).orTimeout(function () { + Env.Log.warn("ON_CHANNEL_CLEARED_TIMEOUT", channelId); + clear(); + }, 30000); }); }); }; -Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb) { +Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb, Server) { if (typeof(channelId) !== 'string' || !Core.isValidId(channelId)) { return cb('INVALID_ARGUMENTS'); } var unsafeKey = Util.unescapeKeyCharacters(safeKey); if (Env.blobStore.isFileId(channelId)) { - //var safeKey = Util.escapeKeyCharacters(unsafeKey); var blobId = channelId; return void nThen(function (w) { @@ -89,6 +116,45 @@ Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb) { return void cb(e); } cb(void 0, 'OK'); + + const channel_cache = Env.historyKeeper.channel_cache; + const metadata_cache = Env.historyKeeper.metadata_cache; + + const clear = function () { + delete channel_cache[channelId]; + Server.clearChannel(channelId); + delete metadata_cache[channelId]; + }; + + // an owner of a channel deleted it + nThen(function (w) { + // close the channel in the store + Env.msgStore.closeChannel(channelId, w()); + }).nThen(function (w) { + // Server.channelBroadcast would be better + // but we can't trust it to track even one callback, + // let alone many in parallel. + // so we simulate it on this side to avoid race conditions + Server.getChannelUserList(channelId).forEach(function (userId) { + Server.send(userId, [ + 0, + Env.historyKeeper.id, + "MSG", + userId, + JSON.stringify({ + error: 'EDELETED', + channel: channelId, + }) + ], w()); + }); + }).nThen(function () { + // clear the channel's data from memory + // once you've sent everyone a notice that the channel has been deleted + clear(); + }).orTimeout(function () { + Env.Log.warn('ON_CHANNEL_DELETED_TIMEOUT', channelId); + clear(); + }, 30000); }); }); }; @@ -121,6 +187,8 @@ Channel.trimHistory = function (Env, safeKey, data, cb) { // clear historyKeeper's cache for this channel Env.historyKeeper.channelClose(channelId); cb(void 0, 'OK'); + delete Env.historyKeeper.channel_cache[channelId]; + delete Env.historyKeeper.metadata_cache[channelId]; }); }); }; @@ -160,7 +228,7 @@ Channel.isNewChannel = function (Env, channel, cb) { Otherwise behaves the same as sending to a channel */ -Channel.writePrivateMessage = function (Env, args, cb, Server) { // XXX odd signature +Channel.writePrivateMessage = function (Env, args, cb, Server) { var channelId = args[0]; var msg = args[1]; @@ -197,11 +265,10 @@ Channel.writePrivateMessage = function (Env, args, cb, Server) { // XXX odd sign // if the message isn't valid it won't be stored. Env.historyKeeper.channelMessage(Server, channelStruct, fullMessage); - // call back with the message and the target channel. - // historyKeeper will take care of broadcasting it if anyone is in the channel - cb(void 0, { - channel: channelId, - message: fullMessage + Server.getChannelUserList(channelId).forEach(function (userId) { + Server.send(userId, fullMessage); }); + + cb(); }; diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js index 09cf1f1d6..41aea9888 100644 --- a/lib/commands/metadata.js +++ b/lib/commands/metadata.js @@ -12,8 +12,7 @@ Data.getMetadata = function (Env, channel, cb/* , Server */) { if (!Core.isValidId(channel)) { return void cb('INVALID_CHAN'); } if (channel.length !== 32) { return cb("INVALID_CHAN_LENGTH"); } - // XXX get metadata from the server cache if it is available - // Server isn't always passed, though... + // FIXME get metadata from the server cache if it is available batchMetadata(channel, cb, function (done) { var ref = {}; var lineHandler = Meta.createLineHandler(ref, Env.Log.error); @@ -37,7 +36,7 @@ Data.getMetadata = function (Env, channel, cb/* , Server */) { } */ var queueMetadata = WriteQueue(); -Data.setMetadata = function (Env, safeKey, data, cb) { +Data.setMetadata = function (Env, safeKey, data, cb, Server) { var unsafeKey = Util.unescapeKeyCharacters(safeKey); var channel = data.channel; @@ -108,8 +107,19 @@ Data.setMetadata = function (Env, safeKey, data, cb) { cb(e); return void next(); } + cb(void 0, metadata); next(); + + const metadata_cache = Env.historyKeeper.metadata_cache; + const channel_cache = Env.historyKeeper.channel_cache; + + metadata_cache[channel] = metadata; + + var index = Util.find(channel_cache, [channel, 'index']); + if (index && typeof(index) === 'object') { index.metadata = metadata; } + + Server.channelBroadcast(channel, JSON.stringify(metadata), Env.historyKeeper.id); }); }); }); diff --git a/lib/commands/pin-rpc.js b/lib/commands/pin-rpc.js index 2478910a7..e490f713d 100644 --- a/lib/commands/pin-rpc.js +++ b/lib/commands/pin-rpc.js @@ -23,7 +23,7 @@ var sumChannelSizes = function (sizes) { .reduce(function (a, b) { return a + b; }, 0); }; -// XXX it's possible for this to respond before the server has had a chance +// FIXME it's possible for this to respond before the server has had a chance // to fetch the limits. Maybe we should respond with an error... // or wait until we actually know the limits before responding var getLimit = Pinning.getLimit = function (Env, publicKey, cb) { @@ -205,7 +205,6 @@ Pinning.removePins = function (Env, safeKey, cb) { }; Pinning.trimPins = function (Env, safeKey, cb) { - // XXX trim to latest pin checkpoint cb("NOT_IMPLEMENTED"); }; @@ -453,10 +452,10 @@ Pinning.loadChannelPins = function (Env) { Pinning.isChannelPinned = function (Env, channel, cb) { Env.evPinnedPadsReady.reg(() => { - if (Env.pinnedPads[channel] && Object.keys(Env.pinnedPads[channel]).length) { + if (Env.pinnedPads[channel] && Object.keys(Env.pinnedPads[channel]).length) { // FIXME 'Object.keys' here is overkill. We only need to know that it isn't empty cb(void 0, true); } else { - delete Env.pinnedPads[channel]; // XXX WAT + delete Env.pinnedPads[channel]; cb(void 0, false); } }); diff --git a/lib/commands/quota.js b/lib/commands/quota.js index 654802f35..74c4eca44 100644 --- a/lib/commands/quota.js +++ b/lib/commands/quota.js @@ -81,7 +81,8 @@ Quota.updateCachedLimits = function (Env, cb) { req.on('error', function (e) { Quota.applyCustomLimits(Env); - if (!Env.domain) { return cb(); } // XXX + // FIXME this is always falsey. Maybe we just suppress errors? + if (!Env.domain) { return cb(); } cb(e); }); diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js index ddcb8764f..dd80d0b53 100644 --- a/lib/historyKeeper.js +++ b/lib/historyKeeper.js @@ -1,993 +1,54 @@ /* jshint esversion: 6 */ -/* global Buffer */ const nThen = require('nthen'); -const Nacl = require('tweetnacl/nacl-fast'); const Crypto = require('crypto'); -const Once = require("./once"); -const Meta = require("./metadata"); const WriteQueue = require("./write-queue"); const BatchRead = require("./batch-read"); - const RPC = require("./rpc"); +const HK = require("./hk-util.js"); -const Extras = require("./hk-util.js"); -const STANDARD_CHANNEL_LENGTH = Extras.STANDARD_CHANNEL_LENGTH; -const EPHEMERAL_CHANNEL_LENGTH = Extras.EPHEMERAL_CHANNEL_LENGTH; - -let Log; -const now = function () { return (new Date()).getTime(); }; -const ONE_DAY = 1000 * 60 * 60 * 24; // one day in milliseconds - -const getHash = Extras.getHash; - -const tryParse = function (str) { - try { - return JSON.parse(str); - } catch (err) { - Log.error('HK_PARSE_ERROR', err); - } -}; - -/* sliceCpIndex - returns a list of all checkpoints which might be relevant for a client connecting to a session - - * if there are two or fewer checkpoints, return everything you have - * if there are more than two - * return at least two - * plus any more which were received within the last 100 messages - - This is important because the additional history is what prevents - clients from forking on checkpoints and dropping forked history. - -*/ -const sliceCpIndex = function (cpIndex, line) { - // Remove "old" checkpoints (cp sent before 100 messages ago) - const minLine = Math.max(0, (line - 100)); - let start = cpIndex.slice(0, -2); - const end = cpIndex.slice(-2); - start = start.filter(function (obj) { - return obj.line > minLine; - }); - return start.concat(end); -}; - -const isMetadataMessage = function (parsed) { - return Boolean(parsed && parsed.channel); -}; - -// validateKeyStrings supplied by clients must decode to 32-byte Uint8Arrays -const isValidValidateKeyString = function (key) { - try { - return typeof(key) === 'string' && - Nacl.util.decodeBase64(key).length === Nacl.sign.publicKeyLength; - } catch (e) { - return false; - } -}; - -var CHECKPOINT_PATTERN = /^cp\|(([A-Za-z0-9+\/=]+)\|)?/; - -module.exports.create = function (cfg, cb) { - var rpc; - const tasks = cfg.tasks; - const store = cfg.store; - Log = cfg.log; +module.exports.create = function (config, cb) { + const Log = config.log; Log.silly('HK_LOADING', 'LOADING HISTORY_KEEPER MODULE'); - const metadata_cache = {}; - const channel_cache = {}; - const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex'); - - Log.verbose('HK_ID', 'History keeper ID: ' + HISTORY_KEEPER_ID); - - /* computeIndex - can call back with an error or a computed index which includes: - * cpIndex: - * array including any checkpoints pushed within the last 100 messages - * processed by 'sliceCpIndex(cpIndex, line)' - * offsetByHash: - * a map containing message offsets by their hash - * this is for every message in history, so it could be very large... - * except we remove offsets from the map if they occur before the oldest relevant checkpoint - * size: in bytes - * metadata: - * validationKey - * expiration time - * owners - * ??? (anything else we might add in the future) - * line - * the number of messages in history - * including the initial metadata line, if it exists - - */ - const computeIndex = function (channelName, cb) { - const cpIndex = []; - let messageBuf = []; - let metadata; - let i = 0; - - const ref = {}; - - const CB = Once(cb); - - const offsetByHash = {}; - let size = 0; - nThen(function (w) { - // iterate over all messages in the channel log - // old channels can contain metadata as the first message of the log - // remember metadata the first time you encounter it - // otherwise index important messages in the log - store.readMessagesBin(channelName, 0, (msgObj, readMore) => { - let msg; - // keep an eye out for the metadata line if you haven't already seen it - // but only check for metadata on the first line - if (!i && !metadata && msgObj.buff.indexOf('{') === 0) { - i++; // always increment the message counter - msg = tryParse(msgObj.buff.toString('utf8')); - if (typeof msg === "undefined") { return readMore(); } - - // validate that the current line really is metadata before storing it as such - if (isMetadataMessage(msg)) { - metadata = msg; - return readMore(); - } - } - i++; - if (msgObj.buff.indexOf('cp|') > -1) { - msg = msg || tryParse(msgObj.buff.toString('utf8')); - if (typeof msg === "undefined") { return readMore(); } - // cache the offsets of checkpoints if they can be parsed - if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) { - cpIndex.push({ - offset: msgObj.offset, - line: i - }); - // we only want to store messages since the latest checkpoint - // so clear the buffer every time you see a new one - messageBuf = []; - } - } - // if it's not metadata or a checkpoint then it should be a regular message - // store it in the buffer - messageBuf.push(msgObj); - return readMore(); - }, w((err) => { - if (err && err.code !== 'ENOENT') { - w.abort(); - return void CB(err); - } - - // once indexing is complete you should have a buffer of messages since the latest checkpoint - // map the 'hash' of each message to its byte offset in the log, to be used for reconnecting clients - messageBuf.forEach((msgObj) => { - const msg = tryParse(msgObj.buff.toString('utf8')); - if (typeof msg === "undefined") { return; } - if (msg[0] === 0 && msg[2] === 'MSG' && typeof(msg[4]) === 'string') { - // msgObj.offset is API guaranteed by our storage module - // it should always be a valid positive integer - offsetByHash[getHash(msg[4], Log)] = msgObj.offset; - } - // There is a trailing \n at the end of the file - size = msgObj.offset + msgObj.buff.length + 1; - }); - })); - }).nThen(function (w) { - // create a function which will iterate over amendments to the metadata - const handler = Meta.createLineHandler(ref, Log.error); - - // initialize the accumulator in case there was a foundational metadata line in the log content - if (metadata) { handler(void 0, metadata); } - - // iterate over the dedicated metadata log (if it exists) - // proceed even in the event of a stream error on the metadata log - store.readDedicatedMetadata(channelName, handler, w(function (err) { - if (err) { - return void Log.error("DEDICATED_METADATA_ERROR", err); - } - })); - }).nThen(function () { - // when all is done, cache the metadata in memory - if (ref.index) { // but don't bother if no metadata was found... - metadata = metadata_cache[channelName] = ref.meta; - } - // and return the computed index - CB(null, { - // Only keep the checkpoints included in the last 100 messages - cpIndex: sliceCpIndex(cpIndex, i), - offsetByHash: offsetByHash, - size: size, - metadata: metadata, - line: i - }); - }); - }; - - /* getIndex - calls back with an error if anything goes wrong - or with a cached index for a channel if it exists - (along with metadata) - otherwise it calls back with the index computed by 'computeIndex' - - as an added bonus: - if the channel exists but its index does not then it caches the index - */ - const batchIndexReads = BatchRead("HK_GET_INDEX"); - const getIndex = (channelName, cb) => { - const chan = channel_cache[channelName]; - - // if there is a channel in memory and it has an index cached, return it - if (chan && chan.index) { - // enforce async behaviour - return void setTimeout(function () { - cb(undefined, chan.index); - }); - } - - batchIndexReads(channelName, cb, function (done) { - computeIndex(channelName, (err, ret) => { - // this is most likely an unrecoverable filesystem error - if (err) { return void done(err); } - // cache the computed result if possible - if (chan) { chan.index = ret; } - // return - done(void 0, ret); - }); - }); - }; - - /* storeMessage - * channel id - * the message to store - * whether the message is a checkpoint - * optionally the hash of the message - * it's not always used, but we guard against it - - - * async but doesn't have a callback - * source of a race condition whereby: - * two messaages can be inserted - * two offsets can be computed using the total size of all the messages - * but the offsets don't correspond to the actual location of the newlines - * because the two actions were performed like ABba... - * the fix is to use callbacks and implement queueing for writes - * to guarantee that offset computation is always atomic with writes - */ - const queueStorage = WriteQueue(); - - const storeMessage = function (channel, msg, isCp, optionalMessageHash) { - const id = channel.id; - - queueStorage(id, function (next) { - const msgBin = Buffer.from(msg + '\n', 'utf8'); - // Store the message first, and update the index only once it's stored. - // store.messageBin can be async so updating the index first may - // result in a wrong cpIndex - nThen((waitFor) => { - store.messageBin(id, msgBin, waitFor(function (err) { - if (err) { - waitFor.abort(); - Log.error("HK_STORE_MESSAGE_ERROR", err.message); - - // this error is critical, but there's not much we can do at the moment - // proceed with more messages, but they'll probably fail too - // at least you won't have a memory leak - - // TODO make it possible to respond to clients with errors so they know - // their message wasn't stored - return void next(); - } - })); - }).nThen((waitFor) => { - getIndex(id, waitFor((err, index) => { - if (err) { - Log.warn("HK_STORE_MESSAGE_INDEX", err.stack); - // non-critical, we'll be able to get the channel index later - return void next(); - } - if (typeof (index.line) === "number") { index.line++; } - if (isCp) { - index.cpIndex = sliceCpIndex(index.cpIndex, index.line || 0); - for (let k in index.offsetByHash) { - if (index.offsetByHash[k] < index.cpIndex[0]) { - delete index.offsetByHash[k]; - } - } - index.cpIndex.push({ - offset: index.size, - line: ((index.line || 0) + 1) - }); - } - if (optionalMessageHash) { index.offsetByHash[optionalMessageHash] = index.size; } - index.size += msgBin.length; - - // handle the next element in the queue - next(); - })); - }); - }); - }; - - /* expireChannel is here to clean up channels that should have been removed - but for some reason are still present - */ - const expireChannel = function (channel) { - return void store.archiveChannel(channel, function (err) { - Log.info("ARCHIVAL_CHANNEL_BY_HISTORY_KEEPER_EXPIRATION", { - channelId: channel, - status: err? String(err): "SUCCESS", - }); - }); - }; - - /* dropChannel - * cleans up memory structures which are managed entirely by the historyKeeper - */ - const dropChannel = function (chanName) { - delete metadata_cache[chanName]; - delete channel_cache[chanName]; - }; - - /* checkExpired - * synchronously returns true or undefined to indicate whether the channel is expired - * according to its metadata - * has some side effects: - * closes the channel via the store.closeChannel API - * and then broadcasts to all channel members that the channel has expired - * removes the channel from the netflux-server's in-memory cache - * removes the channel metadata from history keeper's in-memory cache - - FIXME the boolean nature of this API should be separated from its side effects - */ - const checkExpired = function (Server, channel) { - if (!(channel && channel.length === STANDARD_CHANNEL_LENGTH)) { return false; } - let metadata = metadata_cache[channel]; - if (!(metadata && typeof(metadata.expire) === 'number')) { return false; } - - // the number of milliseconds ago the channel should have expired - let pastDue = (+new Date()) - metadata.expire; - - // less than zero means that it hasn't expired yet - if (pastDue < 0) { return false; } - - // if it should have expired more than a day ago... - // there may have been a problem with scheduling tasks - // or the scheduled tasks may not be running - // so trigger a removal from here - if (pastDue >= ONE_DAY) { expireChannel(channel); } - - // close the channel - store.closeChannel(channel, function () { - Server.channelBroadcast(channel, { - error: 'EEXPIRED', - channel: channel - }, HISTORY_KEEPER_ID); - dropChannel(channel); - }); - - // return true to indicate that it has expired - return true; - }; - - /* onChannelMessage - Determine what we should store when a message a broadcasted to a channel" - - * ignores ephemeral channels - * ignores messages sent to expired channels - * rejects duplicated checkpoints - * validates messages to channels that have validation keys - * caches the id of the last saved checkpoint - * adds timestamps to incoming messages - * writes messages to the store - */ - const onChannelMessage = function (Server, channel, msgStruct) { - // TODO our usage of 'channel' here looks prone to errors - // we only use it for its 'id', but it can contain other stuff - // also, we're using this RPC from both the RPC and Netflux-server - // we should probably just change this to expect a channel id directly - - // don't store messages if the channel id indicates that it's an ephemeral message - if (!channel.id || channel.id.length === EPHEMERAL_CHANNEL_LENGTH) { return; } - - const isCp = /^cp\|/.test(msgStruct[4]); - let id; - if (isCp) { - // id becomes either null or an array or results... - id = CHECKPOINT_PATTERN.exec(msgStruct[4]); - if (Array.isArray(id) && id[2] && id[2] === channel.lastSavedCp) { - // Reject duplicate checkpoints - return; - } - } - - let metadata; - nThen(function (w) { - // getIndex (and therefore the latest metadata) - getIndex(channel.id, w(function (err, index) { - if (err) { - w.abort(); - return void Log.error('CHANNEL_MESSAGE_ERROR', err); - } - - if (!index.metadata) { - // if there's no channel metadata then it can't be an expiring channel - // nor can we possibly validate it - return; - } - - metadata = index.metadata; - - // don't write messages to expired channels - if (checkExpired(Server, channel)) { return void w.abort(); } - - // if there's no validateKey present skip to the next block - if (!metadata.validateKey) { return; } - - // trim the checkpoint indicator off the message if it's present - let signedMsg = (isCp) ? msgStruct[4].replace(CHECKPOINT_PATTERN, '') : msgStruct[4]; - // convert the message from a base64 string into a Uint8Array - - // FIXME this can fail and the client won't notice - signedMsg = Nacl.util.decodeBase64(signedMsg); - - // FIXME this can blow up - // TODO check that that won't cause any problems other than not being able to append... - const validateKey = Nacl.util.decodeBase64(metadata.validateKey); - // validate the message - const validated = Nacl.sign.open(signedMsg, validateKey); - if (!validated) { - // don't go any further if the message fails validation - w.abort(); - Log.info("HK_SIGNED_MESSAGE_REJECTED", 'Channel '+channel.id); - return; - } - })); - }).nThen(function () { - // do checkpoint stuff... - - // 1. get the checkpoint id - // 2. reject duplicate checkpoints - - if (isCp) { - // if the message is a checkpoint we will have already validated - // that it isn't a duplicate. remember its id so that we can - // repeat this process for the next incoming checkpoint - - // WARNING: the fact that we only check the most recent checkpoints - // is a potential source of bugs if one editor has high latency and - // pushes a duplicate of an earlier checkpoint than the latest which - // has been pushed by editors with low latency - // FIXME - if (Array.isArray(id) && id[2]) { - // Store new checkpoint hash - channel.lastSavedCp = id[2]; - } - } - - // add the time to the message - msgStruct.push(now()); - - // storeMessage - storeMessage(channel, JSON.stringify(msgStruct), isCp, getHash(msgStruct[4], Log)); - }); - }; - - /* getHistoryOffset - returns a number representing the byte offset from the start of the log - for whatever history you're seeking. - - query by providing a 'lastKnownHash', - which is really just a string of the first 64 characters of an encrypted message. - OR by -1 which indicates that we want the full history (byte offset 0) - OR nothing, which indicates that you want whatever messages the historyKeeper deems relevant - (typically the last few checkpoints) + // TODO populate Env with everything that you use from config + // so that you can stop passing around your raw config + // and more easily share state between historyKeeper and rpc + const Env = { + Log: Log, + // tasks + // store + id: Crypto.randomBytes(8).toString('hex'), - this function embeds a lot of the history keeper's logic: - - 0. if you passed -1 as the lastKnownHash it means you want the complete history - * I'm not sure why you'd need to call this function if you know it will return 0 in this case... - * it has a side-effect of filling the index cache if it's empty - 1. if you provided a lastKnownHash and that message does not exist in the history: - * either the client has made a mistake or the history they knew about no longer exists - * call back with EINVAL - 2. if you did not provide a lastKnownHash - * and there are fewer than two checkpoints: - * return 0 (read from the start of the file) - * and there are two or more checkpoints: - * return the offset of the earliest checkpoint which 'sliceCpIndex' considers relevant - 3. if you did provide a lastKnownHash - * read through the log until you find the hash that you're looking for - * call back with either the byte offset of the message that you found OR - * -1 if you didn't find it - - */ - const getHistoryOffset = (channelName, lastKnownHash, cb) => { - // lastKnownhash === -1 means we want the complete history - if (lastKnownHash === -1) { return void cb(null, 0); } - let offset = -1; - nThen((waitFor) => { - getIndex(channelName, waitFor((err, index) => { - if (err) { waitFor.abort(); return void cb(err); } - - // check if the "hash" the client is requesting exists in the index - const lkh = index.offsetByHash[lastKnownHash]; - // we evict old hashes from the index as new checkpoints are discovered. - // if someone connects and asks for a hash that is no longer relevant, - // we tell them it's an invalid request. This is because of the semantics of "GET_HISTORY" - // which is only ever used when connecting or reconnecting in typical uses of history... - // this assumption should hold for uses by chainpad, but perhaps not for other uses cases. - // EXCEPT: other cases don't use checkpoints! - // clients that are told that their request is invalid should just make another request - // without specifying the hash, and just trust the server to give them the relevant data. - // QUESTION: does this mean mailboxes are causing the server to store too much stuff in memory? - if (lastKnownHash && typeof(lkh) !== "number") { - waitFor.abort(); - return void cb(new Error('EINVAL')); - } - - // Since last 2 checkpoints - if (!lastKnownHash) { - waitFor.abort(); - // Less than 2 checkpoints in the history: return everything - if (index.cpIndex.length < 2) { return void cb(null, 0); } - // Otherwise return the second last checkpoint's index - return void cb(null, index.cpIndex[0].offset); - /* LATER... - in practice, two checkpoints can be very close together - we have measures to avoid duplicate checkpoints, but editors - can produce nearby checkpoints which are slightly different, - and slip past these protections. To be really careful, we can - seek past nearby checkpoints by some number of patches so as - to ensure that all editors have sufficient knowledge of history - to reconcile their differences. */ - } - - offset = lkh; - })); - }).nThen((waitFor) => { - // if offset is less than zero then presumably the channel has no messages - // returning falls through to the next block and therefore returns -1 - if (offset !== -1) { return; } - - // do a lookup from the index - // FIXME maybe we don't need this anymore? - // otherwise we have a non-negative offset and we can start to read from there - store.readMessagesBin(channelName, 0, (msgObj, readMore, abort) => { - // tryParse return a parsed message or undefined - const msg = tryParse(msgObj.buff.toString('utf8')); - // if it was undefined then go onto the next message - if (typeof msg === "undefined") { return readMore(); } - if (typeof(msg[4]) !== 'string' || lastKnownHash !== getHash(msg[4], Log)) { - return void readMore(); - } - offset = msgObj.offset; - abort(); - }, waitFor(function (err) { - if (err) { waitFor.abort(); return void cb(err); } - })); - }).nThen(() => { - cb(null, offset); - }); - }; - - /* getHistoryAsync - * finds the appropriate byte offset from which to begin reading using 'getHistoryOffset' - * streams through the rest of the messages, safely parsing them and returning the parsed content to the handler - * calls back when it has reached the end of the log - - Used by: - * GET_HISTORY - - */ - const getHistoryAsync = (channelName, lastKnownHash, beforeHash, handler, cb) => { - let offset = -1; - nThen((waitFor) => { - getHistoryOffset(channelName, lastKnownHash, waitFor((err, os) => { - if (err) { - waitFor.abort(); - return void cb(err); - } - offset = os; - })); - }).nThen((waitFor) => { - if (offset === -1) { return void cb(new Error("could not find offset")); } - const start = (beforeHash) ? 0 : offset; - store.readMessagesBin(channelName, start, (msgObj, readMore, abort) => { - if (beforeHash && msgObj.offset >= offset) { return void abort(); } - var parsed = tryParse(msgObj.buff.toString('utf8')); - if (!parsed) { return void readMore(); } - handler(parsed, readMore); - }, waitFor(function (err) { - return void cb(err); - })); - }); - }; - - /* getOlderHistory - * allows clients to query for all messages until a known hash is read - * stores all messages in history as they are read - * can therefore be very expensive for memory - * should probably be converted to a streaming interface - - Used by: - * GET_HISTORY_RANGE - */ - const getOlderHistory = function (channelName, oldestKnownHash, cb) { - var messageBuffer = []; - var found = false; - store.getMessages(channelName, function (msgStr) { - if (found) { return; } - - let parsed = tryParse(msgStr); - if (typeof parsed === "undefined") { return; } - - // identify classic metadata messages by their inclusion of a channel. - // and don't send metadata, since: - // 1. the user won't be interested in it - // 2. this metadata is potentially incomplete/incorrect - if (isMetadataMessage(parsed)) { return; } - - var content = parsed[4]; - if (typeof(content) !== 'string') { return; } - - var hash = getHash(content, Log); - if (hash === oldestKnownHash) { - found = true; - } - messageBuffer.push(parsed); - }, function (err) { - if (err) { - Log.error("HK_GET_OLDER_HISTORY", err); - } - cb(messageBuffer); - }); - }; - - - /* onChannelCleared - * broadcasts to all clients in a channel if that channel is deleted - */ - const onChannelCleared = function (Server, channel) { - Server.channelBroadcast(channel, { - error: 'ECLEARED', - channel: channel - }, HISTORY_KEEPER_ID); - }; - - // When a channel is removed from datastore, broadcast a message to all its connected users - const onChannelDeleted = function (Server, channel) { - store.closeChannel(channel, function () { - Server.channelBroadcast(channel, { - error: 'EDELETED', - channel: channel - }, HISTORY_KEEPER_ID); - }); - - delete channel_cache[channel]; - Server.clearChannel(channel); - delete metadata_cache[channel]; - }; - // Check if the selected channel is expired - // If it is, remove it from memory and broadcast a message to its members - - const onChannelMetadataChanged = function (Server, channel, metadata) { - if (!(channel && metadata_cache[channel] && typeof (metadata) === "object")) { return; } - Log.silly('SET_METADATA_CACHE', { - channel: channel, - metadata: JSON.stringify(metadata), - }); - - metadata_cache[channel] = metadata; - - if (channel_cache[channel] && channel_cache[channel].index) { - channel_cache[channel].index.metadata = metadata; - } - Server.channelBroadcast(channel, metadata, HISTORY_KEEPER_ID); - }; - - const handleGetHistory = function (Server, seq, userId, parsed) { - // parsed[1] is the channel id - // parsed[2] is a validation key or an object containing metadata (optionnal) - // parsed[3] is the last known hash (optionnal) - - Server.send(userId, [seq, 'ACK']); - var channelName = parsed[1]; - var config = parsed[2]; - var metadata = {}; - var lastKnownHash; - var txid; - - // clients can optionally pass a map of attributes - // if the channel already exists this map will be ignored - // otherwise it will be stored as the initial metadata state for the channel - if (config && typeof config === "object" && !Array.isArray(parsed[2])) { - lastKnownHash = config.lastKnownHash; - metadata = config.metadata || {}; - txid = config.txid; - if (metadata.expire) { - metadata.expire = +metadata.expire * 1000 + (+new Date()); - } - } - metadata.channel = channelName; - metadata.created = +new Date(); - - // if the user sends us an invalid key, we won't be able to validate their messages - // so they'll never get written to the log anyway. Let's just drop their message - // on the floor instead of doing a bunch of extra work - // TODO send them an error message so they know something is wrong - if (metadata.validateKey && !isValidValidateKeyString(metadata.validateKey)) { - return void Log.error('HK_INVALID_KEY', metadata.validateKey); - } - - nThen(function (waitFor) { - var w = waitFor(); - - /* unless this is a young channel, we will serve all messages from an offset - this will not include the channel metadata, so we need to explicitly fetch that. - unfortunately, we can't just serve it blindly, since then young channels will - send the metadata twice, so let's do a quick check of what we're going to serve... - */ - getIndex(channelName, waitFor((err, index) => { - /* if there's an error here, it should be encountered - and handled by the next nThen block. - so, let's just fall through... - */ - if (err) { return w(); } - - - // it's possible that the channel doesn't have metadata - // but in that case there's no point in checking if the channel expired - // or in trying to send metadata, so just skip this block - if (!index || !index.metadata) { return void w(); } - // And then check if the channel is expired. If it is, send the error and abort - // FIXME this is hard to read because 'checkExpired' has side effects - if (checkExpired(Server, channelName)) { return void waitFor.abort(); } - // always send metadata with GET_HISTORY requests - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(index.metadata)], w); - })); - }).nThen(() => { - let msgCount = 0; - - // TODO compute lastKnownHash in a manner such that it will always skip past the metadata line? - getHistoryAsync(channelName, lastKnownHash, false, (msg, readMore) => { - msgCount++; - // avoid sending the metadata message a second time - if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); } - if (txid) { msg[0] = txid; } - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(msg)], readMore); - }, (err) => { - if (err && err.code !== 'ENOENT') { - if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", err); } - const parsedMsg = {error:err.message, channel: channelName, txid: txid}; - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]); - return; - } - - const chan = channel_cache[channelName]; - - if (msgCount === 0 && !metadata_cache[channelName] && Server.channelContainsUser(channelName, userId)) { - metadata_cache[channelName] = metadata; - - // the index will have already been constructed and cached at this point - // but it will not have detected any metadata because it hasn't been written yet - // this means that the cache starts off as invalid, so we have to correct it - if (chan && chan.index) { chan.index.metadata = metadata; } - - // new channels will always have their metadata written to a dedicated metadata log - // but any lines after the first which are not amendments in a particular format will be ignored. - // Thus we should be safe from race conditions here if just write metadata to the log as below... - // TODO validate this logic - // otherwise maybe we need to check that the metadata log is empty as well - store.writeMetadata(channelName, JSON.stringify(metadata), function (err) { - if (err) { - // FIXME tell the user that there was a channel error? - return void Log.error('HK_WRITE_METADATA', { - channel: channelName, - error: err, - }); - } - }); - - // write tasks - if(tasks && metadata.expire && typeof(metadata.expire) === 'number') { - // the fun part... - // the user has said they want this pad to expire at some point - tasks.write(metadata.expire, "EXPIRE", [ channelName ], function (err) { - if (err) { - // if there is an error, we don't want to crash the whole server... - // just log it, and if there's a problem you'll be able to fix it - // at a later date with the provided information - Log.error('HK_CREATE_EXPIRE_TASK', err); - Log.info('HK_INVALID_EXPIRE_TASK', JSON.stringify([metadata.expire, 'EXPIRE', channelName])); - } - }); - } - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(metadata)]); - } - - // End of history message: - let parsedMsg = {state: 1, channel: channelName, txid: txid}; - - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]); - }); - }); - }; - - const handleGetHistoryRange = function (Server, seq, userId, parsed) { - var channelName = parsed[1]; - var map = parsed[2]; - - if (!(map && typeof(map) === 'object')) { - return void Server.send(userId, [seq, 'ERROR', 'INVALID_ARGS', HISTORY_KEEPER_ID]); - } - - var oldestKnownHash = map.from; - var desiredMessages = map.count; - var desiredCheckpoint = map.cpCount; - var txid = map.txid; - if (typeof(desiredMessages) !== 'number' && typeof(desiredCheckpoint) !== 'number') { - return void Server.send(userId, [seq, 'ERROR', 'UNSPECIFIED_COUNT', HISTORY_KEEPER_ID]); - } - - if (!txid) { - return void Server.send(userId, [seq, 'ERROR', 'NO_TXID', HISTORY_KEEPER_ID]); - } - - Server.send(userId, [seq, 'ACK']); - return void getOlderHistory(channelName, oldestKnownHash, function (messages) { - var toSend = []; - if (typeof (desiredMessages) === "number") { - toSend = messages.slice(-desiredMessages); - } else { - let cpCount = 0; - for (var i = messages.length - 1; i >= 0; i--) { - if (/^cp\|/.test(messages[i][4]) && i !== (messages.length - 1)) { - cpCount++; - } - toSend.unshift(messages[i]); - if (cpCount >= desiredCheckpoint) { break; } - } - } - toSend.forEach(function (msg) { - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, - JSON.stringify(['HISTORY_RANGE', txid, msg])]); - }); - - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, - JSON.stringify(['HISTORY_RANGE_END', txid, channelName]) - ]); - }); - }; - - const handleGetFullHistory = function (Server, seq, userId, parsed) { - // parsed[1] is the channel id - // parsed[2] is a validation key (optionnal) - // parsed[3] is the last known hash (optionnal) - - Server.send(userId, [seq, 'ACK']); - - // FIXME should we send metadata here too? - // none of the clientside code which uses this API needs metadata, but it won't hurt to send it (2019-08-22) - return void getHistoryAsync(parsed[1], -1, false, (msg, readMore) => { - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(['FULL_HISTORY', msg])], readMore); - }, (err) => { - let parsedMsg = ['FULL_HISTORY_END', parsed[1]]; - if (err) { - Log.error('HK_GET_FULL_HISTORY', err.stack); - parsedMsg = ['ERROR', parsed[1], err.message]; - } - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]); - }); - }; - - const handleRPC = function (Server, seq, userId, parsed) { - if (typeof(rpc) !== 'function') { return; } - - /* RPC Calls... */ - var rpc_call = parsed.slice(1); - - Server.send(userId, [seq, 'ACK']); - try { - // slice off the sequence number and pass in the rest of the message - rpc(Server, rpc_call, function (err, output) { - if (err) { - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', err])]); - return; - } - var msg = rpc_call[0].slice(); - if (msg[3] === 'REMOVE_OWNED_CHANNEL') { - onChannelDeleted(Server, msg[4]); - } - if (msg[3] === 'CLEAR_OWNED_CHANNEL') { - onChannelCleared(Server, msg[4]); - } - - if (msg[3] === 'SET_METADATA') { // or whatever we call the RPC???? - // make sure we update our cache of metadata - // or at least invalidate it and force other mechanisms to recompute its state - // 'output' could be the new state as computed by rpc - onChannelMetadataChanged(Server, msg[4].channel, output[1]); - } - - // unauthenticated RPC calls have a different message format - if (msg[0] === "WRITE_PRIVATE_MESSAGE" && output && output.channel) { - // clients don't validate messages sent by the historyKeeper - // so this broadcast needs to come from a different id - // we pass 'null' to indicate that it's not coming from a real user - // to ensure that they know not to trust this message - Server.getChannelUserList(output.channel).forEach(function (userId) { - Server.send(userId, output.message); - }); - - // rpc and anonRpc expect their responses to be of a certain length - // and we've already used the output of the rpc call, so overwrite it - output = [null, null, null]; - } - - // finally, send a response to the client that sent the RPC - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0]].concat(output))]); - }); - } catch (e) { - // if anything throws in the middle, send an error - Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', 'SERVER_ERROR'])]); - } - }; - - const directMessageCommands = { - GET_HISTORY: handleGetHistory, - GET_HISTORY_RANGE: handleGetHistoryRange, - GET_FULL_HISTORY: handleGetFullHistory, + metadata_cache: {}, + channel_cache: {}, + queueStorage: WriteQueue(), + batchIndexReads: BatchRead("HK_GET_INDEX"), }; - /* onDirectMessage - * exported for use by the netflux-server - * parses and handles all direct messages directed to the history keeper - * check if it's expired and execute all the associated side-effects - * routes queries to the appropriate handlers - */ - const onDirectMessage = function (Server, seq, userId, json) { - Log.silly('HK_MESSAGE', json); + config.historyKeeper = { + metadata_cache: Env.metadata_cache, + channel_cache: Env.channel_cache, - let parsed; - try { - parsed = JSON.parse(json[2]); - } catch (err) { - Log.error("HK_PARSE_CLIENT_MESSAGE", json); - return; - } - - // If the requested history is for an expired channel, abort - // Note the if we don't have the keys for that channel in metadata_cache, we'll - // have to abort later (once we know the expiration time) - if (checkExpired(Server, parsed[1])) { return; } - - // look up the appropriate command in the map of commands or fall back to RPC - var command = directMessageCommands[parsed[0]] || handleRPC; - - // run the command with the standard function signature - command(Server, seq, userId, parsed); - }; - - cfg.historyKeeper = { - id: HISTORY_KEEPER_ID, + id: Env.id, channelMessage: function (Server, channel, msgStruct) { // netflux-server emits 'channelMessage' events whenever someone broadcasts to a channel // historyKeeper stores these messages if the channel id indicates that they are // a channel type with permanent history - onChannelMessage(Server, channel, msgStruct); + HK.onChannelMessage(Env, Server, channel, msgStruct); }, channelClose: function (channelName) { // netflux-server emits 'channelClose' events whenever everyone leaves a channel // we drop cached metadata and indexes at the same time - dropChannel(channelName); + HK.dropChannel(Env, channelName); }, channelOpen: function (Server, channelName, userId) { - channel_cache[channelName] = {}; + Env.channel_cache[channelName] = {}; Server.send(userId, [ 0, - HISTORY_KEEPER_ID, + Env.id, 'JOIN', channelName ]); @@ -995,14 +56,42 @@ module.exports.create = function (cfg, cb) { directMessage: function (Server, seq, userId, json) { // netflux-server allows you to register an id with a handler // this handler is invoked every time someone sends a message to that id - onDirectMessage(Server, seq, userId, json); + HK.onDirectMessage(Env, Server, seq, userId, json); }, }; - RPC.create(cfg, function (err, _rpc) { - if (err) { throw err; } + Log.verbose('HK_ID', 'History keeper ID: ' + Env.id); - rpc = _rpc; - cb(void 0, cfg.historyKeeper); + nThen(function (w) { + require('../storage/file').create(config, w(function (_store) { + config.store = _store; + Env.store = _store; + })); + }).nThen(function (w) { + require("../storage/tasks").create(config, w(function (e, tasks) { + if (e) { + throw e; + } + Env.tasks = tasks; + config.tasks = tasks; + if (config.disableIntegratedTasks) { return; } + + config.intervals = config.intervals || {}; + config.intervals.taskExpiration = setInterval(function () { + tasks.runAll(function (err) { + if (err) { + // either TASK_CONCURRENCY or an error with tasks.list + // in either case it is already logged. + } + }); + }, 1000 * 60 * 5); // run every five minutes + })); + }).nThen(function () { + RPC.create(config, function (err, _rpc) { + if (err) { throw err; } + + Env.rpc = _rpc; + cb(void 0, config.historyKeeper); + }); }); }; diff --git a/lib/hk-util.js b/lib/hk-util.js index aaa861054..0a661c6c8 100644 --- a/lib/hk-util.js +++ b/lib/hk-util.js @@ -1,5 +1,15 @@ +/* jshint esversion: 6 */ +/* global Buffer */ var HK = module.exports; +const nThen = require('nthen'); +const Once = require("./once"); +const Meta = require("./metadata"); +const Nacl = require('tweetnacl/nacl-fast'); + +const now = function () { return (new Date()).getTime(); }; +const ONE_DAY = 1000 * 60 * 60 * 24; // one day in milliseconds + /* getHash * this function slices off the leading portion of a message which is most likely unique @@ -12,7 +22,7 @@ var HK = module.exports; * can't be easily migrated * don't break it! */ -HK.getHash = function (msg, Log) { +const getHash = HK.getHash = function (msg, Log) { if (typeof(msg) !== 'string') { if (Log) { Log.warn('HK_GET_HASH', 'getHash() called on ' + typeof(msg) + ': ' + msg); @@ -24,10 +34,899 @@ HK.getHash = function (msg, Log) { // historyKeeper should explicitly store any channel // with a 32 character id -HK.STANDARD_CHANNEL_LENGTH = 32; +const STANDARD_CHANNEL_LENGTH = HK.STANDARD_CHANNEL_LENGTH = 32; // historyKeeper should not store messages sent to any channel // with a 34 character id -HK.EPHEMERAL_CHANNEL_LENGTH = 34; +const EPHEMERAL_CHANNEL_LENGTH = HK.EPHEMERAL_CHANNEL_LENGTH = 34; + +const tryParse = function (Env, str) { + try { + return JSON.parse(str); + } catch (err) { + Env.Log.error('HK_PARSE_ERROR', err); + } +}; + +/* sliceCpIndex + returns a list of all checkpoints which might be relevant for a client connecting to a session + + * if there are two or fewer checkpoints, return everything you have + * if there are more than two + * return at least two + * plus any more which were received within the last 100 messages + + This is important because the additional history is what prevents + clients from forking on checkpoints and dropping forked history. + +*/ +const sliceCpIndex = function (cpIndex, line) { + // Remove "old" checkpoints (cp sent before 100 messages ago) + const minLine = Math.max(0, (line - 100)); + let start = cpIndex.slice(0, -2); + const end = cpIndex.slice(-2); + start = start.filter(function (obj) { + return obj.line > minLine; + }); + return start.concat(end); +}; + +const isMetadataMessage = function (parsed) { + return Boolean(parsed && parsed.channel); +}; + +// validateKeyStrings supplied by clients must decode to 32-byte Uint8Arrays +const isValidValidateKeyString = function (key) { + try { + return typeof(key) === 'string' && + Nacl.util.decodeBase64(key).length === Nacl.sign.publicKeyLength; + } catch (e) { + return false; + } +}; + +var CHECKPOINT_PATTERN = /^cp\|(([A-Za-z0-9+\/=]+)\|)?/; + +/* expireChannel is here to clean up channels that should have been removed + but for some reason are still present +*/ +const expireChannel = function (Env, channel) { + return void Env.store.archiveChannel(channel, function (err) { + Env.Log.info("ARCHIVAL_CHANNEL_BY_HISTORY_KEEPER_EXPIRATION", { + channelId: channel, + status: err? String(err): "SUCCESS", + }); + }); +}; + +/* dropChannel + * cleans up memory structures which are managed entirely by the historyKeeper +*/ +const dropChannel = HK.dropChannel = function (Env, chanName) { + delete Env.metadata_cache[chanName]; + delete Env.channel_cache[chanName]; +}; + +/* checkExpired + * synchronously returns true or undefined to indicate whether the channel is expired + * according to its metadata + * has some side effects: + * closes the channel via the store.closeChannel API + * and then broadcasts to all channel members that the channel has expired + * removes the channel from the netflux-server's in-memory cache + * removes the channel metadata from history keeper's in-memory cache + + FIXME the boolean nature of this API should be separated from its side effects +*/ +const checkExpired = function (Env, Server, channel) { + const store = Env.store; + const metadata_cache = Env.metadata_cache; + + if (!(channel && channel.length === STANDARD_CHANNEL_LENGTH)) { return false; } + let metadata = metadata_cache[channel]; + if (!(metadata && typeof(metadata.expire) === 'number')) { return false; } + + // the number of milliseconds ago the channel should have expired + let pastDue = (+new Date()) - metadata.expire; + + // less than zero means that it hasn't expired yet + if (pastDue < 0) { return false; } + + // if it should have expired more than a day ago... + // there may have been a problem with scheduling tasks + // or the scheduled tasks may not be running + // so trigger a removal from here + if (pastDue >= ONE_DAY) { expireChannel(Env, channel); } + + // close the channel + store.closeChannel(channel, function () { + Server.channelBroadcast(channel, { + error: 'EEXPIRED', + channel: channel + }, Env.id); + dropChannel(channel); + }); + + // return true to indicate that it has expired + return true; +}; + +/* computeIndex + can call back with an error or a computed index which includes: + * cpIndex: + * array including any checkpoints pushed within the last 100 messages + * processed by 'sliceCpIndex(cpIndex, line)' + * offsetByHash: + * a map containing message offsets by their hash + * this is for every message in history, so it could be very large... + * except we remove offsets from the map if they occur before the oldest relevant checkpoint + * size: in bytes + * metadata: + * validationKey + * expiration time + * owners + * ??? (anything else we might add in the future) + * line + * the number of messages in history + * including the initial metadata line, if it exists + +*/ +const computeIndex = function (Env, channelName, cb) { + const store = Env.store; + const Log = Env.Log; + + const cpIndex = []; + let messageBuf = []; + let metadata; + let i = 0; + + const ref = {}; + + const CB = Once(cb); + + const offsetByHash = {}; + let size = 0; + nThen(function (w) { + // iterate over all messages in the channel log + // old channels can contain metadata as the first message of the log + // remember metadata the first time you encounter it + // otherwise index important messages in the log + store.readMessagesBin(channelName, 0, (msgObj, readMore) => { + let msg; + // keep an eye out for the metadata line if you haven't already seen it + // but only check for metadata on the first line + if (!i && !metadata && msgObj.buff.indexOf('{') === 0) { + i++; // always increment the message counter + msg = tryParse(Env, msgObj.buff.toString('utf8')); + if (typeof msg === "undefined") { return readMore(); } + + // validate that the current line really is metadata before storing it as such + if (isMetadataMessage(msg)) { + metadata = msg; + return readMore(); + } + } + i++; + if (msgObj.buff.indexOf('cp|') > -1) { + msg = msg || tryParse(Env, msgObj.buff.toString('utf8')); + if (typeof msg === "undefined") { return readMore(); } + // cache the offsets of checkpoints if they can be parsed + if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) { + cpIndex.push({ + offset: msgObj.offset, + line: i + }); + // we only want to store messages since the latest checkpoint + // so clear the buffer every time you see a new one + messageBuf = []; + } + } + // if it's not metadata or a checkpoint then it should be a regular message + // store it in the buffer + messageBuf.push(msgObj); + return readMore(); + }, w((err) => { + if (err && err.code !== 'ENOENT') { + w.abort(); + return void CB(err); + } + + // once indexing is complete you should have a buffer of messages since the latest checkpoint + // map the 'hash' of each message to its byte offset in the log, to be used for reconnecting clients + messageBuf.forEach((msgObj) => { + const msg = tryParse(Env, msgObj.buff.toString('utf8')); + if (typeof msg === "undefined") { return; } + if (msg[0] === 0 && msg[2] === 'MSG' && typeof(msg[4]) === 'string') { + // msgObj.offset is API guaranteed by our storage module + // it should always be a valid positive integer + offsetByHash[getHash(msg[4], Log)] = msgObj.offset; + } + // There is a trailing \n at the end of the file + size = msgObj.offset + msgObj.buff.length + 1; + }); + })); + }).nThen(function (w) { + // create a function which will iterate over amendments to the metadata + const handler = Meta.createLineHandler(ref, Log.error); + + // initialize the accumulator in case there was a foundational metadata line in the log content + if (metadata) { handler(void 0, metadata); } + + // iterate over the dedicated metadata log (if it exists) + // proceed even in the event of a stream error on the metadata log + store.readDedicatedMetadata(channelName, handler, w(function (err) { + if (err) { + return void Log.error("DEDICATED_METADATA_ERROR", err); + } + })); + }).nThen(function () { + // when all is done, cache the metadata in memory + if (ref.index) { // but don't bother if no metadata was found... + metadata = Env.metadata_cache[channelName] = ref.meta; + } + // and return the computed index + CB(null, { + // Only keep the checkpoints included in the last 100 messages + cpIndex: sliceCpIndex(cpIndex, i), + offsetByHash: offsetByHash, + size: size, + metadata: metadata, + line: i + }); + }); +}; + +/* getIndex + calls back with an error if anything goes wrong + or with a cached index for a channel if it exists + (along with metadata) + otherwise it calls back with the index computed by 'computeIndex' + + as an added bonus: + if the channel exists but its index does not then it caches the index +*/ +const getIndex = (Env, channelName, cb) => { + const channel_cache = Env.channel_cache; + + const chan = channel_cache[channelName]; + + // if there is a channel in memory and it has an index cached, return it + if (chan && chan.index) { + // enforce async behaviour + return void setTimeout(function () { + cb(undefined, chan.index); + }); + } + + Env.batchIndexReads(channelName, cb, function (done) { + computeIndex(Env, channelName, (err, ret) => { + // this is most likely an unrecoverable filesystem error + if (err) { return void done(err); } + // cache the computed result if possible + if (chan) { chan.index = ret; } + // return + done(void 0, ret); + }); + }); +}; + +/* storeMessage + * channel id + * the message to store + * whether the message is a checkpoint + * optionally the hash of the message + * it's not always used, but we guard against it + + + * async but doesn't have a callback + * source of a race condition whereby: + * two messaages can be inserted + * two offsets can be computed using the total size of all the messages + * but the offsets don't correspond to the actual location of the newlines + * because the two actions were performed like ABba... + * the fix is to use callbacks and implement queueing for writes + * to guarantee that offset computation is always atomic with writes +*/ +const storeMessage = function (Env, channel, msg, isCp, optionalMessageHash) { + const id = channel.id; + const Log = Env.Log; + + Env.queueStorage(id, function (next) { + const msgBin = Buffer.from(msg + '\n', 'utf8'); + // Store the message first, and update the index only once it's stored. + // store.messageBin can be async so updating the index first may + // result in a wrong cpIndex + nThen((waitFor) => { + Env.store.messageBin(id, msgBin, waitFor(function (err) { + if (err) { + waitFor.abort(); + Log.error("HK_STORE_MESSAGE_ERROR", err.message); + + // this error is critical, but there's not much we can do at the moment + // proceed with more messages, but they'll probably fail too + // at least you won't have a memory leak + + // TODO make it possible to respond to clients with errors so they know + // their message wasn't stored + return void next(); + } + })); + }).nThen((waitFor) => { + getIndex(Env, id, waitFor((err, index) => { + if (err) { + Log.warn("HK_STORE_MESSAGE_INDEX", err.stack); + // non-critical, we'll be able to get the channel index later + return void next(); + } + if (typeof (index.line) === "number") { index.line++; } + if (isCp) { + index.cpIndex = sliceCpIndex(index.cpIndex, index.line || 0); + for (let k in index.offsetByHash) { + if (index.offsetByHash[k] < index.cpIndex[0]) { + delete index.offsetByHash[k]; + } + } + index.cpIndex.push({ + offset: index.size, + line: ((index.line || 0) + 1) + }); + } + if (optionalMessageHash) { index.offsetByHash[optionalMessageHash] = index.size; } + index.size += msgBin.length; + + // handle the next element in the queue + next(); + })); + }); + }); +}; + + +/* getHistoryOffset + returns a number representing the byte offset from the start of the log + for whatever history you're seeking. + + query by providing a 'lastKnownHash', + which is really just a string of the first 64 characters of an encrypted message. + OR by -1 which indicates that we want the full history (byte offset 0) + OR nothing, which indicates that you want whatever messages the historyKeeper deems relevant + (typically the last few checkpoints) + + this function embeds a lot of the history keeper's logic: + + 0. if you passed -1 as the lastKnownHash it means you want the complete history + * I'm not sure why you'd need to call this function if you know it will return 0 in this case... + * it has a side-effect of filling the index cache if it's empty + 1. if you provided a lastKnownHash and that message does not exist in the history: + * either the client has made a mistake or the history they knew about no longer exists + * call back with EINVAL + 2. if you did not provide a lastKnownHash + * and there are fewer than two checkpoints: + * return 0 (read from the start of the file) + * and there are two or more checkpoints: + * return the offset of the earliest checkpoint which 'sliceCpIndex' considers relevant + 3. if you did provide a lastKnownHash + * read through the log until you find the hash that you're looking for + * call back with either the byte offset of the message that you found OR + * -1 if you didn't find it + +*/ +const getHistoryOffset = (Env, channelName, lastKnownHash, cb) => { + const store = Env.store; + const Log = Env.Log; + + // lastKnownhash === -1 means we want the complete history + if (lastKnownHash === -1) { return void cb(null, 0); } + let offset = -1; + nThen((waitFor) => { + getIndex(Env, channelName, waitFor((err, index) => { + if (err) { waitFor.abort(); return void cb(err); } + + // check if the "hash" the client is requesting exists in the index + const lkh = index.offsetByHash[lastKnownHash]; + // we evict old hashes from the index as new checkpoints are discovered. + // if someone connects and asks for a hash that is no longer relevant, + // we tell them it's an invalid request. This is because of the semantics of "GET_HISTORY" + // which is only ever used when connecting or reconnecting in typical uses of history... + // this assumption should hold for uses by chainpad, but perhaps not for other uses cases. + // EXCEPT: other cases don't use checkpoints! + // clients that are told that their request is invalid should just make another request + // without specifying the hash, and just trust the server to give them the relevant data. + // QUESTION: does this mean mailboxes are causing the server to store too much stuff in memory? + if (lastKnownHash && typeof(lkh) !== "number") { + waitFor.abort(); + return void cb(new Error('EINVAL')); + } + + // Since last 2 checkpoints + if (!lastKnownHash) { + waitFor.abort(); + // Less than 2 checkpoints in the history: return everything + if (index.cpIndex.length < 2) { return void cb(null, 0); } + // Otherwise return the second last checkpoint's index + return void cb(null, index.cpIndex[0].offset); + /* LATER... + in practice, two checkpoints can be very close together + we have measures to avoid duplicate checkpoints, but editors + can produce nearby checkpoints which are slightly different, + and slip past these protections. To be really careful, we can + seek past nearby checkpoints by some number of patches so as + to ensure that all editors have sufficient knowledge of history + to reconcile their differences. */ + } + + offset = lkh; + })); + }).nThen((waitFor) => { + // if offset is less than zero then presumably the channel has no messages + // returning falls through to the next block and therefore returns -1 + if (offset !== -1) { return; } + + // do a lookup from the index + // FIXME maybe we don't need this anymore? + // otherwise we have a non-negative offset and we can start to read from there + store.readMessagesBin(channelName, 0, (msgObj, readMore, abort) => { + // tryParse return a parsed message or undefined + const msg = tryParse(Env, msgObj.buff.toString('utf8')); + // if it was undefined then go onto the next message + if (typeof msg === "undefined") { return readMore(); } + if (typeof(msg[4]) !== 'string' || lastKnownHash !== getHash(msg[4], Log)) { + return void readMore(); + } + offset = msgObj.offset; + abort(); + }, waitFor(function (err) { + if (err) { waitFor.abort(); return void cb(err); } + })); + }).nThen(() => { + cb(null, offset); + }); +}; + +/* getHistoryAsync + * finds the appropriate byte offset from which to begin reading using 'getHistoryOffset' + * streams through the rest of the messages, safely parsing them and returning the parsed content to the handler + * calls back when it has reached the end of the log + + Used by: + * GET_HISTORY + +*/ +const getHistoryAsync = (Env, channelName, lastKnownHash, beforeHash, handler, cb) => { + const store = Env.store; + + let offset = -1; + nThen((waitFor) => { + getHistoryOffset(Env, channelName, lastKnownHash, waitFor((err, os) => { + if (err) { + waitFor.abort(); + return void cb(err); + } + offset = os; + })); + }).nThen((waitFor) => { + if (offset === -1) { return void cb(new Error("could not find offset")); } + const start = (beforeHash) ? 0 : offset; + store.readMessagesBin(channelName, start, (msgObj, readMore, abort) => { + if (beforeHash && msgObj.offset >= offset) { return void abort(); } + var parsed = tryParse(Env, msgObj.buff.toString('utf8')); + if (!parsed) { return void readMore(); } + handler(parsed, readMore); + }, waitFor(function (err) { + return void cb(err); + })); + }); +}; + +/* getOlderHistory + * allows clients to query for all messages until a known hash is read + * stores all messages in history as they are read + * can therefore be very expensive for memory + * should probably be converted to a streaming interface + + Used by: + * GET_HISTORY_RANGE +*/ +const getOlderHistory = function (Env, channelName, oldestKnownHash, cb) { + const store = Env.store; + const Log = Env.Log; + var messageBuffer = []; + var found = false; + store.getMessages(channelName, function (msgStr) { + if (found) { return; } + + let parsed = tryParse(Env, msgStr); + if (typeof parsed === "undefined") { return; } + + // identify classic metadata messages by their inclusion of a channel. + // and don't send metadata, since: + // 1. the user won't be interested in it + // 2. this metadata is potentially incomplete/incorrect + if (isMetadataMessage(parsed)) { return; } + + var content = parsed[4]; + if (typeof(content) !== 'string') { return; } + + var hash = getHash(content, Log); + if (hash === oldestKnownHash) { + found = true; + } + messageBuffer.push(parsed); + }, function (err) { + if (err) { + Log.error("HK_GET_OLDER_HISTORY", err); + } + cb(messageBuffer); + }); +}; + +const handleRPC = function (Env, Server, seq, userId, parsed) { + const HISTORY_KEEPER_ID = Env.id; + + /* RPC Calls... */ + var rpc_call = parsed.slice(1); + + Server.send(userId, [seq, 'ACK']); + try { + // slice off the sequence number and pass in the rest of the message + Env.rpc(Server, rpc_call, function (err, output) { + if (err) { + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', err])]); + return; + } + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0]].concat(output))]); + }); + } catch (e) { + // if anything throws in the middle, send an error + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', 'SERVER_ERROR'])]); + } +}; + +const handleGetHistory = function (Env, Server, seq, userId, parsed) { + const store = Env.store; + const tasks = Env.tasks; + const metadata_cache = Env.metadata_cache; + const channel_cache = Env.channel_cache; + const HISTORY_KEEPER_ID = Env.id; + const Log = Env.Log; + + // parsed[1] is the channel id + // parsed[2] is a validation key or an object containing metadata (optionnal) + // parsed[3] is the last known hash (optionnal) + + Server.send(userId, [seq, 'ACK']); + var channelName = parsed[1]; + var config = parsed[2]; + var metadata = {}; + var lastKnownHash; + var txid; + + // clients can optionally pass a map of attributes + // if the channel already exists this map will be ignored + // otherwise it will be stored as the initial metadata state for the channel + if (config && typeof config === "object" && !Array.isArray(parsed[2])) { + lastKnownHash = config.lastKnownHash; + metadata = config.metadata || {}; + txid = config.txid; + if (metadata.expire) { + metadata.expire = +metadata.expire * 1000 + (+new Date()); + } + } + metadata.channel = channelName; + metadata.created = +new Date(); + + // if the user sends us an invalid key, we won't be able to validate their messages + // so they'll never get written to the log anyway. Let's just drop their message + // on the floor instead of doing a bunch of extra work + // TODO send them an error message so they know something is wrong + if (metadata.validateKey && !isValidValidateKeyString(metadata.validateKey)) { + return void Log.error('HK_INVALID_KEY', metadata.validateKey); + } + + nThen(function (waitFor) { + var w = waitFor(); + + /* unless this is a young channel, we will serve all messages from an offset + this will not include the channel metadata, so we need to explicitly fetch that. + unfortunately, we can't just serve it blindly, since then young channels will + send the metadata twice, so let's do a quick check of what we're going to serve... + */ + getIndex(Env, channelName, waitFor((err, index) => { + /* if there's an error here, it should be encountered + and handled by the next nThen block. + so, let's just fall through... + */ + if (err) { return w(); } + + + // it's possible that the channel doesn't have metadata + // but in that case there's no point in checking if the channel expired + // or in trying to send metadata, so just skip this block + if (!index || !index.metadata) { return void w(); } + // And then check if the channel is expired. If it is, send the error and abort + // FIXME this is hard to read because 'checkExpired' has side effects + if (checkExpired(Env, Server, channelName)) { return void waitFor.abort(); } + // always send metadata with GET_HISTORY requests + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(index.metadata)], w); + })); + }).nThen(() => { + let msgCount = 0; + + // TODO compute lastKnownHash in a manner such that it will always skip past the metadata line? + getHistoryAsync(Env, channelName, lastKnownHash, false, (msg, readMore) => { + msgCount++; + // avoid sending the metadata message a second time + if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); } + if (txid) { msg[0] = txid; } + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(msg)], readMore); + }, (err) => { + if (err && err.code !== 'ENOENT') { + if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", err); } + const parsedMsg = {error:err.message, channel: channelName, txid: txid}; + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]); + return; + } + + const chan = channel_cache[channelName]; + + if (msgCount === 0 && !metadata_cache[channelName] && Server.channelContainsUser(channelName, userId)) { + metadata_cache[channelName] = metadata; + + // the index will have already been constructed and cached at this point + // but it will not have detected any metadata because it hasn't been written yet + // this means that the cache starts off as invalid, so we have to correct it + if (chan && chan.index) { chan.index.metadata = metadata; } + + // new channels will always have their metadata written to a dedicated metadata log + // but any lines after the first which are not amendments in a particular format will be ignored. + // Thus we should be safe from race conditions here if just write metadata to the log as below... + // TODO validate this logic + // otherwise maybe we need to check that the metadata log is empty as well + store.writeMetadata(channelName, JSON.stringify(metadata), function (err) { + if (err) { + // FIXME tell the user that there was a channel error? + return void Log.error('HK_WRITE_METADATA', { + channel: channelName, + error: err, + }); + } + }); + + // write tasks + if(metadata.expire && typeof(metadata.expire) === 'number') { + // the fun part... + // the user has said they want this pad to expire at some point + tasks.write(metadata.expire, "EXPIRE", [ channelName ], function (err) { + if (err) { + // if there is an error, we don't want to crash the whole server... + // just log it, and if there's a problem you'll be able to fix it + // at a later date with the provided information + Log.error('HK_CREATE_EXPIRE_TASK', err); + Log.info('HK_INVALID_EXPIRE_TASK', JSON.stringify([metadata.expire, 'EXPIRE', channelName])); + } + }); + } + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(metadata)]); + } + + // End of history message: + let parsedMsg = {state: 1, channel: channelName, txid: txid}; + + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]); + }); + }); +}; + +const handleGetHistoryRange = function (Env, Server, seq, userId, parsed) { + var channelName = parsed[1]; + var map = parsed[2]; + const HISTORY_KEEPER_ID = Env.id; + + if (!(map && typeof(map) === 'object')) { + return void Server.send(userId, [seq, 'ERROR', 'INVALID_ARGS', HISTORY_KEEPER_ID]); + } + + var oldestKnownHash = map.from; + var desiredMessages = map.count; + var desiredCheckpoint = map.cpCount; + var txid = map.txid; + if (typeof(desiredMessages) !== 'number' && typeof(desiredCheckpoint) !== 'number') { + return void Server.send(userId, [seq, 'ERROR', 'UNSPECIFIED_COUNT', HISTORY_KEEPER_ID]); + } + + if (!txid) { + return void Server.send(userId, [seq, 'ERROR', 'NO_TXID', HISTORY_KEEPER_ID]); + } + + Server.send(userId, [seq, 'ACK']); + return void getOlderHistory(Env, channelName, oldestKnownHash, function (messages) { + var toSend = []; + if (typeof (desiredMessages) === "number") { + toSend = messages.slice(-desiredMessages); + } else { + let cpCount = 0; + for (var i = messages.length - 1; i >= 0; i--) { + if (/^cp\|/.test(messages[i][4]) && i !== (messages.length - 1)) { + cpCount++; + } + toSend.unshift(messages[i]); + if (cpCount >= desiredCheckpoint) { break; } + } + } + toSend.forEach(function (msg) { + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, + JSON.stringify(['HISTORY_RANGE', txid, msg])]); + }); + + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, + JSON.stringify(['HISTORY_RANGE_END', txid, channelName]) + ]); + }); +}; + +const handleGetFullHistory = function (Env, Server, seq, userId, parsed) { + const HISTORY_KEEPER_ID = Env.id; + const Log = Env.Log; + + // parsed[1] is the channel id + // parsed[2] is a validation key (optionnal) + // parsed[3] is the last known hash (optionnal) + + Server.send(userId, [seq, 'ACK']); + + // FIXME should we send metadata here too? + // none of the clientside code which uses this API needs metadata, but it won't hurt to send it (2019-08-22) + return void getHistoryAsync(Env, parsed[1], -1, false, (msg, readMore) => { + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(['FULL_HISTORY', msg])], readMore); + }, (err) => { + let parsedMsg = ['FULL_HISTORY_END', parsed[1]]; + if (err) { + Log.error('HK_GET_FULL_HISTORY', err.stack); + parsedMsg = ['ERROR', parsed[1], err.message]; + } + Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]); + }); +}; + +const directMessageCommands = { + GET_HISTORY: handleGetHistory, + GET_HISTORY_RANGE: handleGetHistoryRange, + GET_FULL_HISTORY: handleGetFullHistory, +}; + +/* onDirectMessage + * exported for use by the netflux-server + * parses and handles all direct messages directed to the history keeper + * check if it's expired and execute all the associated side-effects + * routes queries to the appropriate handlers +*/ +HK.onDirectMessage = function (Env, Server, seq, userId, json) { + const Log = Env.Log; + Log.silly('HK_MESSAGE', json); + + let parsed; + try { + parsed = JSON.parse(json[2]); + } catch (err) { + Log.error("HK_PARSE_CLIENT_MESSAGE", json); + return; + } + + // If the requested history is for an expired channel, abort + // Note the if we don't have the keys for that channel in metadata_cache, we'll + // have to abort later (once we know the expiration time) + if (checkExpired(Env, Server, parsed[1])) { return; } + + // look up the appropriate command in the map of commands or fall back to RPC + var command = directMessageCommands[parsed[0]] || handleRPC; + + // run the command with the standard function signature + command(Env, Server, seq, userId, parsed); +}; + +/* onChannelMessage + Determine what we should store when a message a broadcasted to a channel" + + * ignores ephemeral channels + * ignores messages sent to expired channels + * rejects duplicated checkpoints + * validates messages to channels that have validation keys + * caches the id of the last saved checkpoint + * adds timestamps to incoming messages + * writes messages to the store +*/ +HK.onChannelMessage = function (Env, Server, channel, msgStruct) { + const Log = Env.Log; + + // TODO our usage of 'channel' here looks prone to errors + // we only use it for its 'id', but it can contain other stuff + // also, we're using this RPC from both the RPC and Netflux-server + // we should probably just change this to expect a channel id directly + + // don't store messages if the channel id indicates that it's an ephemeral message + if (!channel.id || channel.id.length === EPHEMERAL_CHANNEL_LENGTH) { return; } + + const isCp = /^cp\|/.test(msgStruct[4]); + let id; + if (isCp) { + // id becomes either null or an array or results... + id = CHECKPOINT_PATTERN.exec(msgStruct[4]); + if (Array.isArray(id) && id[2] && id[2] === channel.lastSavedCp) { + // Reject duplicate checkpoints + return; + } + } + + let metadata; + nThen(function (w) { + // getIndex (and therefore the latest metadata) + getIndex(Env, channel.id, w(function (err, index) { + if (err) { + w.abort(); + return void Log.error('CHANNEL_MESSAGE_ERROR', err); + } + + if (!index.metadata) { + // if there's no channel metadata then it can't be an expiring channel + // nor can we possibly validate it + return; + } + + metadata = index.metadata; + + // don't write messages to expired channels + if (checkExpired(Env, Server, channel)) { return void w.abort(); } + + // if there's no validateKey present skip to the next block + if (!metadata.validateKey) { return; } + + // trim the checkpoint indicator off the message if it's present + let signedMsg = (isCp) ? msgStruct[4].replace(CHECKPOINT_PATTERN, '') : msgStruct[4]; + // convert the message from a base64 string into a Uint8Array + + // FIXME this can fail and the client won't notice + signedMsg = Nacl.util.decodeBase64(signedMsg); + + // FIXME this can blow up + // TODO check that that won't cause any problems other than not being able to append... + const validateKey = Nacl.util.decodeBase64(metadata.validateKey); + // validate the message + const validated = Nacl.sign.open(signedMsg, validateKey); + if (!validated) { + // don't go any further if the message fails validation + w.abort(); + Log.info("HK_SIGNED_MESSAGE_REJECTED", 'Channel '+channel.id); + return; + } + })); + }).nThen(function () { + // do checkpoint stuff... + + // 1. get the checkpoint id + // 2. reject duplicate checkpoints + + if (isCp) { + // if the message is a checkpoint we will have already validated + // that it isn't a duplicate. remember its id so that we can + // repeat this process for the next incoming checkpoint + + // WARNING: the fact that we only check the most recent checkpoints + // is a potential source of bugs if one editor has high latency and + // pushes a duplicate of an earlier checkpoint than the latest which + // has been pushed by editors with low latency + // FIXME + if (Array.isArray(id) && id[2]) { + // Store new checkpoint hash + channel.lastSavedCp = id[2]; + } + } + + // add the time to the message + msgStruct.push(now()); + + // storeMessage + storeMessage(Env, channel, JSON.stringify(msgStruct), isCp, getHash(msgStruct[4], Log)); + }); +}; diff --git a/lib/rpc.js b/lib/rpc.js index 96b678856..23597eb5b 100644 --- a/lib/rpc.js +++ b/lib/rpc.js @@ -19,7 +19,7 @@ const Store = require("../storage/file"); const BlobStore = require("../storage/blob"); const UNAUTHENTICATED_CALLS = { - GET_FILE_SIZE: Pinning.getFileSize, // XXX TEST + GET_FILE_SIZE: Pinning.getFileSize, GET_MULTIPLE_FILE_SIZE: Pinning.getMultipleFileSize, GET_DELETED_PADS: Pinning.getDeletedPads, IS_CHANNEL_PINNED: Pinning.isChannelPinned, @@ -60,6 +60,7 @@ const AUTHENTICATED_USER_TARGETED = { WRITE_LOGIN_BLOCK: Block.writeLoginBlock, REMOVE_LOGIN_BLOCK: Block.removeLoginBlock, ADMIN: Admin.command, + SET_METADATA: Metadata.setMetadata, }; const AUTHENTICATED_USER_SCOPED = { @@ -70,7 +71,6 @@ const AUTHENTICATED_USER_SCOPED = { EXPIRE_SESSION: Core.expireSessionAsync, REMOVE_PINS: Pinning.removePins, TRIM_PINS: Pinning.trimPins, - SET_METADATA: Metadata.setMetadata, COOKIE: Core.haveACookie, }; @@ -232,7 +232,9 @@ RPC.create = function (config, cb) { myDomain: config.myDomain, mySubdomain: config.mySubdomain, customLimits: config.customLimits, - domain: config.domain // XXX + // FIXME this attribute isn't in the default conf + // but it is referenced in Quota + domain: config.domain }; Env.defaultStorageLimit = typeof(config.defaultStorageLimit) === 'number' && config.defaultStorageLimit > 0? diff --git a/package-lock.json b/package-lock.json index 8be1c779c..d4a119d75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "3.10.0", + "version": "3.11.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -99,9 +99,9 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "chainpad-crypto": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.2.tgz", - "integrity": "sha512-7MJ7qPz/C4sJPsDhPMjdSRmliOCPoRO0XM1vUomcgXA6HINlW+if9AAt/H4q154nYhZ/b57njgC6cWgd/RDidg==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz", + "integrity": "sha512-fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==", "requires": { "tweetnacl": "git://github.com/dchest/tweetnacl-js.git#v0.12.2" }, @@ -113,9 +113,9 @@ } }, "chainpad-server": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.1.tgz", - "integrity": "sha512-duV57hO0o2cKaOwwWdDeO3hgN2thAqoQENrjozhamGrUjF9bFiNW2cq3Dg3HjOY6yeMNIGgj0jMuLJjTSERKhQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.2.tgz", + "integrity": "sha512-9NrFsATd70uAdksxsCZBIJ/SiREmJ6QLYTNaeFLH/nJpeZ2b7wblVGABCj3JYWvngdEZ7Umc+afbWH8sUmtgeQ==", "requires": { "nthen": "0.1.8", "pull-stream": "^3.6.9", @@ -160,9 +160,9 @@ "dev": true }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "concat-map": { @@ -240,9 +240,9 @@ } }, "dom-serializer": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", - "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { "domelementtype": "^2.0.1", @@ -397,15 +397,9 @@ } }, "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", - "dev": true - }, - "flow-bin": { - "version": "0.59.0", - "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.59.0.tgz", - "integrity": "sha512-yJDRffvby5mCTkbwOdXwiGDjeea8Z+BPVuP53/tHqHIZC+KtQD790zopVf7mHk65v+wRn+TZ7tkRSNA9oDmyLg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz", + "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==", "dev": true }, "forwarded": { @@ -449,9 +443,9 @@ } }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -477,9 +471,9 @@ } }, "graceful-fs": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", - "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "has-ansi": { "version": "2.0.0", @@ -592,9 +586,9 @@ "dev": true }, "jshint": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz", - "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz", + "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==", "dev": true, "requires": { "cli": "~1.0.0", @@ -634,9 +628,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -765,16 +759,16 @@ "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" }, "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" }, "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", "requires": { - "mime-db": "1.40.0" + "mime-db": "1.43.0" } }, "minimatch": { @@ -847,9 +841,9 @@ "dev": true }, "pako": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", - "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, "parseurl": { @@ -1304,19 +1298,19 @@ } }, "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", "dev": true, "requires": { "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "xmlbuilder": "~11.0.0" } }, "xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "dev": true } } diff --git a/package.json b/package.json index ddd98c911..81be1c7f8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "3.10.0", + "version": "3.11.0", "license": "AGPL-3.0+", "repository": { "type": "git", @@ -27,7 +27,6 @@ "ws": "^3.3.1" }, "devDependencies": { - "flow-bin": "^0.59.0", "jshint": "^2.10.2", "less": "2.7.1", "lesshint": "^4.5.0", @@ -42,7 +41,6 @@ "lint:js": "jshint --config .jshintrc --exclude-path .jshintignore .", "lint:server": "jshint --config .jshintrc lib", "lint:less": "./node_modules/lesshint/bin/lesshint -c ./.lesshintrc ./customize.dist/src/less2/", - "flow": "./node_modules/.bin/flow", "test": "node scripts/TestSelenium.js", "test-rpc": "cd scripts/tests && node test-rpc", "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../what-is-cryptpad.html ../features.html ../../www/login/index.html ../../www/register/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;", diff --git a/scripts/tests/test-rpc.js b/scripts/tests/test-rpc.js index 2e956cb88..07f30bc46 100644 --- a/scripts/tests/test-rpc.js +++ b/scripts/tests/test-rpc.js @@ -160,8 +160,8 @@ var createUser = function (config, cb) { wc.leave(); })); }).nThen(function (w) { - // give the server time to write your mailbox data before checking that it's correct - // XXX chainpad-server sends an ACK before the channel has actually been created + // FIXME give the server time to write your mailbox data before checking that it's correct + // chainpad-server sends an ACK before the channel has actually been created // causing you to think that everything is good. // without this timeout the GET_METADATA rpc occasionally returns before // the metadata has actually been written to the disk. @@ -234,6 +234,18 @@ var createUser = function (config, cb) { return void cb(err); } })); + }).nThen(function (w) { + // some basic sanity checks... + user.rpc.getServerHash(w(function (err, hash) { + if (err) { + w.abort(); + return void cb(err); + } + if (hash !== EMPTY_ARRAY_HASH) { + console.error("EXPECTED EMPTY ARRAY HASH"); + process.exit(1); + } + })); }).nThen(function () { user.cleanup = function (cb) { diff --git a/storage/file.js b/storage/file.js index b55ba3051..6162f4a8b 100644 --- a/storage/file.js +++ b/storage/file.js @@ -1124,7 +1124,7 @@ module.exports.create = function (conf, cb) { // iterate over the messages in a log readMessagesBin: (channelName, start, asyncMsgHandler, cb) => { if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); } -// XXX there is a race condition here +// FIXME there is a race condition here // historyKeeper reads the file to find the byte offset of the first interesting message // then calls this function again to read from that point. // If this task is in the queue already when the file is read again @@ -1144,7 +1144,7 @@ module.exports.create = function (conf, cb) { // remove a channel and its associated metadata log if present removeChannel: function (channelName, cb) { if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); } -// XXX there's another race condition here... +// FIXME there's another race condition here... // when a remove and an append are scheduled in that order // the remove will delete the channel's metadata (including its validateKey) // then the append will recreate the channel and insert a message. diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less index eb2a8c0f8..84532c6c5 100644 --- a/www/admin/app-admin.less +++ b/www/admin/app-admin.less @@ -27,12 +27,15 @@ .cp-support-list-actions { margin: 10px 0px 10px 2px; } - .cp-support-list-message { - &:last-child:not(.cp-support-fromadmin) { - color: @colortheme_cp-red; - background-color: lighten(@colortheme_cp-red, 25%); - .cp-support-showdata { - background-color: lighten(@colortheme_cp-red, 30%); + + .cp-support-list-ticket:not(.cp-support-list-closed) { + .cp-support-list-message { + &:last-child:not(.cp-support-fromadmin) { + color: @colortheme_cp-red; + background-color: lighten(@colortheme_cp-red, 25%); + .cp-support-showdata { + background-color: lighten(@colortheme_cp-red, 30%); + } } } } diff --git a/www/common/common-hash.js b/www/common/common-hash.js index ad32e65c8..b60ab3306 100644 --- a/www/common/common-hash.js +++ b/www/common/common-hash.js @@ -62,7 +62,9 @@ var factory = function (Util, Crypto, Nacl) { }; Hash.getHiddenHashFromKeys = function (type, secret, opts) { - var mode = ((secret.keys && secret.keys.editKeyStr) || secret.key) ? 'edit/' : 'view/'; + opts = opts || {}; + var canEdit = (secret.keys && secret.keys.editKeyStr) || secret.key; + var mode = (!opts.view && canEdit) ? 'edit/' : 'view/'; var pass = secret.password ? 'p/' : ''; if (secret.keys && secret.keys.fileKeyStr) { mode = ''; } diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 2dd2a9e85..c08b1b94d 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -70,6 +70,7 @@ define([ if (typeof(yes) === 'function') { yes(e); } break; } + $(el || window).off('keydown', handler); }; $(el || window).keydown(handler); @@ -587,7 +588,7 @@ define([ $ok.click(); }, function () { $cancel.click(); - }, ok); + }, frame); document.body.appendChild(frame); setTimeout(function () { @@ -1117,7 +1118,7 @@ define([ var dontShowAgain = h('div.cp-corner-dontshow', [ h('span.fa.fa-times'), - Messages.dontShowAgain || "Don't show again" // XXX + Messages.dontShowAgain ]); var popup = h('div.cp-corner-container', [ diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 06ed02256..358f2c703 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -554,21 +554,27 @@ define([ if (!data.noPassword) { var hasPassword = data.password; + var $pwLabel = $('