July 2015 - tor-commits - lists.torproject.org

[chutney/master] Add new networks for performance testing
by nickm＠torproject.org 15 Jul '15

15 Jul '15

commit bbc3ecbb76cd4fb6b762484ea58b2abe2b4a1c67 Author: teor <teor2345(a)gmail.com> Date: Mon Jul 6 16:23:54 2015 +1000 Add new networks for performance testing Each network has exits flagged with exit=1 --- networks/bridges+ipv6-min | 21 +++++++++++++++++++++ networks/bridges-min | 20 ++++++++++++++++++++ networks/hs-025 | 10 ++++++++++ networks/hs-100 | 12 ++++++++++++ networks/hs-100-clients | 13 +++++++++++++ networks/hs-min | 17 +++++++++++++++++ networks/ipv6-exit-min | 12 ++++++++++++ 7 files changed, 105 insertions(+) diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min new file mode 100644 index 0000000..4542f31 --- /dev/null +++ b/networks/bridges+ipv6-min @@ -0,0 +1,21 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") + +BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, + relay=1, torrc="bridgeauthority.tmpl") +BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", + torrc="bridge-v6.tmpl") +BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") + +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks +# (However, bridge clients use bridges instead of guards, so this +# is only an issue for the exit bootstrapping) + +# The minimum number of authorities/relays/exits is 3, the minimum path length +# But bridge networks with 3 relays don't bootstrap, so we use 4 +NODES = Authority.getN(1) + BridgeAuthority.getN(1) + ExitRelay.getN(1) + \ + BridgeIPv6.getN(1) + BridgeClient.getN(1) + +ConfigureNodes(NODES) diff --git a/networks/bridges-min b/networks/bridges-min new file mode 100644 index 0000000..ffa3194 --- /dev/null +++ b/networks/bridges-min @@ -0,0 +1,20 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") + +BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, + relay=1, torrc="bridgeauthority.tmpl") +Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") +BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") + +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks +# (However, bridge clients use bridges instead of guards, so this +# is only an issue for the exit bootstrapping) + +# The minimum number of authorities/relays/exits is 3, the minimum path length +# But bridge networks with 3 relays don't bootstrap, so we use 4 +NODES = Authority.getN(1) + BridgeAuthority.getN(1) + ExitRelay.getN(1) + \ + Bridge.getN(1) + BridgeClient.getN(1) + +ConfigureNodes(NODES) diff --git a/networks/hs-025 b/networks/hs-025 new file mode 100644 index 0000000..bb75ed1 --- /dev/null +++ b/networks/hs-025 @@ -0,0 +1,10 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") + +NODES = Authority.getN(4) + NonExitRelay.getN(10) + \ + Client.getN(6) + HS.getN(5) + +ConfigureNodes(NODES) diff --git a/networks/hs-100 b/networks/hs-100 new file mode 100644 index 0000000..a8401c9 --- /dev/null +++ b/networks/hs-100 @@ -0,0 +1,12 @@ +# WARNING: This network can bring down a low-specced machine + +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") + +NODES = Authority.getN(5) + NonExitRelay.getN(25) + \ + Client.getN(10) + HS.getN(60) + +ConfigureNodes(NODES) diff --git a/networks/hs-100-clients b/networks/hs-100-clients new file mode 100644 index 0000000..aecaf37 --- /dev/null +++ b/networks/hs-100-clients @@ -0,0 +1,13 @@ +# Each client sends to the hidden service simultaneously +# This requires the appropriate chutney arguments to make each client send data +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") + +# Well, 100 instances, with lots of clients +NODES = Authority.getN(3) + NonExitRelay.getN(10) + \ + Client.getN(86) + HS.getN(1) + +ConfigureNodes(NODES) diff --git a/networks/hs-min b/networks/hs-min new file mode 100644 index 0000000..e7b7403 --- /dev/null +++ b/networks/hs-min @@ -0,0 +1,17 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") +Client = Node(tag="c", torrc="client.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") + +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks + +# A hidden service needs 5 authorities/relays to ensure it can build HS +# connections: +# a minimum path length of 3, plus the client-nominated rendezvous point, +# plus a seperate introduction point +NODES = Authority.getN(3) + NonExitRelay.getN(2) + \ + Client.getN(1) + HS.getN(1) + +ConfigureNodes(NODES) diff --git a/networks/ipv6-exit-min b/networks/ipv6-exit-min new file mode 100644 index 0000000..70379cc --- /dev/null +++ b/networks/ipv6-exit-min @@ -0,0 +1,12 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +IPv6ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay-exit-v6-only.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks + +# The minimum number of authorities/relays/exits is 3, the minimum path length +NODES = Authority.getN(2) + IPv6ExitRelay.getN(1) + Client.getN(1) + +ConfigureNodes(NODES)

