Run the Desktop app in a sandbox #7907
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Turn off node integration in the electron renderer process * Enable the chromium sandbox to put the renderer into its own process * Expose just the ipc module with a preload script * Introduce a little IPC call wrapper so we can call into the renderer process and await on the result. * Use this in a bunch of places we previously used direct calls to electron modules. * Convert other uses of node, eg. use of process to derive the platform (just look at the user agent) * Strip out the desktopCapturer integration which doesn't appear to have ever worked (probably best to just wait until getDisplayMedia() is available in chrome at this point: https://github.com/vector-im/riot-web/issues/4880).
jryans
approved these changes
Dec 18, 2018
src/vector/index.js
Outdated
| // set the platform for react sdk (our Platform object automatically picks the right one) | ||
| PlatformPeg.set(new Platform()); | ||
| // set the platform for react sdk | ||
| //if (navigator.userAgent.toLowerCase().indexOf('electron') > 0) { |
There was a problem hiding this comment.
Maybe remove this commented code?
jryans
reviewed
Dec 18, 2018
| @@ -108,11 +108,6 @@ module.exports = { | |||
| "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), | |||
| }, | |||
| }, | |||
| externals: { | |||
There was a problem hiding this comment.
I am not sure I follow why this was removed... It seems unrelated to the rest of the changes. Is it something outdated that's no longer needed?
There was a problem hiding this comment.
The webpack side doesn't import electron anymore from what I can see. Means that it doesn't need to be declared anymore in the webpack config. (webpack side == everything that actually is riot)
There was a problem hiding this comment.
Yeah, it was just telling webpack to spit out a real 'require' into the bundle for electron rather than try to resolve it itself, but these are all gone now since they won't work in the renderer.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
renderer process and await on the result.
to electron modules.
platform (just look at the user agent)
to have ever worked (probably best to just wait until
getDisplayMedia() is available in chrome at this point:
https://github.com/vector-im/riot-web/issues/4880).
Requires matrix-org/matrix-react-sdk#2372