Enables sandbox for all windows except main
This commit is contained in:
parent
abb839c24b
commit
e211837bcd
67 changed files with 1190 additions and 615 deletions
|
@ -1,14 +1,10 @@
|
|||
// Copyright 2021 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import { contextBridge } from 'electron';
|
||||
|
||||
import { SignalContext } from '../context';
|
||||
|
||||
import { MinimalSignalContext } from '../minimalContext';
|
||||
import { createSetting } from '../../util/preload';
|
||||
import { PermissionsPopup } from '../../components/PermissionsPopup';
|
||||
import { drop } from '../../util/drop';
|
||||
|
||||
const mediaCameraPermissions = createSetting('mediaCameraPermissions', {
|
||||
getter: false,
|
||||
|
@ -17,48 +13,28 @@ const mediaPermissions = createSetting('mediaPermissions', {
|
|||
getter: false,
|
||||
});
|
||||
|
||||
contextBridge.exposeInMainWorld(
|
||||
'nativeThemeListener',
|
||||
window.SignalContext.nativeThemeListener
|
||||
);
|
||||
const params = new URLSearchParams(document.location.search);
|
||||
const forCalling = params.get('forCalling') === 'true';
|
||||
const forCamera = params.get('forCamera') === 'true';
|
||||
|
||||
contextBridge.exposeInMainWorld('SignalContext', {
|
||||
...SignalContext,
|
||||
renderWindow: () => {
|
||||
const params = new URLSearchParams(document.location.search);
|
||||
const forCalling = params.get('forCalling') === 'true';
|
||||
const forCamera = params.get('forCamera') === 'true';
|
||||
function onClose() {
|
||||
drop(MinimalSignalContext.executeMenuRole('close'));
|
||||
}
|
||||
|
||||
let message;
|
||||
if (forCalling) {
|
||||
if (forCamera) {
|
||||
message = SignalContext.i18n('icu:videoCallingPermissionNeeded');
|
||||
const Signal = {
|
||||
PermissionsWindowProps: {
|
||||
forCalling,
|
||||
forCamera,
|
||||
onAccept: () => {
|
||||
if (!forCamera) {
|
||||
drop(mediaPermissions.setValue(true));
|
||||
} else {
|
||||
message = SignalContext.i18n('icu:audioCallingPermissionNeeded');
|
||||
drop(mediaCameraPermissions.setValue(true));
|
||||
}
|
||||
} else {
|
||||
message = SignalContext.i18n('icu:audioPermissionNeeded');
|
||||
}
|
||||
|
||||
function onClose() {
|
||||
void SignalContext.executeMenuRole('close');
|
||||
}
|
||||
|
||||
ReactDOM.render(
|
||||
React.createElement(PermissionsPopup, {
|
||||
i18n: SignalContext.i18n,
|
||||
message,
|
||||
onAccept: () => {
|
||||
if (!forCamera) {
|
||||
void mediaPermissions.setValue(true);
|
||||
} else {
|
||||
void mediaCameraPermissions.setValue(true);
|
||||
}
|
||||
onClose();
|
||||
},
|
||||
onClose,
|
||||
}),
|
||||
document.getElementById('app')
|
||||
);
|
||||
onClose();
|
||||
},
|
||||
onClose,
|
||||
},
|
||||
});
|
||||
};
|
||||
contextBridge.exposeInMainWorld('Signal', Signal);
|
||||
contextBridge.exposeInMainWorld('SignalContext', MinimalSignalContext);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue