rooty/Mstdn
1
0
Fork 0
mirror of https://github.com/rhysd/Mstdn.git synced 2025-01-21 20:52:11 +01:00
Code Issues Releases Activity

add workaround for bug of sandbox and CSP in Electron

Browse Source
This commit is contained in:
rhysd 2017-04-25 01:27:07 +09:00
parent 969df0ca60
commit 79a096b604
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/window.ts
View File

@ -140,7 +140,7 @@ function startNormalWindow(account: Account, config: Config): Promise<Window> {
autoHideMenuBar: !!config.hide_menu, autoHideMenuBar: !!config.hide_menu,
webPreferences: { webPreferences: {
nodeIntegration: false, nodeIntegration: false,
sandbox: !!config.chromium_sandbox, sandbox: sandboxFlag(config, account),
preload: PRELOAD_JS, preload: PRELOAD_JS,
partition: partitionForAccount(account), partition: partitionForAccount(account),
zoomFactor: config.zoom_factor, zoomFactor: config.zoom_factor,
@ -171,6 +171,20 @@ function startNormalWindow(account: Account, config: Config): Promise<Window> {
}); });
} }
function sandboxFlag(config: Config, account: Account) {
// XXX:
// Electron has a bug that CSP prevents preload script from being loaded.
// mstdn.jp enables CSP. So currently we need to disable native sandbox to load preload script.
//
// Ref: https://github.com/electron/electron/issues/9276
//
const electronBugIssue9276 = account.host === 'mstdn.jp' || account.host === 'https://mstdn.jp';
if (electronBugIssue9276) {
return false;
}
return !!config.chromium_sandbox;
}
function startMenuBar(account: Account, config: Config, bar: Menubar.MenubarApp | null): Promise<Window> { function startMenuBar(account: Account, config: Config, bar: Menubar.MenubarApp | null): Promise<Window> {
log.debug('Setup a menubar window'); log.debug('Setup a menubar window');
return new Promise<Window>(resolve => { return new Promise<Window>(resolve => {
@ -190,7 +204,7 @@ function startMenuBar(account: Account, config: Config, bar: Menubar.MenubarApp
showDockIcon: true, showDockIcon: true,
webPreferences: { webPreferences: {
nodeIntegration: false, nodeIntegration: false,
sandbox: !!config.chromium_sandbox, sandbox: sandboxFlag(config, account),
preload: PRELOAD_JS, preload: PRELOAD_JS,
partition: partitionForAccount(account), partition: partitionForAccount(account),
zoomFactor: config.zoom_factor, zoomFactor: config.zoom_factor,