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

[tor/master] Merge branch 'maint-0.4.5' into master
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit ff2b7ae1f3f6066c501b1c4099e3d20dd0533acb Merge: bff3c6f48d 2f87b2ab75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:04:05 2020 -0500 Merge branch 'maint-0.4.5' into master "ours" to avoid version bump.

1 0

[tpo/master] 0.4.5.2-alpha is now uploaded.
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit fa6e992bc4c13a3540265ab2166e9133b9a2f8f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 14:00:41 2020 -0500 0.4.5.2-alpha is now uploaded. --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 9b6d5b1b..c1300e00 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -15,6 +15,6 @@ version = 10.5a4 version = 0.4.4.6 [tor-alpha] -version = 0.4.5.1-alpha +version = 0.4.5.2-alpha

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 23 Nov '20

23 Nov '20

commit 8b02fae8f5b3a2e15c70ff635dbf3454f0ee06e0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 23 18:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+he.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+he.po b/contents+he.po index 8fbfa1cfd1..a28fc240f2 100644 --- a/contents+he.po +++ b/contents+he.po @@ -10923,6 +10923,8 @@ msgid "" "The downside is that your Tor relay's existence is more fragile, since the " "terms of its demise are already negotiated." msgstr "" +"החסרון הנו שקיום הניתוב שלך יותר שברירי, מאחר והתקיים כבר המו\"מ על תנאי " +"ההשרדות שלו. " #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body)

1 0

[tor/release-0.4.5] changelog corrections from arma
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 135b8eea36edd992d0a0c3e9b6d88c013dc3fe48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 13:40:49 2020 -0500 changelog corrections from arma --- ChangeLog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e778eaf51..62e00c17c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,11 +57,11 @@ Changes in version 0.4.5.2-alpha - 2020-11-23 on 0.2.6.1-alpha. - Fix an issue where an ORPort was compared with other kinds of ports, when it should have been only checked against other - ORPorts. This bug lead to "DirPort auto" getting ignored. Fixes - bug 40195; bugfix on 0.4.5.1-alpha. + ORPorts. This bug would lead to "DirPort auto" getting ignored. + Fixes bug 40195; bugfix on 0.4.5.1-alpha. - Fix a bug where a second non-ORPort with a variant family (ex: - SocksPort [::1]:9050) would ignored due to a configuration parsing - error. Fixes bug 40183; bugfix on 0.4.5.1-alpha. + SocksPort [::1]:9050) would be ignored due to a configuration + parsing error. Fixes bug 40183; bugfix on 0.4.5.1-alpha. o Minor bugfixes (crash, relay, signing key): - Avoid assertion failures when we run Tor from the command line

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 23 Nov '20

23 Nov '20

commit 328fdfa3b403c11f0d37611ee588f88f06a95923 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 23 18:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+he.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+he.po b/contents+he.po index cfeaede54f..8fbfa1cfd1 100644 --- a/contents+he.po +++ b/contents+he.po @@ -10906,6 +10906,8 @@ msgid "" "So if you're interested, you might want to get that started early in the " "process -- see our [Research Portal](https://research.torproject.org/)." msgstr "" +"אז אם הנכם מעונינים, תרצו אולי להתחיל מוקדם בתהלים -- ראו [Research " +"Portal](https://research.torproject.org/)." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -10913,6 +10915,7 @@ msgid "" "This approach has the added benefit that you can draw in other faculty and " "students in the process." msgstr "" +"גישה זו עם ערך מוסף של משיכה פנימה אנשי סגל וסטונדנים אחרים במסגרת התהליך." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body)

1 0

[snowflake/master] Remove for loop around broker.Negotiate
by cohosh＠torproject.org 23 Nov '20

23 Nov '20

commit 665d76c5b04c4e470d85a826ea617a2404ed4a1d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Nov 13 15:08:00 2020 -0500 Remove for loop around broker.Negotiate Instead of continuously polling the broker until the client receives a snowflake, fail back to the Connect() loop and try again to collect more peers after ReconnectTimeout. --- client/lib/webrtc.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index af5a45a..3a23ffc 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -112,7 +112,10 @@ func (c *WebRTCPeer) connect(config *webrtc.Configuration, broker *BrokerChannel if err != nil { return err } - answer := exchangeSDP(broker, c.pc.LocalDescription()) + answer, err := broker.Negotiate(c.pc.LocalDescription()) + if err != nil { + return err + } log.Printf("Received Answer.\n") err = c.pc.SetRemoteDescription(*answer) if nil != err { @@ -217,22 +220,6 @@ func (c *WebRTCPeer) establishDataChannel() (*webrtc.DataChannel, error) { } } -// exchangeSDP sends the local SDP offer to the Broker, awaits the SDP answer, -// and returns the answer. -func exchangeSDP(broker *BrokerChannel, offer *webrtc.SessionDescription) *webrtc.SessionDescription { - // Keep trying the same offer until a valid answer arrives. - for { - // Send offer to broker (blocks). - answer, err := broker.Negotiate(offer) - if err == nil { - return answer - } - log.Printf("BrokerChannel Error: %s", err) - log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout) - <-time.After(ReconnectTimeout) - } -} - // Close all channels and transports func (c *WebRTCPeer) cleanup() { // Close this side of the SOCKS pipe.

1 0

[tor/release-0.4.5] A couple of edits for the 0.4.5.2-alpha changelog.
by nickm＠torproject.org 23 Nov '20

23 Nov '20

commit 3d6146a41c6a837979d4629621ec12472eb763f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 23 11:56:55 2020 -0500 A couple of edits for the 0.4.5.2-alpha changelog. --- ChangeLog | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f1346fea0..5e778eaf51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ Changes in version 0.4.5.2-alpha - 2020-11-23 - Tor 0.4.5.2-alpha is the second alpha release in the 0.4.5.2-alpha - series. It fixes several bugs present in earlier releases, including - one that made it impractical to run relays on Windows. It also adds a - few small safety features to improve tor's behavior in the presence of - strange compile-time options, misbehaving proxies, and future versions + Tor 0.4.5.2-alpha is the second alpha release in the 0.4.5.x series. + It fixes several bugs present in earlier releases, including one that + made it impractical to run relays on Windows. It also adds a few small + safety features to improve Tor's behavior in the presence of strange + compile-time options, misbehaving proxies, and future versions of OpenSSL. o Major bugfixes (relay, windows): @@ -34,8 +34,8 @@ Changes in version 0.4.5.2-alpha - 2020-11-23 o Minor bugfixes (circuit, handshake): - In the v3 handshaking code, use connection_or_change_state() to change the state. Previously, we changed the state directly, but - this did not pass a state change to the pubsub or channel objects, - potentially leading to bugs. Fixes bug 32880; bugfix on + this did not pass the state change to the pubsub or channel + objects, potentially leading to bugs. Fixes bug 32880; bugfix on 0.2.3.6-alpha. Patch by Neel Chauhan. o Minor bugfixes (compilation): @@ -55,13 +55,13 @@ Changes in version 0.4.5.2-alpha - 2020-11-23 bridge directly without using the transport, making it easier for adversaries to notice the bridge. Fixes bug 25528; bugfix on 0.2.6.1-alpha. - - Fix an issue where an ORPort was validated against other type of + - Fix an issue where an ORPort was compared with other kinds of ports, when it should have been only checked against other ORPorts. This bug lead to "DirPort auto" getting ignored. Fixes bug 40195; bugfix on 0.4.5.1-alpha. - - Fix a bug where the second non-ORPort with a variant family (ex: - SocksPort [::1]:9050) was ignored due to a logical configuration - parsing error. Fixes bug 40183; bugfix on 0.4.5.1-alpha. + - Fix a bug where a second non-ORPort with a variant family (ex: + SocksPort [::1]:9050) would ignored due to a configuration parsing + error. Fixes bug 40183; bugfix on 0.4.5.1-alpha. o Minor bugfixes (crash, relay, signing key): - Avoid assertion failures when we run Tor from the command line

1 0

[snowflake-mobile/master] Add startProxy method in MainFragment
by cohosh＠torproject.org 23 Nov '20

23 Nov '20

commit 1a47d2c1e0a6c04e46cdd97fec3c94df0a7482b1 Author: Hashik Donthineni <HashikDonthineni(a)Gmail.com> Date: Wed Nov 11 13:13:55 2020 +0530 Add startProxy method in MainFragment --- .../java/org/torproject/snowflake/fragments/MainFragment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index efcddc1..25b0ba2 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -79,8 +79,7 @@ public class MainFragment extends Fragment { setSnowflakeStatus(false); callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); } else { - setSnowflakeStatus(true); - callback.serviceToggle(ForegroundServiceConstants.ACTION_START); + startProxy(); } }); showServed(callback.getServed()); @@ -105,6 +104,14 @@ public class MainFragment extends Fragment { } } + /** + * Starts the proxy. + */ + public void startProxy() { + setSnowflakeStatus(true); + callback.serviceToggle(ForegroundServiceConstants.ACTION_START); + } + /** * Used to update the UI elements with corresponding status of the Snowflake. *

1 0

[snowflake-mobile/master] Add relay check - only handled success
by cohosh＠torproject.org 23 Nov '20

23 Nov '20

commit fed179a61aefef8c4c125fe602701b6f24adbc52 Author: Hashik Donthineni <HashikDonthineni(a)Gmail.com> Date: Wed Nov 11 13:57:22 2020 +0530 Add relay check - only handled success --- .../org/torproject/snowflake/MainActivity.java | 31 +++++++++++++--- .../snowflake/fragments/MainFragment.java | 11 +++++- .../snowflake/interfaces/MainFragmentCallback.java | 1 + .../snowflake/models/MainActivityModel.java | 41 ++++++++++++++++++++-- .../snowflake/mvp/MainActivityMVPContract.java | 12 +++++++ .../presenters/MainActivityPresenter.java | 19 ++++++++++ 6 files changed, 108 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index aa1692c..43f3697 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -7,16 +7,13 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.transition.Slide; import android.util.Log; -import android.view.Gravity; import android.view.MenuItem; import android.view.View; import android.widget.Button; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import androidx.core.view.GravityCompat; import androidx.fragment.app.Fragment; import org.torproject.snowflake.constants.ForegroundServiceConstants; @@ -37,7 +34,6 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb //Indicates if model finished checking the date and reset served count if need be. boolean isCheckDateFinished; private Button settingsButton; - boolean transitionToggle = false; @Override protected void onCreate(Bundle savedInstanceState) { @@ -183,6 +179,14 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb return 0; } + @Override + public void relayCheck() { + // Deactivate settings button + settingsButton.setEnabled(false); + settingsButton.setClickable(false); + presenter.relayCheck(); + } + @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { @@ -193,4 +197,23 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb return super.onOptionsItemSelected(item); } + + + @Override + public void relayFailed(String message) { + runOnUiThread(() -> { + settingsButton.setEnabled(true); + settingsButton.setClickable(true); + }); + } + + @Override + public void relaySuccess() { + runOnUiThread(() -> { + settingsButton.setEnabled(true); + settingsButton.setClickable(true); + Fragment mainFragment = getSupportFragmentManager().findFragmentByTag(Integer.toString(FragmentConstants.MAIN_FRAGMENT)); + ((MainFragment) mainFragment).startProxy(); + }); + } } diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index 25b0ba2..64e0ef4 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -79,7 +79,7 @@ public class MainFragment extends Fragment { setSnowflakeStatus(false); callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); } else { - startProxy(); + startRelayCheck(); } }); showServed(callback.getServed()); @@ -88,6 +88,13 @@ public class MainFragment extends Fragment { return rootView; } + private void startRelayCheck() { + startButton.setEnabled(false); + startButton.setClickable(false); + noteTV.setText("Checking relay reachability"); + callback.relayCheck(); + } + @Override public void onAttach(@NonNull Context context) { super.onAttach(context); @@ -108,6 +115,8 @@ public class MainFragment extends Fragment { * Starts the proxy. */ public void startProxy() { + startButton.setEnabled(true); + startButton.setClickable(true); setSnowflakeStatus(true); callback.serviceToggle(ForegroundServiceConstants.ACTION_START); } diff --git a/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java b/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java index 40da367..32df1c9 100644 --- a/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java +++ b/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java @@ -4,4 +4,5 @@ public interface MainFragmentCallback { boolean isServiceRunning(); void serviceToggle(String action); int getServed(); + void relayCheck(); } diff --git a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java index 66c5f4c..15572a0 100644 --- a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java +++ b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java @@ -3,6 +3,7 @@ package org.torproject.snowflake.models; import android.content.SharedPreferences; import android.util.Log; +import org.jetbrains.annotations.NotNull; import org.torproject.snowflake.GlobalApplication; import org.torproject.snowflake.constants.AppPreferenceKeys; import org.torproject.snowflake.mvp.MainActivityMVPContract; @@ -15,6 +16,11 @@ import java.util.Date; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.schedulers.Schedulers; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.WebSocket; +import okhttp3.WebSocketListener; /** * Model for MainActivity to handle network calls, Shared preferences. @@ -22,8 +28,8 @@ import io.reactivex.rxjava3.schedulers.Schedulers; public class MainActivityModel implements MainActivityMVPContract.Model { private static final String TAG = "MainActivityModel"; private static MainActivityModel instance = null; - private SharedPreferences sharedPreferences; - private MainActivityMVPContract.Presenter presenter; + private final SharedPreferences sharedPreferences; + private final MainActivityMVPContract.Presenter presenter; private int servedCount; private SharedPreferences.OnSharedPreferenceChangeListener listener; @@ -151,4 +157,35 @@ public class MainActivityModel implements MainActivityMVPContract.Model { }); } } + + @Override + public void relayCheck() { + Request req; + try { + req = new Request.Builder().url(GlobalApplication.getWebSocketUrl()).build(); + } catch (IllegalArgumentException e) { + presenter.relayFailure("Malformed URL"); + return; + } + + OkHttpClient client = new OkHttpClient(); + client.newWebSocket(req, + new WebSocketListener() { + @Override + public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, @org.jetbrains.annotations.Nullable Response response) { + Log.d(TAG, "WebSocketListener: onFailure: "); + webSocket.close(1000, "Normal Closure"); //TODO: Change Failure code. + presenter.relayFailure("Web socket connection failed"); + } + + @Override + public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { + Log.d(TAG, "WebSocketListener: onOpen: "); + webSocket.close(1000, "Normal Closure"); + presenter.relaySuccess(); + } + }); + + client.dispatcher().executorService().shutdown(); + } } diff --git a/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java b/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java index 1bda683..6fb9a35 100644 --- a/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java +++ b/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java @@ -6,6 +6,10 @@ package org.torproject.snowflake.mvp; public interface MainActivityMVPContract { interface View { void updateCountInFragment(int i); + + void relayFailed(String message); + + void relaySuccess(); } interface Model { @@ -18,6 +22,8 @@ public interface MainActivityMVPContract { void checkDateAsync(); int getServedCount(); + + void relayCheck(); } interface Presenter { @@ -34,5 +40,11 @@ public interface MainActivityMVPContract { void updateServedCount(int count); void checkDate(); + + void relayCheck(); + + void relayFailure(String message); + + void relaySuccess(); } } diff --git a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java index fd91839..4046f8b 100644 --- a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java +++ b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java @@ -80,4 +80,23 @@ public class MainActivityPresenter implements MainActivityMVPContract.Presenter public void checkDate() { model.checkDateAsync(); } + + @Override + public void relayCheck() { + model.relayCheck(); + } + + @Override + public void relayFailure(String message) { + if (view != null) { + view.relayFailed(message); + } + } + + @Override + public void relaySuccess() { + if (view != null) { + view.relaySuccess(); + } + } }

1 0

[snowflake-mobile/master] Add comments
by cohosh＠torproject.org 23 Nov '20

23 Nov '20

commit 2a7a3ea779ed0188a217bbc1c0760d48ae06c751 Author: Hashik Donthineni <HashikDonthineni(a)Gmail.com> Date: Wed Nov 11 15:06:22 2020 +0530 Add comments --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 9 ++++++++- .../java/org/torproject/snowflake/fragments/MainFragment.java | 5 +++++ .../java/org/torproject/snowflake/models/MainActivityModel.java | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 5fb3fb4..6ec0804 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -198,7 +198,11 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb return super.onOptionsItemSelected(item); } - + /** + * Relay failed. Reset Snowflake status in MainFragment. + * + * @param message Cause of failure. + */ @Override public void relayFailed(String message) { runOnUiThread(() -> { @@ -209,6 +213,9 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb }); } + /** + * Relay test success. Start Snowflake. + */ @Override public void relaySuccess() { runOnUiThread(() -> { diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index 152e794..1e438fb 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -150,6 +150,11 @@ public class MainFragment extends Fragment { colorAnimation.start(); } + /** + * Relay failed. Callback from MainActivity. Reset everything and show the message of failure. + * + * @param message Cause of failure. + */ public void relayFailed(String message) { startButton.setEnabled(true); startButton.setClickable(true); diff --git a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java index cc42599..330118b 100644 --- a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java +++ b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java @@ -158,6 +158,9 @@ public class MainActivityModel implements MainActivityMVPContract.Model { } } + /** + * Checks the relay URL availability. + */ @Override public void relayCheck() { Request req;

1 0