- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! [android] Disable features and functionality
by ma1 (＠ma1) 12 Sep '24

12 Sep '24

ma1 pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: f2364f74 by Dan Ballard at 2024-09-12T20:14:40+00:00 fixup! [android] Disable features and functionality Bug 42954: Further disable review quality feature - - - - - 2 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt ===================================== @@ -224,8 +224,8 @@ class BrowserToolbarCFRPresenter( ToolbarCFR.COOKIE_BANNERS } - shoppingExperienceFeature.isEnabled && - settings.shouldShowReviewQualityCheckCFR -> whichShoppingCFR() +// shoppingExperienceFeature.isEnabled && +// settings.shouldShowReviewQualityCheckCFR -> whichShoppingCFR() else -> ToolbarCFR.NONE } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -1801,7 +1801,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { */ var shouldShowReviewQualityCheckCFR by booleanPreference( key = appContext.getPreferenceKey(R.string.pref_key_should_show_review_quality_cfr), - default = true, + default = false, ) /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f2364f7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f2364f7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-128.2.0esr-14.0-1-build3
by ma1 (＠ma1) 12 Sep '24

12 Sep '24

ma1 pushed new tag mullvad-browser-128.2.0esr-14.0-1-build3 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… 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-128.2.0esr-14.0-1-build4
by ma1 (＠ma1) 12 Sep '24

12 Sep '24

ma1 pushed new tag tor-browser-128.2.0esr-14.0-1-build4 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-build][maint-13.5] 2 commits: Bug 41231: Add var/faketime_date and var/faketime_setup
by morgan (＠morgan) 12 Sep '24

12 Sep '24

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 2ccb1d0b by Nicolas Vigier at 2024-09-12T19:45:10+00:00 Bug 41231: Add var/faketime_date and var/faketime_setup Add var/faketime_date, in order to use it in an external script. At the same time we add var/faketime_setup to avoid duplicating the lines setting up faketime. - - - - - 939bf98d by Nicolas Vigier at 2024-09-12T19:45:17+00:00 Bug 41231: Use release date as timestamp while generating signed dmg - - - - - 6 changed files: - projects/browser/ddmg.sh - projects/libevent/build - projects/tor/build - rbm.conf - tools/signing/ddmg.sh - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/browser/ddmg.sh ===================================== @@ -11,8 +11,7 @@ dmg_tmpdir=$(mktemp -d) hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg" # hfsplus sets all the times to time(NULL) -export LD_PRELOAD=[% c("var/faketime_path") %] -export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% c("var/faketime_setup") %] src_dir=[% src %] # 1 for ceiling and 1 for the inode ===================================== projects/libevent/build ===================================== @@ -11,8 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh ./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --disable-openssl --prefix=$distdir [% IF c("var/macos") -%] - export LD_PRELOAD=[% c("var/faketime_path") %] - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + [% c("var/faketime_setup") %] [% END -%] make -j[% c("num_procs") %] make install ===================================== projects/tor/build ===================================== @@ -94,8 +94,7 @@ find -type f -print0 | xargs -0 [% c("touch") %] [% IF c("var/linux-cross") %]--build=x86_64-linux-gnu[% END %] \ --enable-gpl --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/macos") -%] - export LD_PRELOAD=[% c("var/faketime_path") %] - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + [% c("var/faketime_setup") %] [% END -%] make -j[% c("num_procs") %] make install ===================================== rbm.conf ===================================== @@ -108,6 +108,11 @@ var: Project_Name_Channel: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]' display_name: '[% c("var/Project_Name_Channel") %]' exe_name: firefox + faketime_date: "[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + faketime_setup: | + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME='[% c("var/faketime_date") %]' + locale_ja: ja # When adding new languages, add the equivalent NSIS name to # projects/browser/windows-installer/add-strings.py. ===================================== tools/signing/ddmg.sh ===================================== @@ -4,7 +4,7 @@ # file from a directory # # Usage: -# ddmg.sh <dmg-file> <src-directory> <Volume Label> +# ddmg.sh <dmg-file> <src-directory> <Volume Label> <release date> set -e @@ -14,6 +14,7 @@ source "$script_dir/functions" dest_file="$1" src_dir="$2" volume_label="$3" +browser_release_date="$4" set +e find $src_dir -executable -exec chmod 0755 {} \; 2> /dev/null @@ -26,7 +27,7 @@ dmg_tmpdir=$(mktemp -d) hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg" export LD_PRELOAD=$faketime_path -export FAKETIME="2000-01-01 01:01:01" +export FAKETIME="$browser_release_date" echo "Starting: " $(basename $dest_file) ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -56,6 +56,9 @@ ProjName=$(ProjectName) Proj_Name=$(Project_Name) proj_name=$(project-name) disp_name=$(display_name) +pushd "$script_dir/../.." +browser_release_date=$($rbm showconf --target "$tbb_version_type" --target "$SIGNING_PROJECTNAME-linux-x86_64" browser var/faketime_date) +popd test -d "$macos_signed_dir" || mkdir "$macos_signed_dir" tmpdir="$macos_stapled_dir/tmp" @@ -75,7 +78,7 @@ rm *.DS_Store tar -xf $macos_stapled_dir/"${proj_name}-${tbb_version}-notarized+stapled.tar.zst" cd .. -$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$disp_name" +$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$disp_name" "$browser_release_date" rm -rf "dmg/$disp_name.app" rm -Rf "$tmpdir" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41231: Add var/faketime_date and var/faketime_setup
by morgan (＠morgan) 12 Sep '24

