From c861827d3212468bb42dcd465642152c40721761 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 25 Oct 2018 13:41:06 -0400 Subject: [PATCH] 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;