- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 27597: Package dom_bindings_test only with tests enabled
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 2d5a66c40885598133593c641fd8401a0b2f2fac Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 15 19:52:32 2018 +0000 Bug 27597: Package dom_bindings_test only with tests enabled --- browser/installer/package-manifest.in | 2 +- mobile/android/installer/package-manifest.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 7c89a4f70b95..fadf205c229c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -197,7 +197,7 @@ @RESPATH@/components/dom.xpt @RESPATH@/components/dom_base.xpt @RESPATH@/components/dom_bindings.xpt -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @RESPATH@/components/dom_bindings_test.xpt #endif @RESPATH@/components/dom_file.xpt diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 69714f9eca7c..7fe0e97c2d3b 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -118,7 +118,7 @@ @BINPATH@/components/dom.xpt @BINPATH@/components/dom_base.xpt @BINPATH@/components/dom_bindings.xpt -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @BINPATH@/components/dom_bindings_test.xpt #endif @BINPATH@/components/dom_core.xpt

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit b5793205da5fde6035f1bb7c49752fd38a9ed6e9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 17 06:48:47 2018 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 27597: ASan build option in tor-browser-build is broken --- .mozconfig-asan | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index be11dcbd967a..4fde71a0b1e3 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,15 +1,15 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl" # Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff # (which is part of mar-tools and is not distributed to end-users) with # ASan. See bug 17858. -export HOST_CFLAGS="-fwrapv" -export HOST_CXXFLAGS="-fwrapv" +export HOST_CFLAGS="" +export HOST_CXXFLAGS="" export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@

1 0

