From 62a49af23ff49ef583195fdcba79365c0d9490c0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 21 Dec 2018 22:21:06 +0000
Subject: [PATCH] Only serve origin migrator whilst migrating

as per comment
---
 electron_app/src/electron-main.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 7b854a3657..12203e7906 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -36,6 +36,11 @@ const { migrateFromOldOrigin } = require('./originMigrator');
 
 const windowStateKeeper = require('electron-window-state');
 
+// boolean flag set whilst we are doing one-time origin migration
+// We only serve the origin migration script while we're actually
+// migrating to mitigate any risk of it being used maliciously.
+let migratingOrigin = false;
+
 if (argv['profile']) {
     app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`);
 }
@@ -143,7 +148,9 @@ ipcMain.on('ipcCall', async function(ev, payload) {
                 mainWindow.focus();
             }
         case 'origin_migrate':
+            migratingOrigin = true;
             await migrateFromOldOrigin();
+            migratingOrigin = false;
             break;
         default:
             mainWindow.webContents.send('ipcReply', {
@@ -227,7 +234,7 @@ app.on('ready', () => {
 
         let baseDir;
         // first part of the path determines where we serve from
-        if (target[1] === 'origin_migrator_dest') {
+        if (migratingOrigin && target[1] === 'origin_migrator_dest') {
             // the origin migrator destination page
             // (only the destination script needs to come from the
             // custom protocol: the source part is loaded from a