1 files changed, 5 insertions, 52 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index 128ae35..2072017 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -22,7 +22,6 @@
 import { readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { arch } from 'node:os';
-import { URL } from 'node:url';
 
 import {
   ServiceToMainIpcMessage,
@@ -41,11 +40,12 @@ import { getSnapshot, onAction, onPatch } from 'mobx-state-tree';
 import osName from 'os-name';
 
 import {
-  DEVMODE_ALLOWED_URL_PREFIXES,
   enableStacktraceSourceMaps,
   installDevToolsExtensions,
   openDevToolsWhenReady,
 } from './infrastructure/electron/impl/devTools';
+import hardenSession from './infrastructure/electron/impl/hardenSession';
+import lockWebContentsToFile from './infrastructure/electron/impl/lockWebContentsToFile';
 import getDistResources from './infrastructure/resources/impl/getDistResources';
 import initReactions from './initReactions';
 import { createMainStore } from './stores/MainStore';
@@ -128,32 +128,6 @@ initReactions(store)
     log.log('Failed to initialize application', error);
   });
 
-const rendererBaseURL = resources.getRendererURL('/');
-function shouldCancelMainWindowRequest(url: string, method: string): boolean {
-  if (method !== 'GET') {
-    return true;
-  }
-  let normalizedURL: string;
-  try {
-    normalizedURL = new URL(url).toString();
-  } catch {
-    return true;
-  }
-  if (
-    isDevelopment &&
-    DEVMODE_ALLOWED_URL_PREFIXES.some((prefix) =>
-      normalizedURL.startsWith(prefix),
-    )
-  ) {
-    return false;
-  }
-  const isHttp = normalizedURL.startsWith(rendererBaseURL);
-  const isWs = normalizedURL.startsWith(
-    rendererBaseURL.replace(/^http:/, 'ws:'),
-  );
-  return !isHttp && !isWs;
-}
-
 async function createWindow(): Promise<unknown> {
   mainWindow = new BrowserWindow({
     show: false,
@@ -169,29 +143,7 @@ async function createWindow(): Promise<unknown> {
 
   webContents.userAgent = originalUserAgent;
 
-  webContents.session.setPermissionRequestHandler(
-    (_webContents, _permission, callback) => {
-      callback(false);
-    },
-  );
-
-  webContents.session.webRequest.onBeforeRequest(
-    ({ url, method }, callback) => {
-      callback({
-        cancel: shouldCancelMainWindowRequest(url, method),
-      });
-    },
-  );
-
-  const pageURL = resources.getRendererURL('index.html');
-
-  webContents.on('will-navigate', (event, url) => {
-    if (url !== pageURL) {
-      event.preventDefault();
-    }
-  });
-
-  webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
+  hardenSession(resources, isDevelopment, webContents.session);
 
   if (isDevelopment) {
     openDevToolsWhenReady(mainWindow);
@@ -211,6 +163,7 @@ async function createWindow(): Promise<unknown> {
   });
 
   browserView.webContents.userAgent = userAgent;
+
   autorun(() => {
     browserView.setBounds(store.browserViewBounds);
   });
@@ -350,7 +303,7 @@ async function createWindow(): Promise<unknown> {
       log.error('Failed to load browser', error);
     });
 
-  return mainWindow.loadURL(pageURL);
+  return lockWebContentsToFile(resources, 'index.html', webContents);
 }
 
 app.on('second-instance', () => {