1 0

[chutney/master] Modify existing networks to flag each exit with exit=1
by nickm＠torproject.org 15 Jul '15

15 Jul '15

commit dd201bf68ff0e728484e027bc30968712b66043b Author: teor <teor2345(a)gmail.com> Date: Mon Jul 6 16:22:09 2015 +1000 Modify existing networks to flag each exit with exit=1 Also perform minor clean-up in some files. This is required for the performance testing changes. --- networks/basic | 8 +++++--- networks/basic-025 | 5 +++-- networks/basic-100 | 7 +++++-- networks/basic-min | 12 +++++++----- networks/bridges | 8 +++++--- networks/bridges+ipv6 | 10 ++++++---- networks/bridges+ipv6+hs | 12 +++++++----- networks/hs | 11 +++++++---- networks/middle | 12 ++++++++---- networks/middle-025 | 9 ++++++--- networks/middle-100 | 11 ++++++++--- networks/mixed | 17 ++++++++++------- 12 files changed, 77 insertions(+), 45 deletions(-) diff --git a/networks/basic b/networks/basic index e0213c4..f3f94de 100644 --- a/networks/basic +++ b/networks/basic @@ -1,8 +1,10 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -NODES = Authority.getN(3) + Relay.getN(5) + Client.getN(2) +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +NODES = Authority.getN(3) + ExitRelay.getN(5) + Client.getN(2) ConfigureNodes(NODES) diff --git a/networks/basic-025 b/networks/basic-025 index 103224b..d57bcb8 100644 --- a/networks/basic-025 +++ b/networks/basic-025 @@ -1,7 +1,8 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -NODES = Authority.getN(4) + Relay.getN(16) + Client.getN(5) +NODES = Authority.getN(4) + ExitRelay.getN(16) + Client.getN(5) ConfigureNodes(NODES) diff --git a/networks/basic-100 b/networks/basic-100 index 561c4c4..1b181eb 100644 --- a/networks/basic-100 +++ b/networks/basic-100 @@ -1,7 +1,10 @@ +# WARNING: This network can bring down a low-specced machine + +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -NODES = Authority.getN(5) + Relay.getN(35) + Client.getN(60) +NODES = Authority.getN(5) + ExitRelay.getN(35) + Client.getN(60) ConfigureNodes(NODES) diff --git a/networks/basic-min b/networks/basic-min index 0ee148f..48cf1cf 100644 --- a/networks/basic-min +++ b/networks/basic-min @@ -1,10 +1,12 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -# Since basic-min only has 4, at least 1 of these should still get the flag, -# Otherwise, TestingDirAuthVoteGuard * may need to be used -NODES = Authority.getN(3) + Relay.getN(1) + Client.getN(1) +# Since only 25% of relays get the guard flag, +# TestingDirAuthVoteGuard * may need to be used in small networks + +# The minimum number of authorities/relays/exits is 3, the minimum path length +NODES = Authority.getN(2) + ExitRelay.getN(1) + Client.getN(1) ConfigureNodes(NODES) diff --git a/networks/bridges b/networks/bridges index e6e68d0..8b28eef 100644 --- a/networks/bridges +++ b/networks/bridges @@ -1,5 +1,6 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, @@ -7,8 +8,9 @@ BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + Relay.getN(4) + \ +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 53a1a99..796a7be 100644 --- a/networks/bridges+ipv6 +++ b/networks/bridges+ipv6 @@ -1,5 +1,6 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, @@ -8,12 +9,13 @@ Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 -# TODO: create test for IPv6 only +# bridges+ipv6-min only has IPv6 bridges NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - Relay.getN(4) + \ + ExitRelay.getN(4) + \ BridgeIPv6.getN(1) + Bridge.getN(1) + \ Client.getN(1) + BridgeClient.getN(1) diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs index 5723417..39caee4 100644 --- a/networks/bridges+ipv6+hs +++ b/networks/bridges+ipv6+hs @@ -1,5 +1,6 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, @@ -9,13 +10,14 @@ BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge- BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -# We need 6 (or 7?) authorities/relays/exits to ensure we can build HS connections +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +# We need 5 authorities/relays/exits to ensure we can build HS connections # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 -# TODO: create test for IPv6 only +# bridges+ipv6-min only has IPv6 bridges NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - Relay.getN(4) + \ + ExitRelay.getN(4) + \ BridgeIPv6.getN(1) + Bridge.getN(1) + \ Client.getN(1) + BridgeClient.getN(1) + \ HS.getN(1) diff --git a/networks/hs b/networks/hs index a92fa60..3776ed9 100644 --- a/networks/hs +++ b/networks/hs @@ -1,10 +1,13 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -# We need 6 (or 7?) authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(3) + Relay.getN(4) + Client.getN(1) + HS.getN(1) +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +# We need 5 authorities/relays/exits to ensure we can build HS connections +NODES = Authority.getN(3) + ExitRelay.getN(5) + \ + Client.getN(1) + HS.getN(1) ConfigureNodes(NODES) diff --git a/networks/middle b/networks/middle index 431a10a..9fbdf98 100644 --- a/networks/middle +++ b/networks/middle @@ -1,9 +1,13 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -NODES = Authority.getN(3) + Middle.getN(2) + Relay.getN(3) + Client.getN(2) +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +NODES = Authority.getN(3) + \ + NonExitRelay.getN(2) + ExitRelay.getN(3) + \ + Client.getN(2) ConfigureNodes(NODES) diff --git a/networks/middle-025 b/networks/middle-025 index 7687b8c..a3d11e3 100644 --- a/networks/middle-025 +++ b/networks/middle-025 @@ -1,8 +1,11 @@ +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -NODES = Authority.getN(4) + Middle.getN(10) + Relay.getN(6) + Client.getN(5) +NODES = Authority.getN(4) + \ + NonExitRelay.getN(10) + ExitRelay.getN(6) + \ + Client.getN(5) ConfigureNodes(NODES) diff --git a/networks/middle-100 b/networks/middle-100 index d67702c..72f5689 100644 --- a/networks/middle-100 +++ b/networks/middle-100 @@ -1,8 +1,13 @@ +# WARNING: This network can bring down a low-specced machine + +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -NODES = Authority.getN(5) + Middle.getN(25) + Relay.getN(10) + Client.getN(60) +NODES = Authority.getN(5) + \ + NonExitRelay.getN(25) + ExitRelay.getN(10) + \ + Client.getN(60) ConfigureNodes(NODES) diff --git a/networks/mixed b/networks/mixed index ae516a8..38e0d4e 100644 --- a/networks/mixed +++ b/networks/mixed @@ -1,15 +1,18 @@ OLD_TOR="tor-stable" - +# By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -Relay = Node(tag="r", relay=1, torrc="relay.tmpl") -OldRelay = Node(tag="rOLD", relay=1, torrc="relay.tmpl", tor=OLD_TOR) + tor=OLD_TOR) +Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", + tor=OLD_TOR) Client = Node(tag="c", torrc="client.tmpl") OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR) -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag in 0.2.6 -NODES = (Authority.getN(2) + OldAuthority.getN(2) + OldRelay.getN(2) + - Relay.getN(2) + Client.getN(2) + OldClient.getN(2)) +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +NODES = Authority.getN(2) + OldAuthority.getN(2) + \ + Relay.getN(2) + OldRelay.getN(2) + \ + Client.getN(2) + OldClient.getN(2) ConfigureNodes(NODES)