12 Sep '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f8843dec by Nicolas Vigier at 2024-09-12T19:42:33+00:00 Bug 41231: Add var/faketime_date and var/faketime_setup Add var/faketime_date, in order to use it in an external script. At the same time we add var/faketime_setup to avoid duplicating the lines setting up faketime. - - - - - 98cc097f by Nicolas Vigier at 2024-09-12T19:42:33+00:00 Bug 41231: Use release date as timestamp while generating signed dmg - - - - - 6 changed files: - projects/browser/ddmg.sh - projects/libevent/build - projects/tor/build - rbm.conf - tools/signing/ddmg.sh - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/browser/ddmg.sh ===================================== @@ -11,8 +11,7 @@ dmg_tmpdir=$(mktemp -d) hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg" # hfsplus sets all the times to time(NULL) -export LD_PRELOAD=[% c("var/faketime_path") %] -export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% c("var/faketime_setup") %] src_dir=[% src %] # 1 for ceiling and 1 for the inode ===================================== projects/libevent/build ===================================== @@ -11,8 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh ./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --disable-openssl --prefix=$distdir [% IF c("var/macos") -%] - export LD_PRELOAD=[% c("var/faketime_path") %] - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + [% c("var/faketime_setup") %] [% END -%] make -j[% c("num_procs") %] make install ===================================== projects/tor/build ===================================== @@ -94,8 +94,7 @@ find -type f -print0 | xargs -0 [% c("touch") %] [% IF c("var/linux-cross") %]--build=x86_64-linux-gnu[% END %] \ --enable-gpl --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/macos") -%] - export LD_PRELOAD=[% c("var/faketime_path") %] - export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + [% c("var/faketime_setup") %] [% END -%] make -j[% c("num_procs") %] make install ===================================== rbm.conf ===================================== @@ -108,6 +108,11 @@ var: Project_Name_Channel: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]' display_name: '[% c("var/Project_Name_Channel") %]' exe_name: firefox + faketime_date: "[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + faketime_setup: | + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME='[% c("var/faketime_date") %]' + locale_ja: ja # When adding new languages, add the equivalent NSIS name to # projects/browser/windows-installer/add-strings.py. ===================================== tools/signing/ddmg.sh ===================================== @@ -4,7 +4,7 @@ # file from a directory # # Usage: -# ddmg.sh <dmg-file> <src-directory> <Volume Label> +# ddmg.sh <dmg-file> <src-directory> <Volume Label> <release date> set -e @@ -14,6 +14,7 @@ source "$script_dir/functions" dest_file="$1" src_dir="$2" volume_label="$3" +browser_release_date="$4" set +e find $src_dir -executable -exec chmod 0755 {} \; 2> /dev/null @@ -26,7 +27,7 @@ dmg_tmpdir=$(mktemp -d) hfsfile="$dmg_tmpdir/tbb-uncompressed.dmg" export LD_PRELOAD=$faketime_path -export FAKETIME="2000-01-01 01:01:01" +export FAKETIME="$browser_release_date" echo "Starting: " $(basename $dest_file) ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -56,6 +56,9 @@ ProjName=$(ProjectName) Proj_Name=$(Project_Name) proj_name=$(project-name) disp_name=$(display_name) +pushd "$script_dir/../.." +browser_release_date=$($rbm showconf --target "$tbb_version_type" --target "$SIGNING_PROJECTNAME-linux-x86_64" browser var/faketime_date) +popd test -d "$macos_signed_dir" || mkdir "$macos_signed_dir" tmpdir="$macos_stapled_dir/tmp" @@ -75,7 +78,7 @@ rm *.DS_Store tar -xf $macos_stapled_dir/"${proj_name}-${tbb_version}-notarized+stapled.tar.zst" cd .. -$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$disp_name" +$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$disp_name" "$browser_release_date" rm -rf "dmg/$disp_name.app" rm -Rf "$tmpdir" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: Bug 1902996 - Improve messaging for fullscreen notifications. r=android-reviewers, gl
by ma1 (＠ma1) 12 Sep '24

