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

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Disable features and functionality
by Dan Ballard (＠dan) 28 Sep '23

28 Sep '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: ed46ed61 by Dan Ballard at 2023-09-28T16:42:56+00:00 fixup! Disable features and functionality Bug 42114: Disable Sharing URL from Recent Screen in Private Browsing mode - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -560,7 +560,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { override fun onProvideAssistContent(outContent: AssistContent?) { super.onProvideAssistContent(outContent) val currentTabUrl = components.core.store.state.selectedTab?.content?.url - outContent?.webUri = currentTabUrl?.let { Uri.parse(it) } + if (components.core.store.state.selectedTab?.content?.private == false) { + outContent?.webUri = currentTabUrl?.let { Uri.parse(it) } + } } private fun getBookmarkCount(node: BookmarkNode): Int { View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ed4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ed4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX
by Dan Ballard (＠dan) 28 Sep '23

28 Sep '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: c5b1df66 by Dan Ballard at 2023-09-27T23:48:46-07:00 fixup! Modify UI/UX Bug 42134: Remove Android icon shortcuts for new tab and logins/passwords - - - - - 5 changed files: - fenix/app/src/beta/res/xml/shortcuts.xml - fenix/app/src/debug/res/xml/shortcuts.xml - fenix/app/src/main/res/xml/shortcuts.xml - fenix/app/src/nightly/res/xml/shortcuts.xml - fenix/app/src/release/res/xml/shortcuts.xml Changes: ===================================== fenix/app/src/beta/res/xml/shortcuts.xml ===================================== @@ -3,28 +3,28 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> - <shortcut - android:shortcutId="password_manager" - android:enabled="true" - android:icon="@drawable/ic_static_password_shortcut" - android:shortcutShortLabel="@string/home_screen_shortcut_open_password_screen" - android:shortcutLongLabel="@string/home_screen_shortcut_open_password_screen"> - <intent - android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" - android:targetPackage="org.mozilla.firefox_beta" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> - <shortcut - android:shortcutId="open_new_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.torproject.torbrowser_alpha" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + + + + + + + + + + + + <shortcut android:shortcutId="open_new_private_tab" android:enabled="true" ===================================== fenix/app/src/debug/res/xml/shortcuts.xml ===================================== @@ -4,28 +4,28 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> - <shortcut - android:shortcutId="password_manager" - android:enabled="true" - android:icon="@drawable/ic_static_password_shortcut" - android:shortcutShortLabel="@string/home_screen_shortcut_open_password_screen" - android:shortcutLongLabel="@string/home_screen_shortcut_open_password_screen"> - <intent - android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" - android:targetPackage="org.mozilla.fenix.debug" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> - <shortcut - android:shortcutId="open_new_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.torproject.torbrowser_debug" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + + + + + + + + + + + + <shortcut android:shortcutId="open_new_private_tab" android:enabled="true" ===================================== fenix/app/src/main/res/xml/shortcuts.xml ===================================== @@ -4,28 +4,28 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> - <shortcut - android:shortcutId="password_manager" - android:enabled="true" - android:icon="@drawable/ic_static_password_shortcut" - android:shortcutShortLabel="@string/home_screen_shortcut_open_password_screen" - android:shortcutLongLabel="@string/home_screen_shortcut_open_password_screen"> - <intent - android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" - android:targetPackage="org.mozilla.fenix" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> - <shortcut - android:shortcutId="open_new_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.torproject.torbrowser_dev" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + + + + + + + + + + + + <shortcut android:shortcutId="open_new_private_tab" android:enabled="true" ===================================== fenix/app/src/nightly/res/xml/shortcuts.xml ===================================== @@ -4,28 +4,28 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> - <shortcut - android:shortcutId="password_manager" - android:enabled="true" - android:icon="@drawable/ic_static_password_shortcut" - android:shortcutShortLabel="@string/home_screen_shortcut_open_password_screen" - android:shortcutLongLabel="@string/home_screen_shortcut_open_password_screen"> - <intent - android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" - android:targetPackage="org.mozilla.fenix" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> - <shortcut - android:shortcutId="open_new_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.torproject.torbrowser_nightly" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + + + + + + + + + + + + <shortcut android:shortcutId="open_new_private_tab" android:enabled="true" @@ -37,4 +37,4 @@ android:targetPackage="org.torproject.torbrowser_nightly" android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> </shortcut> -</shortcuts> \ No newline at end of file +</shortcuts> ===================================== fenix/app/src/release/res/xml/shortcuts.xml ===================================== @@ -3,28 +3,28 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> - <shortcut - android:shortcutId="password_manager" - android:enabled="true" - android:icon="@drawable/ic_static_password_shortcut" - android:shortcutShortLabel="@string/home_screen_shortcut_open_password_screen" - android:shortcutLongLabel="@string/home_screen_shortcut_open_password_screen"> - <intent - android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" - android:targetPackage="org.mozilla.firefox" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> - <shortcut - android:shortcutId="open_new_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_TAB" - android:targetPackage="org.torproject.torbrowser" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + + + + + + + + + + + + <shortcut android:shortcutId="open_new_private_tab" android:enabled="true" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c5b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c5b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