1 0

[tor/master] Vote for relays to be fast and stable even when they aren't currently active.
by nickm＠torproject.org 15 Jul '15

15 Jul '15

commit fa788a54f53efd41f160f814d538ff08d134fe96 Author: Peter Retzlaff <pe.retzlaff(a)gmail.com> Date: Sun May 3 19:38:13 2015 +0200 Vote for relays to be fast and stable even when they aren't currently active. --- src/or/dirserv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ed38ba2..8ad8bfe 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2143,10 +2143,8 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, /* Already set by compute_performance_thresholds. */ rs->is_exit = node->is_exit; rs->is_stable = node->is_stable = - router_is_active(ri, node, now) && !dirserv_thinks_router_is_unreliable(now, ri, 1, 0); rs->is_fast = node->is_fast = - router_is_active(ri, node, now) && !dirserv_thinks_router_is_unreliable(now, ri, 0, 1); rs->is_flagged_running = node->is_running; /* computed above */

1 0

[tor/master] Add changes file for 8712; apply it to HSDir flag as well.
by nickm＠torproject.org 15 Jul '15

15 Jul '15

commit a65e835800b1af2c2a4c215b0c8ab282e14105b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 14 14:03:30 2015 -0400 Add changes file for 8712; apply it to HSDir flag as well. --- changes/8712 | 6 ++++++ src/or/dirserv.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/8712 b/changes/8712 new file mode 100644 index 0000000..c7423e8 --- /dev/null +++ b/changes/8712 @@ -0,0 +1,6 @@ + o Minor features (directory authorities): + - Directory authorities no longer vote against the "Fast", + "Stable", and "HSDir" flags just because they were going to vote + against "Running": if the consensus turns out to be that the + router was running, then the authority's vote should count. + Patch from Peter Retzlaff; closes issue 8712. \ No newline at end of file diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8ad8bfe..71be626 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1372,8 +1372,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, return (router->wants_to_be_hs_dir && router->dir_port && node->is_stable && - uptime >= get_options()->MinUptimeHidServDirectoryV2 && - router_is_active(router, node, now)); + uptime >= get_options()->MinUptimeHidServDirectoryV2); } /** Don't consider routers with less bandwidth than this when computing

