From a72eeb9a984534402143667725ee81f2146fe30a Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 11 Jun 2019 20:42:06 +0200 Subject: [PATCH] check sync version before setting up the sync, fixes #559 --- src/routes/api/setup.js | 21 ++++++++++++++++++--- src/services/setup.js | 19 +++++++++++++++++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/routes/api/setup.js b/src/routes/api/setup.js index c33cfaca1..b54169506 100644 --- a/src/routes/api/setup.js +++ b/src/routes/api/setup.js @@ -3,11 +3,13 @@ const sqlInit = require('../../services/sql_init'); const setupService = require('../../services/setup'); const log = require('../../services/log'); +const appInfo = require('../../services/app_info'); async function getStatus() { return { isInitialized: await sqlInit.isDbInitialized(), - schemaExists: await sqlInit.schemaExists() + schemaExists: await sqlInit.schemaExists(), + syncVersion: appInfo.syncVersion }; } @@ -24,7 +26,17 @@ async function setupSyncFromServer(req) { } async function saveSyncSeed(req) { - const options = req.body.options; + const {options, syncVersion} = req.body; + + if (appInfo.syncVersion !== syncVersion) { + const message = `Could not setup sync since local sync protocol version is ${appInfo.syncVersion} while remote is ${syncVersion}. To fix this issue, use same Trilium version on all instances.`; + + log.error(message); + + return [400, { + error: message + }] + } await sqlInit.createDatabaseForSync(options); } @@ -32,7 +44,10 @@ async function saveSyncSeed(req) { async function getSyncSeed() { log.info("Serving sync seed."); - return await setupService.getSyncSeedOptions(); + return { + options: await setupService.getSyncSeedOptions(), + syncVersion: appInfo.syncVersion + }; } module.exports = { diff --git a/src/services/setup.js b/src/services/setup.js index b56284316..f1ec10f39 100644 --- a/src/services/setup.js +++ b/src/services/setup.js @@ -10,6 +10,10 @@ const appInfo = require('./app_info'); async function hasSyncServerSchemaAndSeed() { const response = await requestToSyncServer('GET', '/api/setup/status'); + if (response.syncVersion !== appInfo.syncVersion) { + throw new Error(`Could not setup sync since local sync protocol version is ${appInfo.syncVersion} while remote is ${response.syncVersion}. To fix this issue, use same Trilium version on all instances.`); + } + return response.schemaExists; } @@ -60,7 +64,7 @@ async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, pass log.info("Getting document options from sync server."); // response is expected to contain documentId and documentSecret options - const options = await request.exec({ + const resp = await request.exec({ method: 'get', url: syncServerHost + '/api/setup/sync-seed', auth: { @@ -70,7 +74,18 @@ async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, pass proxy: syncProxy }); - await sqlInit.createDatabaseForSync(options, syncServerHost, syncProxy); + if (resp.syncVersion !== appInfo.syncVersion) { + const message = `Could not setup sync since local sync protocol version is ${appInfo.syncVersion} while remote is ${resp.syncVersion}. To fix this issue, use same Trilium version on all instances.`; + + log.error(message); + + return { + result: 'failure', + error: message + } + } + + await sqlInit.createDatabaseForSync(resp.options, syncServerHost, syncProxy); triggerSync();