- tbb-commits - lists.torproject.org

[Git][tpo/applications/android-components][android-components-60.0.3-10.0-1] 2 commits: Bug 40022: Migrate Tor security level from Fennec
by Matthew Finkel 21 Oct '20

21 Oct '20

Matthew Finkel pushed to branch android-components-60.0.3-10.0-1 at The Tor Project / Applications / android-components Commits: 9eb30f13 by Alex Catarineu at 2020-10-21T22:15:39+02:00 Bug 40022: Migrate Tor security level from Fennec - - - - - 6b75c81e by Matthew Finkel at 2020-10-21T22:09:37+00:00 Merge remote-tracking branch 'acatgl/40022' into android-components-60.0.3-10.0-1 - - - - - 2 changed files: - components/support/migration/src/main/java/mozilla/components/support/migration/FennecMigrator.kt - components/support/migration/src/main/java/mozilla/components/support/migration/GeckoMigration.kt Changes: ===================================== components/support/migration/src/main/java/mozilla/components/support/migration/FennecMigrator.kt ===================================== @@ -975,7 +975,7 @@ class FennecMigrator private constructor( return try { logger.debug("Migrating gecko files...") - val result = GeckoMigration.migrate(profile.path, migrationVersion) + val result = GeckoMigration.migrate(profile.path, migrationVersion, context) logger.debug("Migrated gecko files.") if (result is Result.Failure<GeckoMigrationResult>) { ===================================== components/support/migration/src/main/java/mozilla/components/support/migration/GeckoMigration.kt ===================================== @@ -4,6 +4,7 @@ package mozilla.components.support.migration +import android.content.Context import android.util.AtomicFile import androidx.annotation.VisibleForTesting import mozilla.components.support.ktx.util.writeString @@ -95,7 +96,8 @@ internal object GeckoMigration { */ fun migrate( profilePath: String, - migrationVersion: Int + migrationVersion: Int, + context: Context ): Result<GeckoMigrationResult> { // GeckoView will happily pick up the profile from Fennec and reuse all data in it. So this // migration is mostly focused on removing all prefs that we do not want to reuse. @@ -118,6 +120,23 @@ internal object GeckoMigration { }.toList() } + val secLevel = prefsjs.useLines { + // The prefs are auto-generated, so we can expect the offset to be always the same + it.find { line -> line.startsWith("$USER_PREF(\"extensions.torbutton.security_slider\"") } + ?.substring(50, 51)?.toIntOrNull() + } + if (secLevel != null && secLevel > 0 && secLevel < 4) { + val prefVal = when (secLevel) { + 1 -> "pref_key_tor_security_level_safest_option" + else -> "pref_key_tor_security_level_safer_option" + } + val fenixAppPrefs = context.getSharedPreferences(FennecSettingsMigration.FENIX_SHARED_PREFS_NAME, Context.MODE_PRIVATE) + fenixAppPrefs.edit() + .putBoolean("pref_key_tor_security_level_standard_option", false) + .putBoolean(prefVal, true) + .apply() + } + return if (transformed.isEmpty()) { removePrefsFile(prefsjs) } else { View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment
by Matthew Finkel 21 Oct '20

21 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 7edfd5b5 by Alex Catarineu at 2020-10-21T12:51:36+02:00 Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment - - - - - 03b642ac by Matthew Finkel at 2020-10-21T21:46:59+00:00 Merge remote-tracking branch 'acatgl/40094' into tor-browser-82.0.0b4-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -87,9 +87,7 @@ import org.mozilla.fenix.components.PrivateShortcutCreateManager import org.mozilla.fenix.components.StoreProvider import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.metrics.Event -import org.mozilla.fenix.components.tips.FenixTipManager import org.mozilla.fenix.components.tips.Tip -import org.mozilla.fenix.components.tips.providers.MasterPasswordTipProvider import org.mozilla.fenix.components.toolbar.TabCounterMenu import org.mozilla.fenix.components.toolbar.ToolbarPosition import org.mozilla.fenix.ext.components @@ -218,17 +216,6 @@ class HomeFragment : Fragment() { expandedCollections = emptySet(), mode = currentMode.getCurrentMode(), topSites = components.core.topSitesStorage.cachedTopSites, - tip = StrictMode.allowThreadDiskReads().resetPoliciesAfter { - FenixTipManager( - listOf( - MasterPasswordTipProvider( - requireContext(), - ::navToSavedLogins, - ::dismissTip - ) - ) - ).getTip() - }, showCollectionPlaceholder = components.settings.showCollectionsPlaceholderOnHome ) ) @@ -685,17 +672,6 @@ class HomeFragment : Fragment() { collections = components.core.tabCollectionStorage.cachedTabCollections, mode = currentMode.getCurrentMode(), topSites = components.core.topSitesStorage.cachedTopSites, - tip = StrictMode.allowThreadDiskReads().resetPoliciesAfter { - FenixTipManager( - listOf( - MasterPasswordTipProvider( - requireContext(), - ::navToSavedLogins, - ::dismissTip - ) - ) - ).getTip() - }, showCollectionPlaceholder = components.settings.showCollectionsPlaceholderOnHome ) ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/67007f534ee6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/67007f534ee6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-60.0.3-10.0-1] 2 commits: Bug 40021: Force telemetry=false in Fennec settings migration
by Matthew Finkel 21 Oct '20

21 Oct '20

Matthew Finkel pushed to branch android-components-60.0.3-10.0-1 at The Tor Project / Applications / android-components Commits: 4693b3c0 by Alex Catarineu at 2020-10-21T16:17:57+02:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - cda23d34 by Matthew Finkel at 2020-10-21T20:13:36+00:00 Merge remote-tracking branch 'acatgl/40021' into android-components-60.0.3-10.0-1 - - - - - 2 changed files: - components/support/migration/src/main/java/mozilla/components/support/migration/FennecMigrator.kt - components/support/migration/src/main/java/mozilla/components/support/migration/FennecSettingsMigrator.kt Changes: ===================================== components/support/migration/src/main/java/mozilla/components/support/migration/FennecMigrator.kt ===================================== @@ -92,7 +92,7 @@ sealed class Migration(val currentVersion: Int) { /** * Migrates all Fennec settings backed by SharedPreferences. */ - object Settings : Migration(currentVersion = 2) + object Settings : Migration(currentVersion = 3) /** * Migrates / Disables all currently unsupported Add-ons. ===================================== components/support/migration/src/main/java/mozilla/components/support/migration/FennecSettingsMigrator.kt ===================================== @@ -44,16 +44,11 @@ internal object FennecSettingsMigration { return migrateTelemetryOptInStatus(fennecAppPrefs, fenixAppPrefs) } + @Suppress("UNUSED_PARAMETER") private fun migrateTelemetryOptInStatus( fennecPrefs: SharedPreferences, fenixPrefs: SharedPreferences ): Result<SettingsMigrationResult> { - // Sanity check: make sure we actually have an FHR value set. - if (!fennecPrefs.contains(FENNEC_PREFS_FHR_KEY)) { - logger.warn("Missing FHR pref value") - return Result.Failure(SettingsMigrationException(SettingsMigrationResult.Failure.MissingFHRPrefValue)) - } - // Fennec has two telemetry settings: // - Firefox Health Report (FHR) - defaults to 'on', // - Telemetry - defaults to 'off'. @@ -66,7 +61,7 @@ internal object FennecSettingsMigration { // If FHR is disabled by the user, we'll disable telemetry in Fenix. Otherwise, it will be enabled. // Read Fennec prefs. - val fennecFHRState = fennecPrefs.getBoolean(FENNEC_PREFS_FHR_KEY, false) + val fennecFHRState = false logger.info("Fennec FHR state is: $fennecFHRState") // Update Fenix prefs. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-9.5] Release prep for 9.5.5
by sysrqb＠torproject.org 21 Oct '20

21 Oct '20

commit c684b01184c8bb0623411ce3e442daa45769273b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 21 13:52:42 2020 +0000 Release prep for 9.5.5 Changelog update and versions bump --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 5ef60e0..7e5f4f6 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6186d71..10e7111 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.5.5 -- October 21 2020 + * Android + * Bug 40202: Backport Mozilla Bug 1672223 + Tor Browser 9.5.4 -- August 25 2020 * All Platforms * Update Firefox to 68.12.0esr diff --git a/rbm.conf b/rbm.conf index 9f6d6d3..f1682ef 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,7 +24,7 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5.4' + torbrowser_version: '9.5.5' torbrowser_build: 'build1' torbrowser_incremental_from: - 9.5.3

1 0

[tor-browser/tor-browser-68.12.0esr-9.5-1] Bug 1672223 - [sfnt] Fix heap buffer overflow. r=jfkthame
by sysrqb＠torproject.org 21 Oct '20

21 Oct '20

commit 324751877ea62d526cfda8e581a4ba1a1f431769 Author: Werner Lemberg <wl(a)gnu.org> Date: Tue Oct 20 19:56:59 2020 +0000 Bug 1672223 - [sfnt] Fix heap buffer overflow. r=jfkthame This is CVE-2020-15999. * src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier. Differential Revision: https://phabricator.services.mozilla.com/D94153 --- modules/freetype2/src/sfnt/pngshim.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/freetype2/src/sfnt/pngshim.c b/modules/freetype2/src/sfnt/pngshim.c index 16020266afd5..7d856af53922 100644 --- a/modules/freetype2/src/sfnt/pngshim.c +++ b/modules/freetype2/src/sfnt/pngshim.c @@ -327,6 +327,13 @@ if ( populate_map_and_metrics ) { + /* reject too large bitmaps similarly to the rasterizer */ + if ( imgHeight > 0x7FFF || imgWidth > 0x7FFF ) + { + error = FT_THROW( Array_Too_Large ); + goto DestroyExit; + } + metrics->width = (FT_UShort)imgWidth; metrics->height = (FT_UShort)imgHeight; @@ -335,13 +342,6 @@ map->pixel_mode = FT_PIXEL_MODE_BGRA; map->pitch = (int)( map->width * 4 ); map->num_grays = 256; - - /* reject too large bitmaps similarly to the rasterizer */ - if ( map->rows > 0x7FFF || map->width > 0x7FFF ) - { - error = FT_THROW( Array_Too_Large ); - goto DestroyExit; - } } /* convert palette/gray image to rgb */

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/107' into master
by gk＠torproject.org 20 Oct '20

20 Oct '20

commit 148487e11c5a2d4010054c77c11fa3a2f4108a69 Merge: da39e5d 401c9cd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 21 06:32:04 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/107' into master projects/electrum-nmc/config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tor-browser-build/master] Bug 40042: electrum-nmc: Bump to final 3.3.11
by gk＠torproject.org 20 Oct '20

20 Oct '20

commit 401c9cd155e232e2bc8bd4665bf45baa31bc0399 Author: yanmaani <yanmaani(a)cock.li> Date: Tue Oct 20 22:09:01 2020 +0000 Bug 40042: electrum-nmc: Bump to final 3.3.11 This bumps the checkpoint to height 518353. --- projects/electrum-nmc/config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 008a471..66be513 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -2,9 +2,7 @@ filename: 'Electrum-NMC-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: 3.3.11 git_url: https://github.com/namecoin/electrum-nmc.git -# Note: this Git hash is from the master-3.3.11 branch; the final 3.3.11 isn't -# tagged yet. -git_hash: 463a3a2cb4f5932339a2a1c2d1c2fb40ff049d9d +git_hash: dc366a9cfedac24c0fd12d493f25ed058cf38271 # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. var: container:

1 0

[tor-browser-build/master] Bug 40136: Pick up tor-android-service#40004
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit da39e5da92308d7fa15d3adda34835c8d3530969 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Oct 20 23:05:25 2020 +0000 Bug 40136: Pick up tor-android-service#40004 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 586bbca..5a92d95 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 68b91198066cf89a3664295116b5249b499461d6 +git_hash: 900054eacd0706a0c8df96bf96c7b3c1704b854a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-android-service/master] Bug 40003: Setup Tor in the main thread
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 972188be3819b20a4ea73692d48d238c4fb69a83 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 15 02:50:59 2020 +0000 Bug 40003: Setup Tor in the main thread --- .../main/java/org/torproject/android/service/TorService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index 971c2e9..f1ddcda 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -234,13 +234,10 @@ public final class TorService extends Service implements TorServiceConstants, Or mActionBroadcastReceiver = new ActionBroadcastReceiver(); registerReceiver(mActionBroadcastReceiver, new IntentFilter(CMD_NEWNYM)); - new Thread(new Runnable() { - public void run() { - if (setupTor()) { - notifyIfConnectedToTorNetwork(); - } - } - }).start(); + if (setupTor()) { + mEventBroadcaster.broadcastNotice("Preparing Tor, please wait..."); + notifyIfConnectedToTorNetwork(); + } Log.i("TorService", "onCreate end"); }

1 0

[tor-android-service/master] Merge remote-tracking branch 'acatgh/40004'
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 900054eacd0706a0c8df96bf96c7b3c1704b854a Merge: 8213c8d f0537e9 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Oct 20 23:01:25 2020 +0000 Merge remote-tracking branch 'acatgh/40004' service/src/main/res/values-ar/strings.xml | 1 - service/src/main/res/values-az/strings.xml | 1 - service/src/main/res/values-bg/strings.xml | 1 - service/src/main/res/values-bn-rBD/strings.xml | 1 - service/src/main/res/values-ca/strings.xml | 1 - service/src/main/res/values-cs-rCZ/strings.xml | 1 - service/src/main/res/values-cs/strings.xml | 1 - service/src/main/res/values-cy/strings.xml | 1 - service/src/main/res/values-da/strings.xml | 1 - service/src/main/res/values-de/strings.xml | 1 - service/src/main/res/values-el/strings.xml | 1 - service/src/main/res/values-eo/strings.xml | 1 - service/src/main/res/values-es-rAR/strings.xml | 1 - service/src/main/res/values-es/strings.xml | 1 - service/src/main/res/values-et/strings.xml | 1 - service/src/main/res/values-eu/strings.xml | 1 - service/src/main/res/values-fa/strings.xml | 1 - service/src/main/res/values-fi/strings.xml | 1 - service/src/main/res/values-fr-rFR/strings.xml | 1 - service/src/main/res/values-fr/strings.xml | 1 - service/src/main/res/values-gl/strings.xml | 1 - service/src/main/res/values-he/strings.xml | 1 - service/src/main/res/values-hi/strings.xml | 1 - service/src/main/res/values-hr/strings.xml | 1 - service/src/main/res/values-hu/strings.xml | 1 - service/src/main/res/values-id/strings.xml | 1 - service/src/main/res/values-in-rID/strings.xml | 1 - service/src/main/res/values-in/strings.xml | 1 - service/src/main/res/values-is/strings.xml | 1 - service/src/main/res/values-it/strings.xml | 1 - service/src/main/res/values-iw/strings.xml | 1 - service/src/main/res/values-ja/strings.xml | 1 - service/src/main/res/values-ko/strings.xml | 1 - service/src/main/res/values-lv/strings.xml | 1 - service/src/main/res/values-mk/strings.xml | 1 - service/src/main/res/values-ms-rMY/strings.xml | 1 - service/src/main/res/values-ms/strings.xml | 1 - service/src/main/res/values-nb/strings.xml | 1 - service/src/main/res/values-nl/strings.xml | 1 - service/src/main/res/values-pl/strings.xml | 1 - service/src/main/res/values-pt-rBR/strings.xml | 1 - service/src/main/res/values-pt-rPT/strings.xml | 1 - service/src/main/res/values-pt/strings.xml | 1 - service/src/main/res/values-ro/strings.xml | 1 - service/src/main/res/values-rs-rAR/strings.xml | 1 - service/src/main/res/values-ru/strings.xml | 1 - service/src/main/res/values-si-rLK/strings.xml | 1 - service/src/main/res/values-sk/strings.xml | 1 - service/src/main/res/values-sl/strings.xml | 1 - service/src/main/res/values-sn/strings.xml | 1 - service/src/main/res/values-sr/strings.xml | 1 - service/src/main/res/values-sv/strings.xml | 1 - service/src/main/res/values-ta/strings.xml | 1 - service/src/main/res/values-th/strings.xml | 1 - service/src/main/res/values-tl/strings.xml | 1 - service/src/main/res/values-tr/strings.xml | 1 - service/src/main/res/values-uk/strings.xml | 1 - service/src/main/res/values-uz/strings.xml | 1 - service/src/main/res/values-vi/strings.xml | 1 - service/src/main/res/values-zh-rCN/strings.xml | 1 - service/src/main/res/values-zh-rTW/strings.xml | 1 - service/src/main/res/values/strings.xml | 2 +- 62 files changed, 1 insertion(+), 62 deletions(-)

1 0