Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/electron-chrome-extensions/src/browser/api/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ export const getExtensionUrl = (extension: Electron.Extension, uri: string) => {
} catch {}
}

export const validateExtensionUrl = (url: string, extension: Electron.Extension) => {
try {
url = new URL(url, extension.url).href
} catch (e) {
throw new Error('Invalid URL')
}

if (url.startsWith('chrome:') || url.startsWith('javascript:')) {
throw new Error('Invalid URL')
}

return url
}

export const resolveExtensionPath = (
extension: Electron.Extension,
uri: string,
Expand Down
24 changes: 7 additions & 17 deletions packages/electron-chrome-extensions/src/browser/api/tabs.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
import { ExtensionContext } from '../context'
import { ExtensionEvent } from '../router'
import { getAllWindows, matchesPattern, matchesTitlePattern, TabContents } from './common'
import {
getAllWindows,
matchesPattern,
matchesTitlePattern,
TabContents,
validateExtensionUrl,
} from './common'
import { WindowsAPI } from './windows'
import debug from 'debug'

const d = debug('electron-chrome-extensions:tabs')

const validateExtensionUrl = (url: string, extension: Electron.Extension) => {
// Convert relative URLs to absolute if needed
try {
url = new URL(url, extension.url).href
} catch (e) {
throw new Error('Invalid URL')
}

// Prevent creating chrome://kill or other debug commands
if (url.startsWith('chrome:') || url.startsWith('javascript:')) {
throw new Error('Invalid URL')
}

return url
}

export class TabsAPI {
static TAB_ID_NONE = -1
static WINDOW_ID_NONE = -1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ExtensionContext } from '../context'
import { ExtensionEvent } from '../router'
import { validateExtensionUrl } from './common'
import debug from 'debug'

const d = debug('electron-chrome-extensions:windows')
Expand Down Expand Up @@ -109,6 +110,11 @@ export class WindowsAPI {
}

private async create(event: ExtensionEvent, details: chrome.windows.CreateData) {
if (details.url) {
const urls = Array.isArray(details.url) ? details.url : [details.url]
const resolved = urls.map((u) => validateExtensionUrl(u, event.extension))
details = { ...details, url: Array.isArray(details.url) ? resolved : resolved[0] }
}
const win = await this.ctx.store.createWindow(event, details)
return this.getWindowDetails(win)
}
Expand Down
Loading