From bba1165c770e552b57a4028b2f3efe400c56ffd4 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 28 May 2018 01:42:59 +0100
Subject: [PATCH] =?UTF-8?q?Wrap=20Discord=E2=80=99s=20preload=20script=20i?=
 =?UTF-8?q?nstead=20of=20enabling=20Node=20integration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/index.js                           |  8 +++++++-
 client/src/modules/contentmanager.js          |  2 +-
 client/src/modules/extmodule.js               |  3 ++-
 client/src/modules/globals.js                 |  2 ++
 client/src/modules/pluginmanager.js           |  3 ++-
 client/src/structs/settings/types/custom.js   |  5 +++--
 .../src/ui/components/BdSettingsWrapper.vue   |  3 ++-
 .../ui/components/bd/modals/ErrorModal.vue    |  3 +--
 .../src/ui/components/bd/setting/Custom.vue   |  4 ++--
 client/webpack.config.js                      |  9 +++++----
 client/webpack.production.config.js           |  9 +++++----
 core/src/main.js                              | 12 +++++------
 core/src/modules/utils.js                     |  6 +++++-
 core/src/sparkplug.js                         | 20 +++++++++++++++++++
 14 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/client/src/index.js b/client/src/index.js
index 079a7e4a..be21a426 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -39,7 +39,13 @@ class BetterDiscord {
 
             plugins: PluginManager.localContent,
             themes: ThemeManager.localContent,
-            extmodules: ExtModuleManager.localContent
+            extmodules: ExtModuleManager.localContent,
+
+            __filename, __dirname,
+            module: Globals.require.cache[__filename],
+            require: Globals.require,
+            webpack_require: __webpack_require__,
+            get discord_require() { return WebpackModules.require }
         };
 
         const developermode = Settings.getSetting('core', 'advanced', 'developer-mode');
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 2cbdd863..8d98fc87 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -269,7 +269,7 @@ export default class {
 
             const index = this.getContentIndex(content);
 
-            delete window.require.cache[window.require.resolve(content.paths.mainPath)];
+            delete Globals.require.cache[Globals.require.resolve(content.paths.mainPath)];
 
             if (reload) {
                 const newcontent = await this.preloadContent(content.dirName, true, index);
diff --git a/client/src/modules/extmodule.js b/client/src/modules/extmodule.js
index 4b8fb0db..262fbd84 100644
--- a/client/src/modules/extmodule.js
+++ b/client/src/modules/extmodule.js
@@ -8,13 +8,14 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import Globals from './globals';
 import Content from './content';
 
 export default class ExtModule extends Content {
 
     constructor(internals) {
         super(internals);
-        this.__require = window.require(this.paths.mainPath);
+        this.__require = Globals.require(this.paths.mainPath);
     }
 
     get type() { return 'module' }
diff --git a/client/src/modules/globals.js b/client/src/modules/globals.js
index 6b0312f4..bb9147dc 100644
--- a/client/src/modules/globals.js
+++ b/client/src/modules/globals.js
@@ -17,6 +17,8 @@ export default new class extends Module {
 
     constructor(args) {
         super(args);
+
+        this.require = __non_webpack_require__;
     }
 
     initg() {
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index 4f227840..0dc3cbd2 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -12,6 +12,7 @@ import { Events, Permissions } from 'modules';
 import { Modals } from 'ui';
 import { ErrorEvent } from 'structs';
 import { ClientLogger as Logger } from 'common';
+import Globals from './globals';
 import ContentManager from './contentmanager';
 import ExtModuleManager from './extmodulemanager';
 import Plugin from './plugin';
@@ -96,7 +97,7 @@ export default class extends ContentManager {
             }
         }
 
-        const plugin = window.require(paths.mainPath)(Plugin, new PluginApi(info, paths.contentPath), Vendor, deps);
+        const plugin = Globals.require(paths.mainPath)(Plugin, new PluginApi(info, paths.contentPath), Vendor, deps);
         if (!(plugin.prototype instanceof Plugin))
             throw {message: `Plugin ${info.name} did not return a class that extends Plugin.`};
 
diff --git a/client/src/structs/settings/types/custom.js b/client/src/structs/settings/types/custom.js
index a44bdb54..31c3effd 100644
--- a/client/src/structs/settings/types/custom.js
+++ b/client/src/structs/settings/types/custom.js
@@ -8,10 +8,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { Globals } from 'modules';
+import path from 'path';
 import Setting from './basesetting';
 import SettingsCategory from '../settingscategory';
 import SettingsScheme from '../settingsscheme';
-import path from 'path';
 
 export default class CustomSetting extends Setting {
 
@@ -68,7 +69,7 @@ export default class CustomSetting extends Setting {
      * @param {String} classExport The name of a property of the file's exports that will be used (optional)
      */
     setClass(class_file, class_export) {
-        const component = window.require(path.join(this.path, class_file));
+        const component = Globals.require(path.join(this.path, class_file));
         const setting_class = class_export ? component[class_export](CustomSetting) : component.default ? component.default(CustomSetting) : component(CustomSetting);
 
         if (!(setting_class.prototype instanceof CustomSetting))
diff --git a/client/src/ui/components/BdSettingsWrapper.vue b/client/src/ui/components/BdSettingsWrapper.vue
index 1b636769..98b94c10 100644
--- a/client/src/ui/components/BdSettingsWrapper.vue
+++ b/client/src/ui/components/BdSettingsWrapper.vue
@@ -23,6 +23,7 @@
     // Imports
     import { Events, Settings } from 'modules';
     import { Modals } from 'ui';
+    import process from 'process';
     import BdSettings from './BdSettings.vue';
 
     export default {
@@ -33,7 +34,7 @@
                 active: false,
                 animating: false,
                 timeout: null,
-                platform: global.process.platform
+                platform: process.platform
             };
         },
         components: {
diff --git a/client/src/ui/components/bd/modals/ErrorModal.vue b/client/src/ui/components/bd/modals/ErrorModal.vue
index d43a5139..38f59456 100644
--- a/client/src/ui/components/bd/modals/ErrorModal.vue
+++ b/client/src/ui/components/bd/modals/ErrorModal.vue
@@ -28,11 +28,10 @@
 
 <script>
     // Imports
+    import process from 'process';
     import { Modal } from '../../common';
     import { MiError } from '../../common/MaterialIcon';
 
-    const process = window.require('process');
-
     export default {
         props: ['modal'],
         components: {
diff --git a/client/src/ui/components/bd/setting/Custom.vue b/client/src/ui/components/bd/setting/Custom.vue
index 1d827f45..644e50c3 100644
--- a/client/src/ui/components/bd/setting/Custom.vue
+++ b/client/src/ui/components/bd/setting/Custom.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-    import { PluginManager } from 'modules';
+    import { Globals, PluginManager } from 'modules';
     import SettingsPanel from '../SettingsPanel.vue';
     import Drawer from '../../common/Drawer.vue';
     import Button from '../../common/Button.vue';
@@ -42,7 +42,7 @@
         computed: {
             component() {
                 if (typeof this.setting.file === 'string') {
-                    const component = window.require(path.join(this.setting.path, this.setting.file));
+                    const component = Globals.require(path.join(this.setting.path, this.setting.file));
                     return this.setting.component ? component[this.setting.component] : component.default ? component.default : component;
                 }
 
diff --git a/client/webpack.config.js b/client/webpack.config.js
index e7a75d2f..1c8afb80 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -31,10 +31,11 @@ module.exports = {
         loaders: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
-        electron: 'window.require("electron")',
-        fs: 'window.require("fs")',
-        path: 'window.require("path")',
-        util: 'window.require("util")',
+        electron: 'require("electron")',
+        fs: 'require("fs")',
+        path: 'require("path")',
+        util: 'require("util")',
+        process: 'require("process")',
         sparkplug: 'require("../../core/dist/sparkplug")'
     },
     resolve: {
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index ce82238d..1b35a7e1 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -32,10 +32,11 @@ module.exports = {
         loaders: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
-        electron: 'window.require("electron")',
-        fs: 'window.require("fs")',
-        path: 'window.require("path")',
-        util: 'window.require("util")',
+        electron: 'require("electron")',
+        fs: 'require("fs")',
+        path: 'require("path")',
+        util: 'require("util")',
+        process: 'require("process")',
         sparkplug: 'require("./sparkplug")'
     },
     resolve: {
diff --git a/core/src/main.js b/core/src/main.js
index ecc6eea6..3b665cb0 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -58,9 +58,12 @@ class PatchedBrowserWindow extends BrowserWindow {
         options.webPreferences = Object.assign({}, options.webPreferences);
 
         // Make sure Node integration is enabled
-        options.webPreferences.nodeIntegration = true;
+        const originalPreloadScript = options.webPreferences.preload;
+        options.webPreferences.preload = sparkplug;
 
-        return new BrowserWindow(options);
+        super(options);
+
+        this.__bd_preload = [originalPreloadScript];
     }
 }
 
@@ -147,7 +150,6 @@ class BetterDiscord {
 
         this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
 
-        this.windowUtils.on('did-get-response-details', () => this.ignite());
         this.windowUtils.on('did-finish-load', () => this.injectScripts(true));
 
         this.windowUtils.on('did-navigate-in-page', (event, url, isMainFrame) => {
@@ -165,10 +167,6 @@ class BetterDiscord {
             const defer = setInterval(() => {
                 const windows = BrowserWindow.getAllWindows();
 
-                for (let window of windows) {
-                    if (window) BetterDiscord.ignite(window);
-                }
-
                 if (windows.length === 1 && windows[0].webContents.getURL().includes('discordapp.com')) {
                     resolve(windows[0]);
                     clearInterval(defer);
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index c41c2400..48e3547f 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -185,7 +185,7 @@ class WindowUtils extends Module {
         return WindowUtils.injectScript(this.window, fpath, variable);
     }
 
-    static injectScript(window, fpath, variable) {
+    static async injectScript(window, fpath, variable) {
         window = window.webContents || window;
         if (!window) return;
         // console.log(`Injecting: ${fpath} to`, window);
@@ -193,6 +193,10 @@ class WindowUtils extends Module {
         const escaped_path = fpath.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
         const escaped_variable = variable ? variable.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : null;
 
+        const nodeIntegration = await window.executeJavaScript(`typeof require !== 'undefined'`);
+
+        if (!nodeIntegration) return window.send('--bd-inject-script', {script: fpath, variable});
+
         if (variable) return window.executeJavaScript(`window["${escaped_variable}"] = require("${escaped_path}");`);
         else return window.executeJavaScript(`require("${escaped_path}");`);
     }
diff --git a/core/src/sparkplug.js b/core/src/sparkplug.js
index 5709da11..b635414e 100644
--- a/core/src/sparkplug.js
+++ b/core/src/sparkplug.js
@@ -10,11 +10,31 @@
  * This file is evaluated in the renderer process!
  */
 
+import electron, { ipcRenderer } from 'electron';
+
 (() => {
     if (module.exports.bd) return;
 
     console.log('[BetterDiscord|Sparkplug]');
 
+    const currentWindow = electron.remote.getCurrentWindow();
+
+    if (currentWindow.__bd_preload) {
+        for (let preloadScript of currentWindow.__bd_preload) {
+            try {
+                require(preloadScript);
+            } catch (err) {
+                console.error('[BetterDiscord|Sparkplug] Error thrown in preload script', preloadScript, err);
+            }
+        }
+    }
+
+    ipcRenderer.on('--bd-inject-script', (event, {script, variable}) => {
+        console.log('[BetterDiscord|Sparkplug] Injecting script', script, variable);
+        if (variable) window[variable] = require(script);
+        else require(script);
+    });
+
     const ls = window.localStorage;
     if (!ls) console.warn('[BetterDiscord|Sparkplug] Failed to hook localStorage :(');
     const wsOrig = window.WebSocket;