[tor-browser-build/master] Bug 29143: fix build of obfs4 in nightly builds
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit f27f11201d86b8bb909bad8b4c04f841b5487ddb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 22 13:31:23 2019 +0100 Bug 29143: fix build of obfs4 in nightly builds --- projects/goptlib/config | 5 +++++ projects/goutls/config | 21 +++++++++++++++++++++ projects/goxcrypto/config | 8 +++++++- projects/goxsys/config | 19 +++++++++++++++++++ projects/goxtext/config | 18 ++++++++++++++++++ projects/obfs4/build | 4 ++++ projects/obfs4/config | 6 ++++++ projects/siphash/config | 2 +- 8 files changed, 81 insertions(+), 2 deletions(-) diff --git a/projects/goptlib/config b/projects/goptlib/config index c083763..2fd51f8 100644 --- a/projects/goptlib/config +++ b/projects/goptlib/config @@ -13,6 +13,11 @@ var: use_container: 1 go_lib: git.torproject.org/pluggable-transports/goptlib.git +targets: + nightly: + version: master + tag_gpg_id: 0 + input_files: - project: container-image - name: go diff --git a/projects/goutls/config b/projects/goutls/config new file mode 100644 index 0000000..bdd5273 --- /dev/null +++ b/projects/goutls/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/refraction-networking/utls +git_hash: a89e7e6da482a5a0db02578fc606ace9ccfbea62 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/refraction-networking/utls + go_lib_deps: + - goxcrypto + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index b51b578..fe73f93 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300 +git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,9 +11,13 @@ var: use_container: 1 go_lib: golang.org/x/crypto go_lib_install: + - golang.org/x/crypto/chacha20poly1305 + - golang.org/x/crypto/cryptobyte - golang.org/x/crypto/curve25519 - golang.org/x/crypto/hkdf - golang.org/x/crypto/nacl/secretbox + go_lib_deps: + - goxsys targets: nightly: @@ -23,3 +27,5 @@ input_files: - project: container-image - name: go project: go + - name: goxsys + project: goxsys diff --git a/projects/goxsys/config b/projects/goxsys/config new file mode 100644 index 0000000..64a7213 --- /dev/null +++ b/projects/goxsys/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/sys +git_hash: 11f53e03133963fb11ae0588e08b5e0b85be8be5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/sys + go_lib_install: + - golang.org/x/sys/cpu + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goxtext/config b/projects/goxtext/config new file mode 100644 index 0000000..fba619f --- /dev/null +++ b/projects/goxtext/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/text +# v0.3.0 +git_hash: f21a4dfb5e38f5895301dc265a8def02365cc3d0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/text + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/obfs4/build b/projects/obfs4/build index 4e42b23..dedd1ef 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -11,6 +11,10 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] +[% IF c("var/nightly") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/obfs4/config b/projects/obfs4/config index 2bae851..2c94f10 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -32,3 +32,9 @@ input_files: project: goxcrypto - name: goxnet project: goxnet + - name: goutls + project: goutls + enable: '[% c("var/nightly") %]' + - name: goxtext + project: goxtext + enable: '[% c("var/nightly") %]' diff --git a/projects/siphash/config b/projects/siphash/config index b2cb2a9..7e40bc7 100644 --- a/projects/siphash/config +++ b/projects/siphash/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/dchest/siphash.git -git_hash: 42ba037e748c9062a75e0924705c43b893edefcd +git_hash: 34f201214d993633bb24f418ba11736ab8b55aa7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1484472 - Avoid FileUriExposedException in ExternalIntentDuringPrivateBrowsingPromptFragment. r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit 17314deba4ef021723dbb67d3e31af33790a5147 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Wed Aug 22 16:50:04 2018 +0000 Bug 1484472 - Avoid FileUriExposedException in ExternalIntentDuringPrivateBrowsingPromptFragment. r=jchen The fragment is also used to handle intents launched through GeckoAppShell. openUriExternal(), such as e.g. when launching downloaded files from about:downloads. The synchronous code path when not in private browsing is already covered by the code added in bug 1450449, but the async path through the fragment when in private browsing needs to be handled separately. Differential Revision: https://phabricator.services.mozilla.com/D3916 --HG-- extra : moz-landing-system : lando --- .../ExternalIntentDuringPrivateBrowsingPromptFragment.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java b/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java index b4d1e13d9698..6dd8ae92c854 100644 --- a/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java @@ -17,6 +17,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.os.StrictMode; import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentManager; import android.support.v7.app.AlertDialog; @@ -25,9 +26,9 @@ import android.util.Log; import java.util.List; /** - * A DialogFragment to contain a dialog that appears when the user clicks an Intent:// URI during private browsing. The - * dialog appears to notify the user that a clicked link will open in an external application, potentially leaking their - * browsing history. + * A DialogFragment to contain a dialog that appears when the user clicks an Intent:// URI or + * launches a file during private browsing. The dialog appears to notify the user that a clicked + * link will open in an external application, potentially leaking their browsing history. */ public class ExternalIntentDuringPrivateBrowsingPromptFragment extends DialogFragment { private static final String LOGTAG = ExternalIntentDuringPrivateBrowsingPromptFragment.class.getSimpleName(); @@ -50,7 +51,13 @@ public class ExternalIntentDuringPrivateBrowsingPromptFragment extends DialogFra .setTitle(intent.getDataString()) .setPositiveButton(R.string.button_yes, new DialogInterface.OnClickListener() { public void onClick(final DialogInterface dialog, final int id) { + // Bug 1450449 - Downloaded files are already in a public directory and + // aren't really exclusively owned by Firefox, so there's no real benefit + // to using content:// URIs here. + StrictMode.VmPolicy prevPolicy = StrictMode.getVmPolicy(); + StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX); context.startActivity(intent); + StrictMode.setVmPolicy(prevPolicy); } }) .setNegativeButton(R.string.button_no, null /* we do nothing if the user rejects */ );

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1450449 - Part 3: Starting from Nougat, share images via content:// URIs. r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit d00611cec519373705b83ed2ac89e1db58532fa2 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sat May 12 23:17:38 2018 +0200 Bug 1450449 - Part 3: Starting from Nougat, share images via content:// URIs. r=jchen For sharing images we download the image to a temporary file in our internal storage area. This is a perfect use case for granting temporary access to the file only via a content:// URI instead of directly exposing the real file system path. Since support for content:// URIs by arbitrary other apps might be patchy on older Android versions, though, we only start doing this from Nougat onwards. MozReview-Commit-ID: E2I1t8dZzKj --HG-- extra : rebase_source : 84449c39aed622a995e7e009b8e33d21ff02db23 --- .../org/mozilla/gecko/widget/GeckoActionProvider.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 056a799f1caa..79854e2931bc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java +++ b/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java @@ -8,9 +8,11 @@ package org.mozilla.gecko.widget; import android.app.Activity; import android.net.Uri; import android.support.design.widget.Snackbar; +import android.support.v4.content.FileProvider; import android.util.Base64; import android.view.Menu; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.GeckoApp; import org.mozilla.gecko.R; import org.mozilla.gecko.SnackbarBuilder; @@ -328,7 +330,7 @@ public class GeckoActionProvider { os.write(buf); // Only alter the intent when we're sure everything has worked - intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(imageFile)); + addFileExtra(intent, imageFile); } else { InputStream is = null; try { @@ -346,7 +348,7 @@ public class GeckoActionProvider { } // Only alter the intent when we're sure everything has worked - intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(imageFile)); + addFileExtra(intent, imageFile); } finally { IOUtils.safeStreamClose(is); } @@ -357,4 +359,15 @@ public class GeckoActionProvider { IOUtils.safeStreamClose(os); } } + + private void addFileExtra(final Intent intent, final File file) { + if (AppConstants.Versions.preN) { + intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file)); + } else { + Uri contentUri = FileProvider.getUriForFile(mContext, + AppConstants.MOZ_FILE_PROVIDER_AUTHORITY, file); + intent.putExtra(Intent.EXTRA_STREAM, contentUri); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + } + } }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1450449 - Part 1: Add FileProvider. r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit e80f96596129a94a39caa8e525affa892077d3b0 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sat May 12 22:19:08 2018 +0200 Bug 1450449 - Part 1: Add FileProvider. r=jchen In case we change our thinking on launching of downloaded files and start using content:// URIs for that case as well, we already allow our FileProvider to generate URIs for the whole file system using <root-path>. This is because users can in principle move our download directory to an arbitrary location on the file system as long as it is accessible to Firefox. However not all of these locations (e.g. on a removable SD card) can be specified through the other methods of specifying available files for a FileProvider, so only the <root- path> option remains. MozReview-Commit-ID: 2UStBlU4JsG --HG-- extra : rebase_source : 2c1828e063c1b3e772ac20c415fd34d0da1c24a6 --- mobile/android/app/src/main/res/xml/provider_paths.xml | 10 ++++++++++ mobile/android/base/AndroidManifest.xml.in | 10 ++++++++++ mobile/android/base/AppConstants.java.in | 1 + 3 files changed, 21 insertions(+) diff --git a/mobile/android/app/src/main/res/xml/provider_paths.xml b/mobile/android/app/src/main/res/xml/provider_paths.xml new file mode 100644 index 000000000000..8bdaaac58a1c --- /dev/null +++ b/mobile/android/app/src/main/res/xml/provider_paths.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<paths xmlns:android="http://schemas.android.com/apk/res/android"> + <root-path + name="root" + path="." /> +</paths> diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 0e5f4edaf814..c7c5ead7f82f 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -383,6 +383,16 @@ android:authorities="@ANDROID_PACKAGE_NAME@.db.searchhistory" android:exported="false"/> + <provider android:name="android.support.v4.content.FileProvider" + tools:replace="android:authorities" + android:authorities="@ANDROID_PACKAGE_NAME@.fileprovider" + android:exported="false" + android:grantUriPermissions="true"> + <meta-data android:name="android.support.FILE_PROVIDER_PATHS" + tools:replace="android:resource" + android:resource="@xml/provider_paths" /> + </provider> + <service android:exported="false" android:name="org.mozilla.gecko.updater.UpdateService" diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index d676b1e1da12..e16d936b6b0d 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -25,6 +25,7 @@ public class AppConstants { public static final String MANGLED_ANDROID_PACKAGE_NAME = "@MANGLED_ANDROID_PACKAGE_NAME@"; public static final String MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = "@ANDROID_PACKAGE_NAME@_fxaccount"; + public static final String MOZ_FILE_PROVIDER_AUTHORITY = "@ANDROID_PACKAGE_NAME@.fileprovider"; /** * Encapsulates access to compile-time version definitions, allowing

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1450449 - Part 5: Disable file:// URI checks for downloaded files and launching files from Gecko. r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit ad9b3c0d704dceab75c2b3f6246740c78d8f7c04 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sun May 13 00:07:48 2018 +0200 Bug 1450449 - Part 5: Disable file:// URI checks for downloaded files and launching files from Gecko. r=jchen This is a case where I disagree with Google's stance about content:// URIs. They're perfect for granting access to files that might not even be present on the file system, e.g. virtual files generated on the spot or retrieved from some database, a cloud storage provider's app granting access to files stored in the cloud, etc., as well as for being able to selectively grant access to files conceptually "owned" by a certain app, especially files within the app's private internal storage. However when considering files that don't actually "belong" to any specific app in particular and that are already being stored in a publicly accessible (modulo the READ_EXTERNAL_STORAGE permission, respectively the user granting access through the Storage Access Framework) directory somewhere within the external storage, they also have a number of drawbacks: - While in practice a number of FileProviders will "leak" the true file system path through the content:// URI they generate, the problem remains that there's no way to know for sure whether two content:// URIs received from different apps are in fact referring to the same file or not. In case of our downloads for example, content:// URIs all referring to the same file could in principle be generated * by Firefox itself * by the system Downloads app * by the system file browser app * by any other third-party file browser or similar app that the user might have installed which e.g. will needlessly clutter up any LRU lists other apps might keep. - content:// URIs obviously depend on the generating app still being installed. So even if we fixed bug 1280184, so that uninstalling Firefox would no longer remove the user's downloads, all content:// URIs generated by Firefox re- ferring to those files would become invalid anyway. - Even if the actual file is already sitting in a public directory, when accessing it through the content:// URI the receiving app still needs to explicitly persist the permissions granted for that URI, and there are some signs that you can only persist permissions for a limited number of files. For file:// URIs on the other hand the only limitation on the number of file:// URIS you can remember is the available storage space for storing those URIs, i.e. for practical purposes more or less unlimited. - content:// URIs only grant access to a specific file. If we (or possibly an add-on) started implementing saving of websites as on desktop (i.e. HTML + associated support files instead of a PDF "copy"), then receiving apps couldn't properly open those additional support files (images, style sheets, etc.) when getting a content:// URI to the main HTML file (see https://issuetracker.google.com/issues/77406791) Since we do store downloads in the public Downloads folder on the external storage by default and I believe that conceptually, those files belong to the user and not Firefox specifically, I propose to continue launching downloaded files directly through their file:// URI. To that end, we temporarily disable the corresponding StrictMode restrictions when required and restore them afterwards. MozReview-Commit-ID: LuIYIA5FSGf --HG-- extra : rebase_source : a690b3097fdb03591f25f05a944c9ca3c05ddd04 --- .../org/mozilla/gecko/notifications/NotificationHelper.java | 7 +++++++ .../src/main/java/org/mozilla/gecko/GeckoAppShell.java | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java index 35366609da49..713e9f9d4b3c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java @@ -32,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.Bitmap; import android.net.Uri; +import android.os.StrictMode; import android.support.v4.util.SimpleArrayMap; import android.util.Log; @@ -295,8 +296,14 @@ public final class NotificationHelper implements BundleEventListener { // scheme to prevent Fennec from popping up. final Intent viewFileIntent = createIntentIfDownloadCompleted(message); if (builder != null && viewFileIntent != null && mContext != null) { + // Bug 1450449 - Downloaded files already are already in a public directory and aren't + // really owned exclusively by Firefox, so there's no real benefit to using + // content:// URIs here. + StrictMode.VmPolicy prevPolicy = StrictMode.getVmPolicy(); + StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX); final PendingIntent pIntent = PendingIntent.getActivity( mContext, 0, viewFileIntent, PendingIntent.FLAG_UPDATE_CURRENT); + StrictMode.setVmPolicy(prevPolicy); builder.setAutoCancel(true); builder.setContentIntent(pIntent); 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 34ba3315f295..3d21d7bb2f56 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 @@ -86,6 +86,7 @@ import android.os.Environment; import android.os.Looper; import android.os.ParcelFileDescriptor; import android.os.PowerManager; +import android.os.StrictMode; import android.os.SystemClock; import android.os.Vibrator; import android.provider.Settings; @@ -956,7 +957,14 @@ public class GeckoAppShell if (geckoInterface == null) { return false; } - return geckoInterface.openUriExternal(targetURI, mimeType, packageName, className, action, title); + // Bug 1450449 - Downloaded files already are already in a public directory and aren't + // really owned exclusively by Firefox, so there's no real benefit to using + // content:// URIs here. + StrictMode.VmPolicy prevPolicy = StrictMode.getVmPolicy(); + StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX); + boolean success = geckoInterface.openUriExternal(targetURI, mimeType, packageName, className, action, title); + StrictMode.setVmPolicy(prevPolicy); + return success; } @WrapForJNI(dispatchTo = "gecko")

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1450449 - Part 4: Starting from Nougat, install updates via content:// URIs. r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit 3b926685447ea2056e73d9b3396ea8d5cbdd349f Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sat May 12 23:34:25 2018 +0200 Bug 1450449 - Part 4: Starting from Nougat, install updates via content:// URIs. r=jchen We download the update APK into the public downloads directory and normally the only relevant app consuming that URI should be the system package installer, but just to be safe we only switch usage from Nougat onward, too. MozReview-Commit-ID: GtoXMJ7NdJ3 --HG-- extra : rebase_source : 1e85f8352b7a59cb3cd2fd3034a0103c8705ff09 --- .../base/java/org/mozilla/gecko/updater/UpdateService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java index 71e1097711d9..d5093efca6d6 100644 --- a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java +++ b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java @@ -36,6 +36,7 @@ import android.os.Environment; import android.provider.Settings; import android.support.v4.app.NotificationManagerCompat; import android.support.v4.content.ContextCompat; +import android.support.v4.content.FileProvider; import android.support.v4.net.ConnectivityManagerCompat; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; @@ -707,8 +708,15 @@ public class UpdateService extends IntentService { } Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setDataAndType(Uri.fromFile(updateFile), "application/vnd.android.package-archive"); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + if (AppConstants.Versions.preN) { + intent.setDataAndType(Uri.fromFile(updateFile), "application/vnd.android.package-archive"); + } else { + Uri apkUri = FileProvider.getUriForFile(this, + AppConstants.MOZ_FILE_PROVIDER_AUTHORITY, updateFile); + intent.setDataAndType(apkUri, "application/vnd.android.package-archive"); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + } + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1450449 - Part 2: Use content:// URI for capturing images from FilePicker. r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit f74197a8e82b67b0351e91e134138f91ae0173d4 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sat May 12 23:02:19 2018 +0200 Bug 1450449 - Part 2: Use content:// URI for capturing images from FilePicker. r=jchen Since it is only us and the camera app who have to deal with the content:// URI, it should be safe enough to use content:// URIs on all supported versions. MozReview-Commit-ID: JMIhBRlCiA4 --HG-- extra : rebase_source : 7a19ea138459f4a153a931db1500a0b2cb0649da --- .../base/java/org/mozilla/gecko/FilePicker.java | 4 ++-- .../base/java/org/mozilla/gecko/IntentHelper.java | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/FilePicker.java b/mobile/android/base/java/org/mozilla/gecko/FilePicker.java index 91fcaa16d130..c9ea347e6c88 100644 --- a/mobile/android/base/java/org/mozilla/gecko/FilePicker.java +++ b/mobile/android/base/java/org/mozilla/gecko/FilePicker.java @@ -176,7 +176,7 @@ public class FilePicker implements BundleEventListener { if (mimeType.equals("image/*") && hasPermissionsForMimeType(mimeType, availPermissions)) { // We also add a capture intent - Intent intent = IntentHelper.getImageCaptureIntent( + Intent intent = IntentHelper.getImageCaptureIntent(context, new File(Environment.getExternalStorageDirectory(), fileHandler.generateImageName())); addActivities(intent, intents, baseIntents); @@ -201,7 +201,7 @@ public class FilePicker implements BundleEventListener { addActivities(intent, intents, baseIntents); } if (hasPermissionsForMimeType("image/*", availPermissions)) { - intent = IntentHelper.getImageCaptureIntent( + intent = IntentHelper.getImageCaptureIntent(context, new File(Environment.getExternalStorageDirectory(), fileHandler.generateImageName())); addActivities(intent, intents, baseIntents); diff --git a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java index 9f6422263bbe..f2810a92af51 100644 --- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java @@ -19,6 +19,7 @@ import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragmen import android.annotation.TargetApi; import android.app.Activity; +import android.content.ClipData; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -29,6 +30,7 @@ import android.provider.Browser; import android.provider.MediaStore; import android.support.annotation.Nullable; import android.support.v4.app.FragmentActivity; +import android.support.v4.content.FileProvider; import android.text.TextUtils; import android.util.Log; import android.webkit.MimeTypeMap; @@ -243,10 +245,21 @@ public final class IntentHelper implements BundleEventListener { return new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION); } - public static Intent getImageCaptureIntent(final File destinationFile) { + public static Intent getImageCaptureIntent(final Context context, final File destinationFile) { final Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, - Uri.fromFile(destinationFile)); + Uri destination = FileProvider.getUriForFile(context, + AppConstants.MOZ_FILE_PROVIDER_AUTHORITY, destinationFile); + intent.putExtra(MediaStore.EXTRA_OUTPUT, destination); + + if (AppConstants.Versions.preLollipop) { + // As per https://github.com/commonsguy/cw-omnibus/blob/master/Camera/FileProvider/ + // app/src/main/java/com/commonsware/android/camcon/MainActivity.java - at least we + // don't have to support anything below Jelly Bean. + ClipData clip = + ClipData.newUri(context.getContentResolver(), null, destination); + intent.setClipData(clip); + } + intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION); return intent; }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1500906 - Suppress FileUriExposedExceptions when launching helper apps. r=jchen, a=pascalc
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit 394ffba812d69d4b5767376f0f3ff1e303ba26d1 Author: Jan Henning <jh+bitbucket(a)buttercookie.de> Date: Wed Oct 24 21:02:17 2018 +0200 Bug 1500906 - Suppress FileUriExposedExceptions when launching helper apps. r=jchen, a=pascalc Sharing tabs with file:// URIs is not possible, but users can still send them to other apps via the helper app system in the URL bar/context menu. "Intent:Open" and "Intent:OpenForResult" are both sent from Gecko by HelperApps.jsm. The same reasoning as in bug 1450449 applies as to why for publicly accessible files content:// URIs are more trouble than they're worth. Differential Revision: https://phabricator.services.mozilla.com/D9697 --- .../base/java/org/mozilla/gecko/IntentHelper.java | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java index f2810a92af51..5b7948f79e04 100644 --- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Environment; +import android.os.StrictMode; import android.provider.Browser; import android.provider.MediaStore; import android.support.annotation.Nullable; @@ -471,12 +472,18 @@ public final class IntentHelper implements BundleEventListener { } private void open(final GeckoBundle message) { - openUriExternal(message.getString("url", ""), - message.getString("mime", ""), - message.getString("packageName", ""), - message.getString("className", ""), - message.getString("action", ""), - message.getString("title", ""), false); + final StrictMode.VmPolicy prevPolicy = StrictMode.getVmPolicy(); + StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX); + try { + openUriExternal(message.getString("url", ""), + message.getString("mime", ""), + message.getString("packageName", ""), + message.getString("className", ""), + message.getString("action", ""), + message.getString("title", ""), false); + } finally { + StrictMode.setVmPolicy(prevPolicy); + } } private void openForResult(final GeckoBundle message, final EventCallback callback) { @@ -495,10 +502,14 @@ public final class IntentHelper implements BundleEventListener { return; } final ResultHandler handler = new ResultHandler(callback); + final StrictMode.VmPolicy prevPolicy = StrictMode.getVmPolicy(); + StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX); try { ActivityHandlerHelper.startIntentForActivity(activity, intent, handler); } catch (SecurityException e) { Log.w(LOGTAG, "Forbidden to launch activity.", e); + } finally { + StrictMode.setVmPolicy(prevPolicy); } }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1480079 - Add REQUEST_INSTALL_PACKAGES permission for all builds; r=jchen
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit 4fe43cba0780a310cea820589ae0dc52837ebef9 Author: Petru Lingurar <petru.lingurar(a)softvision.ro> Date: Tue Aug 7 16:48:29 2018 +0300 Bug 1480079 - Add REQUEST_INSTALL_PACKAGES permission for all builds; r=jchen This permission is needed on API26+ to be able to install app updates but also other downloaded APKs. MozReview-Commit-ID: Lk0uqBAJ5BH --HG-- extra : rebase_source : 5f31cfd06c2205cd2a96ac68ba19b697d49ae75c --- mobile/android/base/FennecManifest_permissions.xml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 08c611d0a290..71f07b259135 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -45,6 +45,9 @@ #endif <uses-feature android:name="android.hardware.touchscreen"/> +  + <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/> + #ifdef MOZ_ANDROID_BEAM  <uses-permission android:name="android.permission.NFC"/>

