-
Notifications
You must be signed in to change notification settings - Fork 233
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
runfix: Disable node integrations in webview (#3548)
- Loading branch information
Showing
5 changed files
with
69 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,51 @@ | ||
| import * as querystring from 'querystring'; | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2020 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| export class WindowUrl { | ||
| static parseParams(url: string): querystring.ParsedUrlQuery { | ||
| static parseParams(url: string): URLSearchParams { | ||
| const urlObject = new URL(url); | ||
| return urlObject.search ? querystring.parse(urlObject.search.substr(1)) : {}; | ||
| return urlObject.searchParams; | ||
| } | ||
|
|
||
| static getQueryString(params: querystring.ParsedUrlQuery): string { | ||
| return `?${querystring.unescape(querystring.stringify(params))}`; | ||
| static getQueryString(params: URLSearchParams): string { | ||
| const _params: string[] = []; | ||
| params.forEach((value, key) => { | ||
| _params.push(`${key}=${value}`); | ||
| }); | ||
| return `?${_params.join('&')}`; | ||
| } | ||
|
|
||
| static replaceQueryParams(url: string, params: querystring.ParsedUrlQuery): string { | ||
| static replaceQueryParams(url: string, params: URLSearchParams): string { | ||
| const fullHost = url.split('?')[0]; | ||
| const unescapedQueryParams = WindowUrl.getQueryString(params); | ||
| return encodeURIComponent(`${fullHost}${unescapedQueryParams}`); | ||
| } | ||
|
|
||
| static createWebappUrl( | ||
| localRendererUrl: string, | ||
| customBackendUrl: string, | ||
| withRendererPage: boolean = false, | ||
| ): string { | ||
| static createWebappUrl(localRendererUrl: string, customBackendUrl: string): string { | ||
| const localFileParams = WindowUrl.parseParams(localRendererUrl); | ||
| const envUrlParams = WindowUrl.parseParams(localFileParams['env'] as string); | ||
| const envUrlParams = WindowUrl.parseParams(localFileParams.get('env') as string); | ||
| const customBackendUrlParams = WindowUrl.parseParams(customBackendUrl); | ||
| const mergedParams = {...envUrlParams, ...customBackendUrlParams}; | ||
| const mergedParams = envUrlParams; | ||
| customBackendUrlParams.forEach((value, key) => { | ||
| mergedParams.set(key, value); | ||
| }); | ||
| const newEnvUrl = WindowUrl.replaceQueryParams(customBackendUrl, mergedParams); | ||
|
|
||
| if (withRendererPage === true) { | ||
| const cutPattern = '?env='; | ||
| const localFilePrefix = `${localRendererUrl.split(cutPattern)[0]}${cutPattern}`; | ||
| return `${localFilePrefix}${newEnvUrl}`; | ||
| } | ||
| return newEnvUrl; | ||
| } | ||
| } |