Maintenance: Update to Electron 10.1.5

HeinrichApfelmus · HeinrichApfelmus · commit 148d4bc97134 · 2020-11-13T19:38:24.000+01:00
diff --git a/app/package.json b/app/package.json
@@ -3,6 +3,6 @@
   "version": "2.2.0",
   "main": "src/main.js",
   "devDependencies": {
-    "electron": "^3.1.8"
+    "electron": "^10.1.5"
   }
 }
diff --git a/app/src/main.js b/app/src/main.js
@@ -94,7 +94,11 @@ let applyPreferences = (prefs) => {
 
 let prefWindow  = null
 let menuPreferences = (item, focusedWindow) => {
-  win = new BrowserWindow({x:20, y:20, width: 400, height: 150})
+  win = new BrowserWindow({x:20, y:20, width: 400, height: 150,
+              webPreferences: {
+                nodeIntegration: true,
+                enableRemoteModule: true
+              }})
 
   // remember global reference to window, due to garbage collection
   prefWindow = win
@@ -118,7 +122,16 @@ let windows = {}
 
 // Create a new worksheet window and associate it to a path if necessary.
 let newWorksheet = (path) => {
-  let win = new BrowserWindow({x:20, y:20, width: 800, height: 600})
+  let win = new BrowserWindow({x: 20, y: 20, width: 800, height: 600,
+                  // FIXME: More security consciousness!
+                  // While the interpreter can execute arbitrary Haskell actions,
+                  // we may want to prevent dynamically loaded JavaScript
+                  // from accessing the node.js environment.
+                  webPreferences: {
+                    nodeIntegration: true,
+                    enableRemoteModule: true
+                  }
+                })
   let id  = win.id
   
   windows[id] = win    // keep a reference
diff --git a/app/worksheet.html b/app/worksheet.html
@@ -2,6 +2,7 @@
 <html>
 <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
 
     <link rel="stylesheet" href="vendor/FiraCode_1.203/fira_code.css">
     <link rel="stylesheet" href="vendor/codemirror-5.6.css">

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"version": "2.2.0",`
`4`	`4`	`"main": "src/main.js",`
`5`	`5`	`"devDependencies": {`
`6`		`- "electron": "^3.1.8"`
	`6`	`+ "electron": "^10.1.5"`
`7`	`7`	`}`
`8`	`8`	`}`