Sandboxing the renderer process

src/lib/convertId.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs-extra';
 import path from 'path';
 import * as apmJson from './apmJson';
-import { download, existsTempFile } from './ipcWrapper';
+import { download, existsFile, getTempFilePath } from './ipcWrapper';
 import * as modList from './modList';
 
 /**
@@ -20,12 +20,12 @@ export async function getIdDict(
     });
     return convertJson ? await fs.readJson(convertJson) : {};
   } else {
-    const convertJson = await existsTempFile(
+    const convertJsonPath = await getTempFilePath(
       path.join('package', path.basename(dictUrl)),
       dictUrl,
     );
-    if (convertJson.exists) {
-      return await fs.readJson(convertJson.path);
+    if (existsFile(convertJsonPath)) {
+      return await fs.readJson(convertJsonPath);
     } else {
       return {};
     }

src/lib/ipcWrapper.ts

@@ -1,21 +1,21 @@
 import { ipcRenderer } from 'electron';
 
 export const app = {
   /**
    * Gets the app's name.
    */
   getName: async function () {
     return (await ipcRenderer.invoke('get-app-name')) as string;
   },
 
   /**
    * Gets the app's version.
    */
   getVersion: async function () {
     return (await ipcRenderer.invoke('get-app-version')) as string;
   },
 
   /**
    * Gets a path to a special directory or file associated with `name`.
    * @param {string} name - A name associated with a special directory or file you get.
    */
@@ -49,7 +49,7 @@
   },
 };
 
 /**
  * Whether the app is exe version.
  */
 export async function isExeVersion() {
@@ -63,7 +63,7 @@
   await ipcRenderer.invoke('check-update');
 }
 
 /**
  * Opens a file explorer and returns whether the directory exists.
  * @param {string} relativePath - A relative path from the data directory.
  */
@@ -72,22 +72,32 @@
 }
 
 /**
- * Returns whether the temporary file exists and the path.
+ * Returns the temporary file path.
  * @param {string} relativePath - A relative path from the data directory.
  * @param {string} [keyText] - String used to generate the hash.
+ * @returns {Promise<string>} The temporary file path.
  */