1 0

[tor-browser-build/master] Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit f79412dffd134cb89d463229a5875e53e4274991 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 14 19:11:20 2019 +0100 Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy --- projects/fteproxy/build | 2 ++ projects/fteproxy/config | 2 ++ projects/fteproxy/fteproxy.wrapper | 10 ++++++++++ projects/libfte/build | 4 ++-- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 310c9a5..6b6a82f 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -22,6 +22,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs rm -Rf $pydir [% ELSE -%] + cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper + chmod +x $PTDIR/fteproxy.wrapper cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ [% END -%] diff --git a/projects/fteproxy/config b/projects/fteproxy/config index d58095e..06ea149 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -28,3 +28,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' enable: '[% c("var/windows") %]' + - filename: fteproxy.wrapper + enable: '[% c("var/linux") %]' diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper new file mode 100644 index 0000000..ca10086 --- /dev/null +++ b/projects/fteproxy/fteproxy.wrapper @@ -0,0 +1,10 @@ +#!/bin/sh +basedir=$(dirname "$0") +libdir=$(cd "$basedir"/fteproxy-lib ; pwd) +if test -z "$LD_LIBRARY_PATH" +then + export LD_LIBRARY_PATH="$libdir" +else + export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH" +fi +exec "$basedir/fteproxy.bin" "$@" diff --git a/projects/libfte/build b/projects/libfte/build index 4f3455f..5d62453 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -28,8 +28,8 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] export PYTHON=python2 make cp -ra fte $PTDIR/ - mkdir -p $distdir/TorBrowser/Tor - cp /var/tmp/dist/gmp/lib/libgmp.so.10 $distdir/TorBrowser/Tor/ + mkdir -p $PTDIR/fteproxy-lib + cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib [% END -%] cp -a {LICENSE,README.md} $DOCSDIR/ cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 12b8aad..d9988fb 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,5 +1,5 @@ ## fteproxy configuration -ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed +ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_27531_v2'
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit 74bbaa04f761acd3de775dde0c611e4cb8721b26 Merge: 64ef8a5 f79412d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 24 08:48:50 2019 +0000 Merge remote-tracking branch 'boklm/bug_27531_v2' projects/fteproxy/build | 2 ++ projects/fteproxy/config | 2 ++ projects/fteproxy/fteproxy.wrapper | 10 ++++++++++ projects/libfte/build | 4 ++-- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/maint-8.0] Using build2 for 8.0.5
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 771bcf9f7dcec6ca17cc1f117891d538b8189ffe Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 23 14:49:04 2019 +0000 Using build2 for 8.0.5 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 4f06501..5e1ec0e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.4 project_name: tor-browser

