- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bump tor-browser branch for nightly
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit d85ebd30305a598b2ed5fc8578cf004095056a2f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 09:32:46 2019 +0000 Bump tor-browser branch for nightly --- projects/firefox/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4370f01..fe1b5d4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,9 +8,9 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.1.0 + firefox_platform_version: 68.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 9.0 + torbrowser_branch: 9.5 torbrowser_update_channel: alpha branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' @@ -51,7 +51,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit b90fa19c19224f2493a28475359fa8c4672658c2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 17 20:13:36 2019 +0000 Release preparations for 9.0 Changelog update and versions bump --- projects/firefox/config | 4 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 179 ++++++++++++++++++++- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +- 5 files changed, 185 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4370f01..47d70a1 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # 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") %]-2-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.1.0 + firefox_platform_version: 68.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 56a7725..9a4666d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,180 @@ +Tor Browser 9.0 -- October 22 2019 + * All Platforms + * Update Firefox to 68.2.0esr + * Bug 31740: Remove some unnecessary RemoteSettings instances + * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities + * Bug 28196: about:preferences is not properly translated anymore + * Bug 19417: Disable asmjs on safer and safest security levels + * Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING + * Bug 31935: Disable profile downgrade protection + * Bug 16285: Disable DRM/EME on Android and drop Adobe CDM + * Bug 31602: Remove Pocket indicators in UI and disable it + * Bug 31914: Fix eslint linter error + * Bug 30429: Rebase patches for Firefox 68 ESR + * Bug 31444: Review network code changes for Firefox 68 ESR + * Bug 10760: Integrate Torbutton into Tor Browser directly + * Bug 25856: Remove XUL overlays from Torbutton + * Bug 31322: Fix about:tor assertion failure debug builds + * Bug 29430: Add support for meek_lite bridges to bridgeParser + * Bug 28561: Migrate "About Tor Browser" dialog to tor-browser + * Bug 30683: Prevent detection of locale via some *.properties + * Bug 31298: Backport patch for #24056 + * Bug 9336: Odd wyswig schemes without isolation for browserspy.dk + * Bug 27601: Browser notifications are not working anymore + * Bug 30845: Make sure internal extensions are enabled + * Bug 28896: Enable extensions in private browsing by default + * Bug 31563: Reload search extensions if extensions.enabledScopes has changed + * Bug 31396: Fix communication with NoScript for security settings + * Bug 31142: Fix crash of tab and messing with about:newtab + * Bug 29049: Backport JS Poison Patch + * Bug 25214: Canvas data extraction on locale pdf file should be allowed + * Bug 30657: Locale is leaked via title of link tag on non-html page + * Bug 31015: Disabling SVG hides UI icons in extensions + * Bug 30681: Set security.enterprise_roots.enabled to false + * Bug 30538: Unable to comment on The Independent Newspaper + * Translations update + * Windows + OS X + Linux + * Update Tor to 0.4.1.6 + * Update OpenSSL to 1.1.1d + * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures + * Update Tor Launcher to 0.2.20 + * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 31286: New strings for about:preferences#tor + * Bug 31303: Do not launch tor in browser toolbox + * Bug 32112: Fix bad & escaping in translations + * Bug 31491: Clean up the old meek http helper browser profiles + * Bug 29197: Remove use of overlays + * Bug 31300: Modify Tor Launcher so it is compatible with ESR68 + * Bug 31487: Modify moat client code so it is compatible with ESR68 + * Bug 31488: Moat: support a comma-separated list of transports + * Bug 30468: Add mk locale + * Bug 30469: Add ro locale + * Bug 30319: Remove FTE bits + * Translations update + * Bug 32092: Fix Tor Browser Support link in preferences + * Bug 32111: Fixed issue parsing user-provided bridge strings + * Bug 31749: Fix security level panel spawning events + * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow + * Bug 31748: Fix 'Learn More' links in Security Level preferences and panel + * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 31059: Enable Letterboxing + * Bug 30468: Add mk locale + * Bug 30469: Add ro locale + * Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek + * Bug 31251: Security Level button UI polish + * Bug 31344: Register SecurityLevelPreference's 'unload' callback + * Bug 31286: Provide network settings on about:preferences#tor + * Bug 31886: Fix ko bundle bustage + * Bug 31768: Update onboarding for Tor Browser 9 + * Bug 27511: Add new identity button to toolbar + * Bug 31778: Support dark-theme for the Circuit Display UI + * Bug 31910: Replace meek_lite with meek in circuit display + * Bug 30504: Deal with New Identity related browser console errors + * Bug 31929: Don't escape DTD entity in ar + * Bug 31747: Some onboarding UI is always shown in English + * Bug 32041: Replace = with real hamburguer icon ≡ + * Bug 30304: Browser locale can be obtained via DTD strings + * Bug 31065: Set network.proxy.allow_hijacking_localhost to true + * Bug 24653: Merge securityLevel.properties into torbutton.dtd + * Bug 31164: Set up default bridge at Karlstad University + * Bug 15563: Disable ServiceWorkers on all platforms + * Bug 31598: Disable warning on window resize if letterboxing is enabled + * Bug 31562: Fix circuit display for error pages + * Bug 31575: Firefox is phoning home during start-up + * Bug 31491: Clean up the old meek http helper browser profiles + * Bug 26345: Hide tracking protection UI + * Bug 31601: Disable recommended extensions again + * Bug 30662: Don't show Firefox Home when opening new tabs + * Bug 31457: Disable per-installation profiles + * Bug 28822: Re-implement desktop onboarding for ESR 68 + * Windows + * Bug 31942: Re-enable signature check for language packs + * Bug 29013: Enable stack protection for Firefox on Windows + * Bug 30800: ftp:// on Windows can be used to leak the system time zone + * Bug 31547: Back out patch for Mozilla's bug 1574980 + * Bug 31141: Fix typo in font.system.whitelist + * Bug 30319: Remove FTE bits + * OS X + * Bug 30126: Make Tor Browser compatible with macOS 10.15 + * Bug 31607: App menu items stop working on macOS + * Bug 31955: On macOS avoid throwing inside nonBrowserWindowStartup() + * Bug 29818: Adapt #13379 patch for 68esr + * Bug 31464: Meek and moat are broken on macOS 10.9 with Go 1.12 + * Linux + * Bug 31942: Re-enable signature check for language packs + * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * Bug 31968: Don't fail if /proc/cpuinfo is not readable + * Bug 24755: Stop using a heredoc in start-tor-browser + * Bug 31550: Put curly quotes inside single quotes + * Bug 31394: Replace "-1" with "−1" in start-tor-browser.desktop + * Bug 30319: Remove FTE bits + * Android + * Update Tor to 0.4.1.5 + * Bug 31010: Rebase mobile patches for Fennec 68 + * Bug 31010: Don't use addTrustedTab() on mobile + * Bug 30607: Support Tor Browser running on Android Q + * Bug 31192: Support x86_64 target on Android + * Bug 30380: Cancel dormant by startup + * Bug 30943: Show version number on mobile + * Bug 31720: Enable website suggestions in address bar + * Bug 31822: Security slider is not really visible on Android anymore + * Bug 24920: Only create Private tabs in permanent Private Browsing Mode + * Bug 31730: Revert aarch64-workaround against JIT-related crashes + * Build System + * All Platforms + * Bug 30585: Provide standalone clang 8 project across all platforms + * Bug 30376: Use Rust 1.34 for Tor Browser 9 + * Bug 30490: Add cbindgen project for building Firefox 68 ESR/Fennec 68 + * Bug 30701: Add nodejs project for building Firefox 68 ESR/Fennec 68 + * Bug 31621: Fix node bug that makes large writes to stdout fail + * Bug 30734: Add nasm project for building Firefox 68 ESR/Fennec 68 + * Bug 31293: Make sure the lo interface inside the containers is up + * Bug 27493: Clean up mozconfig options + * Bug 31308: Sync mozconfig files used in tor-browser over to tor-browser-build for esr68 + * Windows + * Bug 29307: Use Stretch for cross-compiling for Windows + * Bug 29731: Remove faketime for Windows builds + * Bug 30322: Windows toolchain update for Firefox 68 ESR + * Bug 28716: Create mingw-w64-clang toolchain + * Bug 28238: Adapt firefox and fxc2 projects for Windows builds + * Bug 28716: Optionally omit timestamp in PE header + * Bug 31567: NS_tsnprintf() does not handle %s correctly on Windows + * Bug 31458: Revert patch for #27503 and bump mingw-w64 revision used + * Bug 9898: Provide clean fix for strcmpi issue in NSPR + * Bug 29013: Enable stack protection support for Firefox on Windows + * Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser + * Bug 31538: Windows bundles based on ESR 68 are not built reproducibly + * Bug 31584: Clean up mingw-w64 project + * Bug 31596: Bump mingw-w64 version to pick up fix for #31567 + * Bug 29187: Bump NSIS version to 3.04 + * Bug 31732: Windows nightly builds are busted due to mingw-w64 commit bump + * Bug 29319: Remove FTE support for Windows + * OS X + * Bug 30323: MacOS toolchain update for Firefox 68 ESR + * Bug 31467: Switch to clang for cctools project + * Bug 31465: Adapt tor-browser-build projects for macOS notarization + * Linux + * Bug 31448: gold and lld break linking 32bit Linux bundles + * Bug 31618: Linux32 builds of Tor Browser 9.0a6 are not matching + * Bug 31450: Still use GCC for our ASan builds + * Bug 30321: Linux toolchain update for Firefox ESR 68 + * Bug 30736: Install yasm from wheezy-backports + * Bug 31447: Don't install Python just for Mach + * Bug 30448: Strip Browser/gtk2/libmozgtk.so + * Android + * Bug 30324: Android toolchain update for Fennec 68 + * Bug 31173: Update android-toolchain project to match Firefox + * Bug 31389: Update Android Firefox to build with Clang + * Bug 31388: Update Rust project for Android + * Bug 30665: Get Firefox 68 ESR working with latest android toolchain + * Bug 30460: Update TOPL project to use Firefox 68 toolchain + * Bug 30461: Update tor-android-service project to use Firefox 68 toolchain + * Bug 28753: Use Gradle with --offline when building the browser part + * Bug 31564: Make Android bundles based on ESR 68 reproducible + * Bug 31981: Remove require-api.patch + * Bug 31979: TOPL: Sort dependency list + * Bug 30665: Remove unnecessary build patches for Firefox + Tor Browser 9.0a8 -- October 14 2019 * All Platforms * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities @@ -364,7 +541,7 @@ Tor Browser 9.0a1 -- May 21 2019 * Update Tor Launcher to 0.2.19 * Bug 28044: Integrate Tor Launcher into tor-browser * Bug 29627: Moat: add support for obfsproxy's meek_lite - * Bug 30139: Remove FTE bits + * Bug 30319: Remove FTE bits * Translations update * Bug 28044: Integrate Tor Launcher into tor-browser * Bug 30372: Backport letterboxing (bug 1538130) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3171be7..54e4973 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.19.5 +version: 0.2.20 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index ae2ef16..74790af 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.2-alpha +version: 0.4.1.6 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 3ba38e4..ab0bbb5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0a8' - torbrowser_build: 'build2' + torbrowser_version: '9.0' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0a7 + - 8.5.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31144 - Do not switching apps from CustomTabs without consent
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit d5123da897516717e62db98dccbcabd70162dcb3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Oct 18 00:57:00 2019 +0000 Bug 31144 - Do not switching apps from CustomTabs without consent --- .../base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java index 230773cd1292..872fe9723001 100644 --- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java @@ -621,7 +621,8 @@ public class CustomTabsActivity extends AppCompatActivity final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(uri); try { - startActivity(intent); + // Bug 31144 - Don't know how to handle this case. + //startActivity(intent); } catch (ActivityNotFoundException e) { Log.w(LOGTAG, "No activity handler found for: " + request.uri); }

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit dfdef56ec12ace37d08e2df516430427d0e08d7a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 17 19:38:32 2019 +0000 fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 974f8c31af17..1501edf47b90 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -375,6 +375,9 @@ pref("dom.presentation.receiver.enabled", false); pref("dom.audiochannel.audioCompeting", false); pref("dom.audiochannel.mediaControl", false); +// Bug 31144 - Avoid proxy-bypass using the Android native download manager. +pref("browser.download.forward_oma_android_download_manager", false); + #expand pref("torbrowser.version", __TOR_BROWSER_VERSION_QUOTED__); // If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit db19bbcd9c34c933ad7fc84693ed8a5ad3bac3cf Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 17 19:30:13 2019 +0000 fixup! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. --- .../gecko/customtabs/CustomTabsActivity.java | 21 ++++--- .../mozilla/gecko/widget/GeckoActionProvider.java | 10 +++- .../main/java/org/mozilla/gecko/GeckoAppShell.java | 68 +++++++++++----------- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java index c75962da35a7..230773cd1292 100644 --- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java @@ -359,16 +359,19 @@ public class CustomTabsActivity extends AppCompatActivity } private void performPendingIntent(@NonNull PendingIntent pendingIntent) { + // Bug 31144 - Fail and return early, prevent potential proxy-bypass. + return; + // bug 1337771: If intent-creator haven't set data url, call send() directly won't work. - final Intent additional = new Intent(); - if (!TextUtils.isEmpty(mCurrentUrl)) { - additional.setData(Uri.parse(mCurrentUrl)); - } - try { - pendingIntent.send(this, 0, additional); - } catch (PendingIntent.CanceledException e) { - Log.w(LOGTAG, "Performing a canceled pending intent", e); - } + //final Intent additional = new Intent(); + //if (!TextUtils.isEmpty(mCurrentUrl)) { + // additional.setData(Uri.parse(mCurrentUrl)); + //} + //try { + // pendingIntent.send(this, 0, additional); + //} catch (PendingIntent.CanceledException e) { + // Log.w(LOGTAG, "Performing a canceled pending intent", e); + //} } /** diff --git a/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java b/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java index 79854e2931bc..9b81d5636e93 100644 --- a/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java +++ b/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java @@ -22,6 +22,7 @@ import org.mozilla.gecko.overlays.ui.ShareDialog; import org.mozilla.gecko.menu.MenuItemSwitcherLayout; import org.mozilla.gecko.util.IOUtils; import org.mozilla.gecko.util.IntentUtils; +import org.mozilla.gecko.util.ProxySelector; import org.mozilla.gecko.util.ThreadUtils; import android.content.Context; @@ -42,7 +43,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; @@ -335,9 +337,9 @@ public class GeckoActionProvider { InputStream is = null; try { final byte[] buf = new byte[2048]; - final URL url = new URL(src); + final URI uri = new URI(src); final String filename = URLUtil.guessFileName(src, null, type); - is = url.openStream(); + is = ProxySelector.openConnectionWithProxy(uri).getInputStream(); final File imageFile = new File(dir, filename); os = new FileOutputStream(imageFile); @@ -353,6 +355,8 @@ public class GeckoActionProvider { IOUtils.safeStreamClose(is); } } + } catch (URISyntaxException ex) { + // Handle this the same way as IOException } catch (IOException ex) { // If something went wrong, we'll just leave the intent un-changed } finally { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java index 03486a12c22e..c38e31dc3b0e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java @@ -1810,39 +1810,41 @@ public class GeckoAppShell { @WrapForJNI private static URLConnection getConnection(final String url) { - try { - String spec; - if (url.startsWith("android://")) { - spec = url.substring(10); - } else { - spec = url.substring(8); - } - - // Check if we are loading a package icon. - try { - if (spec.startsWith("icon/")) { - String[] splits = spec.split("/"); - if (splits.length != 2) { - return null; - } - final String pkg = splits[1]; - final PackageManager pm = getApplicationContext().getPackageManager(); - final Drawable d = pm.getApplicationIcon(pkg); - final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d); - return new BitmapConnection(bitmap); - } - } catch (Exception ex) { - Log.e(LOGTAG, "error", ex); - } - - // if the colon got stripped, put it back - int colon = spec.indexOf(':'); - if (colon == -1 || colon > spec.indexOf('/')) { - spec = spec.replaceFirst("/", ":/"); - } - } catch (Exception ex) { - return null; - } + // Bug 31144 - Prevent potential proxy-bypass + + //try { + // String spec; + // if (url.startsWith("android://")) { + // spec = url.substring(10); + // } else { + // spec = url.substring(8); + // } + + // // Check if we are loading a package icon. + // try { + // if (spec.startsWith("icon/")) { + // String[] splits = spec.split("/"); + // if (splits.length != 2) { + // return null; + // } + // final String pkg = splits[1]; + // final PackageManager pm = getApplicationContext().getPackageManager(); + // final Drawable d = pm.getApplicationIcon(pkg); + // final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d); + // return new BitmapConnection(bitmap); + // } + // } catch (Exception ex) { + // Log.e(LOGTAG, "error", ex); + // } + + // // if the colon got stripped, put it back + // int colon = spec.indexOf(':'); + // if (colon == -1 || colon > spec.indexOf('/')) { + // spec = spec.replaceFirst("/", ":/"); + // } + //} catch (Exception ex) { + // return null; + //} return null; }

1 0

[torbutton/master] Bug 31730: Revert aarch64 fixes for esr60
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 9d744c6adc5ee3608e519c5db49528cd6ee6fe54 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Oct 15 14:18:30 2019 +0200 Bug 31730: Revert aarch64 fixes for esr60 --- modules/security-prefs.js | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index 8701a3b8..f61f24aa 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -4,6 +4,11 @@ let { getBoolPref, setBoolPref, getIntPref, setIntPref } = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services.prefs; + +// Used for detecting the current system architecture +let { XPCOMABI } = + Cu.import("resource://gre/modules/Services.jsm", {}).Services.appinfo; + let { bindPref, bindPrefAndInit } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -33,6 +38,7 @@ const kSecuritySettings = { // The Security Settings prefs in question. const kSliderPref = "extensions.torbutton.security_slider"; const kCustomPref = "extensions.torbutton.security_custom"; +const kSliderMigration = "extensions.torbutton.security_slider_migration"; // ### Prefs @@ -48,8 +54,8 @@ var write_setting_to_prefs = function (settingIndex) { // __read_setting_from_prefs()__. // Read the current pref values, and decide if any of our // security settings matches. Otherwise return null. -var read_setting_from_prefs = function () { - let prefNames = Object.keys(kSecuritySettings); +var read_setting_from_prefs = function (prefNames) { + prefNames = prefNames || Object.keys(kSecuritySettings); for (let settingIndex of [1, 2, 3, 4]) { let possibleSetting = true; // For the given settingIndex, check if all current pref values @@ -128,6 +134,24 @@ var initialize = function () { setIntPref("extensions.torbutton.security_slider", 2); write_setting_to_prefs(2); } + + // Revert #31616 and #31140 fixes + if (getIntPref(kSliderMigration, 0) < 1) { + // If the security settings level and the prefs that we did not change + // have the default value, reset to default security level. + const prefNames = [ + "media.webaudio.enabled", + "mathml.disabled", + "gfx.font_rendering.opentype_svg.enabled", + "svg.disabled" + ]; + if (getBoolPref(kCustomPref) && XPCOMABI.split("-")[0] == "aarch64" && + getIntPref(kSliderPref) === 4 && + read_setting_from_prefs(prefNames) === 4) { + setBoolPref(kCustomPref, false); + } + setIntPref(kSliderMigration, 1); + } log(4, "security-prefs.js initialization complete"); };

1 0

[tor-browser-build/master] Bug 30461: Remove unneeded patches for tor-android-service.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 11672b3b3a615e7493add5d3b3dae0a7ed960551 Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Oct 17 12:35:58 2019 -0700 Bug 30461: Remove unneeded patches for tor-android-service. --- projects/tor-android-service/build | 2 -- projects/tor-android-service/config | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 4f5ac9b..8f8d16d 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -15,8 +15,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/remove-native-build.patch -patch -p1 < $rootdir/disable-daemon.patch -patch -p1 < $rootdir/maven-local.patch # Remove native files, otherwise build will fail after gradle.patch rm -fR service/src/main/jni diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 1ca2cac..492a3e1 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: 50d01b1fbc6e776d0b39f42f644137dd25a92c7a +git_hash: e9bbdc6fb25af47ccaf3bace0162125d94812072 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 @@ -29,5 +29,3 @@ input_files: - project: tor-onion-proxy-library name: topl - filename: remove-native-build.patch - - filename: disable-daemon.patch - - filename: maven-local.patch

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] squash! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 55b6cd7f3139dd0069ba2c69ec6d08da038594ad Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sat Oct 12 00:48:05 2019 +0000 squash! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. Bug 31144 - ESR68 Network Code Review --- .../base/java/org/mozilla/gecko/GeckoApplication.java | 12 +++++++++--- .../src/main/java/org/mozilla/gecko/util/BitmapUtils.java | 13 +++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index 26e06b55ecfc..bb3cdec7c0fe 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -61,6 +61,7 @@ import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; import org.mozilla.gecko.util.IntentUtils; import org.mozilla.gecko.util.PRNGFixes; +import org.mozilla.gecko.util.ProxySelector; import org.mozilla.gecko.util.ShortcutUtils; import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.geckoview.GeckoRuntime; @@ -71,7 +72,7 @@ import java.io.File; import java.io.InputStream; import java.io.IOException; import java.lang.reflect.Method; -import java.net.URL; +import java.net.URI; import java.util.UUID; import org.torproject.android.service.util.Prefs; @@ -866,11 +867,16 @@ public class GeckoApplication extends Application byte[] buf = Base64.decode(aSrc.substring(dataStart + 1), Base64.DEFAULT); image = BitmapUtils.decodeByteArray(buf); } else { + URI uri; int byteRead; byte[] buf = new byte[4192]; os = new ByteArrayOutputStream(); - URL url = new URL(aSrc); - is = url.openStream(); + try { + uri = new URI(aSrc); + } catch (Exception e) { + return; + } + is = ProxySelector.openConnectionWithProxy(uri).getInputStream(); // Cannot read from same stream twice. Also, InputStream from // URL does not support reset. So converting to byte array. diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java index 2a3f08de4ae7..b5e1a9664b35 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java @@ -103,16 +103,9 @@ public final class BitmapUtils { public static Bitmap decodeUrl(final URL url) { InputStream stream = null; - try { - if ("jar".equals(url.getProtocol())) { - final Context context = GeckoAppShell.getApplicationContext(); - stream = GeckoJarReader.getStream(context, url.toString()); - } else { - stream = url.openStream(); - } - } catch (IOException e) { - Log.w(LOGTAG, "decodeUrl: IOException downloading " + url); - return null; + if ("jar".equals(url.getProtocol())) { + final Context context = GeckoAppShell.getApplicationContext(); + stream = GeckoJarReader.getStream(context, url.toString()); } if (stream == null) {

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 947d477eb9289ebcdbbf48ee77609a6d7f395785 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Oct 11 15:16:17 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Disable Presentation API everywhere --- browser/app/profile/000-tor-browser.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 4c244b49d181..974f8c31af17 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -364,6 +364,17 @@ pref("browser.taskbar.lists.tasks.enabled", false); pref("browser.taskbar.lists.recent.enabled", false); #endif +// Disable Presentation API +pref("dom.presentation.controller.enabled", false); +pref("dom.presentation.enabled", false); +pref("dom.presentation.discoverable", false); +pref("dom.presentation.discoverable.encrypted", false); +pref("dom.presentation.discovery.enabled", false); +pref("dom.presentation.receiver.enabled", false); + +pref("dom.audiochannel.audioCompeting", false); +pref("dom.audiochannel.mediaControl", false); + #expand pref("torbrowser.version", __TOR_BROWSER_VERSION_QUOTED__); // If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 47e35494838222732b9eb9638fb40e7a9707b307 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Oct 11 15:17:04 2019 +0000 fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files. --- mobile/android/app/000-tor-browser-android.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index 7fdf796e5caf..0017cb2d058a 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -5,18 +5,6 @@ #include ../../../browser/app/profile/000-tor-browser.js - -// Disable Presentation API -pref("dom.presentation.controller.enabled", false); -pref("dom.presentation.enabled", false); -pref("dom.presentation.discoverable", false); -pref("dom.presentation.discoverable.encrypted", false); -pref("dom.presentation.discovery.enabled", false); -pref("dom.presentation.receiver.enabled", false); - -pref("dom.audiochannel.audioCompeting", false); -pref("dom.audiochannel.mediaControl", false); - // Space separated list of URLs that are allowed to send objects (instead of // only strings) through webchannels. This list is duplicated in browser/app/profile/firefox.js pref("webchannel.allowObject.urlWhitelist", "");

1 0