Merge pull request #10242 from brave/fix/10240

remove webSecurity:false in webPreferences
brave · Sep 13, 2017 · 0cb884d · 0cb884d
2 parents fa1d595 + 019f85b
commit 0cb884d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/app/browser/reducers/windowsReducer.js b/app/browser/reducers/windowsReducer.js
@@ -112,12 +112,9 @@ function windowDefaults (state) {
     minModalWidth: 100,
     windowOffset: 20,
     webPreferences: {
+      // XXX: Do not edit without security review
       sharedWorker: true,
-      nodeIntegration: false,
-      partition: 'default',
-      webSecurity: false,
-      allowFileAccessFromFileUrls: true,
-      allowUniversalAccessFromFileUrls: true
+      partition: 'default'
     }
   }
 }

diff --git a/app/browser/share.js b/app/browser/share.js
@@ -8,7 +8,7 @@ const {shell} = require('electron')
 const tabs = require('./tabs')
 
 const templateUrls = {
-  email: 'mailto:?subject={title}&body={url}',
+  email: 'mailto:?subject={title}&body={url}', // Do not edit without security review
   facebook: 'https://www.facebook.com/sharer.php?u={url}',
   pinterest: 'https://pinterest.com/pin/create/bookmarklet/?url={url}&description={title}',
   twitter: 'https://twitter.com/intent/tweet?url={url}&text={title}&hashtags=brave',