- tbb-commits - lists.torproject.org

[torbutton/master] Bug 26409: Remove spoofed locale implementation
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit e950aeac23670983bedd84c6526bb9a865450a25 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 1 08:04:21 2018 +0000 Bug 26409: Remove spoofed locale implementation In bug 1039069 Mozilla implemented the option of spoofing the locale in the Accept-Language header/JS locale if users with localized builds want that for better fingerprinting protection. That makes our workaround in Torbutton obsolete and we can remove it. Otherwise users start to get the respective language prompt twice, which is quite annoying. --- src/chrome/content/torbutton.js | 109 +----------------------------- src/chrome/locale/en/torbutton.properties | 1 - src/defaults/preferences/preferences.js | 2 - 3 files changed, 1 insertion(+), 111 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 18895927..d0195b46 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,7 @@ let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); -let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); Cu.importGlobalProperties(["XMLHttpRequest"]); @@ -170,7 +170,6 @@ var torbutton_unique_pref_observer = torbutton_use_nontor_proxy(); break; case "privacy.resistFingerprinting": - case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); break; case "privacy.firstparty.isolate": @@ -463,36 +462,6 @@ var torbutton_abouttor_message_handler = { } }; -function torbutton_should_prompt_for_language_preference() { - return torbutton_get_general_useragent_locale().substring(0, 2) != "en" && - !m_tb_prefs.getBoolPref("extensions.torbutton.prompted_language"); -} - - -// Bug 1506 P3: This code asks the user once if they want to spoof their -// language to English. -// -// Asks the user whether Torbutton should make "English requests", and updates -// the extensions.torbutton.spoof_english preference accordingly. -function torbutton_prompt_for_language_preference() { - var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Ci.nsIPromptService); - - // Display two buttons, both with string titles. - var flags = prompts.STD_YES_NO_BUTTONS; - - var message = torbutton_get_property_string("torbutton.popup.prompted_language"); - - m_tb_prefs.setBoolPref("extensions.torbutton.prompted_language", true); - // Display modal prompt, anchored to this window. - var response = prompts.confirmEx(window, "", message, flags, - null, null, null, null, {value: false}); - - // Update preferences to reflect their response and to prevent the prompt from - // being displayed again. - m_tb_prefs.setBoolPref("extensions.torbutton.spoof_english", response == 0); -} - function torbutton_confirm_plugins() { var any_plugins_enabled = false; var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); @@ -1641,23 +1610,6 @@ function torbutton_update_disk_prefs() { function torbutton_update_fingerprinting_prefs() { var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); - if (m_tb_tbb) { - if (mode) { - // Governed also by the spoof_english dialog.. - if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { - m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en"); - m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true); - } else { - if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) - m_tb_prefs.clearUserPref("intl.accept_languages"); - m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); - } - } else { - if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) - m_tb_prefs.clearUserPref("intl.accept_languages"); - } - } - m_tb_prefs.setBoolPref("webgl.min_capability_mode", mode); m_tb_prefs.setBoolPref("webgl.disable-extensions", mode); m_tb_prefs.setBoolPref("dom.network.enabled", !mode); @@ -2019,8 +1971,6 @@ function torbutton_is_windowed(wind) { return true; } -let stopLanguagePromptObserver; - // Bug 1506 P3: This is needed pretty much only for the version check // and the window resizing. See comments for individual functions for // details @@ -2054,15 +2004,6 @@ function torbutton_new_window(event) Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } - // If the default language is not English and we have not already asked, - // add an http-on-modify-request observer that will show a "request English - // language web pages?" prompt the first time a content http or https page - // is opened. - if (torbutton_should_prompt_for_language_preference()) { - stopLanguagePromptObserver = observe("http-on-modify-request", - torbutton_http_connection_observed); - } - // Check the version on every new window. We're already pinging check in these cases. torbutton_do_async_versioncheck(); @@ -2238,54 +2179,6 @@ var torbutton_resizelistener = onSecurityChange: function() {} }; -function torbutton_http_connection_observed(aRequest, aData) { - // If we are loading an HTTP page from content, show the - // "request English language web pages?" prompt. - try { - let httpChannel = aRequest.QueryInterface(Ci.nsIHttpChannel); - if (!aRequest.URI.schemeIs("http") && !aRequest.URI.schemeIs("https")) { - return; - } - if (!httpChannel) return; - let notificationCallbacks = httpChannel.notificationCallbacks; - if (!notificationCallbacks) return; - let loadContext = notificationCallbacks.getInterface(Ci.nsILoadContext); - if (!loadContext) return; - if (!loadContext.isContent) return; - // The above QI did not throw, the scheme is http[s], and we know the - // load context is content, so we must have a true HTTP request from content. - // Stop the observer and display the prompt if another window has - // not already done so. - stopLanguagePromptObserver(); - - if (torbutton_should_prompt_for_language_preference()) { - if (torbutton_is_homepage_url(aRequest.URI)) { - // If the homepage is being loaded, display the prompt after a - // delay to avoid a problem where a blank prompt is displayed. - // In this case, the homepage will be loaded using the current - // spoof English setting, which is OK. - setTimeout(function() { - if (torbutton_should_prompt_for_language_preference()) - torbutton_prompt_for_language_preference(); - }, 2000); - } else { - // No delay is needed. Display the prompt and fix up the - // Accept-Language header before allowing the load to continue. - torbutton_prompt_for_language_preference(); - - // The Accept-Language header for this request was set when the - // channel was created. Reset it to match the value that will be - // used for future requests. - let val = torbutton_get_current_accept_language_value(aRequest.URI); - if (val) - httpChannel.setRequestHeader("Accept-Language", val, false); - } - } - } catch (e) { - torbutton_log(3, e.message); - } -} - // aURI should be an http or https nsIURI object. function torbutton_get_current_accept_language_value(aURI) { diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index d77af1ee..53573df0 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -21,7 +21,6 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 5cfb0eb3..ab9b4bf4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -19,7 +19,6 @@ pref("extensions.torbutton.use_nontor_proxy",false); // State prefs: pref("extensions.torbutton.startup",false); pref("extensions.torbutton.inserted_button",false); -pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the @@ -29,7 +28,6 @@ pref("extensions.torbutton.maximize_warnings_remaining", 3); // Security prefs: pref("extensions.torbutton.cookie_protections",true); pref("extensions.torbutton.cookie_auto_protect",false); -pref("extensions.torbutton.spoof_english",true); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.resize_new_windows",true);

1 0

[tor-browser-build/master] Fix typo in README.MAKEFILE
by boklm＠torproject.org 08 Aug '18

08 Aug '18

commit 3788a45e3dc53d310a52b4262d1ceb7615a12e50 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 8 12:17:43 2018 +0200 Fix typo in README.MAKEFILE --- README.MAKEFILE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MAKEFILE b/README.MAKEFILE index 8094651..7fd05e9 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -47,7 +47,7 @@ testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US locale is created, without mar files. By default it is based on the -alpha channel, but you can change that by editing rbm.conf.local. +alpha channel, but you can change that by editing rbm.local.conf. The resulting build can be found in directory testbuild. {release,alpha,nightly,testbuild}-linux-x86_64-debug

1 0

[tor-browser-build/master] Bug 25485: Fix libstdc++.so.6 compatibility for Tor Browser
by boklm＠torproject.org 08 Aug '18

08 Aug '18

commit 6a89049c0d1200302a59f74e71151466ddae5582 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 7 10:08:30 2018 -0400 Bug 25485: Fix libstdc++.so.6 compatibility for Tor Browser We ship our version of libstdc++.so.6 for backward compatibility of Tor Browser on older systems like Ubuntu 16.04. However, a newer version of the library may be installed on the user's system and we should detect and use that. This commit adds support for detecting the library using a C++ program that uses the latest ABI; if the program executes, we should use the system library, and if not (for the older systems), we add our libstdc++.so.6 to LD_LIBRARY_PATH. --- projects/firefox/abicheck.cc | 35 ++++++++++++++++++++++ projects/firefox/build | 4 +++ projects/firefox/config | 2 ++ .../tor-browser/RelativeLink/start-tor-browser | 7 +++++ projects/tor/build | 4 ++- 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc new file mode 100644 index 0000000..cbecafa --- /dev/null +++ b/projects/firefox/abicheck.cc @@ -0,0 +1,35 @@ +/* + * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found + * This program is borrowed from + * https://en.cppreference.com/w/cpp/error/uncaught_exception and is useful in + * determining the latest C++ ABI. Specifically this program requires + * `GLIBCXX_3.4.22` which we use to compare the version of the installed + * libstdc++.so.6 and the bundled version. If the program executes + * successfully, that means we should use the system version of libstdc++.so.6 + * and if not, that means we should use the bundled version. + */ + +#include <iostream> +#include <exception> +#include <stdexcept> + +struct Foo { + int count = std::uncaught_exceptions(); + ~Foo() { + std::cout << (count == std::uncaught_exceptions() + ? "~Foo() called normally\n" + : "~Foo() called during stack unwinding\n"); + } +}; + +int main() +{ + Foo f; + try { + Foo f; + std::cout << "Exception thrown\n"; + throw std::runtime_error("test exception"); + } catch (const std::exception& e) { + std::cout << "Exception caught: " << e.what() << '\n'; + } +} diff --git a/projects/firefox/build b/projects/firefox/build index da1e71b..4dd0945 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -237,6 +237,10 @@ ELSE; END; %] +[% IF c("var/linux") %] + /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck +[% END %] + [% c('tar', { tar_src => [ browserdir ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', diff --git a/projects/firefox/config b/projects/firefox/config index 3284ed4..02a380d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -116,3 +116,5 @@ input_files: - project: fxc2 name: fxc2 enable: '[% c("var/windows") %]' + - filename: abicheck.cc + enable: '[% c("var/linux") %]' diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 6639f44..47fbdef 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -274,7 +274,14 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" +# Check if the system has a more recent version of libstdc++.so.6; if yes, use +# that instead of the bundled version. +./abicheck >/dev/null 2>&1 +if [ $? -ne 0 ]; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${HOME}/TorBrowser/Tor/libstdc++/" +fi export LD_LIBRARY_PATH + [% IF ! c("var/release") %] export SELFRANDO_write_layout_file= [% END %] diff --git a/projects/tor/build b/projects/tor/build index 8f129d6..89a5418 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -47,12 +47,14 @@ openssldir=/var/tmp/dist/openssl # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy # the libstdc++ into the directory with the libs tor depends on, too. See bug # 13359 for further details. - cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + mkdir -p "$distdir/Tor/libstdc++" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/libstdc++/" [% IF c("var/asan") -%] cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.3 "$distdir/Tor/" cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/" [% END -%] chmod 700 "$distdir"/Tor/*.so* + chmod 700 "$distdir"/Tor/libstdc++/*.so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$distdir/Tor/" [% END %]