12 Sep '24

ma1 pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 3162dd72 by pollymce at 2024-09-12T21:13:09+02:00 Bug 1902996 - Improve messaging for fullscreen notifications. r=android-reviewers,gl Instead of explaining to users that they are in fullscreen mode, which may be obvious, we explain how to get out of it :) Also use a Toast rather than a custom Dialog. Update Focus too. Fix lint errors. Differential Revision: https://phabricator.services.mozilla.com/D215782 - - - - - e7164ace by hackademix at 2024-09-12T21:13:15+02:00 fixup! Bug 1902996 - Improve messaging for fullscreen notifications. r=android-reviewers,gl Backported localizations. - - - - - 30 changed files: - + mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/FullScreenNotification.kt - − mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/FullScreenNotificationDialog.kt - + mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/GestureNavUtils.kt - + mobile/android/android-components/components/feature/prompts/src/test/java/mozilla/components/feature/prompts/dialog/FullScreenNotificationTest.kt - mobile/android/android-components/docs/changelog.md - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - − mobile/android/fenix/app/src/main/res/layout/full_screen_notification_dialog.xml - mobile/android/fenix/app/src/main/res/values-be/strings.xml - mobile/android/fenix/app/src/main/res/values-bg/strings.xml - mobile/android/fenix/app/src/main/res/values-bs/strings.xml - mobile/android/fenix/app/src/main/res/values-ca/strings.xml - mobile/android/fenix/app/src/main/res/values-co/strings.xml - mobile/android/fenix/app/src/main/res/values-cs/strings.xml - mobile/android/fenix/app/src/main/res/values-cy/strings.xml - mobile/android/fenix/app/src/main/res/values-da/strings.xml - mobile/android/fenix/app/src/main/res/values-de/strings.xml - mobile/android/fenix/app/src/main/res/values-dsb/strings.xml - mobile/android/fenix/app/src/main/res/values-el/strings.xml - mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml - mobile/android/fenix/app/src/main/res/values-en-rGB/strings.xml - mobile/android/fenix/app/src/main/res/values-es-rAR/strings.xml - mobile/android/fenix/app/src/main/res/values-es-rCL/strings.xml - mobile/android/fenix/app/src/main/res/values-es-rMX/strings.xml - mobile/android/fenix/app/src/main/res/values-eu/strings.xml - mobile/android/fenix/app/src/main/res/values-fi/strings.xml - mobile/android/fenix/app/src/main/res/values-fr/strings.xml - mobile/android/fenix/app/src/main/res/values-fur/strings.xml - mobile/android/fenix/app/src/main/res/values-fy-rNL/strings.xml - mobile/android/fenix/app/src/main/res/values-gl/strings.xml - mobile/android/fenix/app/src/main/res/values-hsb/strings.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cf07ae… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cf07ae… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 12 Sep '24

