June 2020 - tor-commits - lists.torproject.org

[snowflake-mobile/master] Closing the websocket when necessary
by cohosh＠torproject.org 28 Jun '20

28 Jun '20

commit 416041b857f14cb9211838e54721e343ce654908 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 26 18:49:18 2020 +0530 Closing the websocket when necessary --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index d532412..0b4017c 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -122,6 +122,7 @@ public class MyPersistentService extends Service { mainPeerConnection.dispose(); } + webSocket.close(1000, "Normal closure"); mNotificationManager.cancel(ForegroundServiceConstants.DEF_NOTIFICATION_ID); Log.d(TAG, "onDestroy: Service Destroyed"); super.onDestroy(); @@ -352,6 +353,10 @@ public class MyPersistentService extends Service { private void fetchOffer() { //Fetch offer only when the connection is not alive/active and only when the service is on. if (isServiceStarted && !isConnectionAlive) { + if (isWebSocketOpen) { + //If the WebSocket is still open while a new offer is getting sent, it's old connection's WebSocket. So we can close it and re-open a new one. + webSocket.close(1000, "Normal Closure"); + } isConnectionAlive = true; //Considering connection is alive from now on, until it is set to false. Log.d(TAG, "fetchOffer: Fetching offer from broker."); ///Retrofit call

1 0

[snowflake-mobile/master] Started WebSocket on DataChannelOpen
by cohosh＠torproject.org 28 Jun '20

28 Jun '20

commit 46eb111be5d24e5452bbba7821760cf398403e3b Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 26 17:34:04 2020 +0530 Started WebSocket on DataChannelOpen --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 9e073d5..9df3889 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -311,6 +311,7 @@ public class MyPersistentService extends Service { if (STATE == DataChannel.State.OPEN) { updateNotification("Connection Established. Serving one client."); + startWebSocket(); } else if (STATE == DataChannel.State.CLOSED) { updateNotification("Connection is closed. Resending offer..."); closeConnectionAndResend();

1 0

[snowflake-mobile/master] Added web-socket boiler plate code
by cohosh＠torproject.org 28 Jun '20

28 Jun '20

commit c2f12afc2652f9351be2efbde3cf602df3fc26ca Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 24 14:54:58 2020 +0530 Added web-socket boiler plate code --- .../torproject/snowflake/MyPersistentService.java | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 5fd3b6c..1bcee7e 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -14,6 +14,7 @@ import android.util.Log; import androidx.annotation.Nullable; +import org.jetbrains.annotations.NotNull; import org.json.JSONException; import org.torproject.snowflake.constants.BrokerConstants; import org.torproject.snowflake.constants.ForegroundServiceConstants; @@ -43,6 +44,12 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.CompositeDisposable; import io.reactivex.rxjava3.schedulers.Schedulers; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.WebSocket; +import okhttp3.WebSocketListener; +import okio.ByteString; /** * Main Snowflake implementation of foreground service to relay data in the background. @@ -60,6 +67,7 @@ public class MyPersistentService extends Service { private NotificationManager mNotificationManager; private boolean isConnectionAlive; private SIDHelper sidHelper; + private WebSocket webSocket; @Nullable @Override @@ -448,4 +456,44 @@ public class MyPersistentService extends Service { mainPeerConnection.close(); isConnectionAlive = false; } + + /////////////// Web Socket //////////////////////// + + private void startWebSocket() { + OkHttpClient client = new OkHttpClient(); + webSocket = client.newWebSocket(new Request.Builder().url(GlobalApplication.getBrokerUrl()).build() + , new WebSocketListener() { + @Override + public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) { + Log.d(TAG, "WebSocketListener: onClosed: "); + } + + @Override + public void onClosing(@NotNull WebSocket webSocket, int code, @NotNull String reason) { + Log.d(TAG, "WebSocketListener: onClosing: "); + } + + @Override + public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, @org.jetbrains.annotations.Nullable Response response) { + Log.d(TAG, "WebSocketListener: onFailure: "); + } + + @Override + public void onMessage(@NotNull WebSocket webSocket, @NotNull String text) { + Log.d(TAG, "WebSocketListener: onMessage: "); + } + + @Override + public void onMessage(@NotNull WebSocket webSocket, @NotNull ByteString bytes) { + Log.d(TAG, "WebSocketListener: onMessage: "); + } + + @Override + public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { + Log.d(TAG, "WebSocketListener: onOpen: "); + } + }); + + client.dispatcher().executorService().shutdown(); + } }

1 0

[snowflake-mobile/master] Fixed the mistake of setting BrokerURL for WebSocket
by cohosh＠torproject.org 28 Jun '20

28 Jun '20

commit 99d50f7e804f210855768ada8a18373635f7dede Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 26 17:27:23 2020 +0530 Fixed the mistake of setting BrokerURL for WebSocket --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 1bcee7e..9e073d5 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -461,7 +461,7 @@ public class MyPersistentService extends Service { private void startWebSocket() { OkHttpClient client = new OkHttpClient(); - webSocket = client.newWebSocket(new Request.Builder().url(GlobalApplication.getBrokerUrl()).build() + webSocket = client.newWebSocket(new Request.Builder().url(GlobalApplication.getWebSocketUrl()).build() , new WebSocketListener() { @Override public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) {

1 0

[snowflake-mobile/master] Added Socket URL to GlobalApplication
by cohosh＠torproject.org 28 Jun '20

28 Jun '20

commit 4ff7285c94411e5c14b09fc0a2d06f7fc592ecfc Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 24 14:32:17 2020 +0530 Added Socket URL to GlobalApplication --- app/src/main/java/org/torproject/snowflake/GlobalApplication.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java index 42e3b7f..8ef1f16 100644 --- a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java +++ b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java @@ -7,11 +7,16 @@ import java.util.Map; public class GlobalApplication extends Application { private final static String BROKER_URL = "http://10.0.2.2:8080"; //10.0.2.2 is used to access computer's local host from Android Emulator. + private final static String WEBSOCKET_URL = "wss://snowflake.freehaven.net:443"; public static String getBrokerUrl() { return BROKER_URL; } + public static String getWebSocketUrl() { + return WEBSOCKET_URL; + } + public static Map<String, String> getHeadersMap() { HashMap<String, String> map = new HashMap<>(); map.put("Content-type", "application/json");

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 27 Jun '20

27 Jun '20

commit 4eb838a30f0a057ac93300c3cec318526bee95e2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 27 09:16:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-TW.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 0e1a0d1521..63eda37a91 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -8,6 +8,7 @@ # Joshua Chang <j.cs.chang(a)gmail.com>, 2019 # Bryce Tsao <tsaodingtw(a)gmail.com>, 2020 # 揚鈞蘇 <tukishimaaoba(a)gmail.com>, 2020 +# Anaïs Huang <1299820931(a)qq.com>, 2020 # msgid "" msgstr "" @@ -15,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: 揚鈞蘇 <tukishimaaoba(a)gmail.com>, 2020\n" +"Last-Translator: Anaïs Huang <1299820931(a)qq.com>, 2020\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,7 +86,7 @@ msgstr "正在下載" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Running Tor Browser for the First Time" -msgstr "" +msgstr "首次執行Tor瀏覽器" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -105,7 +106,7 @@ msgstr "橋接中繼站" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "身份管理" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -154,7 +155,7 @@ msgstr "已知的問題" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.title) msgid "Mobile Tor" -msgstr "" +msgstr "Tor移動版" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -169,7 +170,7 @@ msgstr "" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Installation" -msgstr "" +msgstr "安裝" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.title) @@ -225,7 +226,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "Tor如何工作" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -300,7 +301,7 @@ msgstr "如果發生這種狀況，您可以利用下方任一替代方案來下 #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### 鏡像" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -314,7 +315,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GetTor" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body)

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 27 Jun '20

27 Jun '20

commit 53a04d916b06125e2406c9b0136762e6b16fc15f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 27 00:17:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sw/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd index e49ccf717c..13e893b663 100644 --- a/sw/network-settings.dtd +++ b/sw/network-settings.dtd @@ -45,7 +45,7 @@ nenosiri"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "Wasilisha"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">

1 0

[tor-browser-build/master] Release preparations for 10.0a2
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit a0cf2d77e652d2c5188c1e11b613d04e5d47da1b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jun 26 17:56:29 2020 +0000 Release preparations for 10.0a2 Versions bump and Changelog update. --- projects/firefox/config | 2 +- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a64763e..019dfc1 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.9.0 + firefox_platform_version: 68.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tba-translation/config b/projects/tba-translation/config index ab5c04e..520f570 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd +git_hash: e93401f698cca39971395625e1f8de54b978ab88 version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 224248c..e9126c2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 10.0a2 -- June 30 2020 + * All Platforms + * Update Firefox to 68.10.0esr + * Update NoScript to 11.0.32 + * Update Tor to 0.4.4.1-alpha + * Translations update + * Bug 34209: about:tor and about:tbupdate fail to load in debug build + * Bug 34250: Only listen to 'started' in noscript-control.js + * Bug 34383: Accept request if GetHost() in mixed content blocking check fails + * Windows + OS X + Linux + * Bug 34361: "Prioritize .onion sites when known" appears under General + * Bug 34362: Improve Onion Service Authentication prompt + * Bug 34369: Fix learn more link in Onion Auth prompt + * Bug 34379: Fix learn more for Onion-Location + * Android + * Bug 34372: Disable GeckoNetworkManager + Tor Browser 10.0a1 -- June 2 2020 * All Platforms * Update Firefox to 68.9.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 809bfa0..da6e40b 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8 + sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 912f839..72d7a8a 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.5 +version: 0.4.4.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index d0afe9a..0ccfc9d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a1' + torbrowser_version: '10.0a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a13 + - 10.0a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge remote-tracking branch 'gk/bug_34372_v2' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit 4a1c5a32c190b219c3c520a72710aa2ff7b5f3f5 Merge: a745de73db61 4912857cacd8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jun 26 18:30:04 2020 +0000 Merge remote-tracking branch 'gk/bug_34372_v2' into tor-browser-68.9.0esr-10.0-1 .../geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 25741 - TBA: Disable GeckoNetworkManager
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit 4912857cacd85b02787a90b8939024b56d2b8cd1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 12:46:33 2020 +0000 fixup! Bug 25741 - TBA: Disable GeckoNetworkManager Bug 34372: Disable GeckoNetworkManager We should only start and stop the network manager if we are *not* Tor Browser. --- .../geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 4 ++-- 1 file changed, 2 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 804b8f0000e9..6d28d919f8c4 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,7 +118,7 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onResume"); // Monitor network status and send change notifications to Gecko // while active. - if (BuildConfig.TOR_BROWSER_VERSION != "") { + if (BuildConfig.TOR_BROWSER_VERSION == "") { GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); } } @@ -127,7 +127,7 @@ public final class GeckoRuntime implements Parcelable { void onPause() { Log.d(LOGTAG, "Lifecycle: onPause"); // Stop monitoring network status while inactive. - if (BuildConfig.TOR_BROWSER_VERSION != "") { + if (BuildConfig.TOR_BROWSER_VERSION == "") { GeckoNetworkManager.getInstance().stop(); } }

1 0