- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 7494: Create local home page for TBB.
by richard (＠richard) 11 Sep '23

11 Sep '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: ea5cd3a3 by Henry Wilkes at 2023-09-11T18:34:24+01:00 fixup! Bug 7494: Create local home page for TBB. Bug 42075: Increase inline margin for the message links in about:tor. Also increase the end margin of the emoji icon. - - - - - 1 changed file: - browser/components/abouttor/content/aboutTor.css Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -56,6 +56,12 @@ h1 { .message-emoji { height: 1em; vertical-align: sub; + margin-inline-end: 0.3em; +} + +.home-message a { + /* Increase gap between the link and the rest of the text. */ + margin-inline: 0.4em; } #search-form { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea5cd3a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea5cd3a… 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] Adding gitlab merge request template
by Dan Ballard (＠dan) 11 Sep '23

11 Sep '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: c190fae9 by Richard Pospesel at 2023-09-08T02:17:22+00:00 Adding gitlab merge request template - - - - - 1 changed file: - + .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -0,0 +1,57 @@ +## Merge Info + + + +### Related Issues +- tor-browser#xxxxx +- tor-browser-build#xxxxx + +### Backporting + +#### Timeline +- [ ] **Immediate**: patchset needed as soon as possible +- [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport +- [ ] **Eventually**: patchset that needs to be verified in alpha before backport +- [ ] **No Backport (preferred)**: patchset for the next major stable + +#### (Optional) Justification +- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc +- [ ] **Censorship event**: patchset enables censorship circumvention +- [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality +- [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc +- [ ] **Sponsor required**: patchset required for sponsor +- [ ] **Other**: please explain + +### Issue Tracking +- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation + +### Review + +#### Request Reviewer + +- [ ] Request review from an applications developer depending on modified system: + - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer) + - **accessibility** : henry + - **android** : clairehurst, dan + - **build system** : boklm + - **extensions** : ma1 + - **firefox internals (XUL/JS/XPCOM)** : ma1 + - **fonts** : pierov + - **frontend (implementation)** : henry + - **frontend (review)** : donuts, richard + - **localization** : henry, pierov + - **macos** : clairehurst, dan + - **misc/other** : pierov, richard + - **nightly builds** : boklm + - **rebases/release-prep** : dan, ma1, pierov, richard + - **security** : ma1 + - **signing** : boklm, richard + - **updater** : pierov + +#### Change Description + + + +#### How Tested + + \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c19… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c19… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by ma1 (＠ma1) 08 Sep '23

08 Sep '23

ma1 pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 03a24c6d by cypherpunks1 at 2023-09-08T22:06:56+00:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41934: Treat unencrypted websocket connections to onion services as secure - - - - - 1 changed file: - dom/websocket/WebSocket.cpp Changes: ===================================== dom/websocket/WebSocket.cpp ===================================== @@ -1734,12 +1734,15 @@ nsresult WebSocketImpl::Init(JSContext* aCx, bool aIsSecure, } // Don't allow https:// to open ws:// - if (!mIsServerSide && !mSecure && + if (!mIsServerSide && !mSecure && aIsSecure && !Preferences::GetBool("network.websocket.allowInsecureFromHTTPS", false) && !nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackHost( mAsciiHost)) { - if (aIsSecure) { + nsCOMPtr<nsIURI> uri; + nsresult rv = NS_NewURI(getter_AddRefs(uri), mURI); + NS_ENSURE_SUCCESS(rv, rv); + if (!nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(uri)) { return NS_ERROR_DOM_SECURITY_ERR; } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03a24c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03a24c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] Bug 41881: Don't persist custom network requests on private windows
by ma1 (＠ma1) 08 Sep '23

08 Sep '23