1 0

[tor/master] Remove empty rend_service_validate_intro_early function
by nickm＠torproject.org 15 Jul '15

15 Jul '15

commit e03eaa3c4a4b3208b319aadfb125aa1e606adaec Author: John Brooks <john.brooks(a)dereferenced.net> Date: Tue Jul 14 02:28:25 2015 -0400 Remove empty rend_service_validate_intro_early function --- src/or/rendservice.c | 42 ------------------------------------------ src/or/rendservice.h | 2 -- 2 files changed, 44 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6c5ca49..74e8a8d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1538,17 +1538,6 @@ rend_service_receive_introduction(origin_circuit_t *circuit, tor_free(err_msg); } - stage_descr = "early validation"; - /* Early validation of pk/ciphertext part */ - result = rend_service_validate_intro_early(parsed_req, &err_msg); - if (result < 0) { - goto log_error; - } else if (err_msg) { - log_info(LD_REND, "%s on circ %u.", err_msg, - (unsigned)circuit->base_.n_circ_id); - tor_free(err_msg); - } - /* make sure service replay caches are present */ if (!service->accepted_intro_dh_parts) { service->accepted_intro_dh_parts = @@ -2515,37 +2504,6 @@ rend_service_parse_intro_plaintext( return status; } -/** Do validity checks on a parsed intro cell before decryption; some of - * these are not done in rend_service_begin_parse_intro() itself because - * they depend on a lot of other state and would make it hard to unit test. - * Returns >= 0 if successful or < 0 if the intro cell is invalid, and - * optionally writes out an error message for logging. If an err_msg - * pointer is provided, it is the caller's responsibility to free any - * provided message. - */ - -int -rend_service_validate_intro_early(const rend_intro_cell_t *intro, - char **err_msg_out) -{ - int status = 0; - - if (!intro) { - if (err_msg_out) - *err_msg_out = - tor_strdup("NULL intro cell passed to " - "rend_service_validate_intro_early()"); - - status = -1; - goto err; - } - - /* TODO */ - - err: - return status; -} - /** Do validity checks on a parsed intro cell after decryption; some of * these are not done in rend_service_parse_intro_plaintext() itself because * they depend on a lot of other state and would make it hard to unit test. diff --git a/src/or/rendservice.h b/src/or/rendservice.h index 37d9da4..a16a99c 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -93,8 +93,6 @@ rend_intro_cell_t * rend_service_begin_parse_intro(const uint8_t *request, char **err_msg_out); int rend_service_parse_intro_plaintext(rend_intro_cell_t *intro, char **err_msg_out); -int rend_service_validate_intro_early(const rend_intro_cell_t *intro, - char **err_msg_out); int rend_service_validate_intro_late(const rend_intro_cell_t *intro, char **err_msg_out); void rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc);

1 0

[tor/master] Rename ambiguous introduction point functions
by nickm＠torproject.org 15 Jul '15

15 Jul '15

commit cdc5debfde33d196be84863818d7dbaceab2a829 Author: John Brooks <john.brooks(a)dereferenced.net> Date: Tue Jul 14 02:22:23 2015 -0400 Rename ambiguous introduction point functions Task #15824 --- src/or/circuituse.c | 2 +- src/or/rendcommon.c | 2 +- src/or/rendservice.c | 7 ++++--- src/or/rendservice.h | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 572a4f3..05e6736 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1128,7 +1128,7 @@ circuit_build_needed_circs(time_t now) /* make sure any hidden services have enough intro points * HS intro point streams only require an internal circuit */ if (router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) - rend_services_introduce(); + rend_consider_services_intro_points(); circuit_expire_old_circs_as_needed(now); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 411a87c..22599e9 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -787,7 +787,7 @@ rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, break; case RELAY_COMMAND_INTRODUCE2: if (origin_circ) - r = rend_service_introduce(origin_circ,payload,length); + r = rend_service_receive_introduction(origin_circ,payload,length); break; case RELAY_COMMAND_INTRODUCE_ACK: if (origin_circ) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index f4fb860..6c5ca49 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1437,8 +1437,9 @@ rend_check_authorization(rend_service_t *service, * rendezvous point. */ int -rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, - size_t request_len) +rend_service_receive_introduction(origin_circuit_t *circuit, + const uint8_t *request, + size_t request_len) { /* Global status stuff */ int status = 0, result; @@ -3523,7 +3524,7 @@ rend_service_desc_has_uploaded(const rend_data_t *rend_data) * This is called once a second by the main loop. */ void -rend_services_introduce(void) +rend_consider_services_intro_points(void) { int i; time_t now; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index 35a0bb2..37d9da4 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -70,7 +70,7 @@ int rend_config_services(const or_options_t *options, int validate_only); int rend_service_load_all_keys(void); void rend_services_add_filenames_to_lists(smartlist_t *open_lst, smartlist_t *stat_lst); -void rend_services_introduce(void); +void rend_consider_services_intro_points(void); void rend_consider_services_upload(time_t now); void rend_hsdir_routers_changed(void); void rend_consider_descriptor_republication(void); @@ -80,8 +80,9 @@ int rend_service_intro_established(origin_circuit_t *circuit, const uint8_t *request, size_t request_len); void rend_service_rendezvous_has_opened(origin_circuit_t *circuit); -int rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, - size_t request_len); +int rend_service_receive_introduction(origin_circuit_t *circuit, + const uint8_t *request, + size_t request_len); int rend_service_decrypt_intro(rend_intro_cell_t *request, crypto_pk_t *key, char **err_msg_out);

1 0

[webwml/master] Adjust ExitMap links
by atagar＠torproject.org 15 Jul '15

15 Jul '15

commit 43dd82498bb98bad3d1674b89e0ef897a5bb3f16 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 14 10:02:08 2015 -0700 Adjust ExitMap links Revising the links as per phw's request. First turned out to just be a copy of its readme, and second should point to the PETS paper rather than the tech report. --- getinvolved/en/volunteer.wml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 543d5aa..1de19c9 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -698,10 +698,9 @@ meetings around the world.</li> href="https://github.com/NullHypothesis/exitmap/issues">bug tracker</a>)</h3> <p> - <a href="http://n0where.net/tor-exit-relay-scanner-exitmap/">Scanner for - the Tor network</a> by Philipp Winter to detect malicious and misconfigured - exits. For more information about how it works see his <a - href="http://www.cs.kau.se/philwint/spoiled_onions/techreport.pdf">Spoiled + Scanner for the Tor network by Philipp Winter to detect malicious and + misconfigured exits. For more information about how it works see his <a + href="http://www.cs.kau.se/philwint/spoiled_onions/pets2014.pdf">Spoiled Onions</a> research paper. </p>

1 0

[webwml/master] Add ExitMap to the volunteer page
by atagar＠torproject.org 15 Jul '15

15 Jul '15

commit de3beaa5b5462e014e8f5551ddb5481ac4f79925 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 14 09:23:41 2015 -0700 Add ExitMap to the volunteer page ExitMap is still under highly active development and catching bad relays. High time we add it to the volunteer page... https://trac.torproject.org/projects/tor/ticket/16575 --- getinvolved/en/volunteer.wml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index a3600c7..12bf44a 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -293,6 +293,14 @@ meetings around the world.</li> </tr> <tr> + <td><a href="#project-exitmap">ExitMap</a></td> + <td>Backend Service</td> + <td>Python</td> + <td>Moderate</td> + <td>phw</td> + </tr> + + <tr> <td><a href="#project-doctor">DocTor</a></td> <td>Backend Service</td> <td>Python</td> @@ -666,6 +674,19 @@ meetings around the world.</li> running Tor relays and bridges. </p> + <a id="project-exitmap"></a> + <h3><a href="http://www.cs.kau.se/philwint/spoiled_onions/">ExitMap</a> (<a + href="https://github.com/NullHypothesis/exitmap">code</a>, <a + href="https://github.com/NullHypothesis/exitmap/issues">bug tracker</a>)</h3> + + <p> + <a href="http://n0where.net/tor-exit-relay-scanner-exitmap/">Scanner for + the Tor network</a> by Philipp Winter to detect malicious and misconfigured + exits. For more information about how it works see his <a + href="http://www.cs.kau.se/philwint/spoiled_onions/techreport.pdf">Spoiled + Onions</a> research paper. + </p> + <a id="project-doctor"></a> <h3>DocTor (<a href="https://gitweb.torproject.org/doctor.git">code</a>, <a

1 0

[webwml/master] Add Chutney to the volunteer page
by atagar＠torproject.org 15 Jul '15

15 Jul '15

commit 524c17b8d4e5b0e06cc80b552f3bb93d0c885002 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 14 09:32:02 2015 -0700 Add Chutney to the volunteer page By contrast with ExitMap I'm a tad less sold on Chutney, but we'll see where it goes. Nick put quite a bit of work into it in 2014, but not much since then. As I understand it Chutney is due for an overhaul to move from 'tool for Nick' to a more generally useful component. Maybe I'm wrong. If it gets more development attention then great, but if not I might drop it back off the page later. --- getinvolved/en/volunteer.wml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 12bf44a..543d5aa 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -229,6 +229,14 @@ meetings around the world.</li> </tr> <tr> + <td><a href="#project-chutney">Chutney</a></td> + <td>Simulator</td> + <td>Python</td> + <td>Light</td> + <td>nickm</td> + </tr> + + <tr> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -549,6 +557,16 @@ meetings around the world.</li> address-based blocking. </p> + <a id="project-chutney"></a> + <h3>Chutney (<a href="https://gitweb.torproject.org/chutney.git">code</a>, + <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + tracker</a>)</h3> + + <p> + Integration test suite that spawns a local tor network, checking the + interactions of its components. + </p> + <a id="project-shadow"></a> <h3><a href="https://shadow.cs.umn.edu/">Shadow</a> (<a href="https://github.com/shadow">code</a>, <a

1 0

[metrics-tasks/master] Make more tweaks for asn (#15513).
by karsten＠torproject.org 15 Jul '15

15 Jul '15

commit 2e5278add61496bf001e74adb906a9335927997c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 14 18:12:20 2015 +0200 Make more tweaks for asn (#15513). --- task-15513/plot.R | 53 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/task-15513/plot.R b/task-15513/plot.R index 078c791..24bce64 100644 --- a/task-15513/plot.R +++ b/task-15513/plot.R @@ -8,8 +8,9 @@ ggplot(l, aes(x = lifetime_millis / 3600000, colour = service)) + scale_x_continuous("\nLifetime in hours", limits = c(0, max(l$lifetime_millis) / 3600000)) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service", guide = FALSE) + - ggtitle("(a) Lifetime of introduction points\n") + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle("Lifetime of introduction points\n") +ggsave("lifetimes-2015-07-14-a.png", width = 8, height = 5, dpi = 100) l <- read.csv("published-descs.csv") ggplot(l, aes(x = descs, colour = service)) + @@ -17,9 +18,10 @@ ggplot(l, aes(x = descs, colour = service)) + scale_x_continuous("\nNumber of descriptors", limits = c(0, max(l$descs))) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service", guide = FALSE) + - ggtitle(paste("(b) Number of descriptors published per hour,\n", + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle(paste("Number of descriptors published per hour,\n", "including descriptor replicas\n", sep = "")) +ggsave("lifetimes-2015-07-14-b.png", width = 8, height = 5, dpi = 100) l <- read.csv("established-intros.csv") ggplot(l, aes(x = intros, colour = service)) + @@ -27,8 +29,9 @@ ggplot(l, aes(x = intros, colour = service)) + scale_x_continuous("\nNumber of introduction points", limits = c(0, max(l$intros))) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service", guide = FALSE) + - ggtitle("(c) Number of distinct introduction points used per hour\n") + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle("Number of distinct introduction points used per hour\n") +ggsave("lifetimes-2015-07-14-c.png", width = 8, height = 5, dpi = 100) l <- read.csv("intros-per-desc.csv") ggplot(l, aes(x = introsperdesc, colour = service)) + @@ -37,8 +40,9 @@ ggplot(l, aes(x = introsperdesc, colour = service)) + limits = c(0, max(l$introsperdesc)), breaks = seq(0, max(l$introsperdesc), 2)) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service", guide = FALSE) + - ggtitle("(d) Number of introduction points per descriptor\n") + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle("Number of introduction points per descriptor\n") +ggsave("lifetimes-2015-07-14-d.png", width = 8, height = 5, dpi = 100) l <- read.csv("intros-per-relay.csv") data <- rbind( @@ -64,9 +68,10 @@ ggplot(data) + limits = c(0, max(data$x))) + scale_y_continuous(paste("Cumulative number of relays used for", "introduction points\n")) + - scale_colour_hue("Service", guide = FALSE) + - ggtitle(paste("(e) Number of introduction points established on\nthe", + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle(paste("Number of introduction points established on\nthe", "same relay (in the measurement period)\n")) +ggsave("lifetimes-2015-07-14-e.png", width = 8, height = 5, dpi = 100) data <- data[as.character(data$colour) != "agorahooawayyfoe", ] ggplot(data) + @@ -75,24 +80,31 @@ ggplot(data) + limits = c(0, max(data$x, na.rm = TRUE))) + scale_y_continuous(paste("Cumulative number of relays used for", "introduction points\n")) + - scale_colour_hue("Service", guide = FALSE) + - ggtitle(paste("(f) Number of introduction points established on\nthe", + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle(paste("Number of introduction points established on\nthe", "same relay (in the measurement period)\n")) +ggsave("lifetimes-2015-07-14-f.png", width = 8, height = 5, dpi = 100) l <- read.csv("intros-per-desc.csv") +l <- data.frame(l, + scrubbed = ifelse(l$service == "4cjw6cwpeaeppfqz", "a", + ifelse(l$service == "agorahooawayyfoe", "b", + ifelse(l$service == "facebookcorewwwi", "c", + ifelse(l$service == "kpvz7kpmcmne52qf", "d", + ifelse(l$service == "msydqstlz2kzerdg", "e", + "f")))))) l <- aggregate(list(introsperdesc = l$introsperdesc), by = list( publication = (l$publication %/% (1 * 3600 * 1000)) * (1 * 3600), - service = l$service), FUN = max) + scrubbed = l$scrubbed), FUN = max) ggplot(l, aes(x = as.POSIXct(publication, - origin = "1970-01-01 00:00:00"), y = introsperdesc, fill = service)) + + origin = "1970-01-01 00:00:00"), y = introsperdesc, fill = scrubbed)) + geom_area() + scale_fill_hue("", guide = "none") + - facet_grid(service ~ .) + + facet_grid(scrubbed ~ .) + scale_x_datetime("") + scale_y_continuous("") + - ggtitle("(g) Number of introduction points over time\n") + - theme(strip.background = element_blank(), - strip.text.y = element_blank()) + ggtitle("Number of introduction points over time\n") +ggsave("lifetimes-2015-07-14-g.png", width = 8, height = 5, dpi = 100) l <- read.csv("novel-introduction-points.csv") ggplot(l, aes( @@ -101,7 +113,8 @@ ggplot(l, aes( geom_line() + scale_x_datetime("") + scale_y_continuous("Cumulative number of relays\n") + - scale_colour_hue("Service", guide = FALSE) + - ggtitle(paste("(h) Cumulative number of distinct relays\nused for", + scale_colour_hue("Service", labels = c("a", "b", "c", "d", "e", "f")) + + ggtitle(paste("Cumulative number of distinct relays\nused for", "establishing introduction points\n")) +ggsave("lifetimes-2015-07-14-h.png", width = 8, height = 5, dpi = 100)

1 0