28 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: ba5e4b14 by Henry Wilkes at 2023-09-28T17:20:49+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41910: Restore tor browser help link in about:preferences. - - - - - 1 changed file: - toolkit/content/widgets/moz-support-link/moz-support-link.mjs Changes: ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -103,6 +103,19 @@ export default class MozSupportLink extends HTMLAnchorElement { #setHref() { let supportPage = this.getAttribute("support-page") ?? ""; + // For tor-browser we sometimes want to override firefox support links with + // our own. + // See tor-browser#40899. + switch (supportPage) { + case "preferences": + // Shown twice in preferences, both as `{ -brand-short-name } Support`. + // Instead of directing to support for preferences, we link to general + // tor browser support. + // See tor-browser#32092. + this.href = "https://support.torproject.org/tbb" + return; + // Fall through to support.mozilla.org + } let base = MozSupportLink.SUPPORT_URL + supportPage; this.href = this.hasAttribute("utm-content") ? formatUTMParams(this.getAttribute("utm-content"), base) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba5e4b1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba5e4b1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] 2 commits: fixup! Bug 41995: Generated headers on Windows are not reproducible
by richard (＠richard) 28 Sep '23

28 Sep '23

richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 3b4f838b by Pier Angelo Vendrame at 2023-09-28T16:00:59+00:00 fixup! Bug 41995: Generated headers on Windows are not reproducible Revert "Bug 41995: Generated headers on Windows are not reproducible" This reverts commit 1f45f64ee2fb53129a06984f3b9fb36ef3b64645. - - - - - cea59f54 by Pier Angelo Vendrame at 2023-09-28T16:00:59+00:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/eb0fd6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/eb0fd6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.15.1esr-12.5-1] 2 commits: Bug 1847180. a=RyanVM
by Pier Angelo Vendrame (＠pierov) 28 Sep '23

28 Sep '23