12 Sep '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 89777aa1 by Dan Ballard at 2024-09-12T21:08:33+02:00 fixup! Firefox preference overrides. Bug 43046: Disable emailTrackingBlocking in pbm - - - - - 40a262a1 by cypherpunks1 at 2024-09-12T21:08:42+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 43128: Use DuckDuckGo HTML on the Safest security level for Android - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -242,6 +242,7 @@ pref("privacy.donottrackheader.enabled", false); // (mullvad-browser#17) // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", false); +pref("privacy.trackingprotection.emailtracking.pbmode.enabled", false); pref("privacy.trackingprotection.annotate_channels", false); pref("privacy.trackingprotection.cryptomining.enabled", false); pref("privacy.trackingprotection.fingerprinting.enabled", false); ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt ===================================== @@ -13,6 +13,8 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.engine.EngineSession +import mozilla.components.concept.engine.Settings +import mozilla.components.concept.engine.UnsupportedSettingException import mozilla.components.feature.search.ext.buildSearchUrl import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.tabs.TabsUseCases @@ -25,6 +27,7 @@ class SearchUseCases( store: BrowserStore, tabsUseCases: TabsUseCases, sessionUseCases: SessionUseCases, + settings: Settings? = null, ) { interface SearchUseCase { /** @@ -41,6 +44,7 @@ class SearchUseCases( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val sessionUseCases: SessionUseCases, + private val settings: Settings? = null, ) : SearchUseCase { private val logger = Logger("DefaultSearchUseCase") @@ -72,9 +76,15 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { + var securityLevel: Int + try { + securityLevel = settings?.torSecurityLevel ?: 0 + } catch (e: UnsupportedSettingException) { + securityLevel = 0 + } val searchUrl = searchEngine?.let { - searchEngine.buildSearchUrl(searchTerms) - } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms) + searchEngine.buildSearchUrl(searchTerms, securityLevel) + } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) if (searchUrl == null) { logger.warn("No default search engine available to perform search") @@ -124,6 +134,7 @@ class SearchUseCases( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val isPrivate: Boolean, + private val settings: Settings? = null, ) : SearchUseCase { private val logger = Logger("NewTabSearchUseCase") @@ -161,9 +172,15 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { + var securityLevel: Int + try { + securityLevel = settings?.torSecurityLevel ?: 0 + } catch (e: UnsupportedSettingException) { + securityLevel = 0 + } val searchUrl = searchEngine?.let { - searchEngine.buildSearchUrl(searchTerms) - } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms) + searchEngine.buildSearchUrl(searchTerms, securityLevel) + } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) if (searchUrl == null) { logger.warn("No default search engine available to perform search") @@ -310,15 +327,15 @@ class SearchUseCases( } val defaultSearch: DefaultSearchUseCase by lazy { - DefaultSearchUseCase(store, tabsUseCases, sessionUseCases) + DefaultSearchUseCase(store, tabsUseCases, sessionUseCases, settings) } val newTabSearch: NewTabSearchUseCase by lazy { - NewTabSearchUseCase(store, tabsUseCases, false) + NewTabSearchUseCase(store, tabsUseCases, false, settings) } val newPrivateTabSearch: NewTabSearchUseCase by lazy { - NewTabSearchUseCase(store, tabsUseCases, true) + NewTabSearchUseCase(store, tabsUseCases, true, settings) } val addSearchEngine: AddNewSearchEngineUseCase by lazy { ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt ===================================== @@ -85,9 +85,9 @@ fun SearchEngine.buildSuggestionsURL(query: String): String? { /** * Builds a URL to search for the given search terms with this search engine. */ -fun SearchEngine.buildSearchUrl(searchTerm: String): String { +fun SearchEngine.buildSearchUrl(searchTerm: String, securityLevel: Int = 0): String { val builder = SearchUrlBuilder(this) - return builder.buildSearchUrl(searchTerm) + return builder.buildSearchUrl(searchTerm, securityLevel) } /** ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt ===================================== @@ -28,9 +28,12 @@ private const val OS_PARAM_OPTIONAL = "\\{" + "(?:\\w+:)?\\w+?" + "\\}" internal class SearchUrlBuilder( private val searchEngine: SearchEngine, ) { - fun buildSearchUrl(searchTerms: String): String { + fun buildSearchUrl(searchTerms: String, securityLevel: Int): String { // The parser should have put the best URL for this device at the beginning of the list. - val template = searchEngine.resultUrls[0] + var template = searchEngine.resultUrls[0] + if (securityLevel == 1 && (searchEngine.id == "ddg" || searchEngine.id == "ddg-onion")) { + template = template.replaceFirst("/?", "/html/?") + } return buildUrl(template, searchTerms) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt ===================================== @@ -73,6 +73,7 @@ class UseCases( store, tabsUseCases, sessionUseCases, + engine.settings, ) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/e4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/e4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 12 Sep '24