1 0

[tor-browser-build/maint-8.0] Bug 29097: Don't try to install python3.6-lxml
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 7355a3cc844aee4c5ec24b07e886d2a9c5481ee7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 23 14:53:43 2019 +0100 Bug 29097: Don't try to install python3.6-lxml Remove the python3.6-lxml package for the list of dependencies to build https-everywhere. This package does not exist anymore in Debian Buster, and it seems it is not required to build https-everywhere. --- projects/https-everywhere/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index eeef02c..59eb463 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -22,7 +22,6 @@ var: deps: - git - python3.6 - - python3.6-lxml - libxslt1.1 - libxml2-utils - sqlite3

1 0

[tor-browser-build/master] Bug 29097: Don't try to install python3.6-lxml
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 64ef8a5de677aac8b3b608ca8997363130690a6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 23 14:53:43 2019 +0100 Bug 29097: Don't try to install python3.6-lxml Remove the python3.6-lxml package for the list of dependencies to build https-everywhere. This package does not exist anymore in Debian Buster, and it seems it is not required to build https-everywhere. --- projects/https-everywhere/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index bcd47f2..3b45143 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -22,7 +22,6 @@ var: deps: - git - python3.6 - - python3.6-lxml - libxslt1.1 - libxml2-utils - sqlite3