Pier Angelo Vendrame pushed to branch base-browser-102.15.1esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1183dcd0 by Marco Bonardo at 2023-09-28T16:46:19+02:00 Bug 1847180. a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D188240 Differential Revision: https://phabricator.services.mozilla.com/D188568 - - - - - e98eeaff by Ryan VanderMeulen at 2023-09-28T16:46:22+02:00 Bug 1855550 - VP8: disallow thread count changes. r=jesup, a=dsmith Cherry-pick of upstream libvpx commits: https://chromium.googlesource.com/webm/libvpx/+/af6dedd715f4307669366944cca… https://chromium.googlesource.com/webm/libvpx/+/3fbd1dca6a4d2dad332a2110d64… Differential Revision: https://phabricator.services.mozilla.com/D189428 - - - - - 5 changed files: - media/libvpx/libvpx/vp8/encoder/onyx_if.c - toolkit/components/reputationservice/ApplicationReputation.cpp - toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp - xpcom/io/nsLocalFileCommon.cpp - xpcom/io/nsLocalFileCommon.h Changes: ===================================== media/libvpx/libvpx/vp8/encoder/onyx_if.c ===================================== @@ -1445,6 +1445,12 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { last_h = cpi->oxcf.Height; prev_number_of_layers = cpi->oxcf.number_of_layers; + if (cpi->initial_width) { + // TODO(https://crbug.com/1486441): Allow changing thread counts; the + // allocation is done once in vp8_create_compressor(). + oxcf->multi_threaded = cpi->oxcf.multi_threaded; + } + cpi->oxcf = *oxcf; switch (cpi->oxcf.Mode) { ===================================== toolkit/components/reputationservice/ApplicationReputation.cpp ===================================== @@ -181,6 +181,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { ".applescript", //".application", exec // MS ClickOnce //".appref-ms", exec // MS ClickOnce + //".appx", exec + //".appxbundle", exec //".arc", //".arj", ".as", // Mac archive @@ -331,6 +333,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { //".msh2xml", exec // Windows shell //".mshxml", exec // Windows //".msi", exec // Windows installer + //".msix", exec // Windows installer + //".msixbundle", exec // Windows installer //".msp", exec // Windows installer //".mst", exec // Windows installer ".ndif", // Mac disk image ===================================== toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp ===================================== @@ -24,6 +24,8 @@ static const char* const kTestFileExtensions[] = { ".applescript", ".application", // MS ClickOnce ".appref-ms", // MS ClickOnce + ".appx", + ".appxbundle", ".as", // Mac archive ".asp", // Windows Server script ".asx", // Windows Media Player @@ -151,6 +153,8 @@ static const char* const kTestFileExtensions[] = { ".msh2xml", // Windows shell ".mshxml", // Windows ".msi", // Windows installer + ".msix", // Windows installer + ".msixbundle", // Windows installer ".msp", // Windows installer ".mst", // Windows installer ".ndif", // Mac disk image ===================================== xpcom/io/nsLocalFileCommon.cpp ===================================== @@ -40,6 +40,8 @@ const char* const sExecutableExts[] = { ".app", // executable application ".application", // from bug 348763 ".appref-ms", // ClickOnce link + ".appx", + ".appxbundle", ".asp", ".atloc", // Appletalk Location ".bas", @@ -91,6 +93,8 @@ const char* const sExecutableExts[] = { ".msh2xml", // Microsoft Shell ".mshxml", // Microsoft Shell ".msi", + ".msix", + ".msixbundle", ".msp", ".mst", ".ops", // Office Profile Settings ===================================== xpcom/io/nsLocalFileCommon.h ===================================== @@ -7,6 +7,6 @@ #ifndef _NS_LOCAL_FILE_COMMON_H_ #define _NS_LOCAL_FILE_COMMON_H_ -extern const char* const sExecutableExts[103]; +extern const char* const sExecutableExts[107]; #endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8461a8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8461a8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.15.1esr-12.5-1-build3
by Pier Angelo Vendrame (＠pierov) 28 Sep '23

28 Sep '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.15.1esr-12.5-1] 2 commits: Bug 1847180. a=RyanVM
by Pier Angelo Vendrame (＠pierov) 28 Sep '23

