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

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.3.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 19 Sep '23

19 Sep '23

Pier Angelo Vendrame pushed new branch base-browser-115.3.0esr-13.0-1 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] Pushed new tag FIREFOX_115_3_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 19 Sep '23

19 Sep '23

Pier Angelo Vendrame pushed new tag FIREFOX_115_3_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (＠pierov) 19 Sep '23

19 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 81dd9f82 by Pier Angelo Vendrame at 2023-09-19T09:56:55+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42078: Update macOS icons - - - - - 6 changed files: - browser/branding/tb-alpha/document.icns - browser/branding/tb-alpha/firefox.icns - browser/branding/tb-nightly/document.icns - browser/branding/tb-nightly/firefox.icns - browser/branding/tb-release/document.icns - browser/branding/tb-release/firefox.icns Changes: ===================================== browser/branding/tb-alpha/document.icns ===================================== Binary files a/browser/branding/tb-alpha/document.icns and b/browser/branding/tb-alpha/document.icns differ ===================================== browser/branding/tb-alpha/firefox.icns ===================================== Binary files a/browser/branding/tb-alpha/firefox.icns and b/browser/branding/tb-alpha/firefox.icns differ ===================================== browser/branding/tb-nightly/document.icns ===================================== Binary files a/browser/branding/tb-nightly/document.icns and b/browser/branding/tb-nightly/document.icns differ ===================================== browser/branding/tb-nightly/firefox.icns ===================================== Binary files a/browser/branding/tb-nightly/firefox.icns and b/browser/branding/tb-nightly/firefox.icns differ ===================================== browser/branding/tb-release/document.icns ===================================== Binary files a/browser/branding/tb-release/document.icns and b/browser/branding/tb-release/document.icns differ ===================================== browser/branding/tb-release/firefox.icns ===================================== Binary files a/browser/branding/tb-release/firefox.icns and b/browser/branding/tb-release/firefox.icns differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81dd9f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81dd9f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Bug 42074: 2023 year end campaign for tor browser HomeFragment
by Pier Angelo Vendrame (＠pierov) 19 Sep '23

19 Sep '23

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: ec2162be by henry at 2023-09-18T16:12:37+01:00 fixup! Bug 42074: 2023 year end campaign for tor browser HomeFragment - - - - - 1 changed file: - fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -81,12 +81,8 @@  <string name="yec_2023_introduction">Right now, Tor Browser for Android is protecting your privacy!</string>  -  - <string name="yec_2023_please_donate_beginning">This is possible because of donations from our community.</string> -   -  - <string name="yec_2023_please_donate_full">%s If you value the privacy that Tor Browser for Android offers yourself and others, please make a donation today.</string> + <string name="yec_2023_please_donate">This is possible because of donations from our community. If you value the privacy that Tor Browser for Android offers yourself and others, please make a donation today.</string>    View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ec2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ec2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update ublock-origin to 1.52.0
by boklm (＠boklm) 19 Sep '23

19 Sep '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: aab7b2d6 by Richard Pospesel at 2023-09-18T22:04:13+00:00 Update ublock-origin to 1.52.0 - - - - - 1 changed file: - projects/browser/config Changes: ===================================== projects/browser/config ===================================== @@ -87,9 +87,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4164985/noscript-11.4.27.… name: noscript sha256sum: 6b57d9afce663f801177b7492fe7f00967ee3e66b6351b2cf3ff2a6c3ca99637 - - URL: https://addons.mozilla.org/firefox/downloads/file/4141256/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4164949/ublock_origin-1.5… name: ublock-origin - sha256sum: 8b73468bc233a11dd2895219466381783d19123857dd0b6fd16a01820fca4834 + sha256sum: 3932506ce4df306e4da7527d93d60fe0421cf15045c2f4ea73589d9a0902266b enable: '[% c("var/mullvad-browser") %]' - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firef… name: mullvad-extension View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 19 Sep '23

