August 2019 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-1] Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
by gk＠torproject.org 31 Aug '19

31 Aug '19

commit 25134efbece613bf35a6456f1f472bc33e082e60 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. Also: Bug 28051 - Use our Orbot for proxying our connections --- .../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 3940d3c84249..9515975f680a 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 = 9150; + private static final int TOR_HTTP_PROXY_PORT = 8218; + public static URLConnection openConnectionWithProxy(final 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 e85ccb855bff..51ebd6ce990f 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-68.1.0esr-9.0-1] Orfox: quit button added
by gk＠torproject.org 31 Aug '19

31 Aug '19

commit 23afe32d66453837ddd5943332ff9b2d9579a5c4 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 e7d490a552fe..4123acca9bbe 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3277,7 +3277,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-68.1.0esr-9.0-1] Bug 25741 - TBA: Disable GeckoNetworkManager
by gk＠torproject.org 31 Aug '19

31 Aug '19

commit 075ad0a98f40d38d34cb4b8ddc49a72892662f1e 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. --- .../src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index 6023e2512398..804b8f0000e9 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -118,14 +118,18 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onResume"); // Monitor network status and send change notifications to Gecko // while active. - GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + if (BuildConfig.TOR_BROWSER_VERSION != "") { + GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + } } @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE) void onPause() { Log.d(LOGTAG, "Lifecycle: onPause"); // Stop monitoring network status while inactive. - GeckoNetworkManager.getInstance().stop(); + if (BuildConfig.TOR_BROWSER_VERSION != "") { + GeckoNetworkManager.getInstance().stop(); + } } }

1 0

[torbutton/master] Bug 31010 - Don't use addTrustedTab on mobile
by gk＠torproject.org 31 Aug '19

31 Aug '19

commit 8c4c10af480ea9c232b4fc64712141af8e96f3da Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Aug 30 14:20:47 2019 -0400 Bug 31010 - Don't use addTrustedTab on mobile --- chrome/content/torbutton.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 756c2c7c..6209b6b8 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -1861,9 +1861,10 @@ function showSecurityPreferencesPanel(chromeWindow) { if (settingsTab === null) { // Open up the settings panel in a new tab. - tabBrowser.addTrustedTab(SECURITY_PREFERENCES_URI, { + tabBrowser.addTab(SECURITY_PREFERENCES_URI, { "selected": true, "parentId": tabBrowser.selectedTab.id, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), }); } else { // Activate an existing settings panel tab.

1 0

[torbutton/master] Merge remote-tracking branch 'sysrqb/bug31010_00'
by gk＠torproject.org 31 Aug '19

31 Aug '19

commit 0efb110e9bc65e3289c58d093c32a25877f61e0b Merge: 72aad504 8c4c10af Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 31 19:37:41 2019 +0000 Merge remote-tracking branch 'sysrqb/bug31010_00' chrome/content/torbutton.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 31563: force reloading search extensions if extensions.enabledScopes has changed
by gk＠torproject.org 31 Aug '19

31 Aug '19