12 Sep '24

Pier Angelo Vendrame pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: bed52c3f by Dan Ballard at 2024-09-12T21:07:53+02:00 fixup! Firefox preference overrides. Bug 43046: Disable emailTrackingBlocking in pbm - - - - - 379a2960 by cypherpunks1 at 2024-09-12T21:08:09+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 43128: Use DuckDuckGo HTML on the Safest security level for Android - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -242,6 +242,7 @@ pref("privacy.donottrackheader.enabled", false); // (mullvad-browser#17) // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", false); +pref("privacy.trackingprotection.emailtracking.pbmode.enabled", false); pref("privacy.trackingprotection.annotate_channels", false); pref("privacy.trackingprotection.cryptomining.enabled", false); pref("privacy.trackingprotection.fingerprinting.enabled", false); ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt ===================================== @@ -13,6 +13,8 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.engine.EngineSession +import mozilla.components.concept.engine.Settings +import mozilla.components.concept.engine.UnsupportedSettingException import mozilla.components.feature.search.ext.buildSearchUrl import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.tabs.TabsUseCases @@ -25,6 +27,7 @@ class SearchUseCases( store: BrowserStore, tabsUseCases: TabsUseCases, sessionUseCases: SessionUseCases, + settings: Settings? = null, ) { interface SearchUseCase { /** @@ -41,6 +44,7 @@ class SearchUseCases( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val sessionUseCases: SessionUseCases, + private val settings: Settings? = null, ) : SearchUseCase { private val logger = Logger("DefaultSearchUseCase") @@ -72,9 +76,15 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { + var securityLevel: Int + try { + securityLevel = settings?.torSecurityLevel ?: 0 + } catch (e: UnsupportedSettingException) { + securityLevel = 0 + } val searchUrl = searchEngine?.let { - searchEngine.buildSearchUrl(searchTerms) - } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms) + searchEngine.buildSearchUrl(searchTerms, securityLevel) + } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) if (searchUrl == null) { logger.warn("No default search engine available to perform search") @@ -124,6 +134,7 @@ class SearchUseCases( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val isPrivate: Boolean, + private val settings: Settings? = null, ) : SearchUseCase { private val logger = Logger("NewTabSearchUseCase") @@ -161,9 +172,15 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { + var securityLevel: Int + try { + securityLevel = settings?.torSecurityLevel ?: 0 + } catch (e: UnsupportedSettingException) { + securityLevel = 0 + } val searchUrl = searchEngine?.let { - searchEngine.buildSearchUrl(searchTerms) - } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms) + searchEngine.buildSearchUrl(searchTerms, securityLevel) + } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) if (searchUrl == null) { logger.warn("No default search engine available to perform search") @@ -310,15 +327,15 @@ class SearchUseCases( } val defaultSearch: DefaultSearchUseCase by lazy { - DefaultSearchUseCase(store, tabsUseCases, sessionUseCases) + DefaultSearchUseCase(store, tabsUseCases, sessionUseCases, settings) } val newTabSearch: NewTabSearchUseCase by lazy { - NewTabSearchUseCase(store, tabsUseCases, false) + NewTabSearchUseCase(store, tabsUseCases, false, settings) } val newPrivateTabSearch: NewTabSearchUseCase by lazy { - NewTabSearchUseCase(store, tabsUseCases, true) + NewTabSearchUseCase(store, tabsUseCases, true, settings) } val addSearchEngine: AddNewSearchEngineUseCase by lazy { ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt ===================================== @@ -85,9 +85,9 @@ fun SearchEngine.buildSuggestionsURL(query: String): String? { /** * Builds a URL to search for the given search terms with this search engine. */ -fun SearchEngine.buildSearchUrl(searchTerm: String): String { +fun SearchEngine.buildSearchUrl(searchTerm: String, securityLevel: Int = 0): String { val builder = SearchUrlBuilder(this) - return builder.buildSearchUrl(searchTerm) + return builder.buildSearchUrl(searchTerm, securityLevel) } /** ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt ===================================== @@ -28,9 +28,12 @@ private const val OS_PARAM_OPTIONAL = "\\{" + "(?:\\w+:)?\\w+?" + "\\}" internal class SearchUrlBuilder( private val searchEngine: SearchEngine, ) { - fun buildSearchUrl(searchTerms: String): String { + fun buildSearchUrl(searchTerms: String, securityLevel: Int): String { // The parser should have put the best URL for this device at the beginning of the list. - val template = searchEngine.resultUrls[0] + var template = searchEngine.resultUrls[0] + if (securityLevel == 1 && (searchEngine.id == "ddg" || searchEngine.id == "ddg-onion")) { + template = template.replaceFirst("/?", "/html/?") + } return buildUrl(template, searchTerms) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt ===================================== @@ -73,6 +73,7 @@ class UseCases( store, tabsUseCases, sessionUseCases, + engine.settings, ) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec42f6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec42f6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Bug 40009: [android] Change the default search engines
by Pier Angelo Vendrame (＠pierov) 12 Sep '24

