February 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 9cbc40e37675e77a654bad88f99959873759b9fd Merge: 5fc0437e7 9656ad323 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 15:28:11 2018 -0500 Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1 changes/bug25070 | 3 +++ src/or/protover.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Changes file for 25070
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 9656ad32329f24d9d93e3e7067eb07cbe4ed0002 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:55:56 2018 +1100 Changes file for 25070 --- changes/bug25070 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug25070 b/changes/bug25070 new file mode 100644 index 000000000..c2f4e58c4 --- /dev/null +++ b/changes/bug25070 @@ -0,0 +1,3 @@ + o Major bugfixes (protocol versions): + - Add Link protocol version 5 to the supported protocols list. + Fixes bug 25070; bugfix on 0.3.1.1-alpha.

1 0

[tor/maint-0.3.1] Add Link protocol version 5 to the supported protocols list in protover.c
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit a8e5e3a492378f6a9a2b4d55a4e7e5bab3f9dca4 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:51:03 2018 +1100 Add Link protocol version 5 to the supported protocols list in protover.c Part of #25070, bugfix on 0.3.1.1-alpha. --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 094609269..033e9063a 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -292,7 +292,7 @@ protover_get_supported_protocols(void) "HSDir=1-2 " "HSIntro=3-4 " "HSRend=1-2 " - "Link=1-4 " + "Link=1-5 " "LinkAuth=1,3 " "Microdesc=1-2 " "Relay=1-2";

1 0

[tor/maint-0.3.2] Add Link protocol version 5 to the supported protocols list in protover.c
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit a8e5e3a492378f6a9a2b4d55a4e7e5bab3f9dca4 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:51:03 2018 +1100 Add Link protocol version 5 to the supported protocols list in protover.c Part of #25070, bugfix on 0.3.1.1-alpha. --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 094609269..033e9063a 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -292,7 +292,7 @@ protover_get_supported_protocols(void) "HSDir=1-2 " "HSIntro=3-4 " "HSRend=1-2 " - "Link=1-4 " + "Link=1-5 " "LinkAuth=1,3 " "Microdesc=1-2 " "Relay=1-2";

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 9cbc40e37675e77a654bad88f99959873759b9fd Merge: 5fc0437e7 9656ad323 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 15:28:11 2018 -0500 Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1 changes/bug25070 | 3 +++ src/or/protover.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Add Link protocol version 5 to the supported protocols list in protover.c
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit a8e5e3a492378f6a9a2b4d55a4e7e5bab3f9dca4 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:51:03 2018 +1100 Add Link protocol version 5 to the supported protocols list in protover.c Part of #25070, bugfix on 0.3.1.1-alpha. --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 094609269..033e9063a 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -292,7 +292,7 @@ protover_get_supported_protocols(void) "HSDir=1-2 " "HSIntro=3-4 " "HSRend=1-2 " - "Link=1-4 " + "Link=1-5 " "LinkAuth=1,3 " "Microdesc=1-2 " "Relay=1-2";

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 31542cc306ea6d7f4ca629fccd9bcd536573f6d8 Merge: 61cb2993d 9cbc40e37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 15:28:17 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug25070 | 3 +++ src/or/protover.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Add Link protocol version 5 to the supported protocols list in protover.c
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 7a701f260356d9363dfa1b7694c5cafff57ad221 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:51:03 2018 +1100 Add Link protocol version 5 to the supported protocols list in protover.c Part of #25070, bugfix on 0.3.1.1-alpha. --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 1a5f4ac91..41b50df87 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -332,7 +332,7 @@ protover_get_supported_protocols(void) "HSDir=1-2 " "HSIntro=3-4 " "HSRend=1-2 " - "Link=1-4 " + "Link=1-5 " "LinkAuth=1,3 " "Microdesc=1-2 " "Relay=1-2";

1 0

[tor/master] Add Link protocol version 5 to the supported protocols list in protover.rs
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit b67f0106785a393d85a4c2fb1c205aa3d2e3b301 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:51:59 2018 +1100 Add Link protocol version 5 to the supported protocols list in protover.rs And fix the unsupported protover example so it uses a Link protover much higher than 5. Part of #25070, bugfix on 0.3.3.1-alpha, which introduced the protover crate. --- src/rust/protover/protover.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 5e281a3e9..cf6fb78e2 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -32,7 +32,7 @@ const SUPPORTED_PROTOCOLS: &'static [&'static str] = &[ "HSDir=1-2", "HSIntro=3-4", "HSRend=1-2", - "Link=1-4", + "Link=1-5", "LinkAuth=1,3", "Microdesc=1-2", "Relay=1-2", @@ -684,7 +684,7 @@ fn write_vote_to_string(vote: &HashMap<String, String>) -> String { /// ``` /// use protover::*; /// -/// let is_supported = is_supported_here(Proto::Link, 5); +/// let is_supported = is_supported_here(Proto::Link, 10); /// assert_eq!(false, is_supported); /// /// let is_supported = is_supported_here(Proto::Link, 1);

1 0

