April 2023 - tor-commits - lists.torproject.org

[tor] branch main updated (447775a5e0 -> 2bb8988629)
by gitolite role 13 Apr '23

13 Apr '23

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch main in repository tor. from 447775a5e0 Merge branch 'maint-0.4.7' new a9fc6c937c protover: Support Relay=5 for Conflux (prop329) new 45432175fe trunnel: Add Conflux related cell definition new 8b185b2ac3 Prop#329 Cells: Building and parsing parsing conflux commands new 0d14d6b44a Prop#329 Tests: Add tests for conflux cells. new eac2bad86b Prop#329 params: Consensus parameter and torrc handling new a1794ef687 Prop#329 Headers: Header files for conflux new 2bd1eca78c Prop#329 Algs: Conflux multiplexed cell receive handling new e0881a669a Prop#329 Algs: Conflux multiplexed cell sending decision algs new b999051e44 Prop#329 OOM: Handle freeing conflux queues on OOM new cf715a56f1 Prop#329 sendme: Adjust sendme sending and tracking for conflux new a4ee0c29ee Prop#329: Add purposes for conflux circuits new 21c861bfa3 Refactor stream blocking due to channel cell queues new 2f865b4bba Prop#329 streams: Handle stream usage with conflux new 336a24754d Prop#329 Pool: Handle linking, unlinking, and relaunching conflux circuit legs. new 46e473f43e Prop#329 Pool: Avoid sharing Guards and Middles between circuits. new 39c2927d6f Prop#329 Pool: Handle pre-building and using conflux sets. new 8d4781e730 Prop#329 Tests: Add tests for the conflux pool new 731a50c8c4 Prop#329: Add conflux to build new 7c70f713c3 Avoid closing dirty circs with active half-edges new 2bb8988629 Fix cases where edge connections can stall. The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/man/tor.1.txt | 6 + src/app/config/config.c | 1 + src/app/config/or_options_st.h | 4 + src/app/main/shutdown.c | 2 + src/app/main/subsystem_list.c | 2 + src/core/mainloop/connection.c | 27 +- src/core/mainloop/connection.h | 1 + src/core/mainloop/mainloop.c | 12 +- src/core/mainloop/mainloop.h | 2 +- src/core/or/circuit_st.h | 29 +- src/core/or/circuitbuild.c | 80 +- src/core/or/circuitbuild.h | 9 +- src/core/or/circuitlist.c | 35 + src/core/or/circuitlist.h | 9 +- src/core/or/circuitpadding.c | 7 +- src/core/or/circuituse.c | 75 +- src/core/or/circuituse.h | 7 + src/core/or/conflux.c | 1008 ++++++++++++++++ src/core/or/conflux.h | 84 ++ src/core/or/conflux_cell.c | 355 ++++++ src/core/or/conflux_cell.h | 50 + src/core/or/conflux_params.c | 281 +++++ src/core/or/conflux_params.h | 29 + src/core/or/conflux_pool.c | 1999 +++++++++++++++++++++++++++++++ src/core/or/conflux_pool.h | 46 + src/core/or/conflux_st.h | 157 +++ src/core/or/conflux_sys.c | 37 + src/core/or/conflux_sys.h | 23 + src/core/or/conflux_util.c | 393 ++++++ src/core/or/conflux_util.h | 59 + src/core/or/congestion_control_common.c | 14 +- src/core/or/congestion_control_common.h | 2 +- src/core/or/congestion_control_flow.c | 47 +- src/core/or/congestion_control_flow.h | 2 - src/core/or/connection_edge.c | 35 +- src/core/or/connection_edge.h | 1 + src/core/or/cpath_build_state_st.h | 2 + src/core/or/edge_connection_st.h | 13 +- src/core/or/include.am | 13 + src/core/or/or.h | 12 + src/core/or/or_circuit_st.h | 12 +- src/core/or/origin_circuit_st.h | 11 +- src/core/or/protover.c | 4 + src/core/or/protover.h | 3 + src/core/or/relay.c | 383 ++++-- src/core/or/versions.c | 7 + src/feature/client/circpathbias.c | 13 +- src/feature/client/entrynodes.c | 42 +- src/feature/client/entrynodes.h | 14 +- src/feature/nodelist/networkstatus.c | 2 + src/feature/nodelist/node_select.h | 2 + src/feature/nodelist/nodelist.c | 11 +- src/feature/nodelist/nodelist.h | 1 + src/feature/nodelist/routerlist.c | 5 + src/feature/relay/dns.c | 4 + src/test/fakecircs.c | 10 +- src/test/include.am | 2 + src/test/test.c | 2 + src/test/test.h | 2 + src/test/test_conflux_cell.c | 60 + src/test/test_conflux_pool.c | 1338 +++++++++++++++++++++ src/trunnel/conflux.c | 1158 ++++++++++++++++++ src/trunnel/conflux.h | 422 +++++++ src/trunnel/conflux.trunnel | 66 + src/trunnel/include.am | 9 +- 65 files changed, 8327 insertions(+), 226 deletions(-) create mode 100644 src/core/or/conflux.c create mode 100644 src/core/or/conflux.h create mode 100644 src/core/or/conflux_cell.c create mode 100644 src/core/or/conflux_cell.h create mode 100644 src/core/or/conflux_params.c create mode 100644 src/core/or/conflux_params.h create mode 100644 src/core/or/conflux_pool.c create mode 100644 src/core/or/conflux_pool.h create mode 100644 src/core/or/conflux_st.h create mode 100644 src/core/or/conflux_sys.c create mode 100644 src/core/or/conflux_sys.h create mode 100644 src/core/or/conflux_util.c create mode 100644 src/core/or/conflux_util.h create mode 100644 src/test/test_conflux_cell.c create mode 100644 src/test/test_conflux_pool.c create mode 100644 src/trunnel/conflux.c create mode 100644 src/trunnel/conflux.h create mode 100644 src/trunnel/conflux.trunnel -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 20

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: dropme! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2f760c56 by Henry Wilkes at 2023-04-13T17:18:45+00:00 dropme! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41725 - Changes to connectionPane.xhtml have been moved to: + Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection - - - - - 5c63c357 by Henry Wilkes at 2023-04-13T17:18:45+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41725 - Changes to connectionPane.xhtml have been moved from: + Bug 27476: Implement about:torconnect captive portal within Tor Browser - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7c7f1d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7c7f1d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 5 commits: Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 627eab30 by Dan Ballard at 2023-04-13T16:15:53+00:00 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." Bug 40701: Improve security warning when downloading a file This reverts commit 5d003f7c5e0910c8e0c6f4e55a0ca7aa002faad1. - - - - - 95ab5a71 by Dan Ballard at 2023-04-13T16:17:39+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 40701: Remove old download popup - - - - - 87ddea9a by Dan Ballard at 2023-04-13T16:17:40+00:00 fixup! Add TorStrings module for localization Bug 40701: Improve security warning when downloading a file Add strings for new pane, flag deprecated strings Bug 40701: fix capitalization of 'internet' - - - - - 0169c7ee by Dan Ballard at 2023-04-13T16:17:40+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 40701: Improve security warning when downloading a file Remove existing popup warnings and add pref for new one Bug 40701: update pref names - - - - - 7c7f1d72 by Dan Ballard at 2023-04-13T16:17:41+00:00 Bug 40701: Add in pane security warning when downloading a file - - - - - 12 changed files: - browser/app/profile/000-tor-browser.js - browser/components/downloads/content/downloads.css - browser/components/downloads/content/downloads.js - browser/components/downloads/content/downloadsPanel.inc.xhtml - browser/themes/shared/customizableui/panelUI-shared.css - browser/themes/shared/downloads/downloads.inc.css - toolkit/torbutton/chrome/locale/en-US/torbutton.properties - − toolkit/torbutton/components/external-app-blocker.js - toolkit/torbutton/jar.mn - uriloader/exthandler/nsExternalHelperAppService.cpp - uriloader/exthandler/nsExternalHelperAppService.h - uriloader/exthandler/nsIExternalHelperAppService.idl Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -64,11 +64,15 @@ pref("extensions.torbutton.startup", false); // Security prefs: pref("extensions.torbutton.resize_new_windows", false); -pref("extensions.torbutton.launch_warning", true); // Browser home page: pref("browser.startup.homepage", "about:tor"); +// tor-browser#40701: Add new download warning and flipping prefs to match Firefox +pref("browser.download.useDownloadDir", true); +pref("browser.download.always_ask_before_handling_new_types", false); +pref("browser.download.showTorWarning", true); + // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0); ===================================== browser/components/downloads/content/downloads.css ===================================== @@ -95,6 +95,32 @@ padding: 0.62em; } +#downloadsPanel-mainView { + /* Fix the layout to ensure the #downloadsWarningDescription is given enough + * vertical space. For tor-browser#40701. + * TODO: May no longer be necessary after esr 115 due to bugzilla bug 1816455. + */ + display: flex; + flex-direction: column; +} + +#downloadsWarning p { + padding-inline: 8px; + margin-block-start: 8px; + margin-block-end: 0; + line-height: 1.4; +} + +#downloadsWarningHeaderTitle { + font-weight: bold; +} + +#downloadsWarningDescription { + /* Make sure we wrap the text rather than request the default max-content + * width from the parent XUL -moz-box. */ + width: 0; +} + #downloadsHistory, #downloadsFooterButtons { margin: 0; ===================================== browser/components/downloads/content/downloads.js ===================================== @@ -31,6 +31,10 @@ "use strict"; +const PREF_SHOW_DOWNLOAD_WARNING = "browser.download.showTorWarning"; + +const TAILS_URI = "https://tails.boum.org/"; + var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); @@ -93,6 +97,13 @@ var DownloadsPanel = { */ _state: 0, + /** + * State of tor's download warning. It should only be initialized once (text assigned, + * button commands assigned). This tracks if that has been performed and prevents + * repeats. + */ + _torWarningInitialized: false, + /** The panel is not linked to downloads data yet. */ get kStateUninitialized() { return 0; @@ -132,6 +143,15 @@ var DownloadsPanel = { ); } + let showDownloadWarning = Services.prefs.getBoolPref( + PREF_SHOW_DOWNLOAD_WARNING + ); + if (!showDownloadWarning) { + document.getElementById("downloadsWarning").hidden = true; + } else { + document.getElementById("downloadsWarning").hidden = false; + } + if (this._state != this.kStateUninitialized) { DownloadsCommon.log("DownloadsPanel is already initialized."); return; @@ -155,6 +175,44 @@ var DownloadsPanel = { DownloadsSummary ); + if (this._torWarningInitialized == 0) { + document.getElementById( + "downloadsWarningHeaderTitle" + ).textContent = this._getString("torbutton.download.warning.title"); + let tailsBrandName = this._getString( + "torbutton.download.warning.tails_brand_name" + ); + + let warningDescriptionText = this._getString( + "torbutton.download.warning.description" + ); + let [head, rest] = warningDescriptionText.split("%S"); + const tailsLink = document.createElement("a"); + tailsLink.setAttribute("href", TAILS_URI); + tailsLink.textContent = tailsBrandName.trim(); + tailsLink.addEventListener("click", event => { + event.preventDefault(); + this.hidePanel(); + openWebLinkIn(TAILS_URI, "tab"); + }); + + let downloadsWarningDescription = document.getElementById( + "downloadsWarningDescription" + ); + downloadsWarningDescription.append(head, tailsLink, rest); + + let dismissBtn = document.getElementById( + "downloadWarningDismiss" + ); + dismissBtn.textContent = this._getString("torbutton.download.warning.dismiss"); + dismissBtn.addEventListener("click", event => { + Services.prefs.setBoolPref(PREF_SHOW_DOWNLOAD_WARNING, false); + document.getElementById("downloadsWarning").hidden = true; + this._focusPanel(true); + }); + this._torWarningInitialized = 1; + } + DownloadsCommon.log( "DownloadsView attached - the panel for this window", "should now see download items come in." @@ -530,16 +588,21 @@ var DownloadsPanel = { /** * Move focus to the main element in the downloads panel, unless another * element in the panel is already focused. + * + * @param {bool} [forceFocus=false] - Whether to force move the focus. */ - _focusPanel() { - // We may be invoked while the panel is still waiting to be shown. - if (this._state != this.kStateShown) { - return; - } + _focusPanel(forceFocus=false) { + if (!forceFocus) { + // We may be invoked while the panel is still waiting to be shown. + if (this._state != this.kStateShown) { + return; + } - if (document.activeElement && this.panel.contains(document.activeElement)) { - return; + if (document.activeElement && this.panel.contains(document.activeElement)) { + return; + } } + let focusOptions = { preventFocusRing: !!this._preventFocusRing }; if (DownloadsView.richListBox.itemCount > 0) { DownloadsView.richListBox.selectedIndex = 0; @@ -658,6 +721,30 @@ var DownloadsPanel = { } }, 0); }, + + /** + * Get a string from the properties bundle. + * + * @param {string} name - The string name. + * + * @return {string} The string. + */ + _getString(name) { + if (!this._stringBundle) { + this._stringBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties" + ); + } + try { + return this._stringBundle.GetStringFromName(name); + } catch {} + if (!this._fallbackStringBundle) { + this._fallbackStringBundle = Services.strings.createBundle( + "resource://torbutton/locale/en-US/torbutton.properties" + ); + } + return this._fallbackStringBundle.GetStringFromName(name); + }, }; XPCOMUtils.defineConstant(this, "DownloadsPanel", DownloadsPanel); ===================================== browser/components/downloads/content/downloadsPanel.inc.xhtml ===================================== @@ -124,6 +124,21 @@ disablekeynav="true"> <panelview id="downloadsPanel-mainView"> + <vbox id="downloadsWarning"> + <vbox role="alert" + aria-labelledby="downloadsWarningHeaderTitle" + aria-describedby="downloadsWarningDescription"> + <html:p id="downloadsWarningHeaderTitle"></html:p> + <html:p id="downloadsWarningDescription"> + </html:p> + + <html:div class="panel-footer"> + <html:button id="downloadWarningDismiss"> + </html:button> + </html:div> + </vbox> + <toolbarseparator /> + </vbox> <vbox class="panel-view-body-unscrollable"> <richlistbox id="downloadsListBox" data-l10n-id="downloads-panel-items" ===================================== browser/themes/shared/customizableui/panelUI-shared.css ===================================== @@ -1324,6 +1324,7 @@ panelview .toolbarbutton-1 { #downloadsFooterButtons > toolbarseparator, .cui-widget-panelview menuseparator, .cui-widget-panel toolbarseparator, +#downloadsWarning toolbarseparator, #securityLevel-panel toolbarseparator { appearance: none; min-height: 0; ===================================== browser/themes/shared/downloads/downloads.inc.css ===================================== @@ -258,6 +258,7 @@ } /*** Toolbarseparator ***/ +#downloadsWarning toolbarseparator, #downloadsFooterButtons > toolbarseparator { margin-inline: 0; } ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.properties ===================================== @@ -32,7 +32,7 @@ torbutton.circuit_display.click_to_copy = Click to Copy torbutton.circuit_display.copied = Copied! # end -# External app blocker +# External app blocker strings used up to 12.0 - TODO: remove when 12.5 becomes stable: torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n @@ -41,6 +41,14 @@ torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on +# Download pane warning +torbutton.download.warning.title = Be careful opening downloads +# %S will be a link to the Tails operating system website. With the content given by torbutton.download.warning.tails_brand_name +torbutton.download.warning.description = Some files may connect to the internet when opened without using Tor. To be safe, open the files while offline or use a portable operating system like %S. +# Locale name for Tails operating system. +torbutton.download.warning.tails_brand_name = Tails +torbutton.download.warning.dismiss = Got it + # .Onion Page Info prompt. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) ===================================== toolkit/torbutton/components/external-app-blocker.js deleted ===================================== @@ -1,160 +0,0 @@ -// Bug 1506 Android P1/TBB P5: This code provides users with notification -// in the event of external app launch. We want it to exist in the desktop -// port, but it is probably useless for Android. - -/************************************************************************* - * External App Handler. - * Handles displaying confirmation dialogs for external apps and protocols - * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 - * - * An instance of this module is created each time the browser starts to - * download a file and when an external application may be invoked to - * handle an URL (e.g., when the user clicks on a mailto: URL). - *************************************************************************/ - -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { PromptUtils } = ChromeUtils.import( - "resource://gre/modules/SharedPromptUtils.jsm" -); - -XPCOMUtils.defineLazyModuleGetters(this, { - ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", -}); - -let { torbutton_get_property_string } = ChromeUtils.import( - "resource://torbutton/modules/utils.js" -); - -// Module specific constants -const kMODULE_NAME = "Torbutton External App Handler"; -const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1"; -const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); - -const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; - -function ExternalAppBlocker() { - this.logger = Cc["@torproject.org/torbutton-logger;1"].getService( - Ci.nsISupports - ).wrappedJSObject; - this.logger.log(3, "Component Load 0: New ExternalAppBlocker."); -} - -ExternalAppBlocker.prototype = { - _helperAppLauncher: undefined, - - QueryInterface: ChromeUtils.generateQI([ - Ci.nsIObserver, - Ci.nsIHelperAppWarningDialog, - ]), - - // make this an nsIClassInfo object - flags: Ci.nsIClassInfo.DOM_OBJECT, - classDescription: kMODULE_NAME, - contractID: kCONTRACT_ID, - classID: kMODULE_CID, - - // method of nsIClassInfo - getInterfaces(count) { - count.value = kInterfaces.length; - return kInterfaces; - }, - - // method of nsIClassInfo - getHelperForLanguage(count) { - return null; - }, - - // method of nsIHelperAppWarningDialog - maybeShow(aLauncher, aWindowContext) { - // Hold a reference to the object that called this component. This is - // important not just because we need to later invoke the - // continueRequest() or cancelRequest() callback on aLauncher, but also - // so that the launcher object (which is a reference counted object) is - // not released too soon. - this._helperAppLauncher = aLauncher; - - if (!Services.prefs.getBoolPref("extensions.torbutton.launch_warning")) { - this._helperAppLauncher.continueRequest(); - return; - } - - this._showPrompt(aWindowContext); - }, - - /* - * The _showPrompt() implementation uses some XUL and JS that is part of the - * browser's confirmEx() implementation. Specifically, _showPrompt() depends - * on chrome://global/content/commonDialog.xhtml as well as some of the code - * in resource://gre/modules/SharedPromptUtils.jsm. - */ - _showPrompt(aWindowContext) { - let parentWin; - try { - parentWin = aWindowContext.getInterface(Ci.nsIDOMWindow); - } catch (e) { - parentWin = Services.wm.getMostRecentWindow("navigator:browser"); - } - - let title = torbutton_get_property_string("torbutton.popup.external.title"); - let app = torbutton_get_property_string("torbutton.popup.external.app"); - let note = torbutton_get_property_string("torbutton.popup.external.note"); - let suggest = torbutton_get_property_string( - "torbutton.popup.external.suggest" - ); - let launch = torbutton_get_property_string("torbutton.popup.launch"); - let cancel = torbutton_get_property_string("torbutton.popup.cancel"); - let dontask = torbutton_get_property_string("torbutton.popup.dontask"); - - let args = { - promptType: "confirmEx", - title, - text: app + note + suggest + " ", - checkLabel: dontask, - checked: false, - ok: false, - button0Label: launch, - button1Label: cancel, - defaultButtonNum: 1, // Cancel - buttonNumClicked: 1, // Cancel - enableDelay: true, - }; - - let propBag = PromptUtils.objectToPropBag(args); - let uri = "chrome://global/content/commonDialog.xhtml"; - let promptWin = Services.ww.openWindow( - parentWin, - uri, - "_blank", - "centerscreen,chrome,titlebar", - propBag - ); - promptWin.addEventListener("load", aEvent => { - promptWin.addEventListener("unload", aEvent => { - PromptUtils.propBagToObject(propBag, args); - - if (0 == args.buttonNumClicked) { - // Save the checkbox value and tell the browser's external helper app - // module about the user's choice. - if (args.checked) { - Services.prefs.setBoolPref( - "extensions.torbutton.launch_warning", - false - ); - } - - this._helperAppLauncher.continueRequest(); - } else { - this._helperAppLauncher.cancelRequest(Cr.NS_BINDING_ABORTED); - } - }); - }); - }, -}; - -// Assign factory to global object. -const NSGetFactory = XPCOMUtils.generateNSGetFactory - ? XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]) - : ComponentUtils.generateNSGetFactory([ExternalAppBlocker]); ===================================== toolkit/torbutton/jar.mn ===================================== @@ -34,9 +34,6 @@ torbutton.jar: % component {f605ec27-d867-44b5-ad97-2a29276642c3} %components/dragDropFilter.js % contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} -% component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} %components/external-app-blocker.js -% contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} - % component {06322def-6fde-4c06-aef6-47ae8e799629} %components/startup-observer.js % contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -144,9 +144,6 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] = static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] = "browser.helperApps.neverAsk.openFile"; -static const char WARNING_DIALOG_CONTRACT_ID[] = - "@torproject.org/torbutton-extAppBlocker;1"; - StaticRefPtr<nsIFile> sFallbackDownloadDir; // Helper functions for Content-Disposition headers @@ -398,22 +395,6 @@ nsresult GenerateRandomName(nsACString& result) { return NS_OK; } -static already_AddRefed<nsIInterfaceRequestor> GetDialogParentAux( - BrowsingContext* aBrowsingContext, nsIInterfaceRequestor* aWindowContext) { - nsCOMPtr<nsIInterfaceRequestor> dialogParent = aWindowContext; - - if (!dialogParent && aBrowsingContext) { - dialogParent = do_QueryInterface(aBrowsingContext->GetDOMWindow()); - } - if (!dialogParent && aBrowsingContext && XRE_IsParentProcess()) { - RefPtr<Element> element = aBrowsingContext->Top()->GetEmbedderElement(); - if (element) { - dialogParent = do_QueryInterface(element->OwnerDoc()->GetWindow()); - } - } - return dialogParent.forget(); -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -611,96 +592,6 @@ static const char* descriptionOverwriteExtensions[] = { "avif", "jxl", "pdf", "svg", "webp", "xml", }; -////////////////////////////////////////////////////////////////////////////////////////////////////// -// begin nsExternalLoadURIHandler class definition and implementation -////////////////////////////////////////////////////////////////////////////////////////////////////// -class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher { - public: - NS_DECL_THREADSAFE_ISUPPORTS - NS_DECL_NSIHELPERAPPWARNINGLAUNCHER - - nsExternalLoadURIHandler(nsIHandlerInfo* aHandlerInfo, nsIURI* aURI, - nsIPrincipal* aTriggeringPrincipal, - BrowsingContext* aBrowsingContext, - bool aTriggeredExternally); - - protected: - ~nsExternalLoadURIHandler(); - - nsCOMPtr<nsIHandlerInfo> mHandlerInfo; - nsCOMPtr<nsIURI> mURI; - nsCOMPtr<nsIPrincipal> mTriggeringPrincipal; - RefPtr<BrowsingContext> mBrowsingContext; - bool mTriggeredExternally; - nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; -}; - -NS_IMPL_ADDREF(nsExternalLoadURIHandler) -NS_IMPL_RELEASE(nsExternalLoadURIHandler) - -NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher) - NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) -NS_INTERFACE_MAP_END - -nsExternalLoadURIHandler::nsExternalLoadURIHandler( - nsIHandlerInfo* aHandlerInfo, nsIURI* aURI, - nsIPrincipal* aTriggeringPrincipal, BrowsingContext* aBrowsingContext, - bool aTriggeredExternally) - : mHandlerInfo(aHandlerInfo), - mURI(aURI), - mTriggeringPrincipal(aTriggeringPrincipal), - mBrowsingContext(aBrowsingContext), - mTriggeredExternally(aTriggeredExternally) - -{ - nsresult rv = NS_OK; - mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); - if (NS_SUCCEEDED(rv) && mWarningDialog) { - // This will create a reference cycle (the dialog holds a reference to us - // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest - // or CancelRequest. - nsCOMPtr<nsIInterfaceRequestor> dialogParent = - GetDialogParentAux(aBrowsingContext, nullptr); - rv = mWarningDialog->MaybeShow(this, dialogParent); - } - - if (NS_FAILED(rv)) { - // If for some reason we could not open the download warning prompt, - // continue with the request. - ContinueRequest(); - } -} - -nsExternalLoadURIHandler::~nsExternalLoadURIHandler() {} - -NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() { - MOZ_ASSERT(mURI); - MOZ_ASSERT(mHandlerInfo); - - // Break our reference cycle with the download warning dialog (set up in - // LoadURI). - mWarningDialog = nullptr; - - nsresult rv = NS_OK; - nsCOMPtr<nsIContentDispatchChooser> chooser = - do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - return chooser->HandleURI(mHandlerInfo, mURI, mTriggeringPrincipal, - mBrowsingContext, mTriggeredExternally); -} - -NS_IMETHODIMP nsExternalLoadURIHandler::CancelRequest(nsresult aReason) { - NS_ENSURE_ARG(NS_FAILED(aReason)); - - // Break our reference cycle with the download warning dialog (set up in - // LoadURI). - mWarningDialog = nullptr; - - return NS_OK; -} - static StaticRefPtr<nsExternalHelperAppService> sExtHelperAppSvcSingleton; /** @@ -723,9 +614,6 @@ nsExternalHelperAppService::GetSingleton() { return do_AddRef(sExtHelperAppSvcSingleton); } -////////////////////////////////////////////////////////////////////////////////////////////////////// -// nsExternalHelperAppService definition and implementation -////////////////////////////////////////////////////////////////////////////////////////////////////// NS_IMPL_ISUPPORTS(nsExternalHelperAppService, nsIExternalHelperAppService, nsPIExternalAppLauncher, nsIExternalProtocolService, nsIMIMEService, nsIObserver, nsISupportsWeakReference) @@ -1238,15 +1126,14 @@ nsExternalHelperAppService::LoadURI(nsIURI* aURI, rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); - RefPtr<nsExternalLoadURIHandler> h = new nsExternalLoadURIHandler( + nsCOMPtr<nsIContentDispatchChooser> chooser = + do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + + return chooser->HandleURI( handler, escapedURI, aRedirectPrincipal ? aRedirectPrincipal : aTriggeringPrincipal, aBrowsingContext, aTriggeredExternally); - if (!h) { - return NS_ERROR_OUT_OF_MEMORY; - } - - return NS_OK; } ////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1391,7 +1278,6 @@ NS_INTERFACE_MAP_BEGIN(nsExternalAppHandler) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIHelperAppLauncher) - NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) NS_INTERFACE_MAP_ENTRY(nsICancelable) NS_INTERFACE_MAP_ENTRY(nsIBackgroundFileSaverObserver) NS_INTERFACE_MAP_ENTRY(nsINamed) @@ -1647,7 +1533,18 @@ void nsExternalAppHandler::MaybeApplyDecodingForExtension( already_AddRefed<nsIInterfaceRequestor> nsExternalAppHandler::GetDialogParent() { - return GetDialogParentAux(mBrowsingContext, mWindowContext); + nsCOMPtr<nsIInterfaceRequestor> dialogParent = mWindowContext; + + if (!dialogParent && mBrowsingContext) { + dialogParent = do_QueryInterface(mBrowsingContext->GetDOMWindow()); + } + if (!dialogParent && mBrowsingContext && XRE_IsParentProcess()) { + RefPtr<Element> element = mBrowsingContext->Top()->GetEmbedderElement(); + if (element) { + dialogParent = do_QueryInterface(element->OwnerDoc()->GetWindow()); + } + } + return dialogParent.forget(); } NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) { @@ -1795,34 +1692,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) { loadInfo->SetForceAllowDataURI(true); } - mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); - if (NS_SUCCEEDED(rv) && mWarningDialog) { - // This will create a reference cycle (the dialog holds a reference to us - // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest - // or CancelRequest. - nsCOMPtr<nsIInterfaceRequestor> dialogParent = GetDialogParent(); - rv = mWarningDialog->MaybeShow(this, dialogParent); - } - - if (NS_FAILED(rv)) { - // If for some reason we could not open the download warning prompt, - // continue with the request. - ContinueRequest(); - } - - return NS_OK; -} - -NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() { - nsAutoCString MIMEType; - if (mMimeInfo) { - mMimeInfo->GetMIMEType(MIMEType); - } - - // Break our reference cycle with the download warning dialog (set up in - // OnStartRequest). - mWarningDialog = nullptr; - // now that the temp file is set up, find out if we need to invoke a dialog // asking the user what they want us to do with this content... @@ -1968,7 +1837,7 @@ NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() { GetTargetFile(getter_AddRefs(fileToTest)); if (fileToTest) { bool isExecutable; - nsresult rv = fileToTest->IsExecutable(&isExecutable); + rv = fileToTest->IsExecutable(&isExecutable); if (NS_FAILED(rv) || mTempFileIsExecutable || isExecutable) { // checking NS_FAILED, because paranoia is good alwaysAsk = true; @@ -1984,7 +1853,20 @@ NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() { } #endif - nsresult rv = NS_OK; + nsAutoCString actionTelem; + if (alwaysAsk) { + actionTelem.AssignLiteral("ask"); + } else if (shouldAutomaticallyHandleInternally) { + actionTelem.AssignLiteral("internal"); + } else if (action == nsIMIMEInfo::useHelperApp || + action == nsIMIMEInfo::useSystemDefault) { + actionTelem.AssignLiteral("external"); + } else { + actionTelem.AssignLiteral("save"); + } + + RecordDownloadTelemetry(aChannel, actionTelem.get()); + if (alwaysAsk) { // Display the dialog mDialog = do_CreateInstance(NS_HELPERAPPLAUNCHERDLG_CONTRACTID, &rv); @@ -2017,14 +1899,6 @@ NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() { return NS_OK; } -NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) { - // Break our reference cycle with the download warning dialog (set up in - // OnStartRequest). - mWarningDialog = nullptr; - - return Cancel(aReason); -} - void nsExternalAppHandler::RecordDownloadTelemetry(nsIChannel* aChannel, const char* aAction) { // Telemetry for helper app dialog @@ -2888,7 +2762,7 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) { } // Break our reference cycle with the helper app dialog (set up in - // ContinueRequest) + // OnStartRequest) mDialog = nullptr; mDialogShowing = false; ===================================== uriloader/exthandler/nsExternalHelperAppService.h ===================================== @@ -261,7 +261,6 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService, */ class nsExternalAppHandler final : public nsIStreamListener, public nsIHelperAppLauncher, - public nsIHelperAppWarningLauncher, public nsIBackgroundFileSaverObserver, public nsINamed { public: @@ -269,7 +268,6 @@ class nsExternalAppHandler final : public nsIStreamListener, NS_DECL_NSISTREAMLISTENER NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIHELPERAPPLAUNCHER - NS_DECL_NSIHELPERAPPWARNINGLAUNCHER NS_DECL_NSICANCELABLE NS_DECL_NSIBACKGROUNDFILESAVEROBSERVER NS_DECL_NSINAMED @@ -546,7 +544,6 @@ class nsExternalAppHandler final : public nsIStreamListener, nsCOMPtr<nsITransfer> mTransfer; nsCOMPtr<nsIHelperAppLauncherDialog> mDialog; - nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; /** ===================================== uriloader/exthandler/nsIExternalHelperAppService.idl ===================================== @@ -189,50 +189,3 @@ interface nsIHelperAppLauncher : nsICancelable */ readonly attribute uint64_t browsingContextId; }; - -/** - * nsIHelperAppWarningLauncher is implemented by two classes: - * nsExternalLoadURIHandler - * nsExternalAppHandler - */ -[scriptable, uuid(cffd508b-4aaf-43ad-99c6-671d35cbc558)] -interface nsIHelperAppWarningLauncher : nsISupports -{ - /** - * Callback invoked by the external app warning dialog to continue the - * request. - * NOTE: This will release the reference to the nsIHelperAppWarningDialog. - */ - void continueRequest(); - - /** - * Callback invoked by the external app warning dialog to cancel the request. - * NOTE: This will release the reference to the nsIHelperAppWarningDialog. - * - * @param aReason - * Pass a failure code to indicate the reason why this operation is - * being canceled. It is an error to pass a success code. - */ - void cancelRequest(in nsresult aReason); -}; - -/** - * nsIHelperAppWarningDialog is implemented by Torbutton's external app - * blocker (src/components/external-app-blocker.js). - */ -[scriptable, uuid(f4899a3f-0df3-42cc-9db8-bdf599e5a208)] -interface nsIHelperAppWarningDialog : nsISupports -{ - /** - * Possibly show a launch warning dialog (it will not be shown if the user - * has chosen to not see the warning again). - * - * @param aLauncher - * A nsIHelperAppWarningLauncher to be invoked after the user confirms - * or cancels the download. - * @param aWindowContext - * The window associated with the download. - */ - void maybeShow(in nsIHelperAppWarningLauncher aLauncher, - in nsISupports aWindowContext); -}; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4d0bea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4d0bea… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-102.2.1-12.5-1-build4
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed new tag tor-browser-102.2.1-12.5-1-build4 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-102… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-102.2.1-12.5-1] 2 commits: Bug 1816059 - Show the notification for entering fullscreen as a Toast
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed to branch tor-browser-102.2.1-12.5-1 at The Tor Project / Applications / fenix Commits: cdaac9f3 by Mugurell at 2023-04-12T16:37:12+00:00 Bug 1816059 - Show the notification for entering fullscreen as a Toast - - - - - 850f7163 by Alexandru2909 at 2023-04-12T16:37:12+00:00 Add FLAG_SECURE to SearchDialogFragment - - - - - 3 changed files: - app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt - + app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt ===================================== @@ -17,6 +17,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.accessibility.AccessibilityManager +import android.widget.Toast import androidx.annotation.CallSuper import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AlertDialog @@ -1381,12 +1382,8 @@ abstract class BaseBrowserFragment : if (inFullScreen) { // Close find in page bar if opened findInPageIntegration.onBackPressed() - FenixSnackbar.make( - view = binding.dynamicSnackbarContainer, - duration = Snackbar.LENGTH_SHORT, - isDisplayedWithBrowserToolbar = false - ) - .setText(getString(R.string.full_screen_notification)) + Toast + .makeText(requireContext(), R.string.full_screen_notification, Toast.LENGTH_SHORT) .show() activity?.enterToImmersiveMode() browserToolbarView.collapse() ===================================== app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt ===================================== @@ -78,6 +78,7 @@ import org.mozilla.fenix.databinding.SearchSuggestionsHintBinding import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.ext.requireComponents +import org.mozilla.fenix.ext.secure import org.mozilla.fenix.ext.settings import org.mozilla.fenix.search.awesomebar.AwesomeBarView import org.mozilla.fenix.search.awesomebar.toSearchProviderState @@ -151,6 +152,10 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { override fun onBackPressed() { this(a)SearchDialogFragment.onBackPressed() } + }.apply { + if ((requireActivity() as HomeActivity).browsingModeManager.mode.isPrivate) { + this.secure(requireActivity()) + } } } ===================================== app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt ===================================== @@ -0,0 +1,212 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.search + +import android.view.WindowManager.LayoutParams +import androidx.fragment.app.Fragment +import androidx.navigation.NavBackStackEntry +import androidx.navigation.NavController +import androidx.navigation.fragment.findNavController +import io.mockk.Called +import io.mockk.Runs +import io.mockk.every +import io.mockk.just +import io.mockk.mockk +import io.mockk.mockkStatic +import io.mockk.spyk +import io.mockk.unmockkStatic +import io.mockk.verify +import mozilla.components.browser.state.search.SearchEngine +import mozilla.components.browser.state.state.SearchState +import mozilla.components.browser.state.state.searchEngines +import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine +import mozilla.components.support.test.robolectric.testContext +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertSame +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mozilla.fenix.HomeActivity +import org.mozilla.fenix.components.Components +import org.mozilla.fenix.ext.requireComponents +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner + +@RunWith(FenixRobolectricTestRunner::class) +internal class SearchDialogFragmentTest { + private val navController: NavController = mockk() + private val fragment = SearchDialogFragment() + + @Before + fun setup() { + mockkStatic("androidx.navigation.fragment.FragmentKt") + every { any<Fragment>().findNavController() } returns navController + } + + @After + fun teardown() { + unmockkStatic("androidx.navigation.fragment.FragmentKt") + } + + @Test + fun `GIVEN this is the only visible fragment WHEN asking for the previous destination THEN return null`() { + every { navController.backQueue } returns ArrayDeque(listOf(getDestination(fragmentName))) + + assertNull(fragment.getPreviousDestination()) + } + + @Test + fun `GIVEN this and FragmentB on top of this are visible WHEN asking for the previous destination THEN return null`() { + every { navController.backQueue } returns ArrayDeque( + listOf( + getDestination(fragmentName), + getDestination("FragmentB"), + ), + ) + + assertNull(fragment.getPreviousDestination()) + } + + @Test + fun `GIVEN FragmentA, this and FragmentB are visible WHEN asking for the previous destination THEN return FragmentA`() { + val fragmentADestination = getDestination("FragmentA") + every { navController.backQueue } returns ArrayDeque( + listOf( + fragmentADestination, + getDestination(fragmentName), + getDestination("FragmentB"), + ), + ) + + assertSame(fragmentADestination, fragment.getPreviousDestination()) + } + + @Test + fun `GIVEN FragmentA and this on top of it are visible WHEN asking for the previous destination THEN return FragmentA`() { + val fragmentADestination = getDestination("FragmentA") + every { navController.backQueue } returns ArrayDeque( + listOf( + fragmentADestination, + getDestination(fragmentName), + ), + ) + + assertSame(fragmentADestination, fragment.getPreviousDestination()) + } + + @Test + fun `GIVEN the default search engine is currently selected WHEN checking the need to update the current search engine THEN don't to anything`() { + fragment.interactor = mockk() + val defaultSearchEngine: SearchEngine = mockk { + every { id } returns "default" + } + val otherSearchEngine: SearchEngine = mockk { + every { id } returns "other" + } + val components: Components = mockk { + every { core.store.state.search } returns mockk(relaxed = true) { + every { searchEngines } returns listOf(otherSearchEngine, defaultSearchEngine) + } + } + mockkStatic( + "org.mozilla.fenix.ext.FragmentKt", + "mozilla.components.browser.state.state.SearchStateKt", + ) { + every { any<Fragment>().requireComponents } returns components + every { any<SearchState>().selectedOrDefaultSearchEngine } returns defaultSearchEngine + + fragment.maybeSelectShortcutEngine(defaultSearchEngine.id) + + verify { fragment.interactor wasNot Called } + } + } + + @Test + fun `GIVEN the default search engine is not currently selected WHEN checking the need to update the current search engine THEN update it to the current engine`() { + fragment.interactor = mockk { + every { onSearchShortcutEngineSelected(any()) } just Runs + } + val defaultSearchEngine: SearchEngine = mockk { + every { id } returns "default" + } + val otherSearchEngine: SearchEngine = mockk { + every { id } returns "other" + } + val components: Components = mockk { + every { core.store.state.search } returns mockk(relaxed = true) { + every { searchEngines } returns listOf(otherSearchEngine, defaultSearchEngine) + } + } + mockkStatic( + "org.mozilla.fenix.ext.FragmentKt", + "mozilla.components.browser.state.state.SearchStateKt", + ) { + every { any<Fragment>().requireComponents } returns components + every { any<SearchState>().selectedOrDefaultSearchEngine } returns defaultSearchEngine + + fragment.maybeSelectShortcutEngine(otherSearchEngine.id) + + verify { fragment.interactor.onSearchShortcutEngineSelected(otherSearchEngine) } + } + } + + @Test + fun `GIVEN the currently selected search engine is unknown WHEN checking the need to update the current search engine THEN don't do anything`() { + fragment.interactor = mockk() + + fragment.maybeSelectShortcutEngine(null) + + verify { fragment.interactor wasNot Called } + } + + @Test + fun `GIVEN app is in private mode WHEN search dialog is created THEN the dialog is secure`() { + val activity: HomeActivity = mockk(relaxed = true) + val fragment = spyk(SearchDialogFragment()) + val layoutParams = LayoutParams() + layoutParams.flags = LayoutParams.FLAG_SECURE + + every { activity.browsingModeManager.mode.isPrivate } returns true + every { activity.window } returns mockk(relaxed = true) { + every { attributes } returns LayoutParams().apply { flags = LayoutParams.FLAG_SECURE } + } + every { fragment.requireActivity() } returns activity + every { fragment.requireContext() } returns testContext + + val dialog = fragment.onCreateDialog(null) + + assertEquals(LayoutParams.FLAG_SECURE, dialog.window?.attributes?.flags!! and LayoutParams.FLAG_SECURE) + } + + @Test + fun `GIVEN app is in normal mode WHEN search dialog is created THEN the dialog is not secure`() { + val activity: HomeActivity = mockk(relaxed = true) + val fragment = spyk(SearchDialogFragment()) + val layoutParams = LayoutParams() + layoutParams.flags = LayoutParams.FLAG_SECURE + + every { activity.browsingModeManager.mode.isPrivate } returns false + every { activity.window } returns mockk(relaxed = true) { + every { attributes } returns LayoutParams().apply { flags = LayoutParams.FLAG_SECURE } + } + every { fragment.requireActivity() } returns activity + every { fragment.requireContext() } returns testContext + + val dialog = fragment.onCreateDialog(null) + + assertEquals(0, dialog.window?.attributes?.flags!! and LayoutParams.FLAG_SECURE) + } +} + +private val fragmentName = SearchDialogFragment::class.java.canonicalName?.substringAfterLast('.')!! + +private fun getDestination(destinationName: String): NavBackStackEntry { + return mockk { + every { destination } returns mockk { + every { displayName } returns "test.id/$destinationName" + } + } +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/5c26f2353ef1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/5c26f2353ef1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.10.0esr-12.5-1-build2
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed new tag tor-browser-102.10.0esr-12.5-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 5 commits: Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers, valentin
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5d5d2455 by Kershaw Chang at 2023-04-12T16:35:04+00:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - 1ef8ee04 by Hubert Boma Manilla at 2023-04-12T16:35:05+00:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - 6957f008 by Hubert Boma Manilla at 2023-04-12T16:35:05+00:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - 64b502e0 by Jon Coppeard at 2023-04-12T16:35:05+00:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - 4d0bea87 by Jon Coppeard at 2023-04-12T16:35:06+00:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - 30 changed files: - devtools/client/debugger/packages/devtools-source-map/src/source-map.js - devtools/client/debugger/packages/devtools-source-map/src/utils/fetchSourceMap.js - devtools/client/debugger/packages/devtools-source-map/src/utils/privileged-network-request.js - devtools/client/debugger/test/mochitest/browser.ini - + devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-redirect.js - devtools/client/debugger/test/mochitest/shared-head.js - devtools/client/framework/test/browser.ini - devtools/client/framework/test/browser_source_map-reload.js - − devtools/client/framework/test/code_bundle_reload_1.js - − devtools/client/framework/test/code_bundle_reload_1.js.map - − devtools/client/framework/test/code_bundle_reload_2.js - − devtools/client/framework/test/code_bundle_reload_2.js.map - + devtools/client/framework/test/reload/.eslintrc.js - + devtools/client/framework/test/reload/README.md - + devtools/client/framework/test/reload/package.json - + devtools/client/framework/test/reload/v1/code_bundle_reload.js - + devtools/client/framework/test/reload/v1/code_bundle_reload.js.map - devtools/client/framework/test/code_reload_1.js → devtools/client/framework/test/reload/v1/code_reload_1.js - devtools/client/framework/test/doc_reload.html → devtools/client/framework/test/reload/v1/doc_reload.html - + devtools/client/framework/test/reload/v2/code_bundle_reload.js - + devtools/client/framework/test/reload/v2/code_bundle_reload.js.map - devtools/client/framework/test/code_reload_2.js → devtools/client/framework/test/reload/v2/code_reload_2.js - + devtools/client/framework/test/reload/v2/doc_reload.html - + devtools/client/framework/test/reload/webpack.config.js - − devtools/client/framework/test/sjs_code_bundle_reload_map.sjs - − devtools/client/framework/test/sjs_code_reload.sjs - devtools/client/shared/test/shared-head.js - dom/fetch/FetchDriver.cpp - js/src/debugger/DebugAPI-inl.h - js/src/debugger/DebugAPI.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/307d5a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/307d5a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.10.0esr-12.5-1-build2
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed new tag base-browser-102.10.0esr-12.5-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] 5 commits: Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers, valentin
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c2c2ae6b by Kershaw Chang at 2023-04-12T16:33:02+00:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - 6e2aeeed by Hubert Boma Manilla at 2023-04-12T16:33:03+00:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - 56ac62b9 by Hubert Boma Manilla at 2023-04-12T16:33:03+00:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - fd6ffb84 by Jon Coppeard at 2023-04-12T16:33:04+00:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - 52a82664 by Jon Coppeard at 2023-04-12T16:33:04+00:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - 30 changed files: - devtools/client/debugger/packages/devtools-source-map/src/source-map.js - devtools/client/debugger/packages/devtools-source-map/src/utils/fetchSourceMap.js - devtools/client/debugger/packages/devtools-source-map/src/utils/privileged-network-request.js - devtools/client/debugger/test/mochitest/browser.ini - + devtools/client/debugger/test/mochitest/browser_dbg-sourcemaps-redirect.js - devtools/client/debugger/test/mochitest/shared-head.js - devtools/client/framework/test/browser.ini - devtools/client/framework/test/browser_source_map-reload.js - − devtools/client/framework/test/code_bundle_reload_1.js - − devtools/client/framework/test/code_bundle_reload_1.js.map - − devtools/client/framework/test/code_bundle_reload_2.js - − devtools/client/framework/test/code_bundle_reload_2.js.map - + devtools/client/framework/test/reload/.eslintrc.js - + devtools/client/framework/test/reload/README.md - + devtools/client/framework/test/reload/package.json - + devtools/client/framework/test/reload/v1/code_bundle_reload.js - + devtools/client/framework/test/reload/v1/code_bundle_reload.js.map - devtools/client/framework/test/code_reload_1.js → devtools/client/framework/test/reload/v1/code_reload_1.js - devtools/client/framework/test/doc_reload.html → devtools/client/framework/test/reload/v1/doc_reload.html - + devtools/client/framework/test/reload/v2/code_bundle_reload.js - + devtools/client/framework/test/reload/v2/code_bundle_reload.js.map - devtools/client/framework/test/code_reload_2.js → devtools/client/framework/test/reload/v2/code_reload_2.js - + devtools/client/framework/test/reload/v2/doc_reload.html - + devtools/client/framework/test/reload/webpack.config.js - − devtools/client/framework/test/sjs_code_bundle_reload_map.sjs - − devtools/client/framework/test/sjs_code_reload.sjs - devtools/client/shared/test/shared-head.js - dom/fetch/FetchDriver.cpp - js/src/debugger/DebugAPI-inl.h - js/src/debugger/DebugAPI.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b53567… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b53567… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.10.0esr-12.0-1-build2
by Richard Pospesel (＠richard) 12 Apr '23

12 Apr '23

Richard Pospesel pushed new tag base-browser-102.10.0esr-12.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0