Revert "feat: only allow bundled preload scripts (#17308)" (#19132)

This reverts commit 8cf15cc9310ca5983f15e511c3ecdac8e75e225d.

docs/api/breaking-changes.md

@@ -94,10 +94,6 @@ powerMonitor.querySystemIdleTime(callback)
 const idleTime = getSystemIdleTime()
 ```
 
-## Preload scripts outside of app path are not allowed
-
-For security reasons, preload scripts can only be loaded from a subpath of the [app path](app.md#appgetapppath).
-
 # Planned Breaking API Changes (5.0)
 
 ## `new BrowserWindow({ webPreferences })`

docs/api/browser-window.md

@@ -266,8 +266,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       When node integration is turned off, the preload script can reintroduce
       Node global symbols back to the global scope. See example
       [here](process.md#event-loaded).
-      **Note:** For security reasons, preload scripts can only be loaded from
-      a subpath of the [app path](app.md#appgetapppath).
     * `sandbox` Boolean (optional) - If set, this will sandbox the renderer
       associated with the window, making it compatible with the Chromium
       OS-level sandbox and disabling the Node.js engine. This is not the same as

docs/api/session.md

@@ -569,8 +569,6 @@ Returns `Promise<void>` - resolves when the session’s HTTP authentication cach
 Adds scripts that will be executed on ALL web contents that are associated with
 this session just before normal `preload` scripts run.
 
-**Note:** For security reasons, preload scripts can only be loaded from a subpath of the [app path](app.md#appgetapppath).
-
 #### `ses.getPreloads()`
 
 Returns `String[]` an array of paths to preload scripts that have been

docs/api/webview-tag.md

@@ -162,9 +162,6 @@ When the guest page doesn't have node integration this script will still have
 access to all Node APIs, but global objects injected by Node will be deleted
 after this script has finished executing.
 
-**Note:** For security reasons, preload scripts can only be loaded from
-a subpath of the [app path](app.md#appgetapppath).
-
 **Note:** This option will be appear as `preloadURL` (not `preload`) in
 the `webPreferences` specified to the `will-attach-webview` event.
 

filenames.gni

@@ -61,7 +61,6 @@ filenames = {
     "lib/common/error-utils.js",
     "lib/common/init.ts",
     "lib/common/parse-features-string.js",
-    "lib/common/path-utils.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/web-view-methods.js",
     "lib/renderer/callbacks-registry.js",

lib/browser/rpc-server.js

@@ -3,7 +3,6 @@
 const electron = require('electron')
 const { EventEmitter } = require('events')
 const fs = require('fs')
-const path = require('path')
 const util = require('util')
 
 const v8Util = process.electronBinding('v8_util')
@@ -20,7 +19,6 @@ const guestViewManager = require('@electron/internal/browser/guest-view-manager'
 const bufferUtils = require('@electron/internal/common/buffer-utils')
 const errorUtils = require('@electron/internal/common/error-utils')
 const clipboardUtils = require('@electron/internal/common/clipboard-utils')
-const { isParentDir } = require('@electron/internal/common/path-utils')
 
 const hasProp = {}.hasOwnProperty
 
@@ -500,24 +498,12 @@ ipcMainUtils.handle('ELECTRON_BROWSER_CLIPBOARD', function (event, method, ...ar
 })
 
 const readFile = util.promisify(fs.readFile)
-const realpath = util.promisify(fs.realpath)
-
-let absoluteAppPath
-const getAppPath = async function () {
-  if (absoluteAppPath === undefined) {
-    absoluteAppPath = await realpath(electron.app.getAppPath())
-  }
-  return absoluteAppPath
-}
 
 const getPreloadScript = async function (preloadPath) {
   let preloadSrc = null
   let preloadError = null
   if (preloadPath) {
     try {
-      if (!isParentDir(await getAppPath(), await realpath(preloadPath))) {
-        throw new Error('Preload scripts outside of app path are not allowed')
-      }
       preloadSrc = (await readFile(preloadPath)).toString()
     } catch (err) {
       preloadError = errorUtils.serialize(err)

lib/common/path-utils.ts

@@ -1,6 +0,0 @@
-import * as path from 'path'
-
-export const isParentDir = function (parent: string, dir: string) {
-  const relative = path.relative(parent, dir)
-  return !!relative && !relative.startsWith('..') && !path.isAbsolute(relative)
-}

lib/renderer/init.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events'
-import * as fs from 'fs'
 import * as path from 'path'
 
 const Module = require('module')
@@ -188,22 +187,10 @@ if (nodeIntegration) {
 }
 
 const errorUtils = require('@electron/internal/common/error-utils')
-const { isParentDir } = require('@electron/internal/common/path-utils')
-
-let absoluteAppPath: string
-const getAppPath = function () {
-  if (absoluteAppPath === undefined) {
-    absoluteAppPath = fs.realpathSync(appPath!)
-  }
-  return absoluteAppPath
-}
 
 // Load the preload scripts.
 for (const preloadScript of preloadScripts) {
   try {
-    if (!isParentDir(getAppPath(), fs.realpathSync(preloadScript))) {
-      throw new Error('Preload scripts outside of app path are not allowed')
-    }
     require(preloadScript)
   } catch (error) {
     console.error(`Unable to load preload script: ${preloadScript}`)

spec/api-web-contents-spec.js

@@ -3,7 +3,6 @@
 const assert = require('assert')
 const ChildProcess = require('child_process')
 const fs = require('fs')
-const os = require('os')
 const http = require('http')
 const path = require('path')
 const { closeWindow } = require('./window-helpers')
@@ -1089,16 +1088,6 @@ describe('webContents module', () => {
   describe('preload-error event', () => {
     const generateSpecs = (description, sandbox) => {
       describe(description, () => {
-        const tmpPreload = path.join(os.tmpdir(), 'preload.js')
-
-        before((done) => {
-          fs.writeFile(tmpPreload, '', done)
-        })
-
-        after((done) => {
-          fs.unlink(tmpPreload, () => done())
-        })
-
         it('is triggered when unhandled exception is thrown', async () => {
           const preload = path.join(fixtures, 'module', 'preload-error-exception.js')
 
@@ -1158,26 +1147,6 @@ describe('webContents module', () => {
           expect(preloadPath).to.equal(preload)
           expect(error.message).to.contain('preload-invalid.js')
         })
-
-        it('is triggered when preload script is outside of app path', async () => {
-          const preload = tmpPreload
-
-          w.destroy()
-          w = new BrowserWindow({
-            show: false,
-            webPreferences: {
-              sandbox,
-              preload
-            }
-          })
-
-          const promise = emittedOnce(w.webContents, 'preload-error')
-          w.loadURL('about:blank')
-
-          const [, preloadPath, error] = await promise
-          expect(preloadPath).to.equal(preload)
-          expect(error.message).to.contain('Preload scripts outside of app path are not allowed')
-        })
       })
     }