[tor/master] Add unit tests for supported protocols
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 8bb79ca4a74d5e9e7b392a89df651c7d2be4ef7c Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:53:41 2018 +1100 Add unit tests for supported protocols Prevents future regressions like #25070. --- src/test/test_protover.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 686536211..d3d146256 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -8,6 +8,9 @@ #include "protover.h" +#include "or.h" +#include "connection_or.h" + static void test_protover_parse(void *arg) { @@ -250,6 +253,154 @@ test_protover_supports_version(void *arg) ; } +/* This could be MAX_PROTOCOLS_TO_EXPAND, but that's not exposed by protover */ +#define MAX_PROTOCOLS_TO_TEST 1024 + +/* LinkAuth and Relay protocol versions. + * Hard-coded here, because they are not in the code, or not exposed in the + * headers. */ +#define PROTOVER_LINKAUTH_V1 1 +#define PROTOVER_LINKAUTH_V3 3 + +#define PROTOVER_RELAY_V1 1 +#define PROTOVER_RELAY_V2 2 + +/* Highest supported HSv2 introduce protocol version. + * Hard-coded here, because it does not appear anywhere in the code. + * It's not clear if we actually support version 2, see #25068. */ +#define PROTOVER_HSINTRO_V2 3 + +/* HSv2 Rend and HSDir protocol versions. + * Hard-coded here, because they do not appear anywhere in the code. */ +#define PROTOVER_HS_RENDEZVOUS_POINT_V2 1 +#define PROTOVER_HSDIR_V2 1 + +/* DirCache, Desc, Microdesc, and Cons protocol versions. + * Hard-coded here, because they do not appear anywhere in the code. */ +#define PROTOVER_DIRCACHE_V1 1 +#define PROTOVER_DIRCACHE_V2 2 + +#define PROTOVER_DESC_V1 1 +#define PROTOVER_DESC_V2 2 + +#define PROTOVER_MICRODESC_V1 1 +#define PROTOVER_MICRODESC_V2 2 + +#define PROTOVER_CONS_V1 1 +#define PROTOVER_CONS_V2 2 + +/* Make sure we haven't forgotten any supported protocols */ +static void +test_protover_supported_protocols(void *arg) +{ + (void)arg; + + const char *supported_protocols = protover_get_supported_protocols(); + + /* Test for new Link in the code, that hasn't been added to supported + * protocols */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_LINK, + MAX_LINK_PROTO)); + for (uint16_t i = 0; i < MAX_PROTOCOLS_TO_TEST; i++) { + if (is_or_protocol_version_known(i)) { + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_LINK, + i)); + } + } + + /* Legacy LinkAuth does not appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_LINKAUTH, + PROTOVER_LINKAUTH_V1)); + /* Latest LinkAuth is not exposed in the headers. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_LINKAUTH, + PROTOVER_LINKAUTH_V3)); + /* Is there any way to test for new LinkAuth? */ + + /* Relay protovers do not appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_RELAY, + PROTOVER_RELAY_V1)); + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_RELAY, + PROTOVER_RELAY_V2)); + /* Is there any way to test for new Relay? */ + + /* We could test legacy HSIntro by calling rend_service_update_descriptor(), + * and checking the protocols field. But that's unlikely to change, so + * we just use a hard-coded value. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_HSINTRO, + PROTOVER_HSINTRO_V2)); + /* Test for HSv3 HSIntro */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_HSINTRO, + PROTOVER_HS_INTRO_V3)); + /* Is there any way to test for new HSIntro? */ + + /* Legacy HSRend does not appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_HSREND, + PROTOVER_HS_RENDEZVOUS_POINT_V2)); + /* Test for HSv3 HSRend */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_HSREND, + PROTOVER_HS_RENDEZVOUS_POINT_V3)); + /* Is there any way to test for new HSRend? */ + + /* Legacy HSDir does not appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_HSDIR, + PROTOVER_HSDIR_V2)); + /* Test for HSv3 HSDir */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_HSDIR, + PROTOVER_HSDIR_V3)); + /* Is there any way to test for new HSDir? */ + + /* No DirCache versions appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_DIRCACHE, + PROTOVER_DIRCACHE_V1)); + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_DIRCACHE, + PROTOVER_DIRCACHE_V2)); + /* Is there any way to test for new DirCache? */ + + /* No Desc versions appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_DESC, + PROTOVER_DESC_V1)); + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_DESC, + PROTOVER_DESC_V2)); + /* Is there any way to test for new Desc? */ + + /* No Microdesc versions appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_MICRODESC, + PROTOVER_MICRODESC_V1)); + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_MICRODESC, + PROTOVER_MICRODESC_V2)); + /* Is there any way to test for new Microdesc? */ + + /* No Cons versions appear anywhere in the code. */ + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_CONS, + PROTOVER_CONS_V1)); + tt_assert(protocol_list_supports_protocol(supported_protocols, + PRT_CONS, + PROTOVER_CONS_V2)); + /* Is there any way to test for new Cons? */ + + done: + ; +} + #define PV_TEST(name, flags) \ { #name, test_protover_ ##name, (flags), NULL, NULL } @@ -261,6 +412,7 @@ struct testcase_t protover_tests[] = { PV_TEST(list_supports_protocol_for_unsupported_returns_false, 0), PV_TEST(list_supports_protocol_returns_true, 0), PV_TEST(supports_version, 0), + PV_TEST(supported_protocols, 0), END_OF_TESTCASES };

1 0