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

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] 2 commits: fixup! Adding issue and merge request templates
by richard (＠richard) 14 Jun '23

14 Jun '23

richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f2fb23c2 by Richard Pospesel at 2023-06-14T17:07:34+00:00 fixup! Adding issue and merge request templates - removed exta unneeded dashes - updated Backporting section to better match our desired process going forward: - discourage requests for backport to stable - provide justification for backport request from list proposed at last Tor meeting - added 'consistency' justification for patches/changes which can be difficult to context switch between but don't affect the final build output - added explicit merge destination selection - - - - - f02f3319 by Richard Pospesel at 2023-06-14T17:12:14+00:00 fixup! Bug 41649: Create rebase and security backport gitlab issue templates - made formatting consistent between each template - updated the directions around the base-browser rebase to better reflect how we *actually* do it with regards to only rarely needing to rebase base-browser seperately - fixed a few typos and incorrect git cherry-pick examples - moved signing and tagging to their own section in the rebase templates - changed instances of 'origin' to 'upstream' to be consistent with github/gitlab documentation - added firefox-android section and marked android-components and fenix sections as optional for esr102 only so we don't have to urently fix this once we swithc to esr115 - - - - - 4 changed files: - .gitlab/issue_templates/Backport Android Security Fixes.md - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/issue_templates/Backport Android Security Fixes.md ===================================== @@ -1,41 +1,43 @@ <details> <summary>Explanation of Variables</summary> -- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - example : `102.8.0` -- `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. - - example: `110` -- `$(PROJECT_NAME)` : the name of the browser project, either `base-browser` or `tor-browser` -- `$(TOR_BROWSER_MAJOR)` : the Tor Browser major version - - example : `12` -- `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version - - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10` -- `$(BUILD_N)` : a project's build revision within a its branch; many of the Firefox-related projects have a `$(BUILD_N)` suffix and may differ between projects even when they contribute to the same build. - - example : `build1` + +- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc + - **Example**: `102.8.0` +- `$(RR_VERSION)`: the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. + - **Example**: `110` +- `$(PROJECT_NAME)`: the name of the browser project, either `base-browser` or `tor-browser` +- `$(TOR_BROWSER_MAJOR)`: the Tor Browser major version + - **Example**: `12` +- `$(TOR_BROWSER_MINOR)`: the Tor Browser minor version + - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10` +- `$(BUILD_N)`: a project's build revision within a its branch; many of the Firefox-related projects have a `$(BUILD_N)` suffix and may differ between projects even when they contribute to the same build. + - **Example**: `build1` </details> -**NOTE:** It is assumed the `tor-browser` rebase (stable and alpha) has already happened and there exists a `build1` build tags for both `base-browser` and `tor-browser` (stable and alpha) +**NOTE:** It is assumed the `tor-browser` rebases (stable and alpha) have already happened and there exists a `build1` build tags for both `base-browser` and `tor-browser` (stable and alpha) ### **Bookkeeping** - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issues (stable and alpha). -### **Security Vulnerabilities Report** : https://www.mozilla.org/en-US/security/advisories/ +### **Security Vulnerabilities Report**: https://www.mozilla.org/en-US/security/advisories/ - Potentially Affected Components: - - `firefox`/`geckoview` : https://github.com/mozilla/gecko-dev - - `application-services` : https://github.com/mozilla/application-services - - `android-components` : https://github.com/mozilla-mobile/firefox-android - - `fenix` : https://github.com/mozilla-mobile/firefox-android + - `firefox`/`geckoview`: https://github.com/mozilla/gecko-dev + - `application-services`: https://github.com/mozilla/application-services + - `android-components` (ESR 102 only): https://github.com/mozilla-mobile/firefox-android + - `fenix` (ESR 102 only): https://github.com/mozilla-mobile/firefox-android + - `firefox-android`: https://github.com/mozilla-mobile/firefox-android -**NOTE:** `android-components` and `fenix` used to have their own repos, but since November 2022 they have converged to a single `firefox-android` repo. Any backports will require manually porting patches over to our legacy repos. +**NOTE:** `android-components` and `fenix` used to have their own repos, but since November 2022 they have converged to a single `firefox-android` repo. Any backports will require manually porting patches over to our legacy repos until we have transitioned to ESR 115. -- [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create a candidate list of CVEs which potentially need to be backported in this issue: +- [ ] Go through the `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` report and create a candidate list of CVEs which potentially need to be backported in this issue: - CVEs which are explicitly labeled as 'Android' only - CVEs which are fixed in Rapid Release but not in ESR - 'Memory safety bugs' fixed in Rapid Release but not in ESR - [ ] Foreach issue: - Create link to the CVE on [mozilla.org](https://www.mozilla.org/en-US/security/advisories/) - - example: https://www.mozilla.org/en-US/security/advisories/mfsa2023-05/#CVE-2023-257… + - **Example**: https://www.mozilla.org/en-US/security/advisories/mfsa2023-05/#CVE-2023-257… - Create link to the associated Bugzilla issues (found in the CVE description) - Create links to the relevant `gecko-dev`/other commit hashes which need to be backported OR a brief justification for why the fix does not need to be backported - To find the `gecko-dev` version of a `mozilla-central`, search for a unique string in the relevant `mozilla-central` commit message in the `gecko-dev/release` branch log. @@ -46,13 +48,13 @@  -### **tor-browser** : https://gitlab.torproject.org/tpo/applications/tor-browser.git +### **tor-browser**: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - [ ] Backport patches to `tor-browser` stable branch - [ ] Open MR @@ -62,33 +64,34 @@ - [ ] `tor-browser` alpha - [ ] `base-browser` alpha - [ ] Sign/Tag commits: - - Tag : `$(PROJECT_NAME)-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` + - **Tag**: `$(PROJECT_NAME)-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - **Message**: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable|alpha)` - [ ] `base-browser` stable - [ ] `tor-browser` stable - [ ] `base-browser` alpha - [ ] `tor-browser` alpha - - [ ] Push tags to `origin` -**OR** + - [ ] Push tags to `upstream` +- **OR** - [ ] No backports -### **application-services** : *TODO: we will need to setup a gitlab copy of this repo that we can apply security backports to if there are ever any security issues here* +### **application-services**: https://gitlab.torproject.org/tpo/applications/application-services +- **NOTE**: we will need to setup a gitlab copy of this repo and update `tor-browser-build` before we can apply security backports here - [ ] Backport any Android-specific security fixes from Firefox rapid-release - [ ] Backport patches to `application-services` stable branch - [ ] Open MR - [ ] Merge - [ ] Rebase patches onto `application-services` alpha - [ ] Sign/Tag commits: - - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha` + - **Tag**: `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - **Message**: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable|alpha` - [ ] `application-services` stable - [ ] `application-services` alpha - - [ ] Push tags to `origin` - **OR** + - [ ] Push tags to `upstream` +- **OR** - [ ] No backports -### **android-components** : https://gitlab.torproject.org/tpo/applications/android-components.git +### **android-components (Optional, ESR 102)**: https://gitlab.torproject.org/tpo/applications/android-components.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - **NOTE**: Since November 2022, this repo has been merged with `fenix` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `android-components` project. - [ ] Backport patches to `android-components` stable branch @@ -96,16 +99,16 @@ - [ ] Merge - [ ] Rebase patches onto `android-components` alpha - [ ] Sign/Tag commits: - - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` + - **Tag**: `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - **Message**: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable|alpha)` - [ ] `android-components` stable - [ ] `android-components` alpha - - [ ] Push tags to `origin` -**OR** + - [ ] Push tags to `upstream` +- **OR** - [ ] No backports -### **fenix** : https://gitlab.torproject.org/tpo/applications/fenix.git +### **fenix (Optional, ESR 102)**: https://gitlab.torproject.org/tpo/applications/fenix.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - **NOTE**: Since February 2023, this repo has been merged with `android-components` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `fenix` project. - [ ] Backport patches to `fenix` stable branch @@ -113,12 +116,27 @@ - [ ] Merge - [ ] Rebase patches onto `fenix` alpha - [ ] Sign/Tag commits: - - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` + - **Tag**: `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - **Message**: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable|alpha)` - [ ] `fenix` stable - [ ] `fenix` alpha - - [ ] Push tags to `origin` -**OR** + - [ ] Push tags to `upstream` +- **OR** +- [ ] No backports + +### **firefox-android**: https://gitlab.torproject.org/tpo/applications/firefox-android +- [ ] Backport any Android-specific security fixes from Firefox rapid-release + - [ ] Backport patches to `firefox-android` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `fenix` alpha + - [ ] Sign/Tag commits: + - **Tag**: `firefox-android-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - **Message**: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable|alpha)` + - [ ] `firefox-android` stable + - [ ] `firefox-android` alpha + - [ ] Push tags to `upstream` +- **OR** - [ ] No backports /confidential ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -1,27 +1,29 @@ -**NOTE:** All examples reference the rebase from 102.7.0esr to 102.8.0esr +**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr <details> <summary>Explanation of Variables</summary> -- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - example : `102.8.0` -- `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - example : `FIREFOX_102_8_0esr_RELEASE` -- `$(ESR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) -- `$(BROWSER_MAJOR)` : the browser major version - - example : `12` -- `$(BROWSER_MINOR)` : the browser minor version - - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10` -- `$(BASE_BROWSER_BRANCH)` : the full name of the current `base-browser` branch - - example: `base-browser-102.8.0esr-12.5-1` -- `$(BASE_BROWSER_BRANCH_PREV)` : the full name of the previous `base-browser` branch - - example: `base-browser-102.7.0esr-12.5-1` -- `$(TOR_BROWSER_BRANCH)` : the full name of the current `tor-browser` branch - - example: `tor-browser-102.8.0esr-12.5-1` -- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous `tor-browser` branch - - example: `tor-browser-102.7.0esr-12.5-1` + +- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc + - **Example**: `102.8.0` +- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` + - **Example**: `FIREFOX_102_8_0esr_RELEASE` +- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) + - **Example**: `FIREFOX_102_7_0esr_BUILD1` +- `$(BROWSER_MAJOR)`: the browser major version + - **Example**: `12` +- `$(BROWSER_MINOR)`: the browser minor version + - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10` +- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch + - **Example**: `base-browser-102.8.0esr-12.5-1` +- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch + - **Example**: `base-browser-102.7.0esr-12.5-1` +- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch + - **Example**: `tor-browser-102.8.0esr-12.5-1` +- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch + - **Example**: `tor-browser-102.7.0esr-12.5-1` </details> -**NOTE:** It is assumed that we've already identified the new esr branch during the tor-browser stable rebase +**NOTE:** It is assumed that we've already identified the new ESR branch during the tor-browser stable rebase ### **Bookkeeping** @@ -33,7 +35,7 @@ - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - example: `*-102.8.0esr-12.5-1*` + - **Example**: `*-102.8.0esr-12.5-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` @@ -41,23 +43,36 @@ ### **Create New Branches** - [ ] Create new alpha `base-browser` branch from Firefox mercurial tag (found during the stable rebase) - - branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - example: `base-browser-102.8.0esr-12.5-1` + - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - **Example**: `base-browser-102.8.0esr-12.5-1` - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag - - branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - example: `tor-browser-102.8.0esr-12.5-1` -- [ ] Push new `base-browser` branch to `origin` -- [ ] Push new `tor-browser` branch to `origin` + - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - **Example**: `tor-browser-102.8.0esr-12.5-1` +- [ ] Push new `base-browser` branch to `upstream` +- [ ] Push new `tor-browser` branch to `upstream` + +### **Rebase tor-browser** -### **Rebase base-browser** +- [ ] Checkout a new local branch for the `tor-browser` rebase + - **Example**: `git branch tor-browser-rebase FIREFOX_102_8_0esr_BUILD1` +- [ ] **(Optional)** `base-browser` rebase and autosquash + - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag + - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch + - **Example**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1` + - [ ] Rebase and autosquash these cherry-picked commits + - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` + - [ ] Cherry-pick remainder of patches after the `buildN` tag + - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..upstream/base-browser-102.7.0esr-12.5-1` -- [ ] Checkout a new local branch for the `base-browser` rebase - - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1` -- [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch - - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1` -- [ ] Rebase and autosquash these cherry-picked commits - - example: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` +- [ ] `tor-browser` rebase and autosquash + - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` + - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag + - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1` + - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..tor-browser-102.7.0esr-12.5-1-build1` + - [ ] Rebase and autosquash **ONLY** these newly cherry-picked commits using the commit noted previously: `git rebase --autosquash --interactive $(PREV_HEAD)` + - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` - [ ] **(Optional)** Patch reordering + - **NOTE**: We typically want to do this after new features or bug fix commits which are not !fixups to an existing commit have been merged and are just sitting at the end of the commit history - Relocate new `base-browser` patches in the patch-set to enforce this rough thematic ordering: - **MOZILLA BACKPORTS** - official Firefox patches we have backported to our ESR branch: Android-specific security updates, critical bug fixes, worthwhile features, etc - **MOZILLA REVERTS** - revert commits of official Firefox patches @@ -66,34 +81,7 @@ - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc - **SECURITY PATCHES** - security improvements, hardening, etc - **PRIVACY PATCHES** - fingerprinting, linkability, proxy bypass, etc - - **FEATURES** - new functionality: updater, UX, letterboxing, security level, add-on integration, etc -- [ ] Cherry-pick remainder of patches after the `build1` tag - - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1 origin/base-browser-102.7.0esr-12.5-1` -- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - - `git diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) > current_patchset.diff` - - `git diff $(ESR_TAG)..$(BASE_BROWSER_BRANCH) > rebased_patchset.diff` - - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/base-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD` -- [ ] Open MR for the `base-browser` rebase -- [ ] Merge -- [ ] Sign/Tag HEAD of the merged new `base-browser` branch: - - Tag : `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - Message : `Tagging build1 for $(ESR_VERSION)esr-based alpha` -- [ ] Push tag to `origin` - -### **Rebase tor-browser** - -- [ ] Checkout a new branch for the `tor-browser` rebase starting from the `base-browser` `build1` tag - - example: `git branch tor-browser-rebase base-browser-102.8.0esr-12.5-1-build1` -- [ ] Cherry-pick the previous `tor-browser` commits from `base-browser`'s previous `build1` tag up to `tor-browser`'s newest `buildN` tag (not necessarily `build1` if we have multiple build tags) - - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1` -- [ ] Rebase and autosquash these cherry-picked commits (from the last new `base-browser` commit to `HEAD`) - - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD` - - [ ] **(Optional)** Patch reordering + - **FEATURES** - new functionality: updater, UX, letterboxing, security level, add-on - Relocate new `tor-browser` patches in the patch-set to enforce this rough thematic ordering: - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc @@ -105,11 +93,10 @@ - **TOR SECURITY PATCHES** - tor-specific security improvements - **TOR PRIVACY PATCHES** - tor-specific privacy improvements - **TOR FEATURES** - new tor-specific functionality: manual, onion-location, onion service client auth, etc -- [ ] Cherry-pick remainder of patches after the last `buildN` tag - - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..origin/tor-browser-102.7.0esr-12.5-1` -- [ ] Rebase and autosquash again (from the last new `base-browser` commit to `HEAD`), this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify. - - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD` - - **NOTE**: Do not allow `fixup` or `squash` commands here! + - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag + - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.5-1-build1..upstream/tor-browser-102.7.0esr-12.5-1` + - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. + - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - [ ] diff of diffs: - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - @@ -118,11 +105,20 @@ - diff `current_patchset.diff` and `rebased_patchset.diff` - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD` + - **Example**: `git range-dif FIREFOX_102_7_0esr_BUILD1..upstream/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase - [ ] Merge -- [ ] Sign/Tag HEAD of the merged new `tor-browser` branch: - - Tag : `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - Message : `Tagging build1 for $(ESR_VERSION)esr-based alpha` -- [ ] Push tag to `origin` +- Update and push `base-browser` branch + - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch + - [ ] Push these commits to `upstream` + +### **Sign and Tag** +- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: + - **Tag**: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` + - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based alpha` + - [ ] Push tag to `upstream` +- [ ] Sign/Tag HEAD of the merged `base-browser` branch: + - **Tag**: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` + - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based alpha` + - [ ] Push tag to `upstream` ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -1,24 +1,26 @@ -**NOTE:** All examples reference the rebase from 102.7.0esr to 102.8.0esr +**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr <details> - <summary>Explanation of variables</summary> -- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - example : `102.8.0` -- `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - example : `FIREFOX_102_8_0esr_RELEASE` -- `$(ESR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) -- `$(BROWSER_MAJOR)` : the browser major version - - example : `12` -- `$(BROWSER_MINOR)` : the browser minor version - - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10` -- `$(BASE_BROWSER_BRANCH)` : the full name of the current `base-browser` branch - - example: `base-browser-102.8.0esr-12.0-1` -- `$(BASE_BROWSER_BRANCH_PREV)` : the full name of the previous `base-browser` branch - - example: `base-browser-102.7.0esr-12.0-1` -- `$(TOR_BROWSER_BRANCH)` : the full name of the current `tor-browser` branch - - example: `tor-browser-102.8.0esr-12.0-1` -- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous `tor-browser` branch - - example: `tor-browser-102.7.0esr-12.0-1` + <summary>Explanation of Variables</summary> + +- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc + - **Example**: `102.8.0` +- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` + - **Example**: `FIREFOX_102_8_0esr_RELEASE` +- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) + - **Example**: `FIREFOX_102_7_0esr_BUILD1` +- `$(BROWSER_MAJOR)`: the browser major version + - **Example**: `12` +- `$(BROWSER_MINOR)`: the browser minor version + - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10` +- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch + - **Example**: `base-browser-102.8.0esr-12.0-1` +- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch + - **Example**: `base-browser-102.7.0esr-12.0-1` +- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch + - **Example**: `tor-browser-102.8.0esr-12.0-1` +- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch + - **Example**: `tor-browser-102.7.0esr-12.0-1` </details> ### **Bookkeeping** @@ -31,69 +33,55 @@ - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - example: `*-102.8.0esr-12.0-1*` + - **Example**: `*-102.8.0esr-12.0-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags - - example: `FIREFOX_102_8_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit : https://github.com/mozilla/gecko-dev - - Search for unique string found in the mercurial commit in the `gecko-dev/esr102` branch - - example: 3a3a96c9eedd02296d6652dd50314fccbc5c4845 +- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags + - **Example**: `FIREFOX_102_8_0esr_BUILD1` +- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev + - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit + - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845` - [ ] Sign and Tag `gecko-dev` commit - Sign/Tag `gecko-dev` commit : - - Tag : `$(ESR_TAG)` - - Message : `Hg tag $(ESR_TAG)` + - **Tag**: `$(ESR_TAG)` + - **Message**: `Hg tag $(ESR_TAG)` - [ ] Create new stable `base-browser` branch from tag - - branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - example: `base-browser-102.8.0esr-12.0-1` + - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - **Example**: `base-browser-102.8.0esr-12.0-1` - [ ] Create new stable `tor-browser` branch from - - branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - example: `tor-browser-102.8.0esr-12.0-1` -- [ ] Push new `base-browser` branch to `origin` -- [ ] Push new `tor-browser` branch to `origin` -- [ ] Push new `$(ESR_TAG)` to `origin` - -### **Rebase base-browser** - -- [ ] Checkout a new local branch for the `base-browser` rebase - - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1` -- [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch - - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1` -- [ ] Rebase and autosquash these cherry-picked commits - - example: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` -- [ ] Cherry-pick remainder of patches after the `build1` tag - - example: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1 origin/base-browser-102.7.0esr-12.0-1` -- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - - `git diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) > current_patchset.diff` - - `git diff $(ESR_TAG)..$(BASE_BROWSER_BRANCH) > rebased_patchset.diff` - - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/base-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD` -- [ ] Open MR for the `base-browser` rebase -- [ ] Merge -- [ ] Sign/Tag HEAD of the merged new `base-browser` branch: - - Tag : `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable` -- [ ] Push tag to `origin` - + - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - **Example**: `tor-browser-102.8.0esr-12.0-1` +- [ ] Push new `base-browser` branch to `upstream` +- [ ] Push new `tor-browser` branch to `upstream` +- [ ] Push new `$(ESR_TAG)` to `upstream` ### **Rebase tor-browser** -- [ ] Checkout a new branch for the `tor-browser` rebase starting from the `base-browser` `build1` tag - - example: `git branch tor-browser-rebase base-browser-102.8.0esr-12.0-1-build1` -- [ ] Cherry-pick the previous `tor-browser` commits from `base-browser`'s previous `build1` tag up to `tor-browser`'s newest `buildN` tag (not necessarily `build1` if we have multiple build tags) - - example: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..tor-browser-102.7.0esr-12.0-1-build1` -- [ ] Rebase and autosquash these cherry-picked commits (from the last new `base-browser` commit to `HEAD`) - - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.0-1-build1 HEAD` -- [ ] Cherry-pick remainder of patches after the last `buildN` tag - - example: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..origin/tor-browser-102.7.0esr-12.0-1` +- [ ] Checkout a new local branch for the `tor-browser` rebase + - **Example**: `git branch tor-browser-rebase FIREFOX_102_8_0esr_BUILD1` +- [ ] **(Optional)** `base-browser` rebase + - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag + - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch + - **Example**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1` + - [ ] Rebase and autosquash these cherry-picked commits + - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` + - [ ] Cherry-pick remainder of patches after the `buildN` tag + - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..upstream/base-browser-102.7.0esr-12.0-1` +- [ ] `tor-browser` rebase + - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` + - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag + - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..tor-browser-102.7.0esr-12.0-1-build1` + - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..tor-browser-102.7.0esr-12.0-1-build1` + - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)` + - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` + - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag + - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.0-1-build1..upstream/tor-browser-102.7.0esr-12.0-1` + - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. + - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - [ ] diff of diffs: - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - @@ -102,10 +90,20 @@ - diff `current_patchset.diff` and `rebased_patchset.diff` - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD` + - **Example**: `git range-dif FIREFOX_102_7_0esr_BUILD1..upstream/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase - [ ] Merge -- [ ] Sign/Tag HEAD of the merged new `tor-browser` branch: - - Tag : `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable` -- [ ] Push tag to `origin` +- Update and push `base-browser` branch + - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch + - [ ] Push these commits to `upstream` + +### **Sign and Tag** + +- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: + - **Tag**: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` + - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable` + - [ ] Push tag to `upstream` +- [ ] Sign/Tag HEAD of the merged `base-browser` branch: + - **Tag**: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` + - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable` + - [ ] Push tag to `upstream` ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -2,23 +2,34 @@  -- ### Related Issues - - tor-browser#xxxxx - - tor-browser-build#xxxxx - - etc - -- ### Backport Timeline - - [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build) - - [ ] **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** - patchset for the next major stable - -- ### Upstream Merging - - [ ] Merge to `base-browser` - typically for `!fixups` to patches in the `base-browser` branch, though sometimes new patches as well - - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please please make separate merge requests for each part - -- ### Issue Tracking - - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +### Related Issues +- tor-browser#xxxxx +- mullvad-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 + +### Merging +- [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports +- [ ] Merge to `base-browser` -`!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports + - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging + +### Issue Tracking +- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ## Change Description View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ba9571… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ba9571… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0b5-13.0-1] 97 commits: Bug 41454: Move focus after calling openPreferences for a sub-category.
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-115.0b5-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 1cf63a37 by Henry Wilkes at 2023-06-14T09:33:21+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 4139872a by Henry Wilkes at 2023-06-14T09:33:23+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - e9f23088 by Pier Angelo Vendrame at 2023-06-14T09:33:23+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 610fbfc5 by Pier Angelo Vendrame at 2023-06-14T09:33:23+02:00 fixup! Bug 41116: Normalize system fonts. Update to the latest proposal to upstream. It fixes build issues on macOS. - - - - - 70ca5977 by Pier Angelo Vendrame at 2023-06-14T09:33:24+02:00 fixup! Bug 41116: Normalize system fonts. ShouldResistFinterprinting now always wants a target. - - - - - 13ca9cfd by Marco Simonelli at 2023-06-14T09:33:24+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - e7788102 by Marco Simonelli at 2023-06-14T09:33:25+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 20958510 by Pier Angelo Vendrame at 2023-06-14T09:33:25+02:00 fixup! Bug 41459: WebRTC fails to build under mingw (Part 2) Reworked the _com_error conversion to string, to use functions that are available also to mingw. - - - - - 24658877 by Marco Simonelli at 2023-06-14T09:33:26+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 21969d74 by Marco Simonelli at 2023-06-14T09:33:26+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - cdd2fe0f by Pier Angelo Vendrame at 2023-06-14T09:33:26+02:00 fixup! Bug 41459: WebRTC fails to build under mingw (Part 4) Define _CRT_RAND_S as a compiler flag, to avoid problems due to unified sources. - - - - - 61cd0851 by Marco Simonelli at 2023-06-14T09:33:27+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - fbe3e5b4 by Marco Simonelli at 2023-06-14T09:33:27+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 28776065 by Gaba at 2023-06-14T09:33:28+02:00 Adding issue and merge request templates - - - - - efecab1e by Pier Angelo Vendrame at 2023-06-14T09:33:28+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 79678742 by Pier Angelo Vendrame at 2023-06-14T09:33:29+02:00 fixup! Base Browser's .mozconfigs. Do not specify --{enable,disable}-verify-mar in mozconfigs, as this option does not exist anymore, and signed mars are enabled by default. - - - - - 7da1afab by Pier Angelo Vendrame at 2023-06-14T09:33:29+02:00 fixup! Base Browser's .mozconfigs. Use the new flag upstream to replace the Bug 41542 commit. - - - - - 689a21c5 by Pier Angelo Vendrame at 2023-06-14T09:33:29+02:00 fixup! Base Browser's .mozconfigs. Disable the notification server because of the upstream Bug 1782837. - - - - - 82aadf12 by Pier Angelo Vendrame at 2023-06-14T09:33:30+02:00 fixup! Base Browser's .mozconfigs. Explicitly say we want verified updates. - - - - - f2ff5211 by Pier Angelo Vendrame at 2023-06-14T09:33:30+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - a42c52d8 by Pier Angelo Vendrame at 2023-06-14T09:33:31+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - d05967a3 by Dan Ballard at 2023-06-14T09:33:31+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 4ee710fc by Matthew Finkel at 2023-06-14T09:33:31+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - b82fe664 by Matthew Finkel at 2023-06-14T09:33:32+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 054eefbb by Mike Perry at 2023-06-14T09:33:32+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 0a7949c5 by Alex Catarineu at 2023-06-14T09:33:33+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 6ab9f4f2 by Georg Koppen at 2023-06-14T09:33:33+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - b2a5ea82 by Kathy Brade at 2023-06-14T09:33:34+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 1033cb3f by Kathy Brade at 2023-06-14T09:33:34+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - c9f6abf8 by Alex Catarineu at 2023-06-14T09:34:05+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - d3072c64 by Kathy Brade at 2023-06-14T09:34:08+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - f53f7025 by Arthur Edelstein at 2023-06-14T09:34:08+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 186aa994 by Alex Catarineu at 2023-06-14T09:34:09+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 669f1eeb by Pier Angelo Vendrame at 2023-06-14T09:34:09+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Linted - - - - - bf90fc3d by Pier Angelo Vendrame at 2023-06-14T09:34:09+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - e8a87e8b by Georg Koppen at 2023-06-14T09:34:10+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - b4f10712 by Pier Angelo Vendrame at 2023-06-14T09:34:10+02:00 fixup! Bug 30541: Disable WebGL readPixel() for web content - - - - - 6e15b036 by Pier Angelo Vendrame at 2023-06-14T09:34:11+02:00 fixup! Bug 30541: Disable WebGL readPixel() for web content ShouldResistFinterprinting now always wants a target. - - - - - 336fcb65 by Alex Catarineu at 2023-06-14T09:34:11+02:00 Bug 28369: Stop shipping pingsender executable - - - - - b1b1e299 by Pier Angelo Vendrame at 2023-06-14T09:34:12+02:00 fixup! Bug 28369: Stop shipping pingsender executable Linted - - - - - 0f081b68 by cypherpunks1 at 2023-06-14T09:34:12+02:00 Bug 41568: Disable LaterRun - - - - - 9266b13c by cypherpunks1 at 2023-06-14T09:34:12+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 1f1ce481 by Pier Angelo Vendrame at 2023-06-14T09:34:13+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 9533dd15 by Mike Perry at 2023-06-14T09:34:13+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 7d4a765f by Pier Angelo Vendrame at 2023-06-14T09:34:14+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - ab191d17 by Henry Wilkes at 2023-06-14T09:34:14+02:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - b6108518 by Pier Angelo Vendrame at 2023-06-14T09:34:15+02:00 fixup! Firefox preference overrides. - - - - - 75f6d56e by hackademix at 2023-06-14T09:34:15+02:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - f5ae888f by Pier Angelo Vendrame at 2023-06-14T09:34:15+02:00 fixup! Firefox preference overrides. Missing comments on tor-browser.git. To be moved there. - - - - - 627466c4 by Pier Angelo Vendrame at 2023-06-14T09:34:16+02:00 fixup! Firefox preference overrides. Remove other references to Tor Browser prefs - - - - - 9a6207bf by Pier Angelo Vendrame at 2023-06-14T09:34:16+02:00 fixup! Firefox preference overrides. Ignore 001-base-profile.js during linting. - - - - - 453feb73 by Pier Angelo Vendrame at 2023-06-14T09:34:17+02:00 fixup! Firefox preference overrides. Pref name change after uplifting. - - - - - 913cb815 by Richard Pospesel at 2023-06-14T09:34:17+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - a611cccf by Pier Angelo Vendrame at 2023-06-14T09:34:18+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 8f6d4a72 by Alex Catarineu at 2023-06-14T09:34:18+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - e29633fb by Alex Catarineu at 2023-06-14T09:34:18+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 5ccec282 by Alex Catarineu at 2023-06-14T09:34:19+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - a93dbe5b by Alex Catarineu at 2023-06-14T09:34:19+02:00 Bug 26345: Hide tracking protection UI - - - - - b87bf754 by Pier Angelo Vendrame at 2023-06-14T09:34:20+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - bf05e0c5 by Alex Catarineu at 2023-06-14T09:34:20+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 7c6a042c by Mike Perry at 2023-06-14T09:34:21+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - d2095e94 by Igor Oliveira at 2023-06-14T09:34:21+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - 681dd372 by Pier Angelo Vendrame at 2023-06-14T09:34:21+02:00 fixup! Bug 23104: Add a default line height compensation - - - - - de2836e5 by Pier Angelo Vendrame at 2023-06-14T09:34:22+02:00 fixup! Bug 23104: Add a default line height compensation Get the document from aPresContext, which Moz already checks and see it isn't null. - - - - - 79bf91a5 by Pier Angelo Vendrame at 2023-06-14T09:34:24+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - e7209b51 by Matthew Finkel at 2023-06-14T09:34:25+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - ced31ed7 by Pier Angelo Vendrame at 2023-06-14T09:34:25+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 44b50e6e by hackademix at 2023-06-14T09:34:25+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 5e5f7650 by hackademix at 2023-06-14T09:34:26+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 0d9d7c7f by hackademix at 2023-06-14T09:34:26+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 3784817e by hackademix at 2023-06-14T09:34:27+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 497dd956 by hackademix at 2023-06-14T09:34:27+02:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - 9167902c by hackademix at 2023-06-14T09:34:28+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - b4f4c1dd by hackademix at 2023-06-14T09:34:28+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - 0de39294 by hackademix at 2023-06-14T09:34:28+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - b83dc999 by hackademix at 2023-06-14T09:34:29+02:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - aa855011 by Pier Angelo Vendrame at 2023-06-14T09:34:29+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 3cd4f7ba by p13dz at 2023-06-14T09:34:30+02:00 Bug 40283: Workaround for the file upload bug - - - - - 536348e6 by Arthur Edelstein at 2023-06-14T09:34:30+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - cef6e13f by Pier Angelo Vendrame at 2023-06-14T09:34:31+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 41838e0a by Henry Wilkes at 2023-06-14T09:34:31+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - a7f1e619 by Kathy Brade at 2023-06-14T09:34:31+02:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - a6bb64f9 by Kathy Brade at 2023-06-14T09:34:32+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - e12bcc04 by Pier Angelo Vendrame at 2023-06-14T09:34:32+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - 4c319547 by Pier Angelo Vendrame at 2023-06-14T09:34:33+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Linted - - - - - 57c3c34c by Pier Angelo Vendrame at 2023-06-14T09:34:33+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp. They are already defined in toolkit/xre/nsUpdateDriver.h. - - - - - 220352d0 by Pier Angelo Vendrame at 2023-06-14T09:34:34+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Fix another build error on macOS - - - - - fa880368 by Nicolas Vigier at 2023-06-14T09:34:34+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - d7f5cd1d by hackademix at 2023-06-14T09:34:34+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 6a70e9fd by Pier Angelo Vendrame at 2023-06-14T09:34:35+02:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - c4ff530f by Pier Angelo Vendrame at 2023-06-14T09:34:35+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - f4b04c19 by Alex Catarineu at 2023-06-14T09:34:36+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - acbe111f by Matthew Finkel at 2023-06-14T09:34:36+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - c043564a by Pier Angelo Vendrame at 2023-06-14T09:34:37+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - a5973001 by Pier Angelo Vendrame at 2023-06-14T09:34:37+02:00 fixup! Bug 40925: Implemented the Security Level component Linted - - - - - c25cf18b by Pier Angelo Vendrame at 2023-06-14T09:34:37+02:00 Bug 40926: Implemented the New Identity feature - - - - - 43311546 by Henry Wilkes at 2023-06-14T09:34:38+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - browser/base/moz.build - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/560cc1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/560cc1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.0b5-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

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

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0b5-13.0-1] 97 commits: Bug 41454: Move focus after calling openPreferences for a sub-category.
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch base-browser-115.0b5-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 1cf63a37 by Henry Wilkes at 2023-06-14T09:33:21+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 4139872a by Henry Wilkes at 2023-06-14T09:33:23+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - e9f23088 by Pier Angelo Vendrame at 2023-06-14T09:33:23+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 610fbfc5 by Pier Angelo Vendrame at 2023-06-14T09:33:23+02:00 fixup! Bug 41116: Normalize system fonts. Update to the latest proposal to upstream. It fixes build issues on macOS. - - - - - 70ca5977 by Pier Angelo Vendrame at 2023-06-14T09:33:24+02:00 fixup! Bug 41116: Normalize system fonts. ShouldResistFinterprinting now always wants a target. - - - - - 13ca9cfd by Marco Simonelli at 2023-06-14T09:33:24+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - e7788102 by Marco Simonelli at 2023-06-14T09:33:25+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 20958510 by Pier Angelo Vendrame at 2023-06-14T09:33:25+02:00 fixup! Bug 41459: WebRTC fails to build under mingw (Part 2) Reworked the _com_error conversion to string, to use functions that are available also to mingw. - - - - - 24658877 by Marco Simonelli at 2023-06-14T09:33:26+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 21969d74 by Marco Simonelli at 2023-06-14T09:33:26+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - cdd2fe0f by Pier Angelo Vendrame at 2023-06-14T09:33:26+02:00 fixup! Bug 41459: WebRTC fails to build under mingw (Part 4) Define _CRT_RAND_S as a compiler flag, to avoid problems due to unified sources. - - - - - 61cd0851 by Marco Simonelli at 2023-06-14T09:33:27+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - fbe3e5b4 by Marco Simonelli at 2023-06-14T09:33:27+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 28776065 by Gaba at 2023-06-14T09:33:28+02:00 Adding issue and merge request templates - - - - - efecab1e by Pier Angelo Vendrame at 2023-06-14T09:33:28+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 79678742 by Pier Angelo Vendrame at 2023-06-14T09:33:29+02:00 fixup! Base Browser's .mozconfigs. Do not specify --{enable,disable}-verify-mar in mozconfigs, as this option does not exist anymore, and signed mars are enabled by default. - - - - - 7da1afab by Pier Angelo Vendrame at 2023-06-14T09:33:29+02:00 fixup! Base Browser's .mozconfigs. Use the new flag upstream to replace the Bug 41542 commit. - - - - - 689a21c5 by Pier Angelo Vendrame at 2023-06-14T09:33:29+02:00 fixup! Base Browser's .mozconfigs. Disable the notification server because of the upstream Bug 1782837. - - - - - 82aadf12 by Pier Angelo Vendrame at 2023-06-14T09:33:30+02:00 fixup! Base Browser's .mozconfigs. Explicitly say we want verified updates. - - - - - f2ff5211 by Pier Angelo Vendrame at 2023-06-14T09:33:30+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - a42c52d8 by Pier Angelo Vendrame at 2023-06-14T09:33:31+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - d05967a3 by Dan Ballard at 2023-06-14T09:33:31+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 4ee710fc by Matthew Finkel at 2023-06-14T09:33:31+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - b82fe664 by Matthew Finkel at 2023-06-14T09:33:32+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 054eefbb by Mike Perry at 2023-06-14T09:33:32+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 0a7949c5 by Alex Catarineu at 2023-06-14T09:33:33+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 6ab9f4f2 by Georg Koppen at 2023-06-14T09:33:33+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - b2a5ea82 by Kathy Brade at 2023-06-14T09:33:34+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 1033cb3f by Kathy Brade at 2023-06-14T09:33:34+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - c9f6abf8 by Alex Catarineu at 2023-06-14T09:34:05+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - d3072c64 by Kathy Brade at 2023-06-14T09:34:08+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - f53f7025 by Arthur Edelstein at 2023-06-14T09:34:08+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 186aa994 by Alex Catarineu at 2023-06-14T09:34:09+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 669f1eeb by Pier Angelo Vendrame at 2023-06-14T09:34:09+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Linted - - - - - bf90fc3d by Pier Angelo Vendrame at 2023-06-14T09:34:09+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - e8a87e8b by Georg Koppen at 2023-06-14T09:34:10+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - b4f10712 by Pier Angelo Vendrame at 2023-06-14T09:34:10+02:00 fixup! Bug 30541: Disable WebGL readPixel() for web content - - - - - 6e15b036 by Pier Angelo Vendrame at 2023-06-14T09:34:11+02:00 fixup! Bug 30541: Disable WebGL readPixel() for web content ShouldResistFinterprinting now always wants a target. - - - - - 336fcb65 by Alex Catarineu at 2023-06-14T09:34:11+02:00 Bug 28369: Stop shipping pingsender executable - - - - - b1b1e299 by Pier Angelo Vendrame at 2023-06-14T09:34:12+02:00 fixup! Bug 28369: Stop shipping pingsender executable Linted - - - - - 0f081b68 by cypherpunks1 at 2023-06-14T09:34:12+02:00 Bug 41568: Disable LaterRun - - - - - 9266b13c by cypherpunks1 at 2023-06-14T09:34:12+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 1f1ce481 by Pier Angelo Vendrame at 2023-06-14T09:34:13+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 9533dd15 by Mike Perry at 2023-06-14T09:34:13+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 7d4a765f by Pier Angelo Vendrame at 2023-06-14T09:34:14+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - ab191d17 by Henry Wilkes at 2023-06-14T09:34:14+02:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - b6108518 by Pier Angelo Vendrame at 2023-06-14T09:34:15+02:00 fixup! Firefox preference overrides. - - - - - 75f6d56e by hackademix at 2023-06-14T09:34:15+02:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - f5ae888f by Pier Angelo Vendrame at 2023-06-14T09:34:15+02:00 fixup! Firefox preference overrides. Missing comments on tor-browser.git. To be moved there. - - - - - 627466c4 by Pier Angelo Vendrame at 2023-06-14T09:34:16+02:00 fixup! Firefox preference overrides. Remove other references to Tor Browser prefs - - - - - 9a6207bf by Pier Angelo Vendrame at 2023-06-14T09:34:16+02:00 fixup! Firefox preference overrides. Ignore 001-base-profile.js during linting. - - - - - 453feb73 by Pier Angelo Vendrame at 2023-06-14T09:34:17+02:00 fixup! Firefox preference overrides. Pref name change after uplifting. - - - - - 913cb815 by Richard Pospesel at 2023-06-14T09:34:17+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - a611cccf by Pier Angelo Vendrame at 2023-06-14T09:34:18+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 8f6d4a72 by Alex Catarineu at 2023-06-14T09:34:18+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - e29633fb by Alex Catarineu at 2023-06-14T09:34:18+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 5ccec282 by Alex Catarineu at 2023-06-14T09:34:19+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - a93dbe5b by Alex Catarineu at 2023-06-14T09:34:19+02:00 Bug 26345: Hide tracking protection UI - - - - - b87bf754 by Pier Angelo Vendrame at 2023-06-14T09:34:20+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - bf05e0c5 by Alex Catarineu at 2023-06-14T09:34:20+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 7c6a042c by Mike Perry at 2023-06-14T09:34:21+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - d2095e94 by Igor Oliveira at 2023-06-14T09:34:21+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - 681dd372 by Pier Angelo Vendrame at 2023-06-14T09:34:21+02:00 fixup! Bug 23104: Add a default line height compensation - - - - - de2836e5 by Pier Angelo Vendrame at 2023-06-14T09:34:22+02:00 fixup! Bug 23104: Add a default line height compensation Get the document from aPresContext, which Moz already checks and see it isn't null. - - - - - 79bf91a5 by Pier Angelo Vendrame at 2023-06-14T09:34:24+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - e7209b51 by Matthew Finkel at 2023-06-14T09:34:25+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - ced31ed7 by Pier Angelo Vendrame at 2023-06-14T09:34:25+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 44b50e6e by hackademix at 2023-06-14T09:34:25+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 5e5f7650 by hackademix at 2023-06-14T09:34:26+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 0d9d7c7f by hackademix at 2023-06-14T09:34:26+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 3784817e by hackademix at 2023-06-14T09:34:27+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 497dd956 by hackademix at 2023-06-14T09:34:27+02:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - 9167902c by hackademix at 2023-06-14T09:34:28+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - b4f4c1dd by hackademix at 2023-06-14T09:34:28+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - 0de39294 by hackademix at 2023-06-14T09:34:28+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - b83dc999 by hackademix at 2023-06-14T09:34:29+02:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - aa855011 by Pier Angelo Vendrame at 2023-06-14T09:34:29+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 3cd4f7ba by p13dz at 2023-06-14T09:34:30+02:00 Bug 40283: Workaround for the file upload bug - - - - - 536348e6 by Arthur Edelstein at 2023-06-14T09:34:30+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - cef6e13f by Pier Angelo Vendrame at 2023-06-14T09:34:31+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 41838e0a by Henry Wilkes at 2023-06-14T09:34:31+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - a7f1e619 by Kathy Brade at 2023-06-14T09:34:31+02:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - a6bb64f9 by Kathy Brade at 2023-06-14T09:34:32+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - e12bcc04 by Pier Angelo Vendrame at 2023-06-14T09:34:32+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - 4c319547 by Pier Angelo Vendrame at 2023-06-14T09:34:33+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Linted - - - - - 57c3c34c by Pier Angelo Vendrame at 2023-06-14T09:34:33+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp. They are already defined in toolkit/xre/nsUpdateDriver.h. - - - - - 220352d0 by Pier Angelo Vendrame at 2023-06-14T09:34:34+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Fix another build error on macOS - - - - - fa880368 by Nicolas Vigier at 2023-06-14T09:34:34+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - d7f5cd1d by hackademix at 2023-06-14T09:34:34+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 6a70e9fd by Pier Angelo Vendrame at 2023-06-14T09:34:35+02:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - c4ff530f by Pier Angelo Vendrame at 2023-06-14T09:34:35+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - f4b04c19 by Alex Catarineu at 2023-06-14T09:34:36+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - acbe111f by Matthew Finkel at 2023-06-14T09:34:36+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - c043564a by Pier Angelo Vendrame at 2023-06-14T09:34:37+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - a5973001 by Pier Angelo Vendrame at 2023-06-14T09:34:37+02:00 fixup! Bug 40925: Implemented the Security Level component Linted - - - - - c25cf18b by Pier Angelo Vendrame at 2023-06-14T09:34:37+02:00 Bug 40926: Implemented the New Identity feature - - - - - 43311546 by Henry Wilkes at 2023-06-14T09:34:38+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - browser/base/moz.build - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/560cc1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/560cc1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: d891a214 by Henry Wilkes at 2023-06-14T15:39:40+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41850: Don't show tor connection animation for new windows. (cherry picked from commit ba957145a761f1212df2d4f2b348478404c78e08) - - - - - 2 changed files: - browser/components/torconnect/content/torConnectTitlebarStatus.css - browser/components/torconnect/content/torConnectTitlebarStatus.js Changes: ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -64,11 +64,11 @@ } @media (prefers-reduced-motion: no-preference) { - #tor-connect-titlebar-status.tor-connect-status-connected { + #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition { transition: color 1000ms; } - #tor-connect-titlebar-status.tor-connect-status-connected img { + #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition img { animation-name: onion-not-connected-to-connected; animation-delay: 200ms; animation-fill-mode: both; ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -16,6 +16,12 @@ var gTorConnectTitlebarStatus = { * @type {Element} */ label: null, + /** + * Whether we are connected, or null if the connection state is not yet known. + * + * @type {bool?} + */ + connected: null, /** * Initialize the component. @@ -84,7 +90,31 @@ var gTorConnectTitlebarStatus = { break; } this.label.textContent = this._strings[textId]; - this.node.classList.toggle("tor-connect-status-connected", connected); + if (this.connected !== connected) { + // When we are transitioning from + // this.connected = false + // to + // this.connected = true + // we want to animate the transition from the not connected state to the + // connected state (provided prefers-reduced-motion is not set). + // + // If instead we are transitioning directly from the initial state + // this.connected = null + // to + // this.connected = true + // we want to immediately show the connected state without any transition. + // + // In both cases, the status will eventually be hidden. + // + // We only expect this latter case when opening a new window after + // bootstrapping has already completed. See tor-browser#41850. + this.node.classList.toggle( + "tor-connect-status-animate-transition", + connected && this.connected !== null + ); + this.node.classList.toggle("tor-connect-status-connected", connected); + this.connected = connected; + } this.node.classList.toggle( "tor-connect-status-potentially-blocked", potentiallyBlocked View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d891a21… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d891a21… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by richard (＠richard) 14 Jun '23

14 Jun '23

richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ba957145 by Henry Wilkes at 2023-06-14T15:40:56+01:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41850: Don't show tor connection animation for new windows. - - - - - 2 changed files: - browser/components/torconnect/content/torConnectTitlebarStatus.css - browser/components/torconnect/content/torConnectTitlebarStatus.js Changes: ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -64,11 +64,11 @@ } @media (prefers-reduced-motion: no-preference) { - #tor-connect-titlebar-status.tor-connect-status-connected { + #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition { transition: color 1000ms; } - #tor-connect-titlebar-status.tor-connect-status-connected img { + #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition img { animation-name: onion-not-connected-to-connected; animation-delay: 200ms; animation-fill-mode: both; ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -16,6 +16,12 @@ var gTorConnectTitlebarStatus = { * @type {Element} */ label: null, + /** + * Whether we are connected, or null if the connection state is not yet known. + * + * @type {bool?} + */ + connected: null, /** * Initialize the component. @@ -84,7 +90,31 @@ var gTorConnectTitlebarStatus = { break; } this.label.textContent = this._strings[textId]; - this.node.classList.toggle("tor-connect-status-connected", connected); + if (this.connected !== connected) { + // When we are transitioning from + // this.connected = false + // to + // this.connected = true + // we want to animate the transition from the not connected state to the + // connected state (provided prefers-reduced-motion is not set). + // + // If instead we are transitioning directly from the initial state + // this.connected = null + // to + // this.connected = true + // we want to immediately show the connected state without any transition. + // + // In both cases, the status will eventually be hidden. + // + // We only expect this latter case when opening a new window after + // bootstrapping has already completed. See tor-browser#41850. + this.node.classList.toggle( + "tor-connect-status-animate-transition", + connected && this.connected !== null + ); + this.node.classList.toggle("tor-connect-status-connected", connected); + this.connected = connected; + } this.node.classList.toggle( "tor-connect-status-potentially-blocked", potentiallyBlocked View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba95714… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba95714… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor] branch main updated (d5306e107f -> 44368a727a)
by gitolite role 14 Jun '23

14 Jun '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from d5306e107f Merge branch 'tor-gitlab/mr/715' new 03d63bc7bd Add a conflux helper to log conflux sets. new 176f0929bb Add conflux logs to diagnose cases where RTTs are absent/zero. new ff59e2f490 Add BUG() macro to marked edge reads new da50d21c42 Bug 40801: Send LINKED_ACK before attaching streams new 6a513e2ff5 Bug 40801: Do not change read state of marked conns new 0149c1ff98 Bug 40801: Add changes file new dbd37c0e7b Bug 40810: Improve validation checks to ignore 0-RTT legs new 5d63842e86 Bug 40810: Avoid using 0 RTT legs new 7ffda7512d Changes file for bug40810 new 44368a727a Merge branch 'tor-gitlab/mr/721' The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/bug40801 | 10 +++++ changes/bug40810 | 4 ++ src/core/or/conflux.c | 21 ++++++--- src/core/or/conflux_pool.c | 106 ++++++++++++++++++++++++++++++++++++++++----- src/core/or/conflux_pool.h | 3 ++ src/core/or/conflux_util.c | 42 +++++++++++++----- src/core/or/relay.c | 8 ++-- 7 files changed, 162 insertions(+), 32 deletions(-) create mode 100644 changes/bug40801 create mode 100644 changes/bug40810 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 10

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: fc3e82b2 by Henry Wilkes at 2023-06-14T12:50:56+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41849: Use the firefox check.svg since we removed our own equivalent check.svg in tor-browser!663. (cherry picked from commit 4e9c03457f775b9d98945d73b1b876b50b5340c9) - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -210,7 +210,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-current-bridge-icon { margin-inline-start: 1px; margin-inline-end: 7px; - list-style-image: url("chrome://browser/content/torpreferences/check.svg"); + list-style-image: url("chrome://global/skin/icons/check.svg"); -moz-context-properties: fill; fill: currentColor; flex: 0 0 auto; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fc3e82b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fc3e82b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4e9c0345 by Henry Wilkes at 2023-06-14T12:50:20+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41849: Use the firefox check.svg since we removed our own equivalent check.svg in tor-browser!663. - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -210,7 +210,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-current-bridge-icon { margin-inline-start: 1px; margin-inline-end: 7px; - list-style-image: url("chrome://browser/content/torpreferences/check.svg"); + list-style-image: url("chrome://global/skin/icons/check.svg"); -moz-context-properties: fill; fill: currentColor; flex: 0 0 auto; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4e9c034… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4e9c034… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 01e38a05 by Henry Wilkes at 2023-06-14T10:04:00+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41848 - Consistently disable the accept/connect button in the bridge dialogs until the user gives some input. (cherry picked from commit 0d458af9bf952c1b6f4f685e7c1397156ae8b69c) - - - - - 3 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.jsm - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/provideBridgeDialog.jsm Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.jsm ===================================== @@ -26,6 +26,7 @@ class BuiltinBridgeDialog { constructor(onSubmit) { this.onSubmit = onSubmit; this._acceptButton = null; + this._radioGroup = null; } _populateXUL(window, dialog) { @@ -36,7 +37,7 @@ class BuiltinBridgeDialog { "#torPreferences-builtinBridge-description" ).textContent = TorStrings.settings.builtinBridgeDescription2; - const radioGroup = dialog.querySelector( + this._radioGroup = dialog.querySelector( "#torPreferences-builtinBridge-typeSelection" ); @@ -60,13 +61,8 @@ class BuiltinBridgeDialog { TorSettings.bridges.source == TorBridgeSource.BuiltIn ? TorSettings.bridges.builtin_type : null; - if (currentBuiltinType) { - radioGroup.value = currentBuiltinType; - } else { - radioGroup.selectedItem = null; - } - for (const optionEl of radioGroup.querySelectorAll( + for (const optionEl of this._radioGroup.querySelectorAll( ".builtin-bridges-option" )) { const radio = optionEl.querySelector("radio"); @@ -85,8 +81,15 @@ class BuiltinBridgeDialog { ); } + if (currentBuiltinType) { + this._radioGroup.value = currentBuiltinType; + } else { + this._radioGroup.selectedItem = null; + } + + this._radioGroup.addEventListener("select", () => this.onSelectChange()); dialog.addEventListener("dialogaccept", () => { - this.onSubmit(radioGroup.value, TorConnect.canBeginBootstrap); + this.onSubmit(this._radioGroup.value, TorConnect.canBeginBootstrap); }); dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( @@ -102,9 +105,15 @@ class BuiltinBridgeDialog { this._acceptButton = dialog.getButton("accept"); Services.obs.addObserver(this, TorConnectTopics.StateChange); + + this.onSelectChange(); this.onAcceptStateChange(); } + onSelectChange() { + this._acceptButton.disabled = !this._radioGroup.value; + } + onAcceptStateChange() { this._acceptButton.setAttribute( "label", ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1088,14 +1088,9 @@ const gConnectionPane = (function() { onAddBuiltinBridge() { const builtinBridgeDialog = new BuiltinBridgeDialog( (bridgeType, connect) => { - if (!bridgeType) { - TorSettings.bridges.enabled = false; - TorSettings.bridges.builtin_type = ""; - } else { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.BuiltIn; - TorSettings.bridges.builtin_type = bridgeType; - } + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.BuiltIn; + TorSettings.bridges.builtin_type = bridgeType; this.saveBridgeSettings(connect); } @@ -1124,15 +1119,9 @@ const gConnectionPane = (function() { onAddBridgeManually() { const provideBridgeDialog = new ProvideBridgeDialog( (aBridgeString, connect) => { - if (aBridgeString) { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.UserProvided; - TorSettings.bridges.bridge_strings = aBridgeString; - } else { - TorSettings.bridges.enabled = false; - TorSettings.bridges.source = TorBridgeSource.Invalid; - TorSettings.bridges.bridge_strings = ""; - } + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.UserProvided; + TorSettings.bridges.bridge_strings = aBridgeString; this.saveBridgeSettings(connect); } ===================================== browser/components/torpreferences/content/provideBridgeDialog.jsm ===================================== @@ -56,32 +56,35 @@ class ProvideBridgeDialog { "placeholder", TorStrings.settings.provideBridgePlaceholder ); - this._textarea.addEventListener("input", () => { - this.onAcceptStateChange(); - }); + + this._textarea.addEventListener("input", () => this.onValueChange()); if (TorSettings.bridges.source == TorBridgeSource.UserProvided) { this._textarea.value = TorSettings.bridges.bridge_strings.join("\n"); } this._dialog.addEventListener("dialogaccept", e => { - let value = this._textarea.value; - if (!value.trim()) { - value = null; - } - this.onSubmit(value, value && TorConnect.canBeginBootstrap); + this.onSubmit(this._textarea.value, TorConnect.canBeginBootstrap); }); this._dialog.addEventListener("dialoghelp", openHelp); this._acceptButton = this._dialog.getButton("accept"); Services.obs.addObserver(this, TorConnectTopics.StateChange); + + this.onValueChange(); this.onAcceptStateChange(); } + onValueChange() { + // TODO: Do some proper value parsing and error reporting. See + // tor-browser#40552. + this._acceptButton.disabled = !this._textarea.value.trim(); + } + onAcceptStateChange() { this._acceptButton.setAttribute( "label", - this._textarea.value.trim() && TorConnect.canBeginBootstrap + TorConnect.canBeginBootstrap ? TorStrings.settings.bridgeButtonConnect : TorStrings.settings.bridgeButtonAccept ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/01e38a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/01e38a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0