1 0

[tor-browser-build/master] Bug: 27020: RBM build fails with runc version 1.0.1
by boklm＠torproject.org 03 Aug '18

03 Aug '18

commit 3960ad5d91701ef9b22e57eef8532e7a2e19b9db Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 1 11:29:46 2018 -0700 Bug: 27020: RBM build fails with runc version 1.0.1 runc version on Ubuntu 18.04 is 1.0.1 which is not currently handled in rbm.conf, so the runc_spec100 flag does not get set properly. This patch changes it so the runc_spec100 flag is set if a spec string greater than 1.0.0 is found. --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index d046d86..8cfa5e2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -390,11 +390,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, - # runc_spec100 is true if runc spec is exactly 1.0.0 + # runc_spec100 is true if runc spec is at least 1.0.0 # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^spec: 1\.0\.0$/m; + return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+$/m; }, }, )

1 0

[tor-launcher/master] Bug 26985: Help button icons missing
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 2a2a1ac8da14983ff682c46e0d8426cb2590ec41 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 31 13:54:26 2018 -0400 Bug 26985: Help button icons missing The image we previously used has been removed from Firefox, so use ESR 60's new help button image instead. Background shading is used for the hover and active states. --- src/chrome/content/network-settings-overlay.xul | 6 ++++-- src/chrome/skin/network-settings.css | 26 +++++++------------------ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 3d42c15..35b9fc7 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -98,8 +98,10 @@ <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" oncommand="onBridgeTypeRadioChange()"/> - <button class="helpButton" - oncommand="onOpenHelp('bridgeHelpContent')"/> + <vbox pack="center"> + <button class="helpButton" + oncommand="onOpenHelp('bridgeHelpContent')"/> + </vbox> <spacer style="width: 3em"/> <menulist id="defaultBridgeType" sizetopopup="always" placeholder="&torsettings.useBridges.default.placeholder;"> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9a02493..c6a9f0b 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -133,8 +133,9 @@ wizard.os-mac #bridgeList { /* reuse Mozilla's help button from the Firefox hamburger menu */ .helpButton { - list-style-image: url(chrome://browser/skin/menuPanel-help.png); - -moz-image-region: rect(0, 16px, 16px, 0); + background: url('chrome://global/skin/icons/help.svg') no-repeat center center; + background-size: 16px 16px; + cursor: pointer; -moz-appearance: none; height: 16px; width: 16px; @@ -152,26 +153,13 @@ wizard.os-mac #bridgeList { } .helpButton:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); + background-color: rgba(12, 12, 13, 0.1); + border-radius: 50%; } .helpButton:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -@media (min-resolution: 8.1dppx) { - .helpButton { - list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); - } - - .helpButton:hover { - -moz-image-region: rect(0, 64px, 32px, 32px); - } - - .helpButton:hover:active { - -moz-image-region: rect(0, 96px, 32px, 64px); - } + background-color: rgba(12, 12, 13, 0.15); + border-radius: 50%; } #progressContent[isShowingReconfigure] description,

1 0

[tor-launcher/master] Bug 25509: Improve the proxy help text.
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 392ba14d7d148edafa58eabb1ea18d95e917dd6d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 31 14:07:33 2018 -0400 Bug 25509: Improve the proxy help text. --- src/chrome/locale/en/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4615146..c6c5687 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0

[tor-browser-build/master] Bug 26951: Fix execdesktop argument passing
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 09111c4e8df1272dcbcf02f5c823e139801c44c4 Author: Ben Burrill <bburrill98(a)gmail.com> Date: Thu Jul 26 14:31:54 2018 -0700 Bug 26951: Fix execdesktop argument passing Prior to this change, arguments with spaces were flattened, so running ./start-tor-browser.desktop --search "hello world" would be converted to ./start-tor-browser.desktop --search hello world opening up two windows, one search for "hello" and one trying to connect to http://world Fixes #18022 as well. --- projects/tor-browser/RelativeLink/execdesktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/execdesktop b/projects/tor-browser/RelativeLink/execdesktop index 0dc7a42..27328b2 100755 --- a/projects/tor-browser/RelativeLink/execdesktop +++ b/projects/tor-browser/RelativeLink/execdesktop @@ -11,4 +11,4 @@ else echo "Launching '${TBB_START_PROG}'..." fi -eval "${TBB_START_PROG} $@" +${TBB_START_PROG} "$@"

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1474306 - Fix typo in the extension optionsType handler. r=Mossop
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 63bb7813511ad99ecbbbc7f0fb610718847ff108 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Jul 9 07:24:00 2018 +0300 Bug 1474306 - Fix typo in the extension optionsType handler. r=Mossop AddonManager.OPTIONS_INLINE_BROWSER was replaced by AddonManager.OPTIONS_TYPE_INLINE_BROWSER. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 2fc1d7edbe80..659d97616dc6 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -560,7 +560,7 @@ async function loadManifestFromRDF(aUri, aStream) { addon.hasEmbeddedWebExtension = getRDFProperty(ds, root, "hasEmbeddedWebExtension") == "true"; if (addon.optionsType && - addon.optionsType != AddonManager.OPTIONS_INLINE_BROWSER && + addon.optionsType != AddonManager.OPTIONS_TYPE_INLINE_BROWSER && addon.optionsType != AddonManager.OPTIONS_TYPE_TAB) { throw new Error("Install manifest specifies unknown optionsType: " + addon.optionsType); }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1459089 - Don't use OS Locale when resistFingerprinting is enabled. When the OS Locale is used, it leaks the OS language in the HTTP Accept-Language header. r=mcomella
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit d352f450f3edd120df9b7ab973db45069ef22bb2 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 3 18:28:00 2018 +0300 Bug 1459089 - Don't use OS Locale when resistFingerprinting is enabled. When the OS Locale is used, it leaks the OS language in the HTTP Accept-Language header. r=mcomella --HG-- extra : rebase_source : 7b0dc69be25c5076696a6bd9db7611cd5b0abbad --- mobile/android/chrome/content/browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 2dc973a15ee7..d081fde9b20e 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -2147,6 +2147,13 @@ var BrowserApp = { appLocale = appLocale.toLowerCase(); } + try { + const resistFingerprinting = Services.prefs.getBoolPref("privacy.resistFingerprinting"); + if (resistFingerprinting) { + osLocale = null; + } + } catch (e) {} + if (osLocale) { osLocale = osLocale.toLowerCase(); }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1459420 - HLS Player doesn't use the centralized Proxy Selector r=mcomella GeckoHlsPlayer uses the default http ExoPlayer handler, called DefaultHttpDataSource. It uses URL::openConnection instead of the Firefox ProxySelector.
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 7aeef47671133760672f881b38117cb4070f32b3 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Jun 4 05:15:00 2018 +0300 Bug 1459420 - HLS Player doesn't use the centralized Proxy Selector r=mcomella GeckoHlsPlayer uses the default http ExoPlayer handler, called DefaultHttpDataSource. It uses URL::openConnection instead of the Firefox ProxySelector. This patch updates the ExoPlayer DefaultHttpDataSource to use the ProxySelector. --- .../exoplayer2/upstream/DefaultHttpDataSource.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 599cdddeb91f..75e1f675c5eb 100644 --- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -31,6 +31,7 @@ import java.lang.reflect.Method; import java.net.HttpURLConnection; import java.net.NoRouteToHostException; import java.net.ProtocolException; +import java.net.URISyntaxException; import java.net.URL; import java.util.List; import java.util.Map; @@ -38,6 +39,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.mozilla.gecko.util.ProxySelector; + /** * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}. * <p> @@ -193,6 +196,8 @@ public class DefaultHttpDataSource implements HttpDataSource { } catch (IOException e) { throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e, dataSpec, HttpDataSourceException.TYPE_OPEN); + } catch (URISyntaxException e) { + throw new HttpDataSourceException("URI invalid: " + dataSpec.uri.toString(), dataSpec, HttpDataSourceException.TYPE_OPEN); } int responseCode; @@ -337,7 +342,7 @@ public class DefaultHttpDataSource implements HttpDataSource { /** * Establishes a connection, following redirects to do so where permitted. */ - private HttpURLConnection makeConnection(DataSpec dataSpec) throws IOException { + private HttpURLConnection makeConnection(DataSpec dataSpec) throws IOException, URISyntaxException { URL url = new URL(dataSpec.uri.toString()); byte[] postBody = dataSpec.postBody; long position = dataSpec.position; @@ -389,8 +394,14 @@ public class DefaultHttpDataSource implements HttpDataSource { * @param followRedirects Whether to follow redirects. */ private HttpURLConnection makeConnection(URL url, byte[] postBody, long position, - long length, boolean allowGzip, boolean followRedirects) throws IOException { - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + long length, boolean allowGzip, boolean followRedirects) throws IOException, URISyntaxException { + /** + * Tor Project modified the way the connection object was created. For the sake of + * simplicity, instead of duplicating the whole file we changed the connection object + * to use the ProxySelector. + */ + HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); + connection.setConnectTimeout(connectTimeoutMillis); connection.setReadTimeout(readTimeoutMillis); if (defaultRequestProperties != null) {

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1455165 - Filter external apps out if needed. r=mcomella
by gk＠torproject.org 30 Jul '18

30 Jul '18

commit 3d30d5d1f2ebbdf60af0180af435afad4ba7e773 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Apr 18 17:16:00 2018 +0300 Bug 1455165 - Filter external apps out if needed. r=mcomella --- mobile/android/chrome/content/browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 5f49c07a5ca5..2dc973a15ee7 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -6235,6 +6235,10 @@ var ExternalApps = { filter: { matches: function(aElement) { + if (!Services.prefs.getBoolPref("network.protocol-handler.external-default")) { + return false; + } + let uri = ExternalApps._getMediaLink(aElement); let apps = []; if (uri) {

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26528 - Don't allow Fennec to use UpdateService when installed through the app store
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 1388fbe6fd988603cbfe10eec92f9f9be578a18c Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Jun 27 12:12:22 2018 -0300 Bug 26528 - Don't allow Fennec to use UpdateService when installed through the app store App stores such as Google Play or F-Droid have their own update service. The Fennec UpdateService should be used just when the user installs it by themselves. --- .../base/java/org/mozilla/gecko/preferences/GeckoPreferences.java | 2 +- .../base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java | 2 +- .../geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java index 3675afa9c052..1042a7c2c990 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java @@ -663,7 +663,7 @@ public class GeckoPreferences pref.setOnPreferenceChangeListener(this); if (PREFS_UPDATER_AUTODOWNLOAD.equals(key)) { - if (!AppConstants.MOZ_UPDATER || ContextUtils.isInstalledFromGooglePlay(this)) { + if (!AppConstants.MOZ_UPDATER || ContextUtils.isInstalledFromAppStore(this)) { preferences.removePreference(pref); i--; continue; diff --git a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java index c4d198ae735f..c63fad412b00 100644 --- a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java @@ -133,7 +133,7 @@ public class UpdateServiceHelper { } public static boolean isUpdaterEnabled(final Context context) { - return AppConstants.MOZ_UPDATER && isEnabled && !ContextUtils.isInstalledFromGooglePlay(context); + return AppConstants.MOZ_UPDATER && isEnabled && !ContextUtils.isInstalledFromAppStore(context); } public static void setUpdateUrl(Context context, String url) { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java index 0228e144fd89..9a793d3c1e8b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java @@ -13,6 +13,7 @@ import android.text.TextUtils; public class ContextUtils { private static final String INSTALLER_GOOGLE_PLAY = "com.android.vending"; + private static final String INSTALLER_FDROID = "org.fdroid.fdroid"; private ContextUtils() {} @@ -37,13 +38,13 @@ public class ContextUtils { } } - public static boolean isInstalledFromGooglePlay(final Context context) { + public static boolean isInstalledFromAppStore(final Context context) { final String installerPackageName = context.getPackageManager().getInstallerPackageName(context.getPackageName()); if (TextUtils.isEmpty(installerPackageName)) { return false; } - return INSTALLER_GOOGLE_PLAY.equals(installerPackageName); + return INSTALLER_GOOGLE_PLAY.equals(installerPackageName) || INSTALLER_FDROID.equals(installerPackageName); } }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Neuter Firefox Accounts
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 2bfa4ee4fd1c0c282fbc7c4960ffbd6320b61bd6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 19 20:39:55 2018 +0000 Bug 25741 - TBA: Neuter Firefox Accounts We're not confident it is proxy-safe, so we disable it. We can revert this when Bug 1314778 lands. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 8 --- .../org/mozilla/gecko/fxa/FirefoxAccounts.java | 73 +++++++++++++--------- .../gecko/fxa/authenticator/AndroidFxAccount.java | 13 +++- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index ce2f1c5908b8..88c707cfa533 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -398,8 +398,6 @@ public class BrowserApp extends GeckoApp private ReadingListHelper mReadingListHelper; - private AccountsHelper mAccountsHelper; - private ExtensionPermissionsHelper mExtensionPermissionsHelper; // The tab to be selected on editing mode exit. @@ -920,7 +918,6 @@ public class BrowserApp extends GeckoApp mSharedPreferencesHelper = new SharedPreferencesHelper(appContext); mReadingListHelper = new ReadingListHelper(appContext, profile); - mAccountsHelper = new AccountsHelper(appContext, profile); mExtensionPermissionsHelper = new ExtensionPermissionsHelper(this); if (AppConstants.MOZ_ANDROID_BEAM) { @@ -1677,11 +1674,6 @@ public class BrowserApp extends GeckoApp mReadingListHelper = null; } - if (mAccountsHelper != null) { - mAccountsHelper.uninit(); - mAccountsHelper = null; - } - if (mExtensionPermissionsHelper != null) { mExtensionPermissionsHelper.uninit(); mExtensionPermissionsHelper = null; diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FirefoxAccounts.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FirefoxAccounts.java index 74b10c477237..a207f9b237ad 100644 --- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FirefoxAccounts.java +++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FirefoxAccounts.java @@ -7,6 +7,7 @@ package org.mozilla.gecko.fxa; import java.io.File; import java.util.concurrent.CountDownLatch; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.background.common.log.Logger; import org.mozilla.gecko.fxa.authenticator.AccountPickler; import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount; @@ -49,15 +50,22 @@ public class FirefoxAccounts { * @return Firefox account objects. */ public static Account[] getFirefoxAccounts(final Context context) { - final Account[] accounts = - AccountManager.get(context).getAccountsByType(FxAccountConstants.ACCOUNT_TYPE); - if (accounts.length > 0) { - FirefoxAccountsUtils.optionallySeparateAccountsDuringFirstRun(context, accounts); - return accounts; - } + if (AppConstants.isTorBrowser()) { + return new Account[0]; + } else { + // TBA: Conditionally disable this at run-time. + // XXX This will throw a java.lang.SecurityException because we don't declare + // the android.permission.GET_ACCOUNTS permission. + final Account[] accounts = + AccountManager.get(context).getAccountsByType(FxAccountConstants.ACCOUNT_TYPE); + if (accounts.length > 0) { + FirefoxAccountsUtils.optionallySeparateAccountsDuringFirstRun(context, accounts); + return accounts; + } - final Account pickledAccount = getPickledAccount(context); - return (pickledAccount != null) ? new Account[] {pickledAccount} : new Account[0]; + final Account pickledAccount = getPickledAccount(context); + return (pickledAccount != null) ? new Account[] {pickledAccount} : new Account[0]; + } } private static Account getPickledAccount(final Context context) { @@ -111,9 +119,14 @@ public class FirefoxAccounts { } public static void logSyncOptions(Bundle syncOptions) { - final boolean scheduleNow = syncOptions.getBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_BACKOFF, false); + if (AppConstants.isTorBrowser()) { + // Don't log an erroneous message, this'll only confuse someone looking at the logs. + return; + } else { + final boolean scheduleNow = syncOptions.getBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_BACKOFF, false); - Logger.info(LOG_TAG, "Sync options -- scheduling now: " + scheduleNow); + Logger.info(LOG_TAG, "Sync options -- scheduling now: " + scheduleNow); + } } public static void requestImmediateSync(final Account account, String[] stagesToSync, String[] stagesToSkip, boolean ignoreSettings) { @@ -145,28 +158,32 @@ public class FirefoxAccounts { * @param stagesToSkip stage names to skip. */ protected static void requestSync(final Account account, final Bundle syncOptions, String[] stagesToSync, String[] stagesToSkip) { - if (account == null) { - throw new IllegalArgumentException("account must not be null"); - } - if (syncOptions == null) { - throw new IllegalArgumentException("syncOptions must not be null"); - } + if (AppConstants.isTorBrowser()) { + return; + } else { + if (account == null) { + throw new IllegalArgumentException("account must not be null"); + } + if (syncOptions == null) { + throw new IllegalArgumentException("syncOptions must not be null"); + } - Utils.putStageNamesToSync(syncOptions, stagesToSync, stagesToSkip); + Utils.putStageNamesToSync(syncOptions, stagesToSync, stagesToSkip); - Logger.info(LOG_TAG, "Requesting sync."); - logSyncOptions(syncOptions); + Logger.info(LOG_TAG, "Requesting sync."); + logSyncOptions(syncOptions); - // We get strict mode warnings on some devices, so make the request on a - // background thread. - ThreadPool.run(new Runnable() { - @Override - public void run() { - for (String authority : AndroidFxAccount.DEFAULT_AUTHORITIES_TO_SYNC_AUTOMATICALLY_MAP.keySet()) { - ContentResolver.requestSync(account, authority, syncOptions); + // We get strict mode warnings on some devices, so make the request on a + // background thread. + ThreadPool.run(new Runnable() { + @Override + public void run() { + for (String authority : AndroidFxAccount.DEFAULT_AUTHORITIES_TO_SYNC_AUTOMATICALLY_MAP.keySet()) { + ContentResolver.requestSync(account, authority, syncOptions); + } } - } - }); + }); + } } /** diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java index 21af0694ceed..58422355b326 100644 --- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java +++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java @@ -29,6 +29,7 @@ import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.background.common.GlobalConstants; import org.mozilla.gecko.background.common.log.Logger; import org.mozilla.gecko.background.fxa.FxAccountUtils; @@ -711,7 +712,11 @@ public class AndroidFxAccount { * @param ignoreSettings whether we should check if syncing is allowed via in-app or system settings. */ public void requestImmediateSync(String[] stagesToSync, String[] stagesToSkip, boolean ignoreSettings) { - FirefoxAccounts.requestImmediateSync(getAndroidAccount(), stagesToSync, stagesToSkip, ignoreSettings); + if (AppConstants.isTorBrowser()) { + return; + } else { + FirefoxAccounts.requestImmediateSync(getAndroidAccount(), stagesToSync, stagesToSkip, ignoreSettings); + } } /** @@ -722,7 +727,11 @@ public class AndroidFxAccount { * @param stagesToSkip stage names to skip; can be null to skip <b>no</b> known stages. */ public void requestEventualSync(String[] stagesToSync, String[] stagesToSkip) { - FirefoxAccounts.requestEventualSync(getAndroidAccount(), stagesToSync, stagesToSkip); + if (AppConstants.isTorBrowser()) { + return; + } else { + FirefoxAccounts.requestEventualSync(getAndroidAccount(), stagesToSync, stagesToSkip); + } } public synchronized void setState(State state) {

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Orfox: hook up default panic trigger to "quit and clear"
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit e7b74ce6d0559f2a9d801b7dae1117fb8ead0212 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Sat Nov 21 00:24:09 2015 +0100 Orfox: hook up default panic trigger to "quit and clear" Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/AndroidManifest.xml.in | 7 +++ .../base/java/org/mozilla/gecko/GeckoApp.java | 61 ++++++++++++---------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 4f626dcc2098..c4ea9a37683e 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -168,6 +168,13 @@ <data android:pathPattern=".*\\.xpi" /> </intent-filter> +  + <intent-filter> + <action android:name="info.guardianproject.panic.action.TRIGGER" /> + + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + #ifdef MOZ_ANDROID_BEAM <intent-filter> <action android:name="android.nfc.action.NDEF_DISCOVERED"/> diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index ada3e5fa5b0c..63a136541970 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -129,6 +129,7 @@ public abstract class GeckoApp extends GeckoActivity public static final String ACTION_INIT_PW = "org.mozilla.gecko.INIT_PW"; public static final String ACTION_SWITCH_TAB = "org.mozilla.gecko.SWITCH_TAB"; public static final String ACTION_SHUTDOWN = "org.mozilla.gecko.SHUTDOWN"; + public static final String ACTION_PANIC_TRIGGER = "info.guardianproject.panic.action.TRIGGER"; public static final String INTENT_REGISTER_STUMBLER_LISTENER = "org.mozilla.gecko.STUMBLER_REGISTER_LOCAL_LISTENER"; @@ -554,42 +555,46 @@ public abstract class GeckoApp extends GeckoActivity @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.quit) { - // Make sure the Guest Browsing notification goes away when we quit. - GuestSession.hideNotification(this); + quitAndClear(); + return true; + } - final SharedPreferences prefs = getSharedPreferencesForProfile(); - final Set<String> clearSet = PrefUtils.getStringSet( - prefs, ClearOnShutdownPref.PREF, new HashSet<String>()); + return super.onOptionsItemSelected(item); + } - final GeckoBundle clearObj = new GeckoBundle(clearSet.size()); - for (final String clear : clearSet) { - clearObj.putBoolean(clear, true); - } + private void quitAndClear() { + // Make sure the Guest Browsing notification goes away when we quit. + GuestSession.hideNotification(this); - final GeckoBundle res = new GeckoBundle(2); - res.putBundle("sanitize", clearObj); + final SharedPreferences prefs = getSharedPreferencesForProfile(); + final Set<String> clearSet = PrefUtils.getStringSet( + prefs, ClearOnShutdownPref.PREF, new HashSet<String>()); - // If the user wants to clear open tabs, or else has opted out of session - // restore and does want to clear history, we also want to prevent the current - // session info from being saved. - if (clearObj.containsKey("private.data.openTabs")) { - res.putBoolean("dontSaveSession", true); - } else if (clearObj.containsKey("private.data.history")) { + final GeckoBundle clearObj = new GeckoBundle(clearSet.size()); + for (final String clear : clearSet) { + clearObj.putBoolean(clear, true); + } - final String sessionRestore = - getSessionRestorePreference(getSharedPreferences()); - res.putBoolean("dontSaveSession", "quit".equals(sessionRestore)); - } + final GeckoBundle res = new GeckoBundle(2); + res.putBundle("sanitize", clearObj); - EventDispatcher.getInstance().dispatch("Browser:Quit", res); + // If the user wants to clear open tabs, or else has opted out of session + // restore and does want to clear history, we also want to prevent the current + // session info from being saved. + if (clearObj.containsKey("private.data.openTabs")) { + res.putBoolean("dontSaveSession", true); + } else if (clearObj.containsKey("private.data.history")) { - // We don't call shutdown here because this creates a race condition which - // can cause the clearing of private data to fail. Instead, we shut down the - // UI only after we're done sanitizing. - return true; + final String sessionRestore = + getSessionRestorePreference(getSharedPreferences()); + res.putBoolean("dontSaveSession", "quit".equals(sessionRestore)); } - return super.onOptionsItemSelected(item); + EventDispatcher.getInstance().dispatch("Browser:Quit", res); + + // We don't call shutdown here because this creates a race condition which + // can cause the clearing of private data to fail. Instead, we shut down the + // UI only after we're done sanitizing. } @Override @@ -1531,6 +1536,8 @@ public abstract class GeckoApp extends GeckoActivity // Copy extras. settingsIntent.putExtras(intent.getUnsafe()); startActivity(settingsIntent); + } else if (ACTION_PANIC_TRIGGER.equals(action)) { + quitAndClear(); } mPromptService = new PromptService(this, getAppEventDispatcher());

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Orfox: disable screenshots and prevent page from being in "recent apps"
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit f44bf9a30b66b7b0ee34cc2daa89b1bde46f12d2 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Sat Nov 21 00:10:06 2015 +0100 Orfox: disable screenshots and prevent page from being in "recent apps" Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/java/org/mozilla/gecko/GeckoApp.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 1f2f95490d0a..ada3e5fa5b0c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -78,6 +78,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewTreeObserver; import android.view.Window; +import android.view.WindowManager; import android.widget.AdapterView; import android.widget.Button; import android.widget.ListView; @@ -1068,6 +1069,9 @@ public abstract class GeckoApp extends GeckoActivity GeckoScreenOrientation.getInstance().update(getResources().getConfiguration().orientation); + // disable screenshots and pic in "recent apps" + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + setContentView(getLayout()); // Set up Gecko layout.

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Disable GeckoNetworkManager
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 945c0a54fb87628cd1679839c6fa3c55e643ec04 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 26 22:22:51 2018 +0000 Bug 25741 - TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. --- mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index f7464acdb019..9a5e89dc1579 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -199,12 +199,16 @@ public class GeckoApplication extends Application if (mIsInitialResume) { GeckoBatteryManager.getInstance().start(this); GeckoFontScaleListener.getInstance().initialize(this); - GeckoNetworkManager.getInstance().start(this); + if (!AppConstants.isTorBrowser()){ + GeckoNetworkManager.getInstance().start(this); + } mIsInitialResume = false; } else if (mPausedGecko) { GeckoThread.onResume(); mPausedGecko = false; - GeckoNetworkManager.getInstance().start(this); + if (!AppConstants.isTorBrowser()){ + GeckoNetworkManager.getInstance().start(this); + } } mInBackground = false;

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: top sites changed, used bookmarks icon temporarily.
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 74da90a39fc0c6f8c5b1a78025b3da514707deaa Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Thu Jun 18 04:14:18 2015 -0400 Bug 25741 - TBA: top sites changed, used bookmarks icon temporarily. Adjust the Top Sites shown when a user taps on the URL bar. Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .../res/drawable-hdpi/suggestedsites_checktor.png | Bin 0 -> 1286 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 1286 bytes .../drawable-hdpi/suggestedsites_torproject.png | Bin 0 -> 1286 bytes .../res/drawable-xhdpi/suggestedsites_checktor.png | Bin 0 -> 1626 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 1626 bytes .../drawable-xhdpi/suggestedsites_torproject.png | Bin 0 -> 1626 bytes .../drawable-xxhdpi/suggestedsites_checktor.png | Bin 0 -> 1626 bytes .../suggestedsites_guardianproject.png | Bin 0 -> 1626 bytes .../drawable-xxhdpi/suggestedsites_torproject.png | Bin 0 -> 1626 bytes .../mozilla/gecko/util/UnusedResourcesUtil.java | 3 ++ mobile/locales/en-US/chrome/region.properties | 42 ++++++++++++--------- mobile/locales/search/list.json | 16 ++++---- mobile/locales/searchplugins/duckduckgo.xml | 6 +-- 13 files changed, 39 insertions(+), 28 deletions(-) diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_checktor.png b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..a87c16e3d566 Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..a87c16e3d566 Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_torproject.png b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..a87c16e3d566 Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_torproject.png differ diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_checktor.png b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_torproject.png b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_torproject.png differ diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_checktor.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_checktor.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_checktor.png differ diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_guardianproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_guardianproject.png differ diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_torproject.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_torproject.png new file mode 100644 index 000000000000..fa7f676310df Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_torproject.png differ diff --git a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java index 8f68e29ba069..7ed717b6fd3d 100644 --- a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java +++ b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java @@ -63,10 +63,13 @@ final class UnusedResourcesUtil { public static final int[] USED_IN_SUGGESTEDSITES = { R.drawable.suggestedsites_amazon, + R.drawable.suggestedsites_checktor, R.drawable.suggestedsites_facebook, + R.drawable.suggestedsites_guardianproject, R.drawable.suggestedsites_restricted_fxsupport, R.drawable.suggestedsites_restricted_mozilla, R.drawable.suggestedsites_twitter, + R.drawable.suggestedsites_torproject, R.drawable.suggestedsites_webmaker, R.drawable.suggestedsites_wikipedia, R.drawable.suggestedsites_youtube, diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties index 79c819c02cd1..1cc4d64ebf05 100644 --- a/mobile/locales/en-US/chrome/region.properties +++ b/mobile/locales/en-US/chrome/region.properties @@ -3,17 +3,17 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Google +browser.search.defaultenginename=DuckDuckGo # Search engine order (order displayed in the search bar dropdown). -browser.search.order.1=Google -browser.search.order.2=Bing +browser.search.order.1=DuckDuckGo +browser.search.order.2=Google # These override the equivalents above when the client detects that it is in # US market only. -browser.search.defaultenginename.US=Google -browser.search.order.US.1=Google -browser.search.order.US.2=Bing +browser.search.defaultenginename.US=DuckDuckGo +browser.search.order.US.1=DuckDuckGo +browser.search.order.US.2=Google # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -44,19 +44,27 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s # browser.suggestedsites.NAME.title=Displayed name # browser.suggestedsites.NAME.url=Website URL # browser.suggestedsites.NAME.bgcolor= Color (hex format) -# -# Note that if you remove or add items to this set, you need to adjust -# mobile/android/tests/browser/robocop/testDistribution.java -# to reflect the new set of IDs reported as tiles data. -# -browser.suggestedsites.list.0=facebook -browser.suggestedsites.list.1=youtube -browser.suggestedsites.list.2=amazon + +browser.suggestedsites.list.0=checktor +browser.suggestedsites.list.1=torproject +browser.suggestedsites.list.2=guardianproject browser.suggestedsites.list.3=wikipedia -browser.suggestedsites.list.4=twitter +browser.suggestedsites.list.4=facebook + +browser.suggestedsites.checktor.title=Check Tor Connection +browser.suggestedsites.checktor.url=https://check.torproject.org/ +browser.suggestedsites.checktor.bgcolor=#ffecf0f3 + +browser.suggestedsites.torproject.title=The Tor Project +browser.suggestedsites.torproject.url=https://www.torproject.org/ +browser.suggestedsites.torproject.bgcolor=#ffecf0f3 + +browser.suggestedsites.guardianproject.title=The Guardian Project +browser.suggestedsites.guardianproject.url=https://guardianproject.info/ +browser.suggestedsites.guardianproject.bgcolor=#ffecf0f3 -browser.suggestedsites.facebook.title=Facebook -browser.suggestedsites.facebook.url=https://m.facebook.com/ +browser.suggestedsites.facebook.title=Facebook Onion Service +browser.suggestedsites.facebook.url=https://m.facebookcorewwwi.onion browser.suggestedsites.facebook.bgcolor=#3B5998 browser.suggestedsites.youtube.title=YouTube diff --git a/mobile/locales/search/list.json b/mobile/locales/search/list.json index 4c490568579c..a0ee93d4f7f7 100644 --- a/mobile/locales/search/list.json +++ b/mobile/locales/search/list.json @@ -1,30 +1,30 @@ { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" + "ddg", "google", "bing", "amazondotcom", "twitter", "wikipedia" ] }, "regionOverrides": { "US": { - "google": "google-2018" + "ddg": "duckduckgo" }, "KZ": { - "google": "google-nocodes" + "ddg": "duckduckgo" }, "BY": { - "google": "google-nocodes" + "ddg": "duckduckgo" }, "RU": { - "google": "google-nocodes" + "ddg": "duckduckgo" }, "TR": { - "google": "google-nocodes" + "ddg": "duckduckgo" }, "UA": { - "google": "google-nocodes" + "ddg": "duckduckgo" }, "CN": { - "google": "google-nocodes" + "ddg": "duckduckgo" } }, "locales": { diff --git a/mobile/locales/searchplugins/duckduckgo.xml b/mobile/locales/searchplugins/duckduckgo.xml index 2e5d1d2802c4..9ff1b91a027a 100644 --- a/mobile/locales/searchplugins/duckduckgo.xml +++ b/mobile/locales/searchplugins/duckduckgo.xml @@ -11,13 +11,13 @@ <Param name="type" value="list"/> </Url>  -<Url type="text/html" method="GET" template="https://duckduckgo.com/"> +<Url type="text/html" method="GET" template="https://duckduckgo.com/html/"> <Param name="q" value="{searchTerms}" /> <Param name="t" value="fpas" /> </Url> -<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/"> +<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/html/"> <Param name="q" value="{searchTerms}" /> <Param name="t" value="ftas" /> </Url> -<SearchForm>https://duckduckgo.com</SearchForm> +<SearchForm>https://duckduckgo.com/html/</SearchForm> </SearchPlugin>

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Orfox: quit button added
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit d3ae0dae41066bf664b1f7b016ca135dd47f10f6 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Fri Jul 17 17:01:09 2015 -0400 Orfox: quit button added Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 3cc087e66622..ea9480d149cc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3711,7 +3711,7 @@ public class BrowserApp extends GeckoApp !PrefUtils.getStringSet(prefs, ClearOnShutdownPref.PREF, new HashSet<String>()).isEmpty(); - aMenu.findItem(R.id.quit).setVisible(visible); + aMenu.findItem(R.id.quit).setVisible(true); // If tab data is unavailable we disable most of the context menu and related items and // return early.

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Adjust the User Agent String so it doesn't leak Android version
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 0635ac83085116e683ea876bb91c848682126ae8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 26 15:17:42 2018 +0000 Bug 25741 - TBA: Adjust the User Agent String so it doesn't leak Android version --- mobile/android/base/AppConstants.java.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index 79f81257dade..d676b1e1da12 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -131,20 +131,33 @@ public class AppConstants { public static final String OS_TARGET = "@OS_TARGET@"; public static final String TARGET_XPCOM_ABI = "@TARGET_XPCOM_ABI@"; - public static final String USER_AGENT_BOT_LIKE = "Redirector/" + AppConstants.MOZ_APP_VERSION + - " (Android; rv:" + AppConstants.MOZ_APP_VERSION + ")"; - - public static final String USER_AGENT_FENNEC_MOBILE = "Mozilla/5.0 (Android " + + // TBA: Commented out, not used. + //public static final String USER_AGENT_BOT_LIKE = "Redirector/" + AppConstants.MOZ_APP_VERSION + + // " (Android; rv:" + AppConstants.MOZ_APP_VERSION + ")"; + + // TBA: Fennec's UAS now contains the Android version. Hard-code all users UAS + // so it matches the RFP string from necko. + // toolkit/components/resistfingerprinting/nsRFPService.h + public static final String USER_AGENT_FENNEC_MOBILE = +//#ifdef TOR_BROWSER_VERSION + "Mozilla/5.0 (Android 6.0; Mobile; rv:60.0) Gecko/20100101 Firefox/60.0"; +//#else + "Mozilla/5.0 (Android " + Build.VERSION.RELEASE + "; Mobile; rv:" + AppConstants.MOZ_APP_VERSION + ") Gecko/" + AppConstants.MOZ_APP_VERSION + " Firefox/" + AppConstants.MOZ_APP_VERSION; +//#endif +//#ifdef TOR_BROWSER_VERSION + public static final String USER_AGENT_FENNEC_TABLET = USER_AGENT_FENNEC_MOBILE; +//#else public static final String USER_AGENT_FENNEC_TABLET = "Mozilla/5.0 (Android " + Build.VERSION.RELEASE + "; Tablet; rv:" + AppConstants.MOZ_APP_VERSION + ") Gecko/" + AppConstants.MOZ_APP_VERSION + " Firefox/" + AppConstants.MOZ_APP_VERSION; +//#endif public static final int MOZ_MIN_CPU_VERSION = @MOZ_MIN_CPU_VERSION@;

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit ebc4951c6b23a345c1cf6d99fd4be2b2a6a22e78 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Fri Jun 12 02:07:45 2015 -0400 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. --- .../java/org/mozilla/gecko/util/ProxySelector.java | 25 +++++++++++++++++++++- .../org/mozilla/gecko/sync/net/BaseResource.java | 7 ++++++ .../service/utils/AbstractCommunicator.java | 11 +++++++--- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index 35010242b22d..f05716fe1d09 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -29,6 +29,10 @@ import java.net.URLConnection; import java.util.List; public class ProxySelector { + private static final String TOR_PROXY_ADDRESS = "127.0.0.1"; + private static final int TOR_SOCKS_PROXY_PORT = 9050; + private static final int TOR_HTTP_PROXY_PORT = 8118; + public static URLConnection openConnectionWithProxy(URI uri) throws IOException { java.net.ProxySelector ps = java.net.ProxySelector.getDefault(); Proxy proxy = Proxy.NO_PROXY; @@ -39,7 +43,26 @@ public class ProxySelector { } } - return uri.toURL().openConnection(proxy); + /* Ignore the proxy we found from the VM, only use Tor. We can probably + * safely use the logic in this class in the future. */ + return uri.toURL().openConnection(getProxy()); + } + + public static Proxy getProxy() { + // TODO make configurable + return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(TOR_PROXY_ADDRESS, TOR_SOCKS_PROXY_PORT)); + } + + public static String getProxyHostAddress() { + return TOR_PROXY_ADDRESS; + } + + public static int getSocksProxyPort() { + return TOR_SOCKS_PROXY_PORT; + } + + public static int getHttpProxyPort() { + return TOR_HTTP_PROXY_PORT; } public ProxySelector() { diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResource.java b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResource.java index 6abe5efc9cb5..48d51be8b42d 100644 --- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResource.java +++ b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResource.java @@ -23,9 +23,11 @@ import org.json.simple.JSONObject; import org.mozilla.gecko.background.common.GlobalConstants; import org.mozilla.gecko.background.common.log.Logger; import org.mozilla.gecko.sync.ExtendedJSONObject; +import org.mozilla.gecko.util.ProxySelector; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpEntity; +import ch.boye.httpclientandroidlib.HttpHost; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.HttpVersion; import ch.boye.httpclientandroidlib.client.AuthCache; @@ -40,6 +42,7 @@ import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase; import ch.boye.httpclientandroidlib.client.methods.HttpUriRequest; import ch.boye.httpclientandroidlib.client.protocol.ClientContext; import ch.boye.httpclientandroidlib.conn.ClientConnectionManager; +import ch.boye.httpclientandroidlib.conn.params.ConnRoutePNames; import ch.boye.httpclientandroidlib.conn.scheme.PlainSocketFactory; import ch.boye.httpclientandroidlib.conn.scheme.Scheme; import ch.boye.httpclientandroidlib.conn.scheme.SchemeRegistry; @@ -215,6 +218,10 @@ public class BaseResource implements Resource { // We could reuse these client instances, except that we mess around // with their parameters… so we'd need a pool of some kind. client = new DefaultHttpClient(getConnectionManager()); + /* TBA: We need a HTTP Proxy here */ + HttpHost defaultProxy = new HttpHost(ProxySelector.getProxyHostAddress(), + ProxySelector.getHttpProxyPort()); + client.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, defaultProxy); // TODO: Eventually we should use Apache HttpAsyncClient. It's not out of alpha yet. // Until then, we synchronously make the request, then invoke our delegate's callback. diff --git a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java index 4e30cb7deeb7..9b3ee98f89db 100644 --- a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java +++ b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java @@ -7,6 +7,7 @@ package org.mozilla.mozstumbler.service.utils; import android.os.Build; import android.util.Log; +import org.mozilla.gecko.util.ProxySelector; import org.mozilla.mozstumbler.service.AppGlobals; import org.mozilla.mozstumbler.service.Prefs; @@ -16,7 +17,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; public abstract class AbstractCommunicator { @@ -72,8 +73,12 @@ public abstract class AbstractCommunicator { if (sMozApiKey == null || prefs != null) { sMozApiKey = prefs.getMozApiKey(); } - URL url = new URL(getUrlString() + "?key=" + sMozApiKey); - mHttpURLConnection = (HttpURLConnection) url.openConnection(); + + /* TBA: This was a URL, but the connection logic would simply + * convert the URL into a URI, and then later convert the URI back + * into a URL. Creating a URL at the beginning is only wasteful. */ + URI uri = new URI(getUrlString() + "?key=" + sMozApiKey); + mHttpURLConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(uri); mHttpURLConnection.setRequestMethod("POST"); } catch (MalformedURLException e) { throw new IllegalArgumentException(e);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Orfox: add BroadcastReceiver to receive Tor status from Orbot
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit e3bb52052fcb1e06b8c90bcacfe456d6a5d7758f Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Sep 1 20:49:27 2015 +0200 Orfox: add BroadcastReceiver to receive Tor status from Orbot Run in thread so Tor status updates will be received while the Gecko event sync is blocking the main thread. This might not be the best approach since it probably means that the main UI will be frozen waiting for Tor to reach ON status. Queue URL Intents events when Orbot is not yet started Instead of failing when opening a URL and Tor is not ready, queue those Intents, then send them once we get STATUS_ON from Orbot. Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .../base/java/org/mozilla/gecko/BrowserApp.java | 32 ++++++++++++++++++++++ .../main/java/org/mozilla/gecko/GeckoAppShell.java | 32 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 8d5bbddabc88..3cc087e66622 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -13,11 +13,13 @@ import android.app.DownloadManager; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; +import android.content.BroadcastReceiver; import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -35,6 +37,9 @@ import android.nfc.NfcEvent; import android.os.Build; import android.os.Bundle; import android.os.Environment; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; import android.os.StrictMode; @@ -1273,6 +1278,16 @@ public class BrowserApp extends GeckoApp } } + private BroadcastReceiver torStatusReceiver = new BroadcastReceiver() { + + @Override + public void onReceive(Context context, Intent intent) { + if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) { + GeckoAppShell.setTorStatus(intent); + } + } + }; + public void checkStartOrbot() { if (!OrbotHelper.isOrbotInstalled(this)) { final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this); @@ -1293,6 +1308,14 @@ public class BrowserApp extends GeckoApp }); builder.show(); } else { + /* run in thread so Tor status updates will be received while the + * Gecko event sync is blocking the main thread */ + HandlerThread handlerThread = new HandlerThread("torStatusReceiver"); + handlerThread.start(); + Looper looper = handlerThread.getLooper(); + Handler handler = new Handler(looper); + registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS), + null, handler); OrbotHelper.requestStartTor(this); } } @@ -1335,6 +1358,15 @@ public class BrowserApp extends GeckoApp for (BrowserAppDelegate delegate : delegates) { delegate.onPause(this); } + + if (torStatusReceiver != null) + { + try { + unregisterReceiver(torStatusReceiver); + } catch (IllegalArgumentException e) { + Log.w(LOGTAG, "Tor status receiver couldn't be unregistered", e); + } + } } @Override 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 7dbb286cae04..f67603f853e2 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 @@ -18,10 +18,13 @@ import java.net.Proxy; import java.net.URLConnection; import java.nio.ByteBuffer; import java.util.ArrayList; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Queue; import java.util.StringTokenizer; import java.util.TreeMap; @@ -39,6 +42,8 @@ import org.mozilla.gecko.util.ProxySelector; import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.geckoview.BuildConfig; +import info.guardianproject.netcipher.proxy.OrbotHelper; + import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; @@ -110,7 +115,11 @@ public class GeckoAppShell // We have static members only. private GeckoAppShell() { } + /* Initialize as STATUS_OFF */ + private static String sTorStatus = OrbotHelper.STATUS_OFF; + private static final CrashHandler CRASH_HANDLER = new CrashHandler() { + @Override protected String getAppPackageName() { final Context appContext = getAppContext(); @@ -200,6 +209,8 @@ public class GeckoAppShell static private int sDensityDpi; static private int sScreenDepth; + static final Queue<Intent> PENDING_URL_INTENTS = new ConcurrentLinkedQueue<Intent>(); + /* Is the value in sVibrationEndTime valid? */ private static boolean sVibrationMaybePlaying; @@ -251,6 +262,16 @@ public class GeckoAppShell private static Rect sScreenSize; + static void sendPendingUrlIntents() { + try { + Context context = getApplicationContext(); + while (!PENDING_URL_INTENTS.isEmpty()) { + final Intent intent = PENDING_URL_INTENTS.poll(); + context.startActivity(intent); + } + } catch (NoSuchElementException e) {} + } + @WrapForJNI(stubName = "NotifyObservers", dispatchTo = "gecko") private static native void nativeNotifyObservers(String topic, String data); @@ -1874,4 +1895,15 @@ public class GeckoAppShell public static String getDefaultLocale() { return Locale.getDefault().toString(); } + + public static void setTorStatus(Intent intent) { + sTorStatus = intent.getStringExtra(OrbotHelper.EXTRA_STATUS); + if (OrbotHelper.STATUS_ON.equals(sTorStatus)) { + sendPendingUrlIntents(); + } + } + + public static String getTorStatus() { + return sTorStatus; + } }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Orfox: NetCipher enabled, checks if orbot is installed
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 5307039febcc2e0fcd0b2451d821197202fda8b8 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Mon Jul 20 21:46:25 2015 -0400 Orfox: NetCipher enabled, checks if orbot is installed Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- .../base/java/org/mozilla/gecko/BrowserApp.java | 38 +++- mobile/android/base/strings.xml.in | 1 + .../netcipher/proxy/OrbotHelper.java | 186 ++++++++++++++++ .../netcipher/proxy/TorServiceUtils.java | 233 +++++++++++++++++++++ mobile/android/torbrowser/strings.xml.in | 5 + 5 files changed, 458 insertions(+), 5 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 88c707cfa533..8d5bbddabc88 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -176,6 +176,8 @@ import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.GeckoSession; +import info.guardianproject.netcipher.proxy.OrbotHelper; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -1271,6 +1273,30 @@ public class BrowserApp extends GeckoApp } } + public void checkStartOrbot() { + if (!OrbotHelper.isOrbotInstalled(this)) { + final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this); + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.install_orbot); + builder.setMessage(R.string.you_must_have_orbot); + builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + startActivity(installOrbotIntent); + } + }); + builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + } + }); + builder.show(); + } else { + OrbotHelper.requestStartTor(this); + } + } + @Override public void onResume() { super.onResume(); @@ -1279,16 +1305,18 @@ public class BrowserApp extends GeckoApp return; } - if (!mHasResumed) { - getAppEventDispatcher().unregisterUiThreadListener(this, "Prompt:ShowTop"); - mHasResumed = true; - } - processTabQueue(); for (BrowserAppDelegate delegate : delegates) { delegate.onResume(this); } + + // isInAutomation is overloaded with isTorBrowser(), but here we actually + // need to know if we are in automation. + final SafeIntent intent = new SafeIntent(getIntent()); + if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) { + checkStartOrbot(); + } } @Override diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index b510012948b9..cf43a3b4c78b 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -25,6 +25,7 @@ <string name="android_package_name_for_ui">@ANDROID_PACKAGE_NAME@</string> #include ../services/strings.xml.in +#include ../torbrowser/strings.xml.in <string name="firstrun_panel_title_welcome">&firstrun_panel_title_welcome;</string> diff --git a/mobile/android/geckoview/src/thirdparty/java/info/guardianproject/netcipher/proxy/OrbotHelper.java b/mobile/android/geckoview/src/thirdparty/java/info/guardianproject/netcipher/proxy/OrbotHelper.java new file mode 100644 index 000000000000..d6a632fda37d --- /dev/null +++ b/mobile/android/geckoview/src/thirdparty/java/info/guardianproject/netcipher/proxy/OrbotHelper.java @@ -0,0 +1,186 @@ + +package info.guardianproject.netcipher.proxy; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.net.Uri; +import android.text.TextUtils; +import android.util.Log; + + +import java.util.List; + +public class OrbotHelper { + + private final static int REQUEST_CODE_STATUS = 100; + + public final static String ORBOT_PACKAGE_NAME = "org.torproject.android"; + public final static String ORBOT_MARKET_URI = "market://details?id=" + ORBOT_PACKAGE_NAME; + public final static String ORBOT_FDROID_URI = "https://f-droid.org/repository/browse/?fdid=" + + ORBOT_PACKAGE_NAME; + public final static String ORBOT_PLAY_URI = "https://play.google.com/store/apps/details?id=" + + ORBOT_PACKAGE_NAME; + + /** + * A request to Orbot to transparently start Tor services + */ + public final static String ACTION_START = "org.torproject.android.intent.action.START"; + /** + * {@link Intent} send by Orbot with {@code ON/OFF/STARTING/STOPPING} status + */ + public final static String ACTION_STATUS = "org.torproject.android.intent.action.STATUS"; + /** + * {@code String} that contains a status constant: {@link #STATUS_ON}, + * {@link #STATUS_OFF}, {@link #STATUS_STARTING}, or + * {@link #STATUS_STOPPING} + */ + public final static String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS"; + /** + * A {@link String} {@code packageName} for Orbot to direct its status reply + * to, used in {@link #ACTION_START} {@link Intent}s sent to Orbot + */ + public final static String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME"; + + /** + * All tor-related services and daemons are stopped + */ + public final static String STATUS_OFF = "OFF"; + /** + * All tor-related services and daemons have completed starting + */ + public final static String STATUS_ON = "ON"; + public final static String STATUS_STARTING = "STARTING"; + public final static String STATUS_STOPPING = "STOPPING"; + /** + * The user has disabled the ability for background starts triggered by + * apps. Fallback to the old Intent that brings up Orbot. + */ + public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; + + public final static String ACTION_START_TOR = "org.torproject.android.START_TOR"; + public final static String ACTION_REQUEST_HS = "org.torproject.android.REQUEST_HS_PORT"; + public final static int START_TOR_RESULT = 0x048079234; + public final static int HS_REQUEST_CODE = 9999; + + private final static String FDROID_PACKAGE_NAME = "org.fdroid.fdroid"; + private final static String PLAY_PACKAGE_NAME = "com.android.vending"; + + private OrbotHelper() { + // only static utility methods, do not instantiate + } + + public static boolean isOrbotRunning(Context context) { + int procId = TorServiceUtils.findProcessId(context); + + return (procId != -1); + } + + public static boolean isOrbotInstalled(Context context) { + return isAppInstalled(context, ORBOT_PACKAGE_NAME); + } + + private static boolean isAppInstalled(Context context, String uri) { + try { + PackageManager pm = context.getPackageManager(); + pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); + return true; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } + + public static void requestHiddenServiceOnPort(Activity activity, int port) { + Intent intent = new Intent(ACTION_REQUEST_HS); + intent.setPackage(ORBOT_PACKAGE_NAME); + intent.putExtra("hs_port", port); + + activity.startActivityForResult(intent, HS_REQUEST_CODE); + } + + /** + * First, checks whether Orbot is installed. If Orbot is installed, then a + * broadcast {@link Intent} is sent to request Orbot to start transparently + * in the background. When Orbot receives this {@code Intent}, it will + * immediately reply to this all with its status via an + * {@link #ACTION_STATUS} {@code Intent} that is broadcast to the + * {@code packageName} of the provided {@link Context} (i.e. + * {@link Context#getPackageName()}. + * + * @param context the app {@link Context} will receive the reply + * @return whether the start request was sent to Orbot + */ + public static boolean requestStartTor(Context context) { + if (OrbotHelper.isOrbotInstalled(context)) { + Log.i("OrbotHelper", "requestStartTor " + context.getPackageName()); + Intent intent = getOrbotStartIntent(); + intent.putExtra(EXTRA_PACKAGE_NAME, context.getPackageName()); + context.sendBroadcast(intent); + return true; + } + return false; + } + + public static Intent getOrbotStartIntent() { + Intent intent = new Intent(ACTION_START); + intent.setPackage(ORBOT_PACKAGE_NAME); + return intent; + } + + /** + * First, checks whether Orbot is installed, then checks whether Orbot is + * running. If Orbot is installed and not running, then an {@link Intent} is + * sent to request Orbot to start, which will show the main Orbot screen. + * The result will be returned in + * {@link Activity#onActivityResult(int requestCode, int resultCode, Intent data)} + * with a {@code requestCode} of {@link START_TOR_RESULT} + * + * @param activity the {@link Activity} that gets the + * {@code START_TOR_RESULT} result + * @return whether the start request was sent to Orbot + */ + public static boolean requestShowOrbotStart(Activity activity) { + if (OrbotHelper.isOrbotInstalled(activity)) { + if (!OrbotHelper.isOrbotRunning(activity)) { + Intent intent = getShowOrbotStartIntent(); + activity.startActivityForResult(intent, START_TOR_RESULT); + return true; + } + } + return false; + } + + public static Intent getShowOrbotStartIntent() { + Intent intent = new Intent(ACTION_START_TOR); + intent.setPackage(ORBOT_PACKAGE_NAME); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + return intent; + } + + public static Intent getOrbotInstallIntent(Context context) { + final Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(ORBOT_MARKET_URI)); + + PackageManager pm = context.getPackageManager(); + List<ResolveInfo> resInfos = pm.queryIntentActivities(intent, 0); + + String foundPackageName = null; + for (ResolveInfo r : resInfos) { + Log.i("OrbotHelper", "market: " + r.activityInfo.packageName); + if (TextUtils.equals(r.activityInfo.packageName, FDROID_PACKAGE_NAME) + || TextUtils.equals(r.activityInfo.packageName, PLAY_PACKAGE_NAME)) { + foundPackageName = r.activityInfo.packageName; + break; + } + } + + if (foundPackageName == null) { + intent.setData(Uri.parse(ORBOT_FDROID_URI)); + } else { + intent.setPackage(foundPackageName); + } + return intent; + } +} diff --git a/mobile/android/geckoview/src/thirdparty/java/info/guardianproject/netcipher/proxy/TorServiceUtils.java b/mobile/android/geckoview/src/thirdparty/java/info/guardianproject/netcipher/proxy/TorServiceUtils.java new file mode 100644 index 000000000000..e553ecac3543 --- /dev/null +++ b/mobile/android/geckoview/src/thirdparty/java/info/guardianproject/netcipher/proxy/TorServiceUtils.java @@ -0,0 +1,233 @@ +/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */ +/* See LICENSE for licensing information */ + +package info.guardianproject.netcipher.proxy; + +import android.content.Context; +import android.util.Log; + + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.URLEncoder; +import java.util.StringTokenizer; + +public class TorServiceUtils { + + private final static String TAG = "TorUtils"; + // various console cmds + public final static String SHELL_CMD_CHMOD = "chmod"; + public final static String SHELL_CMD_KILL = "kill -9"; + public final static String SHELL_CMD_RM = "rm"; + public final static String SHELL_CMD_PS = "ps"; + public final static String SHELL_CMD_PIDOF = "pidof"; + + public final static String CHMOD_EXE_VALUE = "700"; + + public static boolean isRootPossible() + { + + StringBuilder log = new StringBuilder(); + + try { + + // Check if Superuser.apk exists + File fileSU = new File("/system/app/Superuser.apk"); + if (fileSU.exists()) + return true; + + fileSU = new File("/system/app/superuser.apk"); + if (fileSU.exists()) + return true; + + fileSU = new File("/system/bin/su"); + if (fileSU.exists()) + { + String[] cmd = { + "su" + }; + int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); + if (exitCode != 0) + return false; + else + return true; + } + + // Check for 'su' binary + String[] cmd = { + "which su" + }; + int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); + + if (exitCode == 0) { + Log.d(TAG, "root exists, but not sure about permissions"); + return true; + + } + + } catch (IOException e) { + // this means that there is no root to be had (normally) so we won't + // log anything + Log.e(TAG, "Error checking for root access", e); + + } catch (Exception e) { + Log.e(TAG, "Error checking for root access", e); + // this means that there is no root to be had (normally) + } + + Log.e(TAG, "Could not acquire root permissions"); + + return false; + } + + public static int findProcessId(Context context) { + String dataPath = context.getFilesDir().getParentFile().getParentFile().getAbsolutePath(); + String command = dataPath + "/" + OrbotHelper.ORBOT_PACKAGE_NAME + "/app_bin/tor"; + int procId = -1; + + try { + procId = findProcessIdWithPidOf(command); + + if (procId == -1) + procId = findProcessIdWithPS(command); + } catch (Exception e) { + try { + procId = findProcessIdWithPS(command); + } catch (Exception e2) { + Log.e(TAG, "Unable to get proc id for command: " + URLEncoder.encode(command), e2); + } + } + + return procId; + } + + // use 'pidof' command + public static int findProcessIdWithPidOf(String command) throws Exception + { + + int procId = -1; + + Runtime r = Runtime.getRuntime(); + + Process procPs = null; + + String baseName = new File(command).getName(); + // fix contributed my mikos on 2010.12.10 + procPs = r.exec(new String[] { + SHELL_CMD_PIDOF, baseName + }); + // procPs = r.exec(SHELL_CMD_PIDOF); + + BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); + String line = null; + + while ((line = reader.readLine()) != null) + { + + try + { + // this line should just be the process id + procId = Integer.parseInt(line.trim()); + break; + } catch (NumberFormatException e) + { + Log.e("TorServiceUtils", "unable to parse process pid: " + line, e); + } + } + + return procId; + + } + + // use 'ps' command + public static int findProcessIdWithPS(String command) throws Exception + { + + int procId = -1; + + Runtime r = Runtime.getRuntime(); + + Process procPs = null; + + procPs = r.exec(SHELL_CMD_PS); + + BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); + String line = null; + + while ((line = reader.readLine()) != null) + { + if (line.indexOf(' ' + command) != -1) + { + + StringTokenizer st = new StringTokenizer(line, " "); + st.nextToken(); // proc owner + + procId = Integer.parseInt(st.nextToken().trim()); + + break; + } + } + + return procId; + + } + + public static int doShellCommand(String[] cmds, StringBuilder log, boolean runAsRoot, + boolean waitFor) throws Exception + { + + Process proc = null; + int exitCode = -1; + + if (runAsRoot) + proc = Runtime.getRuntime().exec("su"); + else + proc = Runtime.getRuntime().exec("sh"); + + OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream()); + + for (int i = 0; i < cmds.length; i++) + { + // TorService.logMessage("executing shell cmd: " + cmds[i] + + // "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); + + out.write(cmds[i]); + out.write("\n"); + } + + out.flush(); + out.write("exit\n"); + out.flush(); + + if (waitFor) + { + + final char buf[] = new char[10]; + + // Consume the "stdout" + InputStreamReader reader = new InputStreamReader(proc.getInputStream()); + int read = 0; + while ((read = reader.read(buf)) != -1) { + if (log != null) + log.append(buf, 0, read); + } + + // Consume the "stderr" + reader = new InputStreamReader(proc.getErrorStream()); + read = 0; + while ((read = reader.read(buf)) != -1) { + if (log != null) + log.append(buf, 0, read); + } + + exitCode = proc.waitFor(); + + } + + return exitCode; + + } +} diff --git a/mobile/android/torbrowser/strings.xml.in b/mobile/android/torbrowser/strings.xml.in new file mode 100644 index 000000000000..e3a22974ed78 --- /dev/null +++ b/mobile/android/torbrowser/strings.xml.in @@ -0,0 +1,5 @@ + + <string name="install_orbot">Install Orbot?</string> + <string name="you_must_have_orbot">You must have Orbot installed and activated to proxy traffic through it. Would you like to download it?</string> + <string name="yes">Yes</string> + <string name="no">No</string>

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Always Quit, do not restore the last session
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 9965f1db64ffba901f55a59d18fe53b2f66a7354 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 11 20:42:04 2018 +0000 Bug 25741 - TBA: Always Quit, do not restore the last session --- mobile/android/app/src/main/res/xml/preferences_advanced.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/app/src/main/res/xml/preferences_advanced.xml b/mobile/android/app/src/main/res/xml/preferences_advanced.xml index b8c740eabfe3..8c9cee3bdd80 100644 --- a/mobile/android/app/src/main/res/xml/preferences_advanced.xml +++ b/mobile/android/app/src/main/res/xml/preferences_advanced.xml @@ -27,7 +27,7 @@ <ListPreference android:key="android.not_a_preference.restoreSession3" android:title="@string/pref_restore" - android:defaultValue="always" + android:defaultValue="quit" android:entries="@array/pref_restore_entries" android:entryValues="@array/pref_restore_values" android:persistent="true" />

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Only include GCM permissions if we want them
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 8ea67231b7d81646420da6d9c069746fa5e2ccf9 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 16 04:24:01 2018 +0000 Bug 25741 - TBA: Only include GCM permissions if we want them --- 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 eb4e111f6800..1b7b2d5475ec 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -8,7 +8,10 @@ them during the same release, which should be Fennec 48. Therefore we decouple the push permission from MOZ_ANDROID_GCM to let it ride ahead (potentially) of the push feature. --> + +#ifdef MOZ_ANDROID_GCM #include GcmAndroidManifest_permissions.xml.in +#endif #ifdef MOZ_ANDROID_NETWORK_STATE

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Do not import bookmarks and history from native browser by default
by gk＠torproject.org 27 Jul '18

27 Jul '18

commit 4c70fba1083e03e0ce5a24b40fd985a142560fa5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 11 18:51:09 2018 +0000 Bug 25741 - TBA: Do not import bookmarks and history from native browser by default --- mobile/android/app/src/main/res/values/arrays.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/app/src/main/res/values/arrays.xml b/mobile/android/app/src/main/res/values/arrays.xml index 555797ce7db2..f1d166262546 100644 --- a/mobile/android/app/src/main/res/values/arrays.xml +++ b/mobile/android/app/src/main/res/values/arrays.xml @@ -46,8 +46,8 @@ <item>@string/history_title</item> </string-array> <string-array name="pref_import_android_defaults"> - <item>true</item> - <item>true</item> + <item>false</item> + <item>false</item> </string-array> <string-array name="pref_import_android_values"> <item>android_import.data.bookmarks</item>

1 0