-export async function existsTempFile(
+export async function getTempFilePath(
   relativePath: string,
   keyText: string = undefined,
 ) {
-  return (await ipcRenderer.invoke(
-    'exists-temp-file',
+  return ipcRenderer.invoke(
+    'get-temp-file-path',
     relativePath,
     keyText,
-  )) as { exists: boolean; path: string };
+  ) as Promise<string>;
+}
+
+/**
+ * Returns whether the file exists.
+ * @param {string} filePath - A file path
+ * @returns {Promise<boolean>} Whether the file exists
+ */
+export async function existsFile(filePath: string) {
+  return ipcRenderer.invoke('exists-file', filePath) as Promise<boolean>;
 }
 
 /**
  * Opens a directory dialog and returns the path selected by a user.
  * @param {string} title - A title of the dialog.
  * @param {string} defaultPath - A path of the initial directory.
@@ -114,7 +124,7 @@
   await ipcRenderer.invoke('open-dialog', title, message, type);
 }
 
 /**
  * Opens a yes-no dialog and returns a response.
  * @param {string} title - A title of the dialog.
  * @param {string} message - A message showed in the dialog.
@@ -127,7 +137,7 @@
   )) as boolean;
 }
 
 /**
  * Gets nicommons' data.
  * @param {string} id - A nicommons ID.
  */
@@ -142,14 +152,14 @@
   await ipcRenderer.invoke('open-about-window');
 }
 
 /**
  * Opens the confirm dialog for migration v1 to v2.
  */
 export async function migration1to2ConfirmDialog() {
   return (await ipcRenderer.invoke('migration1to2-confirm-dialog')) as number;
 }
 
 /**
  * Opens the input dialog of a data url for migration v1 to v2.
  */
 export async function migration1to2DataurlInputDialog() {

src/lib/modList.ts

@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import * as os from 'os';
 import path from 'path';
 import { isParent } from './apmPath';
-import { download, existsTempFile } from './ipcWrapper';
+import { download, existsFile, getTempFilePath } from './ipcWrapper';
 import * as parseJson from './parseJson';
 const store = new Store();
 
@@ -68,14 +68,14 @@ export async function updateInfo() {
  * @returns {Promise<object>} - An object parsed from list.json.
  */
 export async function getInfo() {
-  const modFile = await existsTempFile('list.json');
-  if (modFile.exists) {
-    return await parseJson.getMod(modFile.path).catch((): null => null);
+  const modFilePath = await getTempFilePath('list.json');
+  if (existsFile(modFilePath)) {
+    return await parseJson.getMod(modFilePath).catch((): null => null);
   } else {
     await updateInfo();
-    const downloadedModFile = await existsTempFile('list.json');
+    const downloadedModFilePath = await getTempFilePath('list.json');
     return await parseJson
-      .getMod(downloadedModFile.path)
+      .getMod(downloadedModFilePath)
       .catch((): null => null);
   }
 }

src/main.ts

@@ -17,7 +17,7 @@ import log from 'electron-log';
 import prompt from 'electron-prompt';
 import Store from 'electron-store';
 import windowStateKeeper from 'electron-window-state';
-import fs, { mkdir, readJsonSync } from 'fs-extra';
+import fs, { exists, mkdir, readJsonSync } from 'fs-extra';
 import path from 'path';
 import 'source-map-support/register';
 import { updateElectronApp } from 'update-electron-app';
@@ -205,17 +205,19 @@ ipcMain.handle('open-path', (event, relativePath) => {
   return folderExists;
 });
 
-ipcMain.handle('exists-temp-file', (event, relativePath, keyText) => {
-  let filePath = path.join(app.getPath('userData'), 'Data/', relativePath);
+ipcMain.handle('get-temp-file-path', (event, relativePath, keyText) => {
+  const filePath = path.join(app.getPath('userData'), 'Data/', relativePath);
   if (keyText) {
-    filePath = path.join(
+    return path.join(
       path.dirname(filePath),
       getHash(keyText) + '_' + path.basename(filePath),
     );
   }
-  return { exists: fs.existsSync(filePath), path: filePath };
+  return filePath;
 });
 
+ipcMain.handle('exists-file', async (event, filePath) => exists(filePath));
+
 ipcMain.handle('open-dir-dialog', async (event, title, defaultPath) => {
   const win = BrowserWindow.getFocusedWindow();
   const dir = await dialog.showOpenDialog(win, {
@@ -414,7 +416,6 @@ async function launch() {
       icon: icon,
       webPreferences: {
         preload: ABOUT_WINDOW_PRELOAD_WEBPACK_ENTRY,
-        sandbox: false,
       },
     });
     aboutWindow.once('close', () => {

src/renderer/about/about_preload.ts

@@ -1,9 +1,9 @@
-import log from 'electron-log';
-import 'source-map-support/register';
-import { app, openDialog } from '../../lib/ipcWrapper';
-import replaceText from '../../lib/replaceText';
+// import log from 'electron-log';
+// import 'source-map-support/register';
+import { contextBridge } from 'electron';
+import { app } from '../../lib/ipcWrapper';
 
-log.catchErrors({
+/* log.catchErrors({
   onError: async () => {
     await openDialog(
       'エラー',
@@ -13,16 +13,10 @@ log.catchErrors({
       'error',
     );
   },
-});
+}); */
 
-window.addEventListener('click', () => {
-  window.close();
-});
-
-window.addEventListener('DOMContentLoaded', async () => {
-  const appVersion = await app.getVersion();
-  replaceText('app-version', appVersion);
-  for (const dependency of ['chrome', 'node', 'electron']) {
-    replaceText(`${dependency}-version`, process.versions[dependency]);
-  }
-});
+contextBridge.exposeInMainWorld(
+  'appVersion',
+  async () => await app.getVersion(),
+);
+contextBridge.exposeInMainWorld('versions', process.versions);

src/renderer/about/about_renderer.ts

@@ -1,3 +1,18 @@
 import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import '../main.css';
 import './about.css';
+import replaceText from '../../lib/replaceText';
+
+declare const appVersion: () => Promise<string>;
+declare const versions: { [key: string]: string };
+
+window.addEventListener('click', () => {
+  window.close();
+});
+
+window.addEventListener('DOMContentLoaded', async () => {
+  replaceText('app-version', await appVersion());
+  for (const dependency of ['chrome', 'node', 'electron']) {
+    replaceText(`${dependency}-version`, versions[dependency]);
+  }
+});