28 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-102.15.1esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c9f778f9 by Marco Bonardo at 2023-09-28T11:12:19+02:00 Bug 1847180. a=RyanVM Original Revision: https://phabricator.services.mozilla.com/D188240 Differential Revision: https://phabricator.services.mozilla.com/D188568 - - - - - 1390a230 by Ryan VanderMeulen at 2023-09-28T11:14:27+02:00 Bug 1855550 - VP8: disallow thread count changes. r=jesup, a=dsmith Cherry-pick of upstream libvpx commits: https://chromium.googlesource.com/webm/libvpx/+/af6dedd715f4307669366944cca… https://chromium.googlesource.com/webm/libvpx/+/3fbd1dca6a4d2dad332a2110d64… Differential Revision: https://phabricator.services.mozilla.com/D189428 - - - - - 5 changed files: - media/libvpx/libvpx/vp8/encoder/onyx_if.c - toolkit/components/reputationservice/ApplicationReputation.cpp - toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp - xpcom/io/nsLocalFileCommon.cpp - xpcom/io/nsLocalFileCommon.h Changes: ===================================== media/libvpx/libvpx/vp8/encoder/onyx_if.c ===================================== @@ -1445,6 +1445,12 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { last_h = cpi->oxcf.Height; prev_number_of_layers = cpi->oxcf.number_of_layers; + if (cpi->initial_width) { + // TODO(https://crbug.com/1486441): Allow changing thread counts; the + // allocation is done once in vp8_create_compressor(). + oxcf->multi_threaded = cpi->oxcf.multi_threaded; + } + cpi->oxcf = *oxcf; switch (cpi->oxcf.Mode) { ===================================== toolkit/components/reputationservice/ApplicationReputation.cpp ===================================== @@ -181,6 +181,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { ".applescript", //".application", exec // MS ClickOnce //".appref-ms", exec // MS ClickOnce + //".appx", exec + //".appxbundle", exec //".arc", //".arj", ".as", // Mac archive @@ -331,6 +333,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { //".msh2xml", exec // Windows shell //".mshxml", exec // Windows //".msi", exec // Windows installer + //".msix", exec // Windows installer + //".msixbundle", exec // Windows installer //".msp", exec // Windows installer //".mst", exec // Windows installer ".ndif", // Mac disk image ===================================== toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp ===================================== @@ -24,6 +24,8 @@ static const char* const kTestFileExtensions[] = { ".applescript", ".application", // MS ClickOnce ".appref-ms", // MS ClickOnce + ".appx", + ".appxbundle", ".as", // Mac archive ".asp", // Windows Server script ".asx", // Windows Media Player @@ -151,6 +153,8 @@ static const char* const kTestFileExtensions[] = { ".msh2xml", // Windows shell ".mshxml", // Windows ".msi", // Windows installer + ".msix", // Windows installer + ".msixbundle", // Windows installer ".msp", // Windows installer ".mst", // Windows installer ".ndif", // Mac disk image ===================================== xpcom/io/nsLocalFileCommon.cpp ===================================== @@ -40,6 +40,8 @@ const char* const sExecutableExts[] = { ".app", // executable application ".application", // from bug 348763 ".appref-ms", // ClickOnce link + ".appx", + ".appxbundle", ".asp", ".atloc", // Appletalk Location ".bas", @@ -91,6 +93,8 @@ const char* const sExecutableExts[] = { ".msh2xml", // Microsoft Shell ".mshxml", // Microsoft Shell ".msi", + ".msix", + ".msixbundle", ".msp", ".mst", ".ops", // Office Profile Settings ===================================== xpcom/io/nsLocalFileCommon.h ===================================== @@ -7,6 +7,6 @@ #ifndef _NS_LOCAL_FILE_COMMON_H_ #define _NS_LOCAL_FILE_COMMON_H_ -extern const char* const sExecutableExts[103]; +extern const char* const sExecutableExts[107]; #endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d1b5a5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d1b5a5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] fixup! Bug 41803: Add some developer tools for working on tor-browser.
by Pier Angelo Vendrame (＠pierov) 28 Sep '23