1 0

[tor-browser-build/master] Merge branch 'bug_28168_v3'
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 55556eb3dd1869980fe733d56647e0307dd66fa1 Merge: 031ecd7 cdf65c9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 23 13:18:40 2019 +0000 Merge branch 'bug_28168_v3' Which should have been "bug_28618_v3", but the changes are okay at least... projects/firefox/1464084.patch | 73 ------------------------------- projects/firefox/1467041.patch | 23 ---------- projects/firefox/build | 2 - projects/firefox/config | 4 -- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 6 files changed, 2 insertions(+), 102 deletions(-)

1 0

[tor-browser-build/master] Bug 28618: Set MOZILLA_OFFICIAL for Windows build
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit cdf65c9b5b0f8533c78b4450e20ba4743a3a0f31 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 17 07:34:19 2019 +0000 Bug 28618: Set MOZILLA_OFFICIAL for Windows build --- projects/firefox/1464084.patch | 73 ------------------------------------------ projects/firefox/1467041.patch | 23 ------------- projects/firefox/build | 2 -- projects/firefox/config | 4 --- 4 files changed, 102 deletions(-) diff --git a/projects/firefox/1464084.patch b/projects/firefox/1464084.patch deleted file mode 100644 index 524cb7f..0000000 --- a/projects/firefox/1464084.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1a1cc016c8f6ff83ea057ee6fe6838b89c382210 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sun, 24 Jun 2018 19:36:35 +0000 -Subject: [PATCH 1/2] Revert "Bug 1464084 - Don't export - std::thread::_M_start_thread symbols with --enable-stdcxx-compat. r=froydnj, - a=RyanVM" - -This reverts commit 655e5f1d95e0d5ecd037f36dbe533372130e5621. - -diff --git a/build/unix/stdc++compat/hide_std.ld b/build/unix/stdc++compat/hide_std.ld -deleted file mode 100644 -index 4b3400b0f327..000000000000 ---- a/build/unix/stdc++compat/hide_std.ld -+++ /dev/null -@@ -1,5 +0,0 @@ --hidden { -- local: -- # std::thread::_M_start_thread(...) -- _ZNSt6thread15_M_start_thread*; --}; -diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build -index 4444d0c4f297..20517a1caef5 100644 ---- a/build/unix/stdc++compat/moz.build -+++ b/build/unix/stdc++compat/moz.build -@@ -23,5 +23,3 @@ COMPILE_FLAGS['CLANG_PLUGIN'] = [] - - DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] - HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION'] -- --OS_LIBS += ['-Wl,--version-script,%s/hide_std.ld' % SRCDIR] -diff --git a/python/mozbuild/mozbuild/action/generate_symbols_file.py b/python/mozbuild/mozbuild/action/generate_symbols_file.py -index bf1ae917a2d0..f118060f47cf 100644 ---- a/python/mozbuild/mozbuild/action/generate_symbols_file.py -+++ b/python/mozbuild/mozbuild/action/generate_symbols_file.py -@@ -42,8 +42,6 @@ def generate_symbols_file(output, *args): - - symbols = [s.strip() for s in pp.out.getvalue().splitlines() if s.strip()] - -- libname, ext = os.path.splitext(os.path.basename(output.name)) -- - if buildconfig.substs['OS_TARGET'] == 'WINNT': - # A def file is generated for MSVC link.exe that looks like the - # following: -@@ -68,13 +66,14 @@ def generate_symbols_file(output, *args): - # those platforms, and to DATA on Windows, so that the "DATA" part - # is, in fact, part of the symbol name as far as the symbols variable - # is concerned. -+ libname, ext = os.path.splitext(os.path.basename(output.name)) - assert ext == '.def' - output.write('LIBRARY %s\nEXPORTS\n %s\n' - % (libname, '\n '.join(symbols))) - elif buildconfig.substs['GCC_USE_GNU_LD']: - # A linker version script is generated for GNU LD that looks like the - # following: -- # liblibrary.so { -+ # { - # global: - # symbol1; - # symbol2; -@@ -82,8 +81,8 @@ def generate_symbols_file(output, *args): - # local: - # *; - # }; -- output.write('%s {\nglobal:\n %s;\nlocal:\n *;\n};' -- % (libname, ';\n '.join(symbols))) -+ output.write('{\nglobal:\n %s;\nlocal:\n *;\n};' -+ % ';\n '.join(symbols)) - elif buildconfig.substs['OS_TARGET'] == 'Darwin': - # A list of symbols is generated for Apple ld that simply lists all - # symbols, with an underscore prefix. --- -2.17.1 - diff --git a/projects/firefox/1467041.patch b/projects/firefox/1467041.patch deleted file mode 100644 index a31e2e0..0000000 --- a/projects/firefox/1467041.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8d940fed5975400910c29037a6c575260d3caa22 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sun, 24 Jun 2018 19:37:55 +0000 -Subject: [PATCH 2/2] Revert "Bug 1467041 - Default to --enable-release when - milestone is beta/release. r=froydnj, a=RyanVM" - -This reverts commit b1f09cd8f4a1abf13f85a2353ac1b9711200b0e5. - -diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 67007c8dcf7c..a1e443019748 100755 ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -1387,7 +1387,6 @@ imply_option('--enable-release', mozilla_official) - imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) - - js_option('--enable-release', -- default=milestone.is_release_or_beta, - help='Build with more conservative, release engineering-oriented ' - 'options. This may slow down builds.') - --- -2.17.1 - diff --git a/projects/firefox/build b/projects/firefox/build index b9d9d5a..f6f3365 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -151,8 +151,6 @@ fi [% IF c("var/windows") %] patch -p1 < $rootdir/nsis-uninstall.patch - patch -p1 < $rootdir/1464084.patch - patch -p1 < $rootdir/1467041.patch [% END -%] rm -f configure diff --git a/projects/firefox/config b/projects/firefox/config index 639d504..0e91d38 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -114,10 +114,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: nsis-uninstall.patch enable: '[% c("var/windows") %]' - - filename: 1464084.patch - enable: '[% c("var/windows") %]' - - filename: 1467041.patch - enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm

1 0

[tor-browser-build/master] Revert "Bug 27865: Tor Browser 8.5a2 is crashing on Windows"
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit b019cacb8fba8aef0362dcef4860e51a46394a13 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 17 07:30:02 2019 +0000 Revert "Bug 27865: Tor Browser 8.5a2 is crashing on Windows" This reverts commit 49eb43da16695c8fce31129f3499a8258761025a. No longer needed after we bumped the binutils version to 2.32.1 in bug 26148. --- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..07e8851 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..1665005 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 27865: Fix start-up crashes on Windows"
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 9daf30f059baff3af2f5b26ab6f60853f19516b2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 17 07:27:24 2019 +0000 Revert "Bug 27865: Fix start-up crashes on Windows" This reverts commit 59261e53591c159c10bcef78dc39478fbb270f77. After bug 26148 landed we get the crash fixes in binutils, which are available starting with 2.27. --- build/moz.configure/toolchain.configure | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 008193c6c945..67007c8dcf7c 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1382,10 +1382,8 @@ option(env='RUSTFLAGS', help='Rust compiler flags') set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags)) -if target.os != 'WINNT': - imply_option('--enable-release', mozilla_official) -else: - imply_option('--enable-release', False) + +imply_option('--enable-release', mozilla_official) imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) js_option('--enable-release',

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 6a9c962b2316c6ede976faaa36294a97b121e382 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 28 09:56:25 2018 -0500 squash! Bug 4234: Use the Firefox Update Process for Tor Browser. Also fix #27828: "Check for Tor Browser update" doesn't seem to do anything. --- toolkit/mozapps/update/nsUpdateService.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 609f1e19f524..b2a4e82cf241 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -4011,7 +4011,15 @@ UpdatePrompt.prototype = { "an update was downloaded. topic: update-downloaded, status: " + update.state); Services.obs.notifyObservers(update, "update-downloaded", update.state); - if (Services.prefs.getBoolPref(PREF_APP_UPDATE_DOORHANGER, false)) { + if (background && Services.prefs.getBoolPref(PREF_APP_UPDATE_DOORHANGER, false)) { + // To fix https://trac.torproject.org/projects/tor/ticket/27828 + // ("Check for Tor Browser update" doesn't seem to do anything), in + // Tor Browser we only return here when the background parameter is + // true. This causes the update wizard XUL window to (correctly) be + // opened in response to "Check for Tor Browser Update." + // This change does not alter the behavior of any existing + // update-related UI because all callers of showUpdateDownloaded() + // other than Torbutton pass true for the background parameter. return; }

1 0

[tor-browser-build/master] Bug 28546: Rebrand Tor Browser's Window's Installer
by boklm＠torproject.org 23 Jan '19

23 Jan '19

commit 031ecd732636c627ea3b6343869d96ccbf3d2df0 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Nov 28 16:13:50 2018 -0800 Bug 28546: Rebrand Tor Browser's Window's Installer This patch passes in the build channel to makensis as a !define so that the tbb-windows-installer torbrowser.nsi installer script can use appropriate branding and set branding-specific names and install paths. --- projects/tbb-windows-installer/config | 2 +- projects/tor-browser/build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index a990229..0ec7b0a 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.5 +version: 0.6 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4661f7a..bc663c2 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -303,7 +303,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("var/touch") %] {} \; pushd "$PKG_DIR" - makensis torbrowser.nsi + makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py @@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" - makensis torbrowser.nsi + makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py

