v1.7.22

Disable Countly

.buildkite/pipeline.yaml

@@ -1,8 +0,0 @@
-steps:
-  - label: ":eslint: Lint"
-    command:
-      - "yarn install"
-      - "yarn lint"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:10"

CHANGELOG.md

@@ -1,3 +1,62 @@
+Changes in [1.7.22](https://github.com/vector-im/element-desktop/releases/tag/v1.7.22) (2021-03-01)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.22-rc.1...v1.7.22)
+
+ * No changes since rc.1
+
+Changes in [1.7.22-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.22-rc.1) (2021-02-24)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.21...v1.7.22-rc.1)
+
+ * Disable Countly
+   [\#169](https://github.com/vector-im/element-desktop/pull/169)
+ * Upgrade to Electron 11.2.3
+   [\#168](https://github.com/vector-im/element-desktop/pull/168)
+
+Changes in [1.7.21](https://github.com/vector-im/element-desktop/releases/tag/v1.7.21) (2021-02-16)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.21-rc.1...v1.7.21)
+
+ * No changes since rc.1
+
+Changes in [1.7.21-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.21-rc.1) (2021-02-10)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.20...v1.7.21-rc.1)
+
+ * Fix desktop Matrix screen sharing
+   [\#161](https://github.com/vector-im/element-desktop/pull/161)
+
+Changes in [1.7.20](https://github.com/vector-im/element-desktop/releases/tag/v1.7.20) (2021-02-04)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.19...v1.7.20)
+
+ * No changes since 1.7.19
+
+Changes in [1.7.19](https://github.com/vector-im/element-desktop/releases/tag/v1.7.19) (2021-02-03)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.19-rc.1...v1.7.19)
+
+ * No changes since rc.1
+
+Changes in [1.7.19-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.19-rc.1) (2021-01-29)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.18...v1.7.19-rc.1)
+
+ * Remove Buildkite pipeline file
+   [\#167](https://github.com/vector-im/element-desktop/pull/167)
+ * Upgrade deps 2021-01-18
+   [\#166](https://github.com/vector-im/element-desktop/pull/166)
+ * package: Bump our seshat version
+   [\#164](https://github.com/vector-im/element-desktop/pull/164)
+ * Enable context isolation, bridge expected IPC
+   [\#163](https://github.com/vector-im/element-desktop/pull/163)
+
+Changes in [1.7.18](https://github.com/vector-im/element-desktop/releases/tag/v1.7.18) (2021-01-26)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17...v1.7.18)
+
+ * No changes since 1.7.17
+
 Changes in [1.7.17](https://github.com/vector-im/element-desktop/releases/tag/v1.7.17) (2021-01-18)
 ===================================================================================================
 [Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17-rc.1...v1.7.17)

element.io/nightly/config.json

@@ -19,10 +19,6 @@
         "siteId": 1,
         "policyUrl": "https://element.io/cookie-policy"
     },
-    "countly": {
-        "url": "https://try.count.ly",
-        "appKey": "8abf1ee15646bc884556b82e5053857904264b66"
-    },
     "roomDirectory": {
         "servers": [
             "matrix.org",

package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "src/electron-main.js",
-  "version": "1.7.17",
+  "version": "1.7.22",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
@@ -30,19 +30,19 @@
     "hak": "node scripts/hak/index.js"
   },
   "dependencies": {
-    "auto-launch": "^5.0.1",
-    "electron-store": "^2.0.0",
-    "electron-window-state": "^4.1.0",
+    "auto-launch": "^5.0.5",
+    "electron-store": "^6.0.1",
+    "electron-window-state": "^5.0.3",
     "minimist": "^1.2.3",
-    "png-to-ico": "^2.1.0",
+    "png-to-ico": "^2.1.1",
     "request": "^2.88.2"
   },
   "devDependencies": {
     "asar": "^2.0.1",
-    "electron-builder": "^22.7.0",
-    "electron-builder-squirrel-windows": "^22.7.0",
-    "electron-devtools-installer": "^2.2.4",
-    "electron-notarize": "^0.2.0",
+    "electron-builder": "22.9.1",
+    "electron-builder-squirrel-windows": "22.9.1",
+    "electron-devtools-installer": "^3.1.1",
+    "electron-notarize": "^1.0.0",
     "eslint": "7.3.1",
     "eslint-config-matrix-org": "^0.1.2",
     "find-npm-prefix": "^1.0.2",
@@ -51,10 +51,10 @@
     "mkdirp": "^1.0.3",
     "needle": "^2.5.0",
     "node-pre-gyp": "^0.15.0",
-    "npm": "^6.14.6",
+    "npm": "^6.14.11",
     "rimraf": "^3.0.2",
-    "semver": "^7.1.3",
-    "tar": "^6.0.1"
+    "semver": "^7.3.4",
+    "tar": "^6.1.0"
   },
   "hakDependencies": {
     "matrix-seshat": "^2.2.3",
@@ -62,7 +62,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "10.2.0",
+    "electronVersion": "11.2.3",
     "files": [
       "package.json",
       {

src/electron-main.js

@@ -1,9 +1,8 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
-Copyright 2018, 2019 New Vector Ltd
 Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2018 - 2021 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -922,11 +921,7 @@ app.on('ready', async () => {
             nodeIntegration: false,
             //sandbox: true, // We enable sandboxing from app.enableSandbox() above
             enableRemoteModule: false,
-            // We don't use this: it's useful for the preload script to
-            // share a context with the main page so we can give select
-            // objects to the main page. The sandbox option isolates the
-            // main page from the background script.
-            contextIsolation: false,
+            contextIsolation: true,
             webgl: false,
             spellcheck: true,
         },

src/preload.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2018, 2019 New Vector Ltd
+Copyright 2018, 2019, 2021 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,58 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const { ipcRenderer } = require('electron');
+const { ipcRenderer, desktopCapturer, contextBridge } = require('electron');
 
-// expose ipcRenderer to the renderer process
-window.ipcRenderer = ipcRenderer;
+// Expose only expected IPC wrapper APIs to the renderer process to avoid
+// handing out generalised messaging access.
+
+const CHANNELS = [
+    "app_onAction",
+    "before-quit",
+    "check_updates",
+    "install_update",
+    "ipcCall",
+    "ipcReply",
+    "loudNotification",
+    "preferences",
+    "seshat",
+    "seshatReply",
+    "setBadgeCount",
+    "update-downloaded",
+    "userDownloadCompleted",
+    "userDownloadOpen",
+];
+
+contextBridge.exposeInMainWorld(
+    "electron",
+    {
+        on(channel, listener) {
+            if (!CHANNELS.includes(channel)) {
+                console.error(`Unknown IPC channel ${channel} ignored`);
+                return;
+            }
+            ipcRenderer.on(channel, listener);
+        },
+        send(channel, ...args) {
+            if (!CHANNELS.includes(channel)) {
+                console.error(`Unknown IPC channel ${channel} ignored`);
+                return;
+            }
+            ipcRenderer.send(channel, ...args);
+        },
+        async getDesktopCapturerSources(options) {
+            const sources = await desktopCapturer.getSources(options);
+            const desktopCapturerSources = [];
+
+            for (const source of sources) {
+                desktopCapturerSources.push({
+                    id: source.id,
+                    name: source.name,
+                    thumbnailURL: source.thumbnail.toDataURL(),
+                });
+            }
+
+            return desktopCapturerSources;
+        },
+    },
+);