28 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: eb0fd6e1 by Henry Wilkes at 2023-09-28T11:37:57+00:00 fixup! Bug 41803: Add some developer tools for working on tor-browser. Bug 42130: Add support for specifying the branch for moving commits to a new default branch. We rename "rebase-on-default" to "move-to-default". Instead of rebasing (which requires checking out the branch, which can trigger a clobber build) we instead create a new branch with the same name, and renaming the old branch. Then we cherry-pick the commits into the new branch. Also rename "show-upstream-commit" to "show-upstream-basis-commit". When checking for the basis commit, we make sure that the upstream branch shares the same FIREFOX base. If a branch was moved onto a tor-browser branch that does not match its "upstream tracking branch", then this should throw. E.g. a branch was tracking origin/tor-browser-115.2.1esr-13.0.1 but was rebased onto origin/tor-browser-115.3.0esr-13.0.1 without changing the tracking branch. - - - - - 1 changed file: - tools/torbrowser/tb-dev Changes: ===================================== tools/torbrowser/tb-dev ===================================== @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK """ Useful tools for working on tor-browser repository. @@ -148,12 +148,28 @@ def get_firefox_ref(search_from): return get_nearest_ref("tag", "FIREFOX_", search_from) -def get_upstream_commit(search_from): +def get_upstream_tracking_branch(search_from): + return git_get(["rev-parse", "--abbrev-ref", f"{search_from}@{{upstream}}"])[0] + + +def get_upstream_basis_commit(search_from): """ Get the first common ancestor of search_from that is also in its upstream branch. """ - return git_get(["merge-base", search_from, f"{search_from}@{{upstream}}"])[0] + upstream_branch = get_upstream_tracking_branch(search_from) + commit = git_get(["merge-base", search_from, upstream_branch])[0] + # Verify that the upstream commit shares the same firefox basis. Otherwise, + # this would indicate that the upstream is on an early or later FIREFOX + # base. + upstream_firefox = get_firefox_ref(upstream_branch).commit + search_firefox = get_firefox_ref(search_from).commit + if upstream_firefox != search_firefox: + raise Exception( + f"Upstream of {search_from} has a different FIREFOX base. " + "You might want to set the upstream tracking branch to a new value." + ) + return commit def get_changed_files(from_commit, staged=False): @@ -239,11 +255,11 @@ def show_firefox_commit(_args): print(ref.commit) -def show_upstream_commit(_args): +def show_upstream_basis_commit(_args): """ Print the last upstream commit for the current HEAD. """ - print(get_upstream_commit("HEAD")) + print(get_upstream_basis_commit("HEAD")) def show_log(args): @@ -278,7 +294,7 @@ def show_changed_files(_args): """ List all the files that have been modified relative to upstream. """ - for filename in get_changed_files(get_upstream_commit("HEAD")): + for filename in get_changed_files(get_upstream_basis_commit("HEAD")): print(filename) @@ -289,7 +305,7 @@ def lint_changed_files(args): os.chdir(get_local_root()) file_list = [ f - for f in get_changed_files(get_upstream_commit("HEAD")) + for f in get_changed_files(get_upstream_basis_commit("HEAD")) if os.path.isfile(f) # Not deleted ] command_base = ["./mach", "lint"] @@ -495,25 +511,49 @@ def branch_from_default(args): git_run(["switch", "--create", args.branchname, "--track", default_branch]) -def rebase_on_default(_args): +def move_to_default(args): """ - Fetch the default gitlab branch from upstream and rebase the current branch - on top. + Fetch the default gitlab branch from upstream and move the specified + branch's commits on top. A new branch will be created tracking the default + branch, and the old branch will be renamed with a suffix for the old + tracking branch. This method will switch to the new branch, but will avoid + switching to the old branch to prevent triggering a CLOBBER build. """ - try: - branch_name = git_get(["branch", "--show-current"])[0] - except IndexError: - raise Exception("No current branch") + branch_name = args.branch + if branch_name is None: + # Use current branch as default. + try: + branch_name = git_get(["branch", "--show-current"])[0] + except IndexError: + raise Exception("No current branch") - current_upstream = get_upstream_commit("HEAD") + current_upstream_branch = get_upstream_tracking_branch(branch_name) default_branch = get_gitlab_default() git_run(["fetch"], get_upstream_name()) - # We set the new upstream before the rebase in case there are conflicts. - git_run(["branch", f"--set-upstream-to={default_branch}"]) - git_run( - ["rebase", "--onto", default_branch, current_upstream, branch_name], check=False - ) + + if current_upstream_branch == default_branch: + print(f"{branch_name} is already set to track the default branch {default_branch}.") + return + + # We want to avoid checking out the old branch because this can cause + # mozilla ./mach to do a CLOBBER build. + # Instead we create a new branch with the same name and cherry pick. + current_basis = get_upstream_basis_commit(branch_name) + old_branch_name = branch_name + "-" + get_firefox_ref(branch_name).name + + print(f"Moving old branch {branch_name} to {old_branch_name}") + git_run(["branch", "-m", branch_name, old_branch_name]) + + try: + git_run(["switch", "--create", branch_name, "--track", default_branch]) + except subprocess.CalledProcessError as err: + print(f"Moving {old_branch_name} back to {branch_name}") + git_run(["branch", "-m", old_branch_name, branch_name]) + raise err + + # Set check to False since cherry-pick might fail due to a merge conflict. + git_run(["cherry-pick", f"{current_basis}..{old_branch_name}"], check=False) def show_range_diff(args): @@ -608,8 +648,8 @@ parser = argparse.ArgumentParser() subparsers = parser.add_subparsers(required=True) for name, details in { - "show-upstream-commit": { - "func": show_upstream_commit, + "show-upstream-basis-commit": { + "func": show_upstream_basis_commit, }, "changed-files": { "func": show_changed_files, @@ -641,8 +681,16 @@ for name, details in { }, }, }, - "rebase-on-default": { - "func": rebase_on_default, + "move-to-default": { + "func": move_to_default, + "args": { + "branch": { + "help": "the branch to move, else uses the current branch", + "metavar": "<branch>", + "nargs": "?", + "completer": branch_complete, + }, + }, }, "show-firefox-commit": { "func": show_firefox_commit, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eb0fd6e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eb0fd6e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-spec][main] Bug 40060: FF113 Audit
by richard (＠richard) 27 Sep '23