commit dc1c60e81e6d23560d597c390eed48b2331f005c Author: Alex Catarineu <acat(a)torproject.org> Date: Sat Aug 31 16:23:20 2019 +0200 Bug 31563: force reloading search extensions if extensions.enabledScopes has changed --- toolkit/components/search/SearchService.jsm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index 419ab822264e..6d6314c6cd4f 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -924,6 +924,7 @@ SearchService.prototype = { let locale = Services.locale.requestedLocale; let buildID = Services.appinfo.platformBuildID; let appVersion = Services.appinfo.version; + let enabledScopes = Services.prefs.getIntPref("extensions.enabledScopes", -1); // Allows us to force a cache refresh should the cache format change. cache.version = CACHE_VERSION; @@ -937,6 +938,10 @@ SearchService.prototype = { cache.appVersion = appVersion; cache.locale = locale; + // Bug 31563: we want to force reloading engines if extensions.enabledScopes + // pref changes + cache.enabledScopes = enabledScopes; + cache.visibleDefaultEngines = this._visibleDefaultEngines; cache.metaData = this._metaData; cache.engines = []; @@ -1025,7 +1030,8 @@ SearchService.prototype = { cache.buildID != buildID || cache.visibleDefaultEngines.length != this._visibleDefaultEngines.length || - this._visibleDefaultEngines.some(notInCacheVisibleEngines); + this._visibleDefaultEngines.some(notInCacheVisibleEngines) || + cache.enabledScopes !== Services.prefs.getIntPref("extensions.enabledScopes", -1); if (!rebuildCache) { SearchUtils.log("_loadEngines: loading from cache directories");

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit be46b95d598c0430028cf06b7ebff0f3d561fd1f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 18:48:34 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.po b/ru.po index 2382347ab..1a3c608d0 100644 --- a/ru.po +++ b/ru.po @@ -29,7 +29,7 @@ # Valid Olov, 2013 # Viktor Kutcevich <architector4(a)tilde.team>, 2019 # Wagan <wagan.sarukhanov(a)gmail.com>, 2015 -# Uho Lot <yavinav(a)gmail.com>, 2016 +# Andrey Kostrikov <yavinav(a)gmail.com>, 2016 # Виктор Ерухин <official159ru(a)mail.ru>, 2018 # Руслан <nasretdinov.r.r(a)ya.ru>, 2014 # Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019

1 0

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit 80cb35d5d222a1e264c07936fb464d6505c5cb41 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 18:46:53 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- sw/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sw/strings.xml b/sw/strings.xml index b1d56593a..fa9e926f2 100644 --- a/sw/strings.xml +++ b/sw/strings.xml @@ -1,4 +1,6 @@ <resources> <string name="try_tor_browser">Jaribu kivinjari cha Tor</string> + <string name="get_it">Pata kutoka chanzo ukipendacho:</string> <string name="go_to_google_play">Nenda Google Play</string> - </resources> + <string name="download_apk">Pakua APK</string> +</resources>

1 0

[translation/torbutton-brandproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandproperties_completed
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit b3e446eeb6cdfd2df2d5f732b4457466d321c971 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 16:20:52 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandprop… --- sw/brand.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sw/brand.properties b/sw/brand.properties index 665350308..a3b8c3c12 100644 --- a/sw/brand.properties +++ b/sw/brand.properties @@ -3,14 +3,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShorterName=Kivinjari cha Tor -brandShortName=Kivinjari cha Tor -brandFullName=Kivinjari cha Tor -vendorShortName=Mradi wa Tor +# brandShortName=Tor Browser +# brandFullName=Tor Browser +# vendorShortName=Tor Project -homePageSingleStartMain=Anza Firefox, ukursa wa nyumbani wa haraka ulijengwa kwenye tafuta -homePageImport=Ingiza ukurasa wako wa nyumbani kutoka %S +# homePageSingleStartMain=Firefox Start, a fast home page with built-in search +# homePageImport=Import your home page from %S -homePageMigrationPageTitle=Uteuzi wa ukurasa wa nyumbani -homePageMigrationDescription=Tafadhali chaguaukurasa wa nyumbani unaopenda kutumia: +# homePageMigrationPageTitle=Home Page Selection +# homePageMigrationDescription=Please select the home page you wish to use: -syncBrandShortName=Sync +# syncBrandShortName=Sync

1 0

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit db179f0f9486df2e70446eabc17bc0a3eee72656 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 16:16:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- sw/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sw/strings.xml b/sw/strings.xml index cb5acbb4f..b1d56593a 100644 --- a/sw/strings.xml +++ b/sw/strings.xml @@ -1,2 +1,4 @@ <resources> + <string name="try_tor_browser">Jaribu kivinjari cha Tor</string> + <string name="go_to_google_play">Nenda Google Play</string> </resources>

1 0