ma1 pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 95b3625a by cypherpunks1 at 2023-09-08T11:45:15+01:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 1 changed file: - devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js Changes: ===================================== devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js ===================================== @@ -4,6 +4,11 @@ "use strict"; +const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", +}); + const { Component, createFactory, @@ -122,10 +127,12 @@ class HTTPCustomRequestPanel extends Component { async componentDidMount() { let { connector, request } = this.props; - const persistedCustomRequest = await asyncStorage.getItem( - "devtools.netmonitor.customRequest" - ); - request = request || persistedCustomRequest; + if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) { + const persistedCustomRequest = await asyncStorage.getItem( + "devtools.netmonitor.customRequest" + ); + request = request || persistedCustomRequest; + } if (!request) { this.setState({ _isStateDataReady: true }); @@ -191,7 +198,9 @@ class HTTPCustomRequestPanel extends Component { } componentWillUnmount() { - asyncStorage.setItem("devtools.netmonitor.customRequest", this.state); + if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) { + asyncStorage.setItem("devtools.netmonitor.customRequest", this.state); + } } handleChangeURL(event) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/95b3625… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/95b3625… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] Bug 41881: Don't persist custom network requests on private windows
by ma1 (＠ma1) 08 Sep '23

08 Sep '23

ma1 pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: d66f99f2 by cypherpunks1 at 2023-09-08T10:16:52+00:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 1 changed file: - devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js Changes: ===================================== devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js ===================================== @@ -4,6 +4,11 @@ "use strict"; +const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", +}); + const { Component, createFactory, @@ -122,10 +127,12 @@ class HTTPCustomRequestPanel extends Component { async componentDidMount() { let { connector, request } = this.props; - const persistedCustomRequest = await asyncStorage.getItem( - "devtools.netmonitor.customRequest" - ); - request = request || persistedCustomRequest; + if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) { + const persistedCustomRequest = await asyncStorage.getItem( + "devtools.netmonitor.customRequest" + ); + request = request || persistedCustomRequest; + } if (!request) { this.setState({ _isStateDataReady: true }); @@ -191,7 +198,9 @@ class HTTPCustomRequestPanel extends Component { } componentWillUnmount() { - asyncStorage.setItem("devtools.netmonitor.customRequest", this.state); + if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) { + asyncStorage.setItem("devtools.netmonitor.customRequest", this.state); + } } handleChangeURL(event) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d66f99f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d66f99f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40951: Copy tor-browser.ftl to the right directory on macOS.
by boklm (＠boklm) 08 Sep '23