27 Sep '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-spec Commits: 962190ab by Richard Pospesel at 2023-09-27T22:41:39+00:00 Bug 40060: FF113 Audit - - - - - 1 changed file: - + audits/FF113_AUDIT Changes: ===================================== audits/FF113_AUDIT ===================================== @@ -0,0 +1,73 @@ +# General + +The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript). + +The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation. + +`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit. + +## Firefox: https://github.com/mozilla/gecko-dev.git + +- Start: `8307d3d3e4bfbca09aaa17e444f106e1e1d91b65` ( `FIREFOX_112_0_2_RELEASE` ) +- End: `8a724297d78ba792067a7e4d17d170c6b3af796e` ( `FIREFOX_113_0_2_RELEASE` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +--- + +## Application Services: https://github.com/mozilla/application-services.git + +- Start: `48916bbaf585f89fdff3404d181b260ed981a2d6` ( `v97.5.0` ) +- End: `e3db1107890d3fe69122d4d78ae04c857329b0ea` ( `v114.1` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Firefox Android: https://github.com/mozilla-mobile/firefox-android.git + +- Start: `32bb398127bacccb268a272091d2e62b8d72d6b9` +- End: `9d87757910437e94a860e1d6f2577d5648ded966` + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +#### Problematic Commits + +- Bug 1822268 - Part 1: Add juno onboarding fragment `536df038039d256cd41ecad41df97b1b3da1a2e4` +- Bug 1821726 - Part 2: Add juno onboarding telemetry `db4bc04177766a241f1e36621c1d8c480aab568d` +- Bug 1822750 - Add option to open default browser help page in custom tab `a488c06ae9ff9d060517da08e2a2db94465dc871` + - **RESOLUTION** All three of these are part of the Firefox onboarding which we have disabled entirely! + +## Ticket Review ## + +Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=113%20Branch&order=priority%2Cbug_severity&limit=0` + +Nothing of interest (manual inspection) + +#### Problematic Tickets + +- **Allow users to submit site support requests in Fenix** https://bugzilla.mozilla.org/show_bug.cgi?id=1805450 + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42007 + - **RESOLUTION** disabled +- **Copying images from Pixiv and pasting them in certain programs is broken** https://bugzilla.mozilla.org/show_bug.cgi?id=1808146 + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42008 + - **RESOLUTION** verified the web request happens in Firefox not the destination app +- **Enable overscroll on Windows on all channels** https://bugzilla.mozilla.org/show_bug.cgi?id=1810641 + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42010 + - **RESOLUTION** nothing to do here until we enable touch events (disabled for now) +## Export +- [ ] Export Report and save to `tor-browser-spec/audits` \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/96… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/96… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-spec][main] Bug 40058: FF111 Audit
by richard (＠richard) 27 Sep '23