1 0

[torbutton/master] Bug 28885: notify users that update is downloading
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 15c369f661fd360c9715b4dd7da147f7aa8f2443 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 16 14:48:35 2019 -0500 Bug 28885: notify users that update is downloading Add "Downloading update" property string. --- src/chrome/locale/en-US/torbutton.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/locale/en-US/torbutton.properties b/src/chrome/locale/en-US/torbutton.properties index f11fb5bf..ea7a7d63 100644 --- a/src/chrome/locale/en-US/torbutton.properties +++ b/src/chrome/locale/en-US/torbutton.properties @@ -50,6 +50,11 @@ profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +# "Downloading update" string for the hamburger menu (see #28885). +# This string is kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +updateDownloadingPanelUILabel=Downloading %S update + # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service)

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1473507 - fix crash in nsILoadInfo::GetOriginAttributes when passing no principal to SavePrivacyAwareURI, r=mccr8
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 11aef302f781e229446fc73251e42efd70c19b38 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Thu Jul 5 23:50:45 2018 +0100 Bug 1473507 - fix crash in nsILoadInfo::GetOriginAttributes when passing no principal to SavePrivacyAwareURI, r=mccr8 Enforce that callers pass triggering principals through to any persist APIs, which all delegate to SaveURIInternal. Also add the missing principal information to the saveURL call in the page info dialog code, which was triggering crashes in this way. MozReview-Commit-ID: L9pNE7BxGws --HG-- extra : rebase_source : 957d765f965aa4f942532c693cae36addd8b781d --- browser/base/content/pageinfo/pageInfo.js | 2 +- dom/webbrowserpersist/nsWebBrowserPersist.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 405b9443342d..30344b989007 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -696,7 +696,7 @@ function saveMedia() { titleKey = "SaveAudioTitle"; saveURL(url, null, titleKey, false, false, makeURI(item.baseURI), - null, gDocInfo.isContentWindowPrivate); + null, gDocInfo.isContentWindowPrivate, gDocInfo.principal); } } else { selectSaveFolder(function(aDirectory) { diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp index 68cb08eac0c0..97650a4b42a0 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.cpp +++ b/dom/webbrowserpersist/nsWebBrowserPersist.cpp @@ -1341,6 +1341,7 @@ nsresult nsWebBrowserPersist::SaveURIInternal( { NS_ENSURE_ARG_POINTER(aURI); NS_ENSURE_ARG_POINTER(aFile); + NS_ENSURE_ARG_POINTER(aTriggeringPrincipal); nsresult rv = NS_OK;

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1473509 - store principal information with the URIs to avoid having to locate documents after the fact, r=mccr8
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 846b2530517793843a0006c41b15ff41b47a6f79 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Fri Jul 6 17:27:17 2018 +0100 Bug 1473509 - store principal information with the URIs to avoid having to locate documents after the fact, r=mccr8 The way we currently save resource URIs that we discovered by walking the document isn't guaranteed to be in-order with when we save the documents they came from. To deduce the correct principal to use to load these subresources, we need to store it with the resource in the map of URIs we work with. MozReview-Commit-ID: GNlNuS6TuVV --HG-- extra : rebase_source : 99982f91971423730aa8661cf66c2dd14e276780 --- dom/webbrowserpersist/nsWebBrowserPersist.cpp | 33 +++++++++++++-------------- dom/webbrowserpersist/nsWebBrowserPersist.h | 5 +++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp index 12e6c41c37d8..68cb08eac0c0 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.cpp +++ b/dom/webbrowserpersist/nsWebBrowserPersist.cpp @@ -84,7 +84,6 @@ struct nsWebBrowserPersist::DocData nsCOMPtr<nsIURI> mBaseURI; nsCOMPtr<nsIWebBrowserPersistDocument> mDocument; nsCOMPtr<nsIURI> mFile; - nsCOMPtr<nsIPrincipal> mPrincipal; nsCString mCharset; }; @@ -101,6 +100,7 @@ struct nsWebBrowserPersist::URIData nsCOMPtr<nsIURI> mFile; nsCOMPtr<nsIURI> mDataPath; nsCOMPtr<nsIURI> mRelativeDocumentURI; + nsCOMPtr<nsIPrincipal> mTriggeringPrincipal; nsCString mRelativePathToData; nsCString mCharset; @@ -605,12 +605,6 @@ nsWebBrowserPersist::SerializeNextFile() } if (urisToPersist > 0) { - nsCOMPtr<nsIPrincipal> docPrincipal; - //XXXgijs I *think* this is already always true, but let's be sure. - MOZ_ASSERT(mDocList.Length() > 0, - "Should have the document for any walked URIs to persist!"); - nsresult rv = mDocList.ElementAt(0)->mDocument-> - GetPrincipal(getter_AddRefs(docPrincipal)); NS_ENSURE_SUCCESS_VOID(rv); // Persist each file in the uri map. The document(s) // will be saved after the last one of these is saved. @@ -642,7 +636,7 @@ nsWebBrowserPersist::SerializeNextFile() // The Referrer Policy doesn't matter here since the referrer is // nullptr. - rv = SaveURIInternal(uri, docPrincipal, nullptr, nullptr, + rv = SaveURIInternal(uri, data->mTriggeringPrincipal, nullptr, nullptr, mozilla::net::RP_Unset, nullptr, nullptr, fileAsURI, true, mIsPrivate); // If SaveURIInternal fails, then it will have called EndDownload, @@ -1749,7 +1743,7 @@ NS_IMETHODIMP nsWebBrowserPersist::OnWalk::VisitResource(nsIWebBrowserPersistDocument* aDoc, const nsACString& aURI) { - return mParent->StoreURI(nsAutoCString(aURI).get()); + return mParent->StoreURI(nsAutoCString(aURI).get(), aDoc); } NS_IMETHODIMP @@ -1760,14 +1754,14 @@ nsWebBrowserPersist::OnWalk::VisitDocument(nsIWebBrowserPersistDocument* aDoc, nsAutoCString uriSpec; nsresult rv = aSubDoc->GetDocumentURI(uriSpec); NS_ENSURE_SUCCESS(rv, rv); - rv = mParent->StoreURI(uriSpec.get(), false, &data); + rv = mParent->StoreURI(uriSpec.get(), aDoc, false, &data); NS_ENSURE_SUCCESS(rv, rv); if (!data) { // If the URI scheme isn't persistable, then don't persist. return NS_OK; } data->mIsSubFrame = true; - return mParent->SaveSubframeContent(aSubDoc, uriSpec, data); + return mParent->SaveSubframeContent(aSubDoc, aDoc, uriSpec, data); } @@ -2513,7 +2507,8 @@ nsWebBrowserPersist::CalcTotalProgress() nsresult nsWebBrowserPersist::StoreURI( - const char *aURI, bool aNeedsPersisting, URIData **aData) + const char *aURI, nsIWebBrowserPersistDocument *aDoc, + bool aNeedsPersisting, URIData **aData) { NS_ENSURE_ARG_POINTER(aURI); @@ -2524,12 +2519,13 @@ nsWebBrowserPersist::StoreURI( mCurrentBaseURI); NS_ENSURE_SUCCESS(rv, rv); - return StoreURI(uri, aNeedsPersisting, aData); + return StoreURI(uri, aDoc, aNeedsPersisting, aData); } nsresult nsWebBrowserPersist::StoreURI( - nsIURI *aURI, bool aNeedsPersisting, URIData **aData) + nsIURI *aURI, nsIWebBrowserPersistDocument *aDoc, + bool aNeedsPersisting, URIData **aData) { NS_ENSURE_ARG_POINTER(aURI); if (aData) @@ -2554,7 +2550,7 @@ nsWebBrowserPersist::StoreURI( } URIData *data = nullptr; - MakeAndStoreLocalFilenameInURIMap(aURI, aNeedsPersisting, &data); + MakeAndStoreLocalFilenameInURIMap(aURI, aDoc, aNeedsPersisting, &data); if (aData) { *aData = data; @@ -2661,6 +2657,7 @@ nsWebBrowserPersist::DocumentEncoderExists(const char *aContentType) nsresult nsWebBrowserPersist::SaveSubframeContent( nsIWebBrowserPersistDocument *aFrameContent, + nsIWebBrowserPersistDocument *aParentDocument, const nsCString& aURISpec, URIData *aData) { @@ -2738,7 +2735,7 @@ nsWebBrowserPersist::SaveSubframeContent( toWalk->mDataPath = frameDataURI; mWalkStack.AppendElement(mozilla::Move(toWalk)); } else { - rv = StoreURI(aURISpec.get()); + rv = StoreURI(aURISpec.get(), aParentDocument); } NS_ENSURE_SUCCESS(rv, rv); @@ -2772,7 +2769,7 @@ nsWebBrowserPersist::CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel) // we store the current location as the key (absolutized version of domnode's attribute's value) nsresult nsWebBrowserPersist::MakeAndStoreLocalFilenameInURIMap( - nsIURI *aURI, bool aNeedsPersisting, URIData **aData) + nsIURI *aURI, nsIWebBrowserPersistDocument *aDoc, bool aNeedsPersisting, URIData **aData) { NS_ENSURE_ARG_POINTER(aURI); @@ -2815,6 +2812,8 @@ nsWebBrowserPersist::MakeAndStoreLocalFilenameInURIMap( data->mRelativeDocumentURI = mTargetBaseURI; data->mCharset = mCurrentCharset; + aDoc->GetPrincipal(getter_AddRefs(data->mTriggeringPrincipal)); + if (aNeedsPersisting) mCurrentThingsToPersist++; diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.h b/dom/webbrowserpersist/nsWebBrowserPersist.h index b9a2e3da73b6..f2cc91ee336d 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.h +++ b/dom/webbrowserpersist/nsWebBrowserPersist.h @@ -94,7 +94,7 @@ private: static nsresult GetLocalFileFromURI(nsIURI *aURI, nsIFile **aLocalFile); static nsresult AppendPathToURI(nsIURI *aURI, const nsAString & aPath, nsCOMPtr<nsIURI>& aOutURI); nsresult MakeAndStoreLocalFilenameInURIMap( - nsIURI *aURI, bool aNeedsPersisting, URIData **aData); + nsIURI *aURI, nsIWebBrowserPersistDocument *aDoc, bool aNeedsPersisting, URIData **aData); nsresult MakeOutputStream( nsIURI *aFile, nsIOutputStream **aOutputStream); nsresult MakeOutputStreamFromFile( @@ -113,16 +113,19 @@ private: nsIURI *aURI, nsString &aFilename); nsresult StoreURI( const char *aURI, + nsIWebBrowserPersistDocument *aDoc, bool aNeedsPersisting = true, URIData **aData = nullptr); nsresult StoreURI( nsIURI *aURI, + nsIWebBrowserPersistDocument *aDoc, bool aNeedsPersisting = true, URIData **aData = nullptr); bool DocumentEncoderExists(const char *aContentType); nsresult SaveSubframeContent( nsIWebBrowserPersistDocument *aFrameContent, + nsIWebBrowserPersistDocument *aParentDocument, const nsCString& aURISpec, URIData *aData); nsresult SendErrorStatusChange(

1 0