19 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 6a043750 by Richard Pospesel at 2023-09-19T07:46:09+00:00 fixup! Firefox preference overrides. Bug 42094: Explicitly disable media.aboutwebrtc.hist.enabled - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -49,6 +49,7 @@ pref("browser.cache.disk.enable", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("security.nocertdb", true); +pref("media.aboutwebrtc.hist.enabled", false); // Disk Activity View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6a04375… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6a04375… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.1esr-13.0-1] Bug 41995: Generated headers on Windows are not reproducible
by richard (＠richard) 19 Sep '23

19 Sep '23

richard pushed to branch base-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a1a48fd by Pier Angelo Vendrame at 2023-09-19T01:34:03+00:00 Bug 41995: Generated headers on Windows are not reproducible The flags optionally passed as a third parameter to DLL_BLOCKLIST_ENTRY are stored in a set, so they are not ordered. Sorting them before outputting them makes the creation of the headers deterministic. - - - - - 1 changed file: - toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py Changes: ===================================== toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py ===================================== @@ -570,7 +570,7 @@ class DllBlocklistEntry(object): flags_str = "" - flags = self.get_flags_list() + flags = sorted(self.get_flags_list()) if flags: flags_str = ", " + " | ".join(map(self.get_flag_string, flags)) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a1a48f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a1a48f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] Bug 41995: Generated headers on Windows are not reproducible
by richard (＠richard) 19 Sep '23

19 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 43f9dbcb by Pier Angelo Vendrame at 2023-09-19T01:29:25+00:00 Bug 41995: Generated headers on Windows are not reproducible The flags optionally passed as a third parameter to DLL_BLOCKLIST_ENTRY are stored in a set, so they are not ordered. Sorting them before outputting them makes the creation of the headers deterministic. - - - - - 1 changed file: - toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py Changes: ===================================== toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py ===================================== @@ -570,7 +570,7 @@ class DllBlocklistEntry(object): flags_str = "" - flags = self.get_flags_list() + flags = sorted(self.get_flags_list()) if flags: flags_str = ", " + " | ".join(map(self.get_flag_string, flags)) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/43f9dbc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/43f9dbc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 6 commits: fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard (＠richard) 19 Sep '23