27 Sep '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-spec Commits: b9a30372 by Richard Pospesel at 2023-09-27T22:22:43+00:00 Bug 40058: FF111 Audit - - - - - 1 changed file: - + audits/FF111_AUDIT Changes: ===================================== audits/FF111_AUDIT ===================================== @@ -0,0 +1,85 @@ +# General + +The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript). + +The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation. + +`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit. + +## Firefox: https://github.com/mozilla/gecko-dev.git + +- Start: `250178df19caa1fb25bfa0e35728426cfbde95f8` ( `FIREFOX_110_0_1_RELEASE` ) +- End: `431cede9cc9472bb648f5dfe24c54d0067c290e4` ( `FIREFOX_111_0_1_RELEASE` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +--- + +## Application Services: https://github.com/mozilla/application-services.git + +- Start: `5755d9ce30ef10248eb55c4b39a522a118ce7d95` ( `v97.1.0` ) +- End: `9657aebb7450c5b58e8b9a88bec12bd5e9e0f700` ( `v97.2.0` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Firefox Android: https://github.com/mozilla-mobile/firefox-android.git + +- Start: `bc529747751ab545dba0a90a339f11382d742c97` +- End: `6b0f9fdb3f603974914de82185cd184065b2ebee` + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +#### Problematic Commits + +- Bug 1811531 - Add 'site' query parameter to Pocket sponsored stories request + `2dfe183ed96720b843f872fdf51fe206ed9a311c` + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41990 + - **RESOLUTION** pocket not available in PBM which we lock+enforce +- Bug 1812518 - Allow a custom View for 3rd party downloads `174237dcbb6d8c631f5834ecbc7875d670bb6d8d` + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41991 + - **RESOLUTION** feature disabled + +## Fenix: https://github.com/mozilla-mobile/fenix.git + +- Start: `69e08e3ffbf4b9f5a2ffec99b238fa0c5da1d315` +- End: `8571b648efc860bd2511183540b792e10c6cc0f4` + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +#### Problematic Commits + +- Bug 1815623 - Add telemetry for sharing to an app from the share sheet + `4e5d9b323b465a73d24f8ee91a8b55df10545c36` + +## Ticket Review ## + +Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=111%20Branch&order=priority%2Cbug_severity&limit=0` + +#### Problematic Tickets + +- **Add API for saving a PDF** https://bugzilla.mozilla.org/show_bug.cgi?id=1810761 + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41993 + - **RESOLUTION** just enabling download byte-per-byte and viewing of PDF in browser, no extra meta data or conversion happens + +## Export +- [x] Export Report and save to `tor-browser-spec/audits` \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0