12 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: f52fcb50 by cypherpunks1 at 2024-09-12T19:06:14+00:00 fixup! Bug 40009: [android] Change the default search engines Bug 43128: Make the ddg-onion search plugin consistent with ddg - - - - - cf07aee1 by cypherpunks1 at 2024-09-12T19:06:14+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 43128: Use DuckDuckGo HTML on the Safest security level for Android - - - - - 5 changed files: - mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt Changes: ===================================== mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml ===================================== @@ -3,9 +3,8 @@ <Description>Duck Duck Go Onion</Description> <InputEncoding>UTF-8</InputEncoding> <Image height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="POST" template="https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion"> +<Url type="text/html" method="GET" template="https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/"> <Param name="q" value="{searchTerms}"/> </Url> <SearchForm>https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion</SearchForm> </SearchPlugin> - ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt ===================================== @@ -13,6 +13,8 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.engine.EngineSession +import mozilla.components.concept.engine.Settings +import mozilla.components.concept.engine.UnsupportedSettingException import mozilla.components.feature.search.ext.buildSearchUrl import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.tabs.TabsUseCases @@ -25,6 +27,7 @@ class SearchUseCases( store: BrowserStore, tabsUseCases: TabsUseCases, sessionUseCases: SessionUseCases, + settings: Settings? = null, ) { interface SearchUseCase { /** @@ -41,6 +44,7 @@ class SearchUseCases( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val sessionUseCases: SessionUseCases, + private val settings: Settings? = null, ) : SearchUseCase { private val logger = Logger("DefaultSearchUseCase") @@ -72,9 +76,15 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { + var securityLevel: Int + try { + securityLevel = settings?.torSecurityLevel ?: 0 + } catch (e: UnsupportedSettingException) { + securityLevel = 0 + } val searchUrl = searchEngine?.let { - searchEngine.buildSearchUrl(searchTerms) - } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms) + searchEngine.buildSearchUrl(searchTerms, securityLevel) + } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) if (searchUrl == null) { logger.warn("No default search engine available to perform search") @@ -124,6 +134,7 @@ class SearchUseCases( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val isPrivate: Boolean, + private val settings: Settings? = null, ) : SearchUseCase { private val logger = Logger("NewTabSearchUseCase") @@ -161,9 +172,15 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { + var securityLevel: Int + try { + securityLevel = settings?.torSecurityLevel ?: 0 + } catch (e: UnsupportedSettingException) { + securityLevel = 0 + } val searchUrl = searchEngine?.let { - searchEngine.buildSearchUrl(searchTerms) - } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms) + searchEngine.buildSearchUrl(searchTerms, securityLevel) + } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) if (searchUrl == null) { logger.warn("No default search engine available to perform search") @@ -310,15 +327,15 @@ class SearchUseCases( } val defaultSearch: DefaultSearchUseCase by lazy { - DefaultSearchUseCase(store, tabsUseCases, sessionUseCases) + DefaultSearchUseCase(store, tabsUseCases, sessionUseCases, settings) } val newTabSearch: NewTabSearchUseCase by lazy { - NewTabSearchUseCase(store, tabsUseCases, false) + NewTabSearchUseCase(store, tabsUseCases, false, settings) } val newPrivateTabSearch: NewTabSearchUseCase by lazy { - NewTabSearchUseCase(store, tabsUseCases, true) + NewTabSearchUseCase(store, tabsUseCases, true, settings) } val addSearchEngine: AddNewSearchEngineUseCase by lazy { ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt ===================================== @@ -85,9 +85,9 @@ fun SearchEngine.buildSuggestionsURL(query: String): String? { /** * Builds a URL to search for the given search terms with this search engine. */ -fun SearchEngine.buildSearchUrl(searchTerm: String): String { +fun SearchEngine.buildSearchUrl(searchTerm: String, securityLevel: Int = 0): String { val builder = SearchUrlBuilder(this) - return builder.buildSearchUrl(searchTerm) + return builder.buildSearchUrl(searchTerm, securityLevel) } /** ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt ===================================== @@ -28,9 +28,12 @@ private const val OS_PARAM_OPTIONAL = "\\{" + "(?:\\w+:)?\\w+?" + "\\}" internal class SearchUrlBuilder( private val searchEngine: SearchEngine, ) { - fun buildSearchUrl(searchTerms: String): String { + fun buildSearchUrl(searchTerms: String, securityLevel: Int): String { // The parser should have put the best URL for this device at the beginning of the list. - val template = searchEngine.resultUrls[0] + var template = searchEngine.resultUrls[0] + if (securityLevel == 1 && (searchEngine.id == "ddg" || searchEngine.id == "ddg-onion")) { + template = template.replaceFirst("/?", "/html/?") + } return buildUrl(template, searchTerms) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt ===================================== @@ -73,6 +73,7 @@ class UseCases( store, tabsUseCases, sessionUseCases, + engine.settings, ) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6a5b1b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6a5b1b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! [android] Disable features and functionality
by Pier Angelo Vendrame (＠pierov) 12 Sep '24

12 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 6ec046c6 by Dan Ballard at 2024-09-12T10:55:16-07:00 fixup! [android] Disable features and functionality Bug 43046: Disable emailTrackingBlocking in pbm - - - - - 6a5b1bc7 by Dan Ballard at 2024-09-12T10:58:25-07:00 fixup! Firefox preference overrides. Bug 43046: Disable emailTrackingBlocking in pbm - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/SettingsTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -242,6 +242,7 @@ pref("privacy.donottrackheader.enabled", false); // (mullvad-browser#17) // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", false); +pref("privacy.trackingprotection.emailtracking.pbmode.enabled", false); pref("privacy.trackingprotection.annotate_channels", false); pref("privacy.trackingprotection.cryptomining.enabled", false); pref("privacy.trackingprotection.fingerprinting.enabled", false); ===================================== mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/SettingsTest.kt ===================================== @@ -180,7 +180,7 @@ class SettingsTest { cookieBannerHandlingDetectOnlyMode = true, cookieBannerHandlingGlobalRules = true, cookieBannerHandlingGlobalRulesSubFrames = true, - emailTrackerBlockingPrivateBrowsing = true, + emailTrackerBlockingPrivateBrowsing = false, ) assertFalse(defaultSettings.domStorageEnabled) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -156,7 +156,7 @@ class Core( cookieBannerHandlingDetectOnlyMode = context.settings().shouldEnableCookieBannerDetectOnly, cookieBannerHandlingGlobalRules = context.settings().shouldEnableCookieBannerGlobalRules, cookieBannerHandlingGlobalRulesSubFrames = context.settings().shouldEnableCookieBannerGlobalRulesSubFrame, - emailTrackerBlockingPrivateBrowsing = true, + emailTrackerBlockingPrivateBrowsing = false, torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, spoofEnglish = context.settings().spoofEnglish, ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ed8735… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ed8735… You're receiving this email because of your account on gitlab.torproject.org.

1 0