diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /browser/components/BrowserContentHandler.sys.mjs | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/BrowserContentHandler.sys.mjs')
-rw-r--r-- | browser/components/BrowserContentHandler.sys.mjs | 97 |
1 files changed, 5 insertions, 92 deletions
diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs index 247f33c8b0..6c156d1700 100644 --- a/browser/components/BrowserContentHandler.sys.mjs +++ b/browser/components/BrowserContentHandler.sys.mjs @@ -60,62 +60,8 @@ function shouldLoadURI(aURI) { return false; } -function validateFirefoxProtocol(aCmdLine, launchedWithArg_osint) { - let paramCount = 0; - // Only accept one parameter when we're handling the protocol. - for (let i = 0; i < aCmdLine.length; i++) { - if (!aCmdLine.getArgument(i).startsWith("-")) { - paramCount++; - } - if (paramCount > 1) { - return false; - } - } - // `-osint` and handling registered file types and protocols is Windows-only. - return AppConstants.platform != "win" || launchedWithArg_osint; -} - -function resolveURIInternal( - aCmdLine, - aArgument, - launchedWithArg_osint = false -) { +function resolveURIInternal(aCmdLine, aArgument) { let principal = lazy.gSystemPrincipal; - - // If using Firefox protocol handler remove it from URI - // at this stage. This is before we would otherwise - // record telemetry so do that here. - let handleFirefoxProtocol = protocol => { - let protocolWithColon = protocol + ":"; - if (aArgument.startsWith(protocolWithColon)) { - if (!validateFirefoxProtocol(aCmdLine, launchedWithArg_osint)) { - throw new Error( - "Invalid use of Firefox-bridge and Firefox-private-bridge protocols." - ); - } - aArgument = aArgument.substring(protocolWithColon.length); - - if ( - !aArgument.startsWith("http://") && - !aArgument.startsWith("https://") - ) { - throw new Error( - "Firefox-bridge and Firefox-private-bridge protocols can only be used in conjunction with http and https urls." - ); - } - - principal = Services.scriptSecurityManager.createNullPrincipal({}); - Services.telemetry.keyedScalarAdd( - "os.environment.launched_to_handle", - protocol, - 1 - ); - } - }; - - handleFirefoxProtocol("firefox-bridge"); - handleFirefoxProtocol("firefox-private-bridge"); - var uri = aCmdLine.resolveURI(aArgument); var uriFixup = Services.uriFixup; @@ -376,12 +322,7 @@ function openBrowserWindow( Ci.nsILoadContext ).usePrivateBrowsing = true; - if ( - AppConstants.platform == "win" && - lazy.NimbusFeatures.majorRelease2022.getVariable( - "feltPrivacyWindowSeparation" - ) - ) { + if (AppConstants.platform == "win") { lazy.WinTaskbar.setGroupIdForWindow( win, lazy.WinTaskbar.defaultPrivateGroupId @@ -602,17 +543,7 @@ nsBrowserContentHandler.prototype = { "private-window", false ); - // Check for Firefox private browsing protocol handler here. - let url = null; - let urlFlagIdx = cmdLine.findFlag("url", false); - if (urlFlagIdx > -1 && cmdLine.length > 1) { - url = cmdLine.getArgument(urlFlagIdx + 1); - } - if (privateWindowParam || url?.startsWith("firefox-private-bridge:")) { - // Check if the osint flag is present on Windows - let launchedWithArg_osint = - AppConstants.platform == "win" && - cmdLine.findFlag("osint", false) == 0; + if (privateWindowParam) { let forcePrivate = true; let resolvedInfo; if (!lazy.PrivateBrowsingUtils.enabled) { @@ -623,19 +554,8 @@ nsBrowserContentHandler.prototype = { uri: Services.io.newURI("about:privatebrowsing"), principal: lazy.gSystemPrincipal, }; - } else if (url?.startsWith("firefox-private-bridge:")) { - cmdLine.removeArguments(urlFlagIdx, urlFlagIdx + 1); - resolvedInfo = resolveURIInternal( - cmdLine, - url, - launchedWithArg_osint - ); } else { - resolvedInfo = resolveURIInternal( - cmdLine, - privateWindowParam, - launchedWithArg_osint - ); + resolvedInfo = resolveURIInternal(cmdLine, privateWindowParam); } handURIToExistingBrowser( resolvedInfo.uri, @@ -1430,11 +1350,7 @@ nsDefaultCommandLineHandler.prototype = { try { var ar; while ((ar = cmdLine.handleFlagWithParam("url", false))) { - let { uri, principal } = resolveURIInternal( - cmdLine, - ar, - launchedWithArg_osint - ); + let { uri, principal } = resolveURIInternal(cmdLine, ar); urilist.push(uri); principalList.push(principal); @@ -1506,9 +1422,6 @@ nsDefaultCommandLineHandler.prototype = { } // Can't open multiple URLs without using system principal. - // The firefox-bridge and firefox-private-bridge protocols should only - // accept a single URL due to using the -osint option - // so this isn't very relevant. var URLlist = urilist.filter(shouldLoadURI).map(u => u.spec); if (URLlist.length) { openBrowserWindow(cmdLine, lazy.gSystemPrincipal, URLlist); |