19 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: de6b3303 by Henry Wilkes at 2023-09-19T01:24:50+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42091: Tidy up authPrompt.jsm. Stop importing modules to the global scope and remove authUtil.jsm. Refactor the description string handling. - - - - - 1a422b66 by Henry Wilkes at 2023-09-19T01:24:50+00:00 fixup! Add TorStrings module for localization Bug 42091: Remove authPrompt "Learn More" href from TorStrings. - - - - - 7c864096 by Henry Wilkes at 2023-09-19T01:24:50+00:00 Bug 42110: Add TorUIUtils module for common tor component methods. - - - - - 6662e2dd by Henry Wilkes at 2023-09-19T01:24:50+00:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42091: Use TorUIUtils to shorten the onion address. - - - - - d66b44eb by Henry Wilkes at 2023-09-19T01:24:50+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42091: Shorten the shown onion address in the auth prompt. - - - - - 6f0199ab by Henry Wilkes at 2023-09-19T01:24:50+00:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 42091: Shorten onion address in site identity panel to be consistent with the circuit display. - - - - - 10 changed files: - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.js - browser/components/onionservices/content/authPreferences.js - browser/components/onionservices/content/authPrompt.js - − browser/components/onionservices/content/authUtil.jsm - browser/components/onionservices/jar.mn - browser/components/torcircuit/content/torCircuitPanel.js - browser/modules/TorStrings.jsm - + browser/modules/TorUIUtils.sys.mjs - browser/modules/moz.build Changes: ===================================== browser/base/content/browser-siteIdentity.js ===================================== @@ -729,7 +729,15 @@ var gIdentityHandler = { host = this._uri.specIgnoringRef; } - return host; + // For tor browser we want to shorten onion addresses for the site identity + // panel (gIdentityHandler) to match the circuit display and the onion + // authorization panel. + // See tor-browser#42091 and tor-browser#41600. + // This will also shorten addresses for other consumers of this method, + // which includes the permissions panel (gPermissionPanel) and the + // protections panel (gProtectionsHandler), although the latter is hidden in + // tor browser. + return TorUIUtils.shortenOnionAddress(host); }, /** ===================================== browser/base/content/browser.js ===================================== @@ -67,6 +67,7 @@ ChromeUtils.defineESModuleGetters(this, { "resource:///modules/firefox-view-tabs-setup-manager.sys.mjs", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs", TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.sys.mjs", + TorUIUtils: "resource:///modules/TorUIUtils.sys.mjs", TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs", UITour: "resource:///modules/UITour.sys.mjs", UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", ===================================== browser/components/onionservices/content/authPreferences.js ===================================== @@ -42,10 +42,11 @@ const OnionServicesAuthPreferences = { elem = groupbox.querySelector(this.selector.learnMore); elem.setAttribute("value", TorStrings.onionServices.learnMore); - elem.setAttribute("href", TorStrings.onionServices.learnMoreURL); - if (TorStrings.onionServices.learnMoreURL.startsWith("about:")) { - elem.setAttribute("useoriginprincipal", "true"); - } + elem.setAttribute( + "href", + "about:manual#onion-services_onion-service-authentication" + ); + elem.setAttribute("useoriginprincipal", "true"); elem = groupbox.querySelector(this.selector.savedKeysButton); elem.setAttribute( ===================================== browser/components/onionservices/content/authPrompt.js ===================================== @@ -1,20 +1,19 @@ -// Copyright (c) 2020, The Tor Project, Inc. +/* eslint-env mozilla/browser-window */ "use strict"; -/* globals gBrowser, PopupNotifications, Services, XPCOMUtils */ - -ChromeUtils.defineESModuleGetters(this, { - TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(this, { - OnionAuthUtil: "chrome://browser/content/onionservices/authUtil.jsm", - CommonUtils: "resource://services-common/utils.js", - TorStrings: "resource:///modules/TorStrings.jsm", -}); - const OnionAuthPrompt = (function () { + // Only import to our internal scope, rather than the global scope of + // browser.xhtml. + const lazy = {}; + ChromeUtils.defineESModuleGetters(lazy, { + TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", + CommonUtils: "resource://services-common/utils.sys.mjs", + }); + XPCOMUtils.defineLazyModuleGetters(lazy, { + TorStrings: "resource:///modules/TorStrings.jsm", + }); + // OnionServicesAuthPrompt objects run within the main/chrome process. // aReason is the topic passed within the observer notification that is // causing this auth prompt to be displayed. @@ -25,11 +24,16 @@ const OnionAuthPrompt = (function () { this._onionHostname = aOnionName; } + const topics = { + clientAuthMissing: "tor-onion-services-clientauth-missing", + clientAuthIncorrect: "tor-onion-services-clientauth-incorrect", + }; + OnionServicesAuthPrompt.prototype = { show(aWarningMessage) { let mainAction = { - label: TorStrings.onionServices.authPrompt.done, - accessKey: TorStrings.onionServices.authPrompt.doneAccessKey, + label: lazy.TorStrings.onionServices.authPrompt.done, + accessKey: lazy.TorStrings.onionServices.authPrompt.doneAccessKey, leaveOpen: true, // Callback is responsible for closing the notification. callback: this._onDone.bind(this), }; @@ -68,9 +72,9 @@ const OnionAuthPrompt = (function () { this._prompt = PopupNotifications.show( this._browser, - OnionAuthUtil.domid.notification, + "tor-clientauth", "", - OnionAuthUtil.domid.anchor, + "tor-clientauth-notification-icon", mainAction, [cancelAction], options @@ -79,52 +83,38 @@ const OnionAuthPrompt = (function () { _onPromptShowing(aWarningMessage) { let xulDoc = this._browser.ownerDocument; - let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description); + let descElem = xulDoc.getElementById("tor-clientauth-notification-desc"); if (descElem) { // Handle replacement of the onion name within the localized // string ourselves so we can show the onion name as bold text. // We do this by splitting the localized string and creating // several HTML <span> elements. - while (descElem.firstChild) { - descElem.firstChild.remove(); - } + const fmtString = lazy.TorStrings.onionServices.authPrompt.description; + const [prefix, suffix] = fmtString.split("%S"); - let fmtString = TorStrings.onionServices.authPrompt.description; - let prefix = ""; - let suffix = ""; - const kToReplace = "%S"; - let idx = fmtString.indexOf(kToReplace); - if (idx < 0) { - prefix = fmtString; - } else { - prefix = fmtString.substring(0, idx); - suffix = fmtString.substring(idx + kToReplace.length); - } + const domainEl = xulDoc.createElement("span"); + domainEl.id = "tor-clientauth-notification-onionname"; + domainEl.textContent = TorUIUtils.shortenOnionAddress( + this._onionHostname + ); - const kHTMLNS = "http://www.w3.org/1999/xhtml"; - let span = xulDoc.createElementNS(kHTMLNS, "span"); - span.textContent = prefix; - descElem.appendChild(span); - span = xulDoc.createElementNS(kHTMLNS, "span"); - span.id = OnionAuthUtil.domid.onionNameSpan; - span.textContent = this._onionHostname; - descElem.appendChild(span); - span = xulDoc.createElementNS(kHTMLNS, "span"); - span.textContent = suffix; - descElem.appendChild(span); + descElem.replaceChildren(prefix, domainEl, suffix); } // Set "Learn More" label and href. - let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.domid.learnMore); + let learnMoreElem = xulDoc.getElementById( + "tor-clientauth-notification-learnmore" + ); if (learnMoreElem) { - learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore); + learnMoreElem.setAttribute( + "value", + lazy.TorStrings.onionServices.learnMore + ); learnMoreElem.setAttribute( "href", - TorStrings.onionServices.learnMoreURL + "about:manual#onion-services_onion-service-authentication" ); - if (TorStrings.onionServices.learnMoreURL.startsWith("about:")) { - learnMoreElem.setAttribute("useoriginprincipal", "true"); - } + learnMoreElem.setAttribute("useoriginprincipal", "true"); } this._showWarning(aWarningMessage); @@ -139,7 +129,7 @@ const OnionAuthPrompt = (function () { if (keyElem) { keyElem.setAttribute( "placeholder", - TorStrings.onionServices.authPrompt.keyPlaceholder + lazy.TorStrings.onionServices.authPrompt.keyPlaceholder ); this._boundOnKeyFieldKeyPress = this._onKeyFieldKeyPress.bind(this); this._boundOnKeyFieldInput = this._onKeyFieldInput.bind(this); @@ -186,14 +176,14 @@ const OnionAuthPrompt = (function () { const base64key = this._keyToBase64(keyElem.value); if (!base64key) { - this._showWarning(TorStrings.onionServices.authPrompt.invalidKey); + this._showWarning(lazy.TorStrings.onionServices.authPrompt.invalidKey); return; } this._prompt.remove(); const controllerFailureMsg = - TorStrings.onionServices.authPrompt.failedToSetKey; + lazy.TorStrings.onionServices.authPrompt.failedToSetKey; try { // ^(subdomain.)*onionserviceid.onion$ (case-insensitive) const onionServiceIdRegExp = @@ -205,7 +195,7 @@ const OnionAuthPrompt = (function () { const checkboxElem = this._getCheckboxElement(); const isPermanent = checkboxElem && checkboxElem.checked; - const provider = await TorProviderBuilder.build(); + const provider = await lazy.TorProviderBuilder.build(); await provider.onionAuthAdd(onionServiceId, base64key, isPermanent); // Success! Reload the page. this._browser.sendMessageToActor("Browser:Reload", {}, "BrowserTab"); @@ -227,7 +217,7 @@ const OnionAuthPrompt = (function () { // this authentication prompt. const failedURI = this._failedURI.spec; const errorCode = - this._reasonForPrompt === OnionAuthUtil.topic.clientAuthMissing + this._reasonForPrompt === topics.clientAuthMissing ? Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH : Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH; const io = @@ -245,19 +235,17 @@ const OnionAuthPrompt = (function () { _getKeyElement() { let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById(OnionAuthUtil.domid.keyElement); + return xulDoc.getElementById("tor-clientauth-notification-key"); }, _getCheckboxElement() { let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById(OnionAuthUtil.domid.checkboxElement); + return xulDoc.getElementById("tor-clientauth-persistkey-checkbox"); }, _showWarning(aWarningMessage) { let xulDoc = this._browser.ownerDocument; - let warningElem = xulDoc.getElementById( - OnionAuthUtil.domid.warningElement - ); + let warningElem = xulDoc.getElementById("tor-clientauth-warning"); let keyElem = this._getKeyElement(); if (warningElem) { if (aWarningMessage) { @@ -289,7 +277,7 @@ const OnionAuthPrompt = (function () { // a tor onion-auth file (which uses lowercase). let rawKey; try { - rawKey = CommonUtils.decodeBase32(aKeyString.toUpperCase()); + rawKey = lazy.CommonUtils.decodeBase32(aKeyString.toUpperCase()); } catch (e) {} if (rawKey) { @@ -313,24 +301,21 @@ const OnionAuthPrompt = (function () { let retval = { init() { - Services.obs.addObserver(this, OnionAuthUtil.topic.clientAuthMissing); - Services.obs.addObserver(this, OnionAuthUtil.topic.clientAuthIncorrect); + Services.obs.addObserver(this, topics.clientAuthMissing); + Services.obs.addObserver(this, topics.clientAuthIncorrect); }, uninit() { - Services.obs.removeObserver(this, OnionAuthUtil.topic.clientAuthMissing); - Services.obs.removeObserver( - this, - OnionAuthUtil.topic.clientAuthIncorrect - ); + Services.obs.removeObserver(this, topics.clientAuthMissing); + Services.obs.removeObserver(this, topics.clientAuthIncorrect); }, // aSubject is the DOM Window or browser where the prompt should be shown. // aData contains the .onion name. observe(aSubject, aTopic, aData) { if ( - aTopic != OnionAuthUtil.topic.clientAuthMissing && - aTopic != OnionAuthUtil.topic.clientAuthIncorrect + aTopic != topics.clientAuthMissing && + aTopic != topics.clientAuthIncorrect ) { return; } ===================================== browser/components/onionservices/content/authUtil.jsm deleted ===================================== @@ -1,25 +0,0 @@ -// Copyright (c) 2020, The Tor Project, Inc. - -"use strict"; - -var EXPORTED_SYMBOLS = ["OnionAuthUtil"]; - -const OnionAuthUtil = { - topic: { - clientAuthMissing: "tor-onion-services-clientauth-missing", - clientAuthIncorrect: "tor-onion-services-clientauth-incorrect", - }, - message: { - authPromptCanceled: "Tor:OnionServicesAuthPromptCanceled", - }, - domid: { - anchor: "tor-clientauth-notification-icon", - notification: "tor-clientauth", - description: "tor-clientauth-notification-desc", - learnMore: "tor-clientauth-notification-learnmore", - onionNameSpan: "tor-clientauth-notification-onionname", - keyElement: "tor-clientauth-notification-key", - warningElement: "tor-clientauth-warning", - checkboxElement: "tor-clientauth-persistkey-checkbox", - }, -}; ===================================== browser/components/onionservices/jar.mn ===================================== @@ -2,7 +2,6 @@ browser.jar: content/browser/onionservices/authPreferences.css (content/authPreferences.css) content/browser/onionservices/authPreferences.js (content/authPreferences.js) content/browser/onionservices/authPrompt.js (content/authPrompt.js) - content/browser/onionservices/authUtil.jsm (content/authUtil.jsm) content/browser/onionservices/netError/ (content/netError/*) content/browser/onionservices/onionservices.css (content/onionservices.css) content/browser/onionservices/savedKeysDialog.js (content/savedKeysDialog.js) ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -408,21 +408,6 @@ var gTorCircuitPanel = { return this._fallbackStringBundle.formatStringFromName(name, args); }, - /** - * Shorten the given address if it is an onion address. - * - * @param {string} address - The address to shorten. - * - * @returns {string} The shortened form of the address, or the address itself - * if it was not shortened. - */ - _shortenOnionAddress(address) { - if (!address.endsWith(".onion") || address.length <= 22) { - return address; - } - return `${address.slice(0, 7)}…${address.slice(-12)}`; - }, - /** * Updates the circuit display in the panel to show the current browser data. */ @@ -465,12 +450,12 @@ var gTorCircuitPanel = { this._panelElements.heading.textContent = this._getString( "torbutton.circuit_display.heading", // Only shorten the onion domain if it has no alias. - [onionAlias ? domain : this._shortenOnionAddress(domain)] + [TorUIUtils.shortenOnionAddress(domain)] ); if (onionAlias) { this._panelElements.aliasLink.textContent = - this._shortenOnionAddress(onionAlias); + TorUIUtils.shortenOnionAddress(onionAlias); if (scheme === "http" || scheme === "https") { // We assume the same scheme as the current page for the alias, which we // expect to be either http or https. @@ -521,7 +506,8 @@ var gTorCircuitPanel = { ); // Set the address that we want to copy. - this._panelElements.endItem.textContent = this._shortenOnionAddress(domain); + this._panelElements.endItem.textContent = + TorUIUtils.shortenOnionAddress(domain); // Button description text, depending on whether our first node was a // bridge, or otherwise a guard. ===================================== browser/modules/TorStrings.jsm ===================================== @@ -300,7 +300,6 @@ const Loader = { const retval = { learnMore: getString("learnMore", "Learn more"), - learnMoreURL: "about:manual#onion-services_onion-service-authentication", errorPage: { browser: getString("errorPage.browser", "Browser"), network: getString("errorPage.network", "Network"), ===================================== browser/modules/TorUIUtils.sys.mjs ===================================== @@ -0,0 +1,26 @@ +/** + * Common methods for tor UI components. + */ +export const TorUIUtils = { + /** + * Shorten the given address if it is an onion address. + * + * @param {string} address - The address to shorten. + * + * @returns {string} The shortened form of the address, or the address itself + * if it was not shortened. + */ + shortenOnionAddress(address) { + if ( + // Only shorten ".onion" addresses. + !address.endsWith(".onion") || + // That are not "onion" aliases. + address.endsWith(".tor.onion") || + // And are long. + address.length <= 21 + ) { + return address; + } + return `${address.slice(0, 6)}…${address.slice(-12)}`; + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -152,6 +152,7 @@ EXTRA_JS_MODULES += [ "TorConnect.sys.mjs", "TorSettings.sys.mjs", "TorStrings.jsm", + "TorUIUtils.sys.mjs", "TransientPrefs.jsm", "URILoadingHelper.sys.mjs", "webrtcUI.jsm", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2760a7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2760a7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (＠pierov) 18 Sep '23