08 Sep '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: bed1acda by Pier Angelo Vendrame at 2023-09-08T10:01:18+02:00 Bug 40951: Copy tor-browser.ftl to the right directory on macOS. While we store our Japanese translation in ja, on macOS we need to move the file to the ja-JP-mac directory. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -134,7 +134,7 @@ mkdir "$HOME/.mozbuild" lang="ja" fi [% END -%] - mv "$transl_tor_browser/$lang/tor-browser.ftl" "$l10ncentral/$lang/browser/browser/" + mv "$transl_tor_browser/$lang/tor-browser.ftl" "$l10ncentral/$central_lang/browser/browser/" mv "$transl_tor_browser/$lang/cryptoSafetyPrompt.properties" "$l10ncentral/$central_lang/browser/chrome/browser/" mv "$transl_tor_browser/$lang" "$torbutton_locales/" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" 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-build][main] Bug 40149: Remove patching of nightly update URL
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0f702b2f by Pier Angelo Vendrame at 2023-09-06T21:21:18+02:00 Bug 40149: Remove patching of nightly update URL Use a new configuration option we recently introduced. Fixes also #40946, as we use the same option for testing purposes. - - - - - 3 changed files: - projects/firefox/build - projects/firefox/config - projects/firefox/mozconfig Changes: ===================================== projects/firefox/build ===================================== @@ -91,11 +91,7 @@ MOZCONFIG_EOF [% END -%] [% IF c("var/override_updater_url") -%] - sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=[% c("var/override_updater_url") %]|' build/application.ini.in cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der -[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%] - # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ===================================== projects/firefox/config ===================================== @@ -30,12 +30,15 @@ var: - yasm - pkg-config has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]' + # For testing purposes use override_updater_url, as it will also override the + # certificate. + updater_url: 'https://aus1.torproject.org/torbrowser/update_3/' # Uncomment this if you want to test the updater. You will need to provide a # marsigner.der in this directory, too. It will be used as a replacement for # the nightly builds keys only. So, using this option for alphas and releases # will not work (the browser will fail with a key/signature mismatch). - # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%…' + # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/' rezip: | rezip_tmpdir=$(mktemp -d) @@ -78,12 +81,15 @@ targets: nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 + var: + updater_url: 'https://nightlies.tbb.torproject.org/nightly-updates/updates/[% c("var/nightly_updates_publish_dir") %]' mullvadbrowser: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser + updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' linux-x86_64: var: ===================================== projects/firefox/mozconfig ===================================== @@ -71,6 +71,11 @@ ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-updater ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update +[% IF c("var/override_updater_url") -%] + ac_add_options --with-updater-url=[% c("var/override_updater_url") %] +[% ELSIF c("var/updater_url") -%] + ac_add_options --with-updater-url=[% c("var/updater_url") %] +[% END -%] mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: bba964da by Pier Angelo Vendrame at 2023-09-07T22:19:02+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow customizing the updater URL with config options. With this, we will not need sed hacks on tor-browser-build anymore. - - - - - 3 changed files: - build/application.ini.in - build/moz.build - build/moz.configure/update-programs.configure Changes: ===================================== build/application.ini.in ===================================== @@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO #if MOZ_UPDATER [AppUpdate] -URL=https://aus1.torproject.org/basebrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL +URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL #endif ===================================== build/moz.build ===================================== @@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]: "MAR_CHANNEL_ID", "MOZ_APP_REMOTINGNAME", "MOZ_CRASHREPORTER_URL", + "BB_UPDATER_URL", ): appini_defines[var] = CONFIG[var] ===================================== build/moz.configure/update-programs.configure ===================================== @@ -204,3 +204,19 @@ option( set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") + + +# Updater URL +# ============================================================== + +option( + "--with-updater-url", + default="https://aus1.torproject.org/torbrowser/update_3/", + nargs=1, + help="Set the updater URL", +) + +set_config( + "BB_UPDATER_URL", + depends("--with-updater-url")(lambda x: x[0].rstrip("/")), +) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 9b73a337 by Pier Angelo Vendrame at 2023-09-06T22:20:01+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow customizing the updater URL with config options. With this, we will not need sed hacks on tor-browser-build anymore. - - - - - 3 changed files: - build/application.ini.in - build/moz.build - build/moz.configure/update-programs.configure Changes: ===================================== build/application.ini.in ===================================== @@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO #if MOZ_UPDATER [AppUpdate] -URL=https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL +URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL #endif ===================================== build/moz.build ===================================== @@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]: "MAR_CHANNEL_ID", "MOZ_APP_REMOTINGNAME", "MOZ_CRASHREPORTER_URL", + "BB_UPDATER_URL", ): appini_defines[var] = CONFIG[var] ===================================== build/moz.configure/update-programs.configure ===================================== @@ -204,3 +204,19 @@ option( set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") + + +# Updater URL +# ============================================================== + +option( + "--with-updater-url", + default="https://aus1.torproject.org/torbrowser/update_3/", + nargs=1, + help="Set the updater URL", +) + +set_config( + "BB_UPDATER_URL", + depends("--with-updater-url")(lambda x: x[0].rstrip("/")), +) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b73a33… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b73a33… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 06 Sep '23

06 Sep '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: bb9daa6d by Richard Pospesel at 2023-09-06T20:50:30+00:00 fixup! Firefox preference overrides. Bug 42057: Disable GetIsTextRecognitionSupported by default - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -539,6 +539,9 @@ pref("privacy.query_stripping.enabled", true); pref("privacy.query_stripping.enabled.pbmode", true); pref("privacy.query_stripping.strip_on_share.enabled", true); +// Disable platform text recogniition functionality (tor-browser#42057) +pref("dom.text-recognition.enabled", false); + #ifdef XP_WIN // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) // this pref changes the app's set AUMID to be dependent on the profile path, rather than View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bb9daa6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bb9daa6… You're receiving this email because of your account on gitlab.torproject.org.

1 0