Enables sandbox for all windows except main

ts/windows/debuglog/app.tsx

@@ -0,0 +1,25 @@
+// Copyright 2023 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import React from 'react';
+import { render } from 'react-dom';
+import { DebugLogWindow } from '../../components/DebugLogWindow';
+import { i18n } from '../sandboxedInit';
+import { strictAssert } from '../../util/assert';
+
+const { DebugLogWindowProps } = window.Signal;
+
+strictAssert(DebugLogWindowProps, 'window values not provided');
+
+render(
+  <DebugLogWindow
+    hasCustomTitleBar={window.SignalContext.OS.hasCustomTitleBar()}
+    executeMenuRole={window.SignalContext.executeMenuRole}
+    closeWindow={() => window.SignalContext.executeMenuRole('close')}
+    downloadLog={DebugLogWindowProps.downloadLog}
+    i18n={i18n}
+    fetchLogs={DebugLogWindowProps.fetchLogs}
+    uploadLogs={DebugLogWindowProps.uploadLogs}
+  />,
+  document.getElementById('app')
+);

ts/windows/debuglog/preload.ts

@@ -1,49 +1,32 @@
 // Copyright 2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import React from 'react';
-import ReactDOM from 'react-dom';
 import { contextBridge, ipcRenderer } from 'electron';
+import { MinimalSignalContext } from '../minimalContext';
 
-import { SignalContext } from '../context';
-import { DebugLogWindow } from '../../components/DebugLogWindow';
-import * as debugLog from '../../logging/debuglogs';
-import { upload } from '../../logging/uploadDebugLog';
-import * as logger from '../../logging/log';
+function downloadLog(logText: string) {
+  ipcRenderer.send('show-debug-log-save-dialog', logText);
+}
 
-contextBridge.exposeInMainWorld('SignalContext', {
-  ...SignalContext,
-  renderWindow: () => {
-    const environmentText: Array<string> = [SignalContext.getEnvironment()];
+async function fetchLogs() {
+  const data = await ipcRenderer.invoke('fetch-log');
+  return ipcRenderer.invoke(
+    'DebugLogs.getLogs',
+    data,
+    window.navigator.userAgent
+  );
+}
 
-    const appInstance = SignalContext.getAppInstance();
-    if (appInstance) {
-      environmentText.push(appInstance);
-    }
+function uploadLogs(logs: string) {
+  return ipcRenderer.invoke('DebugLogs.upload', logs);
+}
 
-    ReactDOM.render(
-      React.createElement(DebugLogWindow, {
-        hasCustomTitleBar: SignalContext.OS.hasCustomTitleBar(),
-        executeMenuRole: SignalContext.executeMenuRole,
-        closeWindow: () => SignalContext.executeMenuRole('close'),
-        downloadLog: (logText: string) =>
-          ipcRenderer.send('show-debug-log-save-dialog', logText),
-        i18n: SignalContext.i18n,
-        fetchLogs() {
-          return debugLog.fetch(
-            SignalContext.getNodeVersion(),
-            SignalContext.getVersion()
-          );
-        },
-        uploadLogs(logs: string) {
-          return upload({
-            content: logs,
-            appVersion: SignalContext.getVersion(),
-            logger,
-          });
-        },
-      }),
-      document.getElementById('app')
-    );
+const Signal = {
+  DebugLogWindowProps: {
+    downloadLog,
+    fetchLogs,
+    uploadLogs,
   },
-});
+};
+contextBridge.exposeInMainWorld('Signal', Signal);
+contextBridge.exposeInMainWorld('SignalContext', MinimalSignalContext);