18 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 2760a7b8 by Henry Wilkes at 2023-09-18T17:00:13+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41957: Use full tor browser icon for site identity button for internal pages. Also remove colors in tor-styles.css. - - - - - 11 changed files: - − browser/branding/tb-alpha/content/identity-icons-brand.svg - browser/branding/tb-alpha/content/jar.mn - − browser/branding/tb-alpha/content/tor-styles.css - − browser/branding/tb-nightly/content/identity-icons-brand.svg - browser/branding/tb-nightly/content/jar.mn - − browser/branding/tb-nightly/content/tor-styles.css - − browser/branding/tb-release/content/identity-icons-brand.svg - browser/branding/tb-release/content/jar.mn - − browser/branding/tb-release/content/tor-styles.css - browser/themes/shared/browser-shared.css - browser/themes/shared/identity-block/identity-block.css Changes: ===================================== browser/branding/tb-alpha/content/identity-icons-brand.svg deleted ===================================== @@ -1,8 +0,0 @@ -<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g clip-rule="evenodd" fill-rule="evenodd"> - <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/> - <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/> - <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/> - </g> - <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/> -</svg> \ No newline at end of file ===================================== browser/branding/tb-alpha/content/jar.mn ===================================== @@ -16,7 +16,5 @@ browser.jar: content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) content/branding/icon256.png (../default256.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/tor-browser-logo.svg - content/branding/tor-styles.css ===================================== browser/branding/tb-alpha/content/tor-styles.css deleted ===================================== @@ -1,11 +0,0 @@ -/* default theme*/ -:root { - --tor-branding-color: var(--teal-70); -} - -/* dark theme */ -@media (prefers-color-scheme: dark) { - :root { - --tor-branding-color: var(--teal-60); - } -} ===================================== browser/branding/tb-nightly/content/identity-icons-brand.svg deleted ===================================== @@ -1,8 +0,0 @@ -<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g clip-rule="evenodd" fill-rule="evenodd"> - <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/> - <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/> - <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/> - </g> - <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/> -</svg> \ No newline at end of file ===================================== browser/branding/tb-nightly/content/jar.mn ===================================== @@ -16,7 +16,5 @@ browser.jar: content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) content/branding/icon256.png (../default256.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/tor-browser-logo.svg - content/branding/tor-styles.css ===================================== browser/branding/tb-nightly/content/tor-styles.css deleted ===================================== @@ -1,11 +0,0 @@ -/* default theme*/ -:root { - --tor-branding-color: var(--blue-60); -} - -/* dark theme */ -@media (prefers-color-scheme: dark) { - :root { - --tor-branding-color: var(--blue-40); - } -} ===================================== browser/branding/tb-release/content/identity-icons-brand.svg deleted ===================================== @@ -1,8 +0,0 @@ -<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g clip-rule="evenodd" fill-rule="evenodd"> - <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/> - <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/> - <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/> - </g> - <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/> -</svg> \ No newline at end of file ===================================== browser/branding/tb-release/content/jar.mn ===================================== @@ -16,7 +16,5 @@ browser.jar: content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) content/branding/icon256.png (../default256.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/tor-browser-logo.svg - content/branding/tor-styles.css ===================================== browser/branding/tb-release/content/tor-styles.css deleted ===================================== @@ -1,11 +0,0 @@ -/* default theme*/ -:root { - --tor-branding-color: var(--purple-60); -} - -/* dark theme */ -@media (prefers-color-scheme: dark) { - :root { - --tor-branding-color: var(--purple-30); - } -} ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,7 +23,6 @@ @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/browser-colors.css"); -@import url("chrome://branding/content/tor-styles.css"); @import url("chrome://browser/skin/tor-urlbar-button.css"); @import url("chrome://browser/skin/onionlocation.css"); ===================================== browser/themes/shared/identity-block/identity-block.css ===================================== @@ -53,10 +53,6 @@ border-radius: var(--urlbar-icon-border-radius); } -#identity-box[pageproxystate="valid"].chromeUI #identity-icon-label { - color: var(--tor-branding-color); -} - #identity-icon-label { padding-inline-start: 4px; } @@ -151,9 +147,12 @@ } #identity-box[pageproxystate="valid"].chromeUI #identity-icon { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); - fill: var(--tor-branding-color); - fill-opacity: 1; + list-style-image: url(chrome://branding/content/icon16.png); +} +@media (min-resolution: 1.1dppx) { + #identity-box[pageproxystate="valid"].chromeUI #identity-icon { + list-style-image: url(chrome://branding/content/icon32.png); + } } #identity-box[pageproxystate="valid"].localResource #identity-icon { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2760a7b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2760a7b… You're receiving this email because of your account on gitlab.torproject.org.

1 0