- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: adfc97d5 by Richard Pospesel at 2023-04-14T19:47:31+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 1 changed file: - tools/torbrowser/bridges.js Changes: ===================================== tools/torbrowser/bridges.js ===================================== @@ -7,71 +7,56 @@ pref( ); pref( "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.5", + "extensions.torlauncher.default_bridge.obfs4.3", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.6", + "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.7", - "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", + "extensions.torlauncher.default_bridge.obfs4.5", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.9", + "extensions.torlauncher.default_bridge.obfs4.6", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.10", + "extensions.torlauncher.default_bridge.obfs4.7", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.11", + "extensions.torlauncher.default_bridge.obfs4.8", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.12", + "extensions.torlauncher.default_bridge.obfs4.9", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.13", + "extensions.torlauncher.default_bridge.obfs4.10", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.14", - "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.15", + "extensions.torlauncher.default_bridge.obfs4.11", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ); -pref( - "extensions.torlauncher.default_bridge.obfs4.16", - "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" -); pref( "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" ); pref( "extensions.torlauncher.default_bridge.snowflake.1", - "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.2", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adfc97d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adfc97d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.5-build2
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

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

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch 12.0.5-build2
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed new branch 12.0.5-build2 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/12.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] fixup! Bug 40814: Prepare stable release 12.0.5
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: b6a60199 by Richard Pospesel at 2023-04-12T16:06:53+00:00 fixup! Bug 40814: Prepare stable release 12.0.5 - - - - - 4 changed files: - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/fenix/config - projects/firefox/config - projects/geckoview/config Changes: ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,4 +1,4 @@ -Tor Browser 12.0.5 - April 06 2023 +Tor Browser 12.0.5 - April 12 2023 * All Platforms * Updated Translations * Updated NoScript to 11.4.21 @@ -9,6 +9,7 @@ Tor Browser 12.0.5 - April 06 2023 * Bug 41526: "Cancel" button when establishing a connection should be grey [tor-browser] * Android * Updated GeckoView to 102.10esr + * Bug 41724: Backport Android-specific security fixes from Firefox 112 to ESR 102.10-based Tor Browser [tor-browser] * Build System * Windows * Bug 40822: The Tor Browser installer doesn't run with mandatory ASLR on (0xc000007b) [tor-browser-build] ===================================== projects/fenix/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build3' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build4' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_platform_version: 102.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.0-1' - browser_build: 1 + browser_build: 2 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -14,7 +14,7 @@ container: var: geckoview_version: 102.10.0esr torbrowser_branch: 12.0-1 - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… 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] 8 commits: fixup! Bug 40597: Implement TorSettings module
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: 1222e90d by Henry Wilkes at 2023-04-13T19:07:38+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. Rename the `hasBootstrapEverFailed` to `potentiallyBlocked` as a specific failure state. Add the `hasEverFailed` boolean property as a catch-all failure state. Add an `enabled` boolean property, which just maps to whether we own the tor process. - - - - - b652316e by Henry Wilkes at 2023-04-13T19:07:39+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. Just use the HasEverFailed state to determine whether to show "Try Again" or to show breadcrumbs. - - - - - 60d18fa7 by Henry Wilkes at 2023-04-13T19:07:39+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. No longer import TorMonitorService, and just use TorConnect instead. + Use TorConnect.enabled to determine whether to show the settings. + Use TorConnect.hasEverFailed state rather than TorMonitorService.bootstrapErrorOccurred to determine whether to show "Try Again". + Use TorConnect.potentiallyBlocked to determine whether to show the location selector. E.g. we don't want to show this if we just failed an internet connection test. - - - - - 9fe1259d by Henry Wilkes at 2023-04-13T19:07:40+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41608 - Remove unused TorMonitorService.bootstrapErrorOccurred - - - - - d6c9dd4f by Henry Wilkes at 2023-04-13T19:07:40+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Remove unused TorMonitorService.bootstrapErrorOccurred - - - - - 2a8e78df by Henry Wilkes at 2023-04-13T19:07:41+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Add the canBeginBootstrap and canBeginAutoBootstrap properties to determine whether it is possible to enter the corresponding TorConnectState from the current state. Add options to openTorConnect to begin bootstrapping or auto-bootstrapping once opened. - - - - - 203f9488 by Henry Wilkes at 2023-04-13T19:07:41+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Use TorConnect.canBeginBootstrap and TorConnect.canBeginAutoBootstrap and use bootstrapping options in openAboutTor. Selecting a location in the preferences now also opens "about:torconnect". - - - - - e109bbd2 by Henry Wilkes at 2023-04-13T19:07:42+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 - Remove the FatalError state since it is not defined in TorConnect. - - - - - 5 changed files: - browser/components/torconnect/TorConnectParent.jsm - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorConnect.jsm - toolkit/components/tor-launcher/TorMonitorService.jsm Changes: ===================================== browser/components/torconnect/TorConnectParent.jsm ===================================== @@ -38,7 +38,7 @@ class TorConnectParent extends JSWindowActorParent { InternetStatus: TorConnect.internetStatus, DetectedLocation: TorConnect.detectedLocation, ShowViewLog: TorConnect.logHasWarningOrError, - HasBootsrapEverFailed: TorConnect.hasBootstrapEverFailed, + HasEverFailed: TorConnect.hasEverFailed, QuickStartEnabled: TorSettings.quickstart.enabled, UIState: TorConnect.uiState, }; @@ -67,8 +67,7 @@ class TorConnectParent extends JSWindowActorParent { self.state.ErrorMessage = null; self.state.ErrorDetails = null; } - self.state.HasBootsrapEverFailed = - TorConnect.hasBootstrapEverFailed; + self.state.HasEverFailed = TorConnect.hasEverFailed; break; } case TorConnectTopics.BootstrapProgress: { @@ -89,10 +88,6 @@ class TorConnectParent extends JSWindowActorParent { self.state.ShowViewLog = true; break; } - case TorConnectTopics.FatalError: { - // TODO: handle - break; - } case TorSettingsTopics.SettingChanged: { if (aData === TorSettingsData.QuickStartEnabled) { self.state.QuickStartEnabled = obj.value; ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -142,7 +142,6 @@ class AboutTorConnect { uiState = { currentState: UIStates.ConnectToTor, - connectIsTryAgain: false, allowAutomaticLocation: true, selectedLocation: "automatic", bootstrapCause: UIStates.ConnectToTor, @@ -389,12 +388,6 @@ class AboutTorConnect { } update_Error(state) { - if (!this.uiState.connectIsTryAgain) { - // TorConnect.hasBootstrapEverFailed remains false in case of Internet - // offline - this.uiState.connectIsTryAgain = true; - this.saveUIState(); - } if (!state.StateChanged) { return; } @@ -457,7 +450,7 @@ class AboutTorConnect { if (state?.StateChanged) { this.elements.connectButton.focus(); } - if (this.uiState.connectIsTryAgain) { + if (state.HasEverFailed) { this.setBreadcrumbsStatus( BreadcrumbStatus.Active, BreadcrumbStatus.Default, @@ -481,7 +474,7 @@ class AboutTorConnect { switch (this.uiState.bootstrapCause) { case UIStates.ConnectToTor: breadcrumbs[0] = BreadcrumbStatus.Active; - title = this.uiState.connectIsTryAgain + title = state.HasEverFailed ? TorStrings.torConnect.tryAgain : TorStrings.torConnect.torConnecting; description = TorStrings.settings.torPreferencesDescription; @@ -505,7 +498,7 @@ class AboutTorConnect { this.setTitle(title, ""); this.showConfigureConnectionLink(description); this.setProgress("", showProgressbar, state.BootstrapProgress); - if (state.HasBootsrapEverFailed) { + if (state.HasEverFailed) { this.setBreadcrumbsStatus(...breadcrumbs); } else { this.hideBreadcrumbs(); ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -18,9 +18,6 @@ const { TorBridgeSource, } = ChromeUtils.import("resource:///modules/TorSettings.jsm"); -const { TorMonitorService } = ChromeUtils.import( - "resource://gre/modules/TorMonitorService.jsm" -); const { TorProtocolService } = ChromeUtils.import( "resource://gre/modules/TorProtocolService.jsm" ); @@ -197,17 +194,13 @@ const gConnectionPane = (function() { ); // wire up connect button messageBoxButton.addEventListener("click", () => { - TorConnect.beginBootstrap(); - TorConnect.openTorConnect(); + TorConnect.openTorConnect({ beginBootstrap: true }); }); this._populateMessagebox = () => { - if ( - TorConnect.shouldShowTorConnect && - TorConnect.state === TorConnectState.Configuring - ) { + if (TorConnect.canBeginBootstrap) { // set messagebox style and text - if (TorMonitorService.bootstrapErrorOccurred) { + if (TorConnect.hasEverFailed) { messageBox.parentNode.style.display = null; messageBox.className = "error"; messageBoxMessage.innerText = TorStrings.torConnect.tryAgainMessage; @@ -291,10 +284,11 @@ const gConnectionPane = (function() { TorStrings.settings.statusInternetOffline; break; } + // FIXME: What about the TorConnectState.Disabled state? if (TorConnect.state === TorConnectState.Bootstrapped) { torIcon.className = "connected"; torStatus.textContent = TorStrings.settings.statusTorConnected; - } else if (TorConnect.hasBootstrapEverFailed) { + } else if (TorConnect.potentiallyBlocked) { torIcon.className = "blocked"; torStatus.textContent = TorStrings.settings.statusTorBlocked; } else { @@ -358,7 +352,9 @@ const gConnectionPane = (function() { TorStrings.settings.bridgeChooseForMe ); chooseForMe.addEventListener("command", e => { - TorConnect.beginAutoBootstrap(location.value); + TorConnect.openTorConnect({ + beginAutoBootstrap: location.value, + }); }); this._populateLocations = () => { const currentValue = location.value; @@ -404,8 +400,8 @@ const gConnectionPane = (function() { }; this._showAutoconfiguration = () => { if ( - !TorConnect.shouldShowTorConnect || - !TorMonitorService.bootstrapErrorOccurred + !TorConnect.canBeginAutoBootstrap || + !TorConnect.potentiallyBlocked ) { locationGroup.setAttribute("hidden", "true"); return; @@ -969,7 +965,7 @@ const gConnectionPane = (function() { // whether the page should be present in about:preferences get enabled() { - return TorMonitorService.ownsTorDaemon; + return TorConnect.enabled; }, // ===================================== browser/modules/TorConnect.jsm ===================================== @@ -366,6 +366,7 @@ const TorConnect = (() => { _errorMessage: null, _errorDetails: null, _logHasWarningOrError: false, + _hasEverFailed: false, _hasBootstrapEverFailed: false, _transitionPromise: null, @@ -458,7 +459,6 @@ const TorConnect = (() => { "Error: Censorship simulation", true ); - TorMonitorService.setBootstrapError(); return; } @@ -581,7 +581,6 @@ const TorConnect = (() => { ); return; } - TorMonitorService.setBootstrapError(); } } @@ -793,6 +792,9 @@ const TorConnect = (() => { }, _changeState(newState, ...args) { + if (newState === TorConnectState.Error) { + this._hasEverFailed = true; + } const prevState = this._state; // ensure this is a valid state transition @@ -836,7 +838,7 @@ const TorConnect = (() => { console.log("TorConnect: init()"); this._callback(TorConnectState.Initial).begin(); - if (!TorMonitorService.ownsTorDaemon) { + if (!this.enabled) { // Disabled this._changeState(TorConnectState.Disabled); } else { @@ -881,15 +883,50 @@ const TorConnect = (() => { Various getters */ + /** + * Whether TorConnect is enabled. + * + * @type {boolean} + */ + get enabled() { + return TorMonitorService.ownsTorDaemon; + }, + get shouldShowTorConnect() { // TorBrowser must control the daemon return ( - TorMonitorService.ownsTorDaemon && + this.enabled && // if we have succesfully bootstraped, then no need to show TorConnect this.state !== TorConnectState.Bootstrapped ); }, + /** + * Whether bootstrapping can currently begin. + * + * The value may change with TorConnectTopics.StateChanged. + * + * @param {boolean} + */ + get canBeginBootstrap() { + return TorConnectStateTransitions.get(this.state).includes( + TorConnectState.Bootstrapping + ); + }, + + /** + * Whether auto-bootstrapping can currently begin. + * + * The value may change with TorConnectTopics.StateChanged. + * + * @param {boolean} + */ + get canBeginAutoBootstrap() { + return TorConnectStateTransitions.get(this.state).includes( + TorConnectState.AutoBootstrapping + ); + }, + get shouldQuickStart() { // quickstart must be enabled return ( @@ -939,7 +976,24 @@ const TorConnect = (() => { return this._logHasWarningOrError; }, - get hasBootstrapEverFailed() { + /** + * Whether we have ever entered the Error state. + * + * @type {boolean} + */ + get hasEverFailed() { + return this._hasEverFailed; + }, + + /** + * Whether the Bootstrapping process has ever failed, not including when it + * failed due to not being connected to the internet. + * + * This does not include a failure in AutoBootstrapping. + * + * @type {boolean} + */ + get potentiallyBlocked() { return this._hasBootstrapEverFailed; }, @@ -982,11 +1036,40 @@ const TorConnect = (() => { win.switchToTabHavingURI("about:preferences#connection", true); }, - openTorConnect() { + /** + * Open the "about:torconnect" tab. + * + * Bootstrapping or AutoBootstrapping can also be automatically triggered at + * the same time, if the current state allows for it. + * + * Bootstrapping will not be triggered if the connection is + * potentially blocked. + * + * @param {object} [options] - extra options. + * @property {boolean} [options.beginBootstrap=false] - Whether to try and + * begin Bootstrapping. + * @property {string} [options.beginAutoBootstrap] - The location to use to + * begin AutoBootstrapping, if possible. + */ + openTorConnect(options) { const win = BrowserWindowTracker.getTopWindow(); win.switchToTabHavingURI("about:torconnect", true, { ignoreQueryString: true, }); + if ( + options?.beginBootstrap && + this.canBeginBootstrap && + !this.potentiallyBlocked + ) { + this.beginBootstrap(); + } + // options.beginAutoBootstrap can be an empty string. + if ( + options?.beginAutoBootstrap !== undefined && + this.canBeginAutoBootstrap + ) { + this.beginAutoBootstrap(options.beginAutoBootstrap); + } }, viewTorLogs() { ===================================== toolkit/components/tor-launcher/TorMonitorService.jsm ===================================== @@ -74,7 +74,6 @@ const TorMonitorService = { _startTimeout: null, _isBootstrapDone: false, - _bootstrapErrorOccurred: false, _lastWarningPhase: null, _lastWarningReason: null, @@ -162,21 +161,11 @@ const TorMonitorService = { return this._isBootstrapDone; }, - get bootstrapErrorOccurred() { - return this._bootstrapErrorOccurred; - }, - clearBootstrapError() { - this._bootstrapErrorOccurred = false; this._lastWarningPhase = null; this._lastWarningReason = null; }, - // This should be used for debug only - setBootstrapError() { - this._bootstrapErrorOccurred = true; - }, - get isRunning() { return !!this._connection; }, @@ -211,7 +200,6 @@ const TorMonitorService = { } } catch (e) { // TorProcess already logs the error. - this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = e.toString(); } @@ -248,7 +236,6 @@ const TorMonitorService = { ControlConnTimings.timeoutMS ) { let s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); - this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = s; logger.info(s); @@ -435,7 +422,6 @@ const TorMonitorService = { if (statusObj.PROGRESS === 100) { this._isBootstrapDone = true; - this._bootstrapErrorOccurred = false; try { Services.prefs.setBoolPref(Preferences.PromptAtStartup, false); } catch (e) { @@ -456,7 +442,6 @@ const TorMonitorService = { }, _notifyBootstrapError(statusObj) { - this._bootstrapErrorOccurred = true; try { Services.prefs.setBoolPref(Preferences.PromptAtStartup, true); } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d585b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d585b… 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] fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 22054938 by hackademix at 2023-04-13T18:58:47+00:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -286,6 +286,8 @@ pref("security.remote_settings.intermediates.enabled", false); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// tor-browser#41695: how many warnings we show if user closes them without restoring the window size +pref("privacy.resistFingerprinting.resizeWarnings", 3); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -54,7 +54,7 @@ async function windowResizeHandler(aEvent) { if (RFPHelper.letterboxingEnabled) { return; } - if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2205493… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2205493… 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] fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
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: 9d585beb by hackademix at 2023-04-13T18:55:46+00:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -286,6 +286,8 @@ pref("security.remote_settings.intermediates.enabled", false); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// tor-browser#41695: how many warnings we show if user closes them without restoring the window size +pref("privacy.resistFingerprinting.resizeWarnings", 3); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -54,7 +54,7 @@ async function windowResizeHandler(aEvent) { if (RFPHelper.letterboxingEnabled) { return; } - if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d585be… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d585be… 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] 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