From 8f1a2d0f75fd60152c9b8aa4bba5cc3e47c748ff Mon Sep 17 00:00:00 2001 From: amyblais Date: Thu, 22 Feb 2018 10:49:12 -0500 Subject: [PATCH 1/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93bec73a..143a8ae2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ This release contains multiple security updates for Windows, Mac and Linux, and [#514](https://github.com/mattermost/desktop/issues/514) ### Architectural Changes - - Major version upgrade of Electron from v1.6.11 to v1.7.9. Electron is the underlying technology used to build the Desktop apps. + - Major version upgrade of Electron from v1.6.11 to v1.7.11. Electron is the underlying technology used to build the Desktop apps. [#602](https://github.com/mattermost/desktop/pull/602) - The app now uses CSS to style the user interface. Styles are also divided to React's inline `style` and CSS. [#540](https://github.com/mattermost/desktop/pull/540) From ba4af963a7051caa5eb71ac759407d3dbace8b1c Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Fri, 23 Mar 2018 22:02:38 +0900 Subject: [PATCH 2/7] Upgrade Electron to 1.7.13 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 84444999..a7f6410e 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "cross-env": "^4.0.0", "css-loader": "^0.28.1", "devtron": "^1.4.0", - "electron": "1.7.11", + "electron": "1.7.13", "electron-builder": "17.4.0", "electron-builder-squirrel-windows": "17.4.0", "electron-connect": "^0.6.1", diff --git a/yarn.lock b/yarn.lock index 2d6f5c24..e106a425 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1659,9 +1659,9 @@ electron-to-chromium@^1.2.7: version "1.3.20" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.20.tgz#2eedd5ccbae7ddc557f68ad1fce9c172e915e4e5" -electron@1.7.11: - version "1.7.11" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.11.tgz#993b6aa79e0e79a7cfcc369f4c813fbd9a0b08d9" +electron@1.7.13: + version "1.7.13" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.13.tgz#10851baec77d686d95812f34425c17e48ac1413f" dependencies: "@types/node" "^7.0.18" electron-download "^3.0.1" From ea2fcb15393f5ab30aaf1367f332a3c5b020a863 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Sat, 24 Mar 2018 00:56:04 +0900 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 143a8ae2..e3cb7cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Mattermost Desktop Application Changelog +## Release v4.0.1 + +Release date: TBD + +This release contains multiple security updates for Windows, Mac and Linux, and it is highly recommended that users upgrade to this version. + +### Architectural Changes + - Minor version upgrade of Electron from v1.7.11 to v1.7.13. Electron is the underlying technology used to build the Desktop apps. + +---- + ## Release v4.0.0 Release date: January 23, 2018 From 7599eab2cd2afeb636a37370d8ca9bb211af91aa Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 26 Mar 2018 20:11:03 +0900 Subject: [PATCH 4/7] Update package version to 4.0.1 --- package.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a7f6410e..b2748305 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mattermost-desktop", "productName": "Mattermost", - "version": "4.0.0", + "version": "4.0.1", "description": "Mattermost", "main": "main.js", "author": "Mattermost, Inc. ", diff --git a/src/package.json b/src/package.json index 8ff89017..f211ada5 100644 --- a/src/package.json +++ b/src/package.json @@ -2,7 +2,7 @@ "name": "mattermost-desktop", "productName": "Mattermost", "desktopName": "Mattermost.desktop", - "version": "4.0.0", + "version": "4.0.1", "description": "Mattermost", "main": "main_bundle.js", "author": "Mattermost, Inc. ", From f31c4b6332442aaff7d736e9317e2a61509ae888 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 26 Mar 2018 22:37:36 +0900 Subject: [PATCH 5/7] Disable Certificate Transparency verification --- src/main.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main.js b/src/main.js index 944d5d41..751ad32f 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,7 @@ const os = require('os'); const path = require('path'); const isDev = require('electron-is-dev'); const installExtension = require('electron-devtools-installer'); +const semver = require('semver'); const squirrelStartup = require('./main/squirrelStartup'); const CriticalErrorHandler = require('./main/CriticalErrorHandler'); @@ -610,6 +611,20 @@ app.on('ready', () => { permissionManager = new PermissionManager(permissionFile, trustedURLs); session.defaultSession.setPermissionRequestHandler(permissionRequestHandler(mainWindow, permissionManager)); + // Disable Certificate Transparency until Electron 1.8.3 + // due to https://github.com/electron/electron/issues/11997 + if (semver.lt(process.versions.electron, '1.8.3')) { + const SUCCESS_AND_DISABLE_CERTIFICATE_TRANSPARENCY = 0; + const USE_VERIFICATION_RESULT_FROM_CHROMIUM = -3; + session.defaultSession.setCertificateVerifyProc((request, callback) => { + if (request.verificationResult === 'net::OK') { + callback(SUCCESS_AND_DISABLE_CERTIFICATE_TRANSPARENCY); + } else { + callback(USE_VERIFICATION_RESULT_FROM_CHROMIUM); + } + }); + } + // Open the DevTools. // mainWindow.openDevTools(); }); From 1c5984d47fb3780effd6b3d57be4d79104b4aa01 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Mon, 26 Mar 2018 16:44:21 -0400 Subject: [PATCH 6/7] Update changelog for 4.0.1 --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3cb7cd8..dde2f0ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,18 @@ ## Release v4.0.1 -Release date: TBD +Release date: March 28, 2018 This release contains multiple security updates for Windows, Mac and Linux, and it is highly recommended that users upgrade to this version. ### Architectural Changes - Minor version upgrade of Electron from v1.7.11 to v1.7.13. Electron is the underlying technology used to build the Desktop apps. +### Bux Fixes + +#### All Platforms + - Disabled Certificate Transparency verification that produced unnecessary certificate errors. + ---- ## Release v4.0.0 From 24829a26908dbc0f8cc5695d3259a4ca1f9ea329 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 27 Mar 2018 21:21:40 +0900 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dde2f0ac..128778be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,11 @@ This release contains multiple security updates for Windows, Mac and Linux, and ### Architectural Changes - Minor version upgrade of Electron from v1.7.11 to v1.7.13. Electron is the underlying technology used to build the Desktop apps. -### Bux Fixes +### Bug Fixes #### All Platforms - Disabled Certificate Transparency verification that produced unnecessary certificate errors. + [#743](https://github.com/mattermost/desktop/pull/743) ----