From a46e99f4d63fcfe56e36835c41721354e1670c74 Mon Sep 17 00:00:00 2001 From: Sven Huester Date: Sat, 22 Sep 2018 09:10:41 +0200 Subject: [PATCH 1/5] added flag for AppImage packaging --- electron-builder.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron-builder.json b/electron-builder.json index 68886377..f07850a8 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -26,7 +26,8 @@ "category": "Network;InstantMessaging", "target": [ "deb", - "tar.gz" + "tar.gz", + "appimage" ], "extraFiles": [ { From 9f5ca839a37140eff8320cebe865f60c26837c98 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 23 Oct 2018 00:09:21 +0900 Subject: [PATCH 2/5] Collect AppImage as CircleCI artifacts --- scripts/cp_artifacts.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cp_artifacts.sh b/scripts/cp_artifacts.sh index 46eca102..1bb25c50 100644 --- a/scripts/cp_artifacts.sh +++ b/scripts/cp_artifacts.sh @@ -12,3 +12,4 @@ cp "${SRC}"/squirrel-windows-ia32/*.exe "${DEST}/" cp "${SRC}"/mattermost-desktop-*.zip "${DEST}/" cp "${SRC}"/*.tar.gz "${DEST}/" cp "${SRC}"/*.deb "${DEST}/" +cp "${SRC}"/*.AppImage "${DEST}/" From 0147c82d0e26f21f2c3666d72f3454b59597c548 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 23 Oct 2018 00:10:44 +0900 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8612ce1..05751b8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,8 @@ Release date: TBD [#818](https://github.com/mattermost/desktop/pull/818) - Set "app start on login" preference to default on and synchronize its state with config.json. [#846](https://github.com/mattermost/desktop/pull/846) + - Added AppImage packages as unofficial build + [#864](https://github.com/mattermost/desktop/pull/864) ### Architectural Changes - Major version upgrade of Electron to v2.0.8. Electron is the underlying technology used to build the Desktop apps. From c861827d3212468bb42dcd465642152c40721761 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 25 Oct 2018 13:41:06 -0400 Subject: [PATCH 4/5] MM-12800 Remove partial ability to use file:// links --- src/browser/components/MattermostView.jsx | 33 ++--------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx index 74b987cb..9167c3e5 100644 --- a/src/browser/components/MattermostView.jsx +++ b/src/browser/components/MattermostView.jsx @@ -22,25 +22,6 @@ const preloadJS = `file://${remote.app.getAppPath()}/browser/webview/mattermost_ const ERR_NOT_IMPLEMENTED = -11; const U2F_EXTENSION_URL = 'chrome-extension://kmendfapggjehodndflmmgagdbamhnfd/u2f-comms.html'; -function extractFileURL(message) { - const matched = message.match(/Not allowed to load local resource:\s*(.+)/); - if (matched) { - return matched[1]; - } - return ''; -} - -function isNetworkDrive(fileURL) { - const u = url.parse(fileURL); - if (u.protocol === 'file:' && u.host) { - // Disallow localhost, 127.0.0.1, ::1. - if (!u.host.match(/^localhost$|^127\.0\.0\.1$|^\[::1\]$/)) { - return true; - } - } - return false; -} - export default class MattermostView extends React.Component { constructor(props) { super(props); @@ -191,19 +172,9 @@ export default class MattermostView extends React.Component { case 1: console.warn(message); break; - case 2: { - const fileURL = extractFileURL(e.message); - if (isNetworkDrive(fileURL)) { - // Network drive: Should be allowed. - if (!shell.openExternal(decodeURI(fileURL))) { - console.log(`[${this.props.name}] shell.openExternal failed: ${fileURL}`); - } - } else { - // Local drive such as 'C:\Windows': Should not be allowed. - console.error(message); - } + case 2: + console.error(message); break; - } default: console.log(message); break; From 51f22c5c22f5dd5aab899920dd6b6f9175c09930 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Sun, 28 Oct 2018 23:08:40 +0900 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05751b8e..767bff55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ Release date: TBD #### Windows - Set "app start on login" preference to default on and synchronize its state with config.json. [#846](https://github.com/mattermost/desktop/pull/846) + - Removed the ability to open UNC path and file:// links. + [#881](https://github.com/mattermost/desktop/pull/881) #### Mac - Add **.dmg** package to support installation.