mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-04-24 18:38:15 +01:00
Enables sandbox for all windows except main
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user