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

[snowflake-mobile/master] Randomly generated Sid
by cohosh＠torproject.org 23 Jun '20

23 Jun '20

commit 5c2800b4804f3bbb04a2d3e4cb9ad787c15f8a12 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 19 16:45:43 2020 +0530 Randomly generated Sid --- .../torproject/snowflake/MyPersistentService.java | 28 ++++++++----- .../java/org/torproject/snowflake/SIDHelper.java | 47 ++++++++++++++++++++++ .../snowflake/exceptions/EmptySIDException.java | 13 ++++++ 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/torproject/… [View More]snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index b888700..b3d9649 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -17,6 +17,7 @@ import androidx.annotation.Nullable; import org.json.JSONException; import org.torproject.snowflake.constants.BrokerConstants; import org.torproject.snowflake.constants.ForegroundServiceConstants; +import org.torproject.snowflake.exceptions.EmptySIDException; import org.torproject.snowflake.interfaces.PeerConnectionObserverCallback; import org.torproject.snowflake.pojo.AnsResponse; import org.torproject.snowflake.pojo.AnswerBody; @@ -58,6 +59,7 @@ public class MyPersistentService extends Service { private CompositeDisposable compositeDisposable; private NotificationManager mNotificationManager; private boolean isConnectionAlive; + private SIDHelper sidHelper; @Nullable @Override @@ -92,6 +94,7 @@ public class MyPersistentService extends Service { mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); isConnectionAlive = false; + sidHelper = SIDHelper.getInstance(); compositeDisposable = new CompositeDisposable(); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Assigning the shared preferences Notification notification = createPersistentNotification(false, null); @@ -340,7 +343,7 @@ public class MyPersistentService extends Service { Log.d(TAG, "fetchOffer: Fetching offer from broker."); ///Retrofit call final GetOfferService getOfferService = RetroServiceGenerator.createService(GetOfferService.class); - Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody("555")); //TODO:Randomly Generate SID. + Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody(sidHelper.generateSid())); compositeDisposable.add( offer.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -391,15 +394,20 @@ public class MyPersistentService extends Service { */ public void sendAnswer(SessionDescription sessionDescription) { Log.d(TAG, "sendAnswer: Sending SDP Answer"); - AnswerBodySDP bodySDP = new AnswerBodySDP(); - bodySDP.setSdp(SDPSerializer.serializeAnswer(sessionDescription)); - AnswerBody body = new AnswerBody("555", bodySDP.toString()); //TODO:Use randomly Generate SID from sendRequest - SendAnswerService service = RetroServiceGenerator.createService(SendAnswerService.class); - Observable<AnsResponse> response = service.sendAnswer(GlobalApplication.getHeadersMap(), body); - compositeDisposable.add( - response.subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()).subscribe(this::answerResponseSuccess, this::answerResponseFailure) - ); + try { + AnswerBodySDP bodySDP = new AnswerBodySDP(); + bodySDP.setSdp(SDPSerializer.serializeAnswer(sessionDescription)); + AnswerBody body = new AnswerBody(sidHelper.getSid(), bodySDP.toString()); + SendAnswerService service = RetroServiceGenerator.createService(SendAnswerService.class); + Observable<AnsResponse> response = service.sendAnswer(GlobalApplication.getHeadersMap(), body); + compositeDisposable.add( + response.subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()).subscribe(this::answerResponseSuccess, this::answerResponseFailure) + ); + } catch (EmptySIDException e) { + Log.e(TAG, "sendAnswer: getSid() is called before sid generation"); + e.printStackTrace(); + } } /** diff --git a/app/src/main/java/org/torproject/snowflake/SIDHelper.java b/app/src/main/java/org/torproject/snowflake/SIDHelper.java new file mode 100644 index 0000000..b2040d1 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/SIDHelper.java @@ -0,0 +1,47 @@ +package org.torproject.snowflake; + +import org.torproject.snowflake.exceptions.EmptySIDException; + +import java.util.Random; + +/** + * A helper class to handle SID operations. + * There should only be one SID for whole connection cycle hence singleton. + */ +public class SIDHelper { + private static SIDHelper sidHelper; + private String sid; + + private SIDHelper() { + } + + public static SIDHelper getInstance() { + if (sidHelper == null) { + sidHelper = new SIDHelper(); + } + return sidHelper; + } + + /** + * generates a new sid. + * + * @return generated sid. + */ + public String generateSid() { + sid = Integer.toString(new Random().nextInt(10000)); + return sid; + } + + /** + * Returns the generated sid. + * + * @return Existing sid that is generated in "generateSid" method. + * @throws EmptySIDException sid is not generated. + */ + public String getSid() throws EmptySIDException { + if (sid == null) { + throw new EmptySIDException(); + } + return sid; + } +} diff --git a/app/src/main/java/org/torproject/snowflake/exceptions/EmptySIDException.java b/app/src/main/java/org/torproject/snowflake/exceptions/EmptySIDException.java new file mode 100644 index 0000000..f69a366 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/exceptions/EmptySIDException.java @@ -0,0 +1,13 @@ +package org.torproject.snowflake.exceptions; + +import androidx.annotation.NonNull; + +public class EmptySIDException extends Exception { + private final String ERROR = "SID is not initialized or generated"; + + @NonNull + @Override + public String toString() { + return ERROR; + } +} [View Less]

1 0

[snowflake-mobile/master] Merge remote-tracking branch 'gitlab/rtc-random-sid'
by cohosh＠torproject.org 23 Jun '20

23 Jun '20

commit 48d6368642d03532ca651008c574380373fce054 Merge: ee8ca17 7e391ac Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jun 23 10:44:43 2020 -0400 Merge remote-tracking branch 'gitlab/rtc-random-sid' .../torproject/snowflake/MyPersistentService.java | 28 ++++++++----- .../java/org/torproject/snowflake/SIDHelper.java | 47 ++++++++++++++++++++++ .../snowflake/exceptions/EmptySIDException.java | 13 ++++++ 3 files changed, 78 insertions(+), 10 deletions(-)

1 0

[snowflake-mobile/master] Changed random number generation function to Base 64
by cohosh＠torproject.org 23 Jun '20

23 Jun '20

commit 7ec57142b40943fd2b13d4268c39651ae4951487 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Mon Jun 22 23:57:47 2020 +0530 Changed random number generation function to Base 64 --- app/src/main/java/org/torproject/snowflake/SIDHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/SIDHelper.java b/app/src/main/java/org/torproject/snowflake/SIDHelper.java index b2040d1..1d6cb51 100644 --- a/app/… [View More]

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit c48e4ca617fbeb0e6b0e5b7c44b601dfbe2a9531 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 14:40:28 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0b6562dfffd0..605e9d398ab0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit … [View More]

1 0

[tor/maint-0.4.4] Update the list of recommended protocol versions to match >=0.3.5.
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit b67f7d722d4cb94d1e77ff9b300c82d8c72b14c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 11:00:58 2020 -0400 Update the list of recommended protocol versions to match >=0.3.5. Since Tor 0.2.9 has been unsupported since January, 0.3.5 is the oldest supported version, and its features constitute the oldest recommended feature-set. This patch updates these recommendations: DirCache=2 Support for consensus … [View More]diffs. New in 0.3.1.1-alpha. HSDir=2 Support for v3 onion service descriptors. New in 0.3.0.4-alpha. HSIntro=4 Support for Ed25519 intropoint authentication keys. New in 0.3.0-4-alpha. HSRend=2 Support for rendezvous cells longer than 20 bytes. New in 0.2.9.4-alpha. Link=5 Link padding and link padding negotiation. New in 0.3.3.2-alpha. LinkAuth=3 Ed25519 link authentication. New in 0.3.0.1-alpha. --- changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.h | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/ticket32696 b/changes/ticket32696 new file mode 100644 index 000000000..8f56fc394 --- /dev/null +++ b/changes/ticket32696 @@ -0,0 +1,7 @@ + o Minor features (directory authority): + - Authorities now recommend protocol versions that are supported + by Tor 0.3.5 and later. (Earlier versions of Tor have been + deprecated since January of this year.) This recommendation + will cause older clients and relays to give a warning on startup, + or when they download a consensus directory. + Closes ticket 32696. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index cf70e1184..1b1c9f2cc 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -239,14 +239,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ + "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ + "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. [View Less]

1 0

[tor/master] Spelling fix: "RECCOMEND" => "RECOMMEND".
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit a82c0cdfcfefc1761883d7f25ecdea73d7216e16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 10:37:47 2020 -0400 Spelling fix: "RECCOMEND" => "RECOMMEND". --- src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 4 ++-- src/test/test_protover.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 85a23a12f..79651563b 100644 --- a/src/feature/… [View More]dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4679,9 +4679,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup(DIRVOTE_RECCOMEND_RELAY_PROTO); + tor_strdup(DIRVOTE_RECOMMEND_RELAY_PROTO); v3_out->recommended_client_protocols = - tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO); + tor_strdup(DIRVOTE_RECOMMEND_CLIENT_PROTO); v3_out->required_relay_protocols = tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO); diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index fa7b1da4a..cf70e1184 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -238,13 +238,13 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, /** The recommended relay protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECCOMEND_RELAY_PROTO \ +#define DIRVOTE_RECOMMEND_RELAY_PROTO \ "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Link=4 Microdesc=1-2 Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECCOMEND_CLIENT_PROTO \ +#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Link=4 Microdesc=1-2 Relay=2" diff --git a/src/test/test_protover.c b/src/test/test_protover.c index c33fbcae2..8fccae1a4 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -645,8 +645,8 @@ test_protover_vote_roundtrip_ours(void *args) (void) args; const char *examples[] = { protover_get_supported_protocols(), - DIRVOTE_RECCOMEND_RELAY_PROTO, - DIRVOTE_RECCOMEND_CLIENT_PROTO, + DIRVOTE_RECOMMEND_RELAY_PROTO, + DIRVOTE_RECOMMEND_CLIENT_PROTO, DIRVOTE_REQUIRE_RELAY_PROTO, DIRVOTE_REQUIRE_CLIENT_PROTO, }; [View Less]

1 0

[tor/maint-0.4.4] Spelling fix: "RECCOMEND" => "RECOMMEND".
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit a82c0cdfcfefc1761883d7f25ecdea73d7216e16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 10:37:47 2020 -0400 Spelling fix: "RECCOMEND" => "RECOMMEND". --- src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 4 ++-- src/test/test_protover.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 85a23a12f..79651563b 100644 --- a/src/feature/… [View More]dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4679,9 +4679,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup(DIRVOTE_RECCOMEND_RELAY_PROTO); + tor_strdup(DIRVOTE_RECOMMEND_RELAY_PROTO); v3_out->recommended_client_protocols = - tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO); + tor_strdup(DIRVOTE_RECOMMEND_CLIENT_PROTO); v3_out->required_relay_protocols = tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO); diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index fa7b1da4a..cf70e1184 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -238,13 +238,13 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, /** The recommended relay protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECCOMEND_RELAY_PROTO \ +#define DIRVOTE_RECOMMEND_RELAY_PROTO \ "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Link=4 Microdesc=1-2 Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECCOMEND_CLIENT_PROTO \ +#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Link=4 Microdesc=1-2 Relay=2" diff --git a/src/test/test_protover.c b/src/test/test_protover.c index c33fbcae2..8fccae1a4 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -645,8 +645,8 @@ test_protover_vote_roundtrip_ours(void *args) (void) args; const char *examples[] = { protover_get_supported_protocols(), - DIRVOTE_RECCOMEND_RELAY_PROTO, - DIRVOTE_RECCOMEND_CLIENT_PROTO, + DIRVOTE_RECOMMEND_RELAY_PROTO, + DIRVOTE_RECOMMEND_CLIENT_PROTO, DIRVOTE_REQUIRE_RELAY_PROTO, DIRVOTE_REQUIRE_CLIENT_PROTO, }; [View Less]

1 0

[tor/maint-0.4.4] Merge branch 'tor-github/pr/1937' into maint-0.4.4
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit 523231516817a7037d150d583f3b83304c2686ec Merge: 3d0e1c42d b67f7d722 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 23 08:52:16 2020 -0400 Merge branch 'tor-github/pr/1937' into maint-0.4.4 changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 12 ++++++------ src/test/test_protover.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)

1 0

[tor/master] Update the list of recommended protocol versions to match >=0.3.5.
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit b67f7d722d4cb94d1e77ff9b300c82d8c72b14c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 11:00:58 2020 -0400 Update the list of recommended protocol versions to match >=0.3.5. Since Tor 0.2.9 has been unsupported since January, 0.3.5 is the oldest supported version, and its features constitute the oldest recommended feature-set. This patch updates these recommendations: DirCache=2 Support for consensus … [View More]diffs. New in 0.3.1.1-alpha. HSDir=2 Support for v3 onion service descriptors. New in 0.3.0.4-alpha. HSIntro=4 Support for Ed25519 intropoint authentication keys. New in 0.3.0-4-alpha. HSRend=2 Support for rendezvous cells longer than 20 bytes. New in 0.2.9.4-alpha. Link=5 Link padding and link padding negotiation. New in 0.3.3.2-alpha. LinkAuth=3 Ed25519 link authentication. New in 0.3.0.1-alpha. --- changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.h | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/ticket32696 b/changes/ticket32696 new file mode 100644 index 000000000..8f56fc394 --- /dev/null +++ b/changes/ticket32696 @@ -0,0 +1,7 @@ + o Minor features (directory authority): + - Authorities now recommend protocol versions that are supported + by Tor 0.3.5 and later. (Earlier versions of Tor have been + deprecated since January of this year.) This recommendation + will cause older clients and relays to give a warning on startup, + or when they download a consensus directory. + Closes ticket 32696. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index cf70e1184..1b1c9f2cc 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -239,14 +239,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ + "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ + "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. [View Less]

1 0

[tor/master] Merge branch 'maint-0.4.4'
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit d3bcbccab9d50fd0dafc682f7ee63902ea344be7 Merge: ceddc39c5 523231516 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 23 08:52:33 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 12 ++++++------ src/test/test_protover.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)

1 0