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

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 8eb9aaf4f65affed0aa450028464a30ab06f74dd Merge: 347b38d6d db6902c23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 10a1969ca327c517e20aeefdc86f88c95322289d Merge: b68e636b3 1295044dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:25:57 2018 -0400 Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/release-0.3.3] Lift the list of default directory servers into their own file.
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Apr 6 03:58:16 2018 +0200 Lift the list of default directory servers into their own file. This patch lifts the list of default directory authorities from config.c into their own auth_dirs.inc file, which is then included in config.c using the C preprocessor. Patch by beastr0. See: https://bugs.torproject.org/24854 --- changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/changes/bug24854 b/changes/bug24854 new file mode 100644 index 000000000..64e10772e --- /dev/null +++ b/changes/bug24854 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move the list of default directory authorities to their own file for + inclusion using the C preprocessor. Closes ticket 24854. Patch by "beastr0". diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc new file mode 100644 index 000000000..58e6817c8 --- /dev/null +++ b/src/or/auth_dirs.inc @@ -0,0 +1,33 @@ +"moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", +"tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", +"dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", +"Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", +"gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "ipv6=[2001:638:a000:4140::ffff:189]:443 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", +"dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", +"maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", +"Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", +"longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", +"bastet orport=443 " + "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "ipv6=[2620:13:4000:6000::1000:118]:443 " + "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", diff --git a/src/or/config.c b/src/or/config.c index 3b4027433..75e406585 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -967,39 +967,7 @@ escaped_safe_str(const char *address) /** List of default directory authorities */ static const char *default_authorities[] = { - "moria1 orport=9101 " - "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " - "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", - "tor26 orport=443 " - "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " - "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " - "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", - "dizum orport=443 " - "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Bifroest orport=443 bridge " - "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", - "gabelmoo orport=443 " - "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "ipv6=[2001:638:a000:4140::ffff:189]:443 " - "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 " - "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " - "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "maatuska orport=80 " - "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "ipv6=[2001:67c:289c::9]:80 " - "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 " - "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 " - "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", - "bastet orport=443 " - "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " - "ipv6=[2620:13:4000:6000::1000:118]:443 " - "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", +#include "auth_dirs.inc" NULL }; diff --git a/src/or/include.am b/src/or/include.am index 5108a08e5..19cf00264 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -127,6 +127,7 @@ endif ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/buffers.h \ src/or/channel.h \ src/or/channeltls.h \

1 0

[tor/release-0.3.2] Lift the list of default directory servers into their own file.
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Apr 6 03:58:16 2018 +0200 Lift the list of default directory servers into their own file. This patch lifts the list of default directory authorities from config.c into their own auth_dirs.inc file, which is then included in config.c using the C preprocessor. Patch by beastr0. See: https://bugs.torproject.org/24854 --- changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/changes/bug24854 b/changes/bug24854 new file mode 100644 index 000000000..64e10772e --- /dev/null +++ b/changes/bug24854 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move the list of default directory authorities to their own file for + inclusion using the C preprocessor. Closes ticket 24854. Patch by "beastr0". diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc new file mode 100644 index 000000000..58e6817c8 --- /dev/null +++ b/src/or/auth_dirs.inc @@ -0,0 +1,33 @@ +"moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", +"tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", +"dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", +"Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", +"gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "ipv6=[2001:638:a000:4140::ffff:189]:443 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", +"dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", +"maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", +"Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", +"longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", +"bastet orport=443 " + "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "ipv6=[2620:13:4000:6000::1000:118]:443 " + "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", diff --git a/src/or/config.c b/src/or/config.c index 3b4027433..75e406585 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -967,39 +967,7 @@ escaped_safe_str(const char *address) /** List of default directory authorities */ static const char *default_authorities[] = { - "moria1 orport=9101 " - "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " - "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", - "tor26 orport=443 " - "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " - "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " - "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", - "dizum orport=443 " - "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Bifroest orport=443 bridge " - "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", - "gabelmoo orport=443 " - "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "ipv6=[2001:638:a000:4140::ffff:189]:443 " - "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 " - "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " - "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "maatuska orport=80 " - "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "ipv6=[2001:67c:289c::9]:80 " - "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 " - "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 " - "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", - "bastet orport=443 " - "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " - "ipv6=[2620:13:4000:6000::1000:118]:443 " - "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", +#include "auth_dirs.inc" NULL }; diff --git a/src/or/include.am b/src/or/include.am index 5108a08e5..19cf00264 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -127,6 +127,7 @@ endif ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/buffers.h \ src/or/channel.h \ src/or/channeltls.h \

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit a6f21a61d1a1893087c744935626a8dc75010385 Merge: bc250fcab d3ac47b41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 10a1969ca327c517e20aeefdc86f88c95322289d Merge: b68e636b3 1295044dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:25:57 2018 -0400 Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 10a1969ca327c517e20aeefdc86f88c95322289d Merge: b68e636b3 1295044dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:25:57 2018 -0400 Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 3230814d2ba0b213e1eba645a7a610fd28e31a11 Merge: f46777163 0b1a054d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[stem/master] Add is_hidden_service_dir to server descriptors
by atagar＠torproject.org 10 Apr '18

10 Apr '18

commit 906c998ab7eee705a33e738fc401dfde04cf882c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 10 09:36:58 2018 -0700 Add is_hidden_service_dir to server descriptors The hidden service directory version is obsolete, but the presence or lack of 'hidden-service-dir' lines are still meaningful... https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78 Adding a boolean attribute indicate if we have the flag. Noticed this thanks to our static checks, which informed me I buggered up my earlier change by ignoring the descriptor's data... STATIC CHECKS * /home/atagar/Desktop/stem/stem/descriptor/server_descriptor.py line 342 - local variable 'value' is assigned to but never used | value = _value('hidden-service-dir', entries) --- docs/change_log.rst | 1 + stem/descriptor/server_descriptor.py | 24 +++++++++++++----------- test/unit/descriptor/server_descriptor.py | 12 +++++++----- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index a67aae2d..b0773382 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -56,6 +56,7 @@ The following are only available within Stem's `git repository * `Fallback directory v2 support <https://lists.torproject.org/pipermail/tor-dev/2017-December/012721.html>`_, which adds *nickname* and *extrainfo* * Added zstd and lzma compression support (:spec:`1cb56af`) + * Added server descriptor's new is_hidden_service_dir attribute * Reduced maximum descriptors fetched by the remote module to match tor's new limit (:trac:`24743`) * Consensus **shared_randomness_*_reveal_count** attributes undocumented, and unavailable if retrieved before their corresponding shared_randomness_*_value attribute (:trac:`25046`) * Allow 'proto' line to have blank values (:spec:`a8455f4`) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 4f2bcbec..63a3d069 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -338,16 +338,6 @@ def _parse_hibernating_line(descriptor, entries): descriptor.hibernating = value == '1' -def _parse_hidden_service_dir_line(descriptor, entries): - value = _value('hidden-service-dir', entries) - - # TODO: Remove the following field in Stem 2.0. It has never been populated... - # - # https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78 - - descriptor.hidden_service_dir = ['2'] - - def _parse_uptime_line(descriptor, entries): # We need to be tolerant of negative uptimes to accommodate a past tor # bug... @@ -450,6 +440,7 @@ _parse_ipv6_policy_line = _parse_simple_line('ipv6-policy', 'exit_policy_v6', fu _parse_allow_single_hop_exits_line = _parse_if_present('allow-single-hop-exits', 'allow_single_hop_exits') _parse_tunneled_dir_server_line = _parse_if_present('tunnelled-dir-server', 'allow_tunneled_dir_requests') _parse_proto_line = _parse_protocol_line('proto', 'protocols') +_parse_hidden_service_dir_line = _parse_if_present('hidden-service-dir', 'is_hidden_service_dir') _parse_caches_extra_info_line = _parse_if_present('caches-extra-info', 'extra_info_cache') _parse_bridge_distribution_request_line = _parse_simple_line('bridge-distribution-request', 'bridge_distribution') _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: set(v.split(' '))) @@ -495,6 +486,8 @@ class ServerDescriptor(Descriptor): :var list link_protocols: link protocols supported by the relay :var list circuit_protocols: circuit protocols supported by the relay + :var bool is_hidden_service_dir: **\*** indicates if the relay serves hidden + service descriptors :var bool hibernating: **\*** hibernating when published :var bool allow_single_hop_exits: **\*** flag if single hop exiting is allowed :var bool allow_tunneled_dir_requests: **\*** flag if tunneled directory @@ -530,6 +523,9 @@ class ServerDescriptor(Descriptor): attributes. .. versionchanged:: 1.7.0 + Added the is_hidden_service_dir attribute. + + .. versionchanged:: 1.7.0 Deprecated the hidden_service_dir field, it's never been populated (:spec:`43c2f78`). This field will be removed in Stem 2.0. """ @@ -560,6 +556,7 @@ class ServerDescriptor(Descriptor): 'link_protocols': (None, _parse_protocols_line), 'circuit_protocols': (None, _parse_protocols_line), + 'is_hidden_service_dir': (False, _parse_hidden_service_dir_line), 'hibernating': (False, _parse_hibernating_line), 'allow_single_hop_exits': (False, _parse_allow_single_hop_exits_line), 'allow_tunneled_dir_requests': (False, _parse_tunneled_dir_server_line), @@ -567,7 +564,6 @@ class ServerDescriptor(Descriptor): 'extra_info_cache': (False, _parse_caches_extra_info_line), 'extra_info_digest': (None, _parse_extrainfo_digest_line), 'extra_info_sha256_digest': (None, _parse_extrainfo_digest_line), - 'hidden_service_dir': (None, _parse_hidden_service_dir_line), 'eventdns': (None, _parse_eventdns_line), 'ntor_onion_key': (None, _parse_ntor_onion_key_line), 'or_addresses': ([], _parse_or_address_line), @@ -638,6 +634,12 @@ class ServerDescriptor(Descriptor): entries, self._unparsed_exit_policy = _descriptor_components(stem.util.str_tools._to_unicode(raw_contents), validate, extra_keywords = ('accept', 'reject'), non_ascii_fields = ('contact', 'platform')) + # TODO: Remove the following field in Stem 2.0. It has never been populated... + # + # https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78 + + self.hidden_service_dir = ['2'] + if validate: self._parse(entries, validate) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index f392b44f..99d3c38e 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -134,13 +134,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(b'www.atagar.com/contact', desc.contact) self.assertEqual(['1', '2'], desc.link_protocols) self.assertEqual(['1'], desc.circuit_protocols) + self.assertEqual(True, desc.is_hidden_service_dir) self.assertEqual(False, desc.hibernating) self.assertEqual(False, desc.allow_single_hop_exits) self.assertEqual(False, desc.allow_tunneled_dir_requests) self.assertEqual(False, desc.extra_info_cache) self.assertEqual('D225B728768D7EA4B5587C13A7A9D22EBBEE6E66', desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) - self.assertEqual(['2'], desc.hidden_service_dir) self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(expected_family, desc.family) self.assertEqual(153600, desc.average_bandwidth) @@ -156,6 +156,8 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual([], desc.get_unrecognized_lines()) self.assertEqual('2C7B27BEAB04B4E2459D89CA6D5CD1CC5F95A689', desc.digest()) + self.assertEqual(['2'], desc.hidden_service_dir) # obsolete field + def test_metrics_descriptor_multiple(self): """ Parses and checks our results against a server descriptor from metrics. @@ -194,13 +196,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(None, desc.contact) self.assertEqual(None, desc.link_protocols) self.assertEqual(None, desc.circuit_protocols) + self.assertEqual(False, desc.is_hidden_service_dir) self.assertEqual(True, desc.hibernating) self.assertEqual(False, desc.allow_single_hop_exits) self.assertEqual(False, desc.allow_tunneled_dir_requests) self.assertEqual(False, desc.extra_info_cache) self.assertEqual(None, desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) - self.assertEqual(None, desc.hidden_service_dir) self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(set(), desc.family) self.assertEqual(102400, desc.average_bandwidth) @@ -243,13 +245,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(b'1024D/04D2E818 L\xc3\xa9na\xc3\xafc Huard <lenaic dot huard AT laposte dot net>', desc.contact) self.assertEqual(['1', '2'], desc.link_protocols) self.assertEqual(['1'], desc.circuit_protocols) + self.assertEqual(True, desc.is_hidden_service_dir) self.assertEqual(False, desc.hibernating) self.assertEqual(False, desc.allow_single_hop_exits) self.assertEqual(False, desc.allow_tunneled_dir_requests) self.assertEqual(False, desc.extra_info_cache) self.assertEqual('56403D838DE152421CD401B8E57DAD4483A3D56B', desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) - self.assertEqual(['2'], desc.hidden_service_dir) self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(set(), desc.family) self.assertEqual(102400, desc.average_bandwidth) @@ -389,13 +391,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(b'0x02225522 Frenn vun der Enn (FVDE) <info AT enn DOT lu>', desc.contact) self.assertEqual(['1', '2'], desc.link_protocols) self.assertEqual(['1'], desc.circuit_protocols) + self.assertEqual(True, desc.is_hidden_service_dir) self.assertEqual(False, desc.hibernating) self.assertEqual(False, desc.allow_single_hop_exits) self.assertEqual(False, desc.allow_tunneled_dir_requests) self.assertEqual(False, desc.extra_info_cache) self.assertEqual('44E9B679AF0B4EB09296985BAF4066AE9CA5BB93', desc.extra_info_digest) self.assertEqual('r+roMxhsjd1GPpn5knQoBvtE9Rhsv8zQHCqiYL6u2CA', desc.extra_info_sha256_digest) - self.assertEqual(['2'], desc.hidden_service_dir) self.assertEqual(family, desc.family) self.assertEqual(149715200, desc.average_bandwidth) self.assertEqual(1048576000, desc.burst_bandwidth) @@ -500,13 +502,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(None, desc.contact) self.assertEqual(['1', '2'], desc.link_protocols) self.assertEqual(['1'], desc.circuit_protocols) + self.assertEqual(False, desc.is_hidden_service_dir) self.assertEqual(False, desc.hibernating) self.assertEqual(False, desc.allow_single_hop_exits) self.assertEqual(False, desc.allow_tunneled_dir_requests) self.assertEqual(True, desc.extra_info_cache) self.assertEqual('BB1F13AA431421BEA29B840A2E33BB1C31C2990B', desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) - self.assertEqual(None, desc.hidden_service_dir) self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(set(), desc.family) self.assertEqual(3220480, desc.average_bandwidth)

1 0

[stem/master] Offline (i.e. not ONLINE) integ tests only wait for 0% bootstrapping (Fixes: #25757)
by atagar＠torproject.org 10 Apr '18

10 Apr '18

commit 16a5983581568dea6f32d43de78867d0796f2bb4 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Tue Apr 10 00:52:36 2018 +0000 Offline (i.e. not ONLINE) integ tests only wait for 0% bootstrapping (Fixes: #25757) Empirically, all not-ONLINE-target integ tests worked at 0% bootstrapping. Changing this value from 5% to 0% allows tests to run without any network access. --- test/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runner.py b/test/runner.py index 67d12dd7..bd3fe8a4 100644 --- a/test/runner.py +++ b/test/runner.py @@ -608,7 +608,7 @@ class Runner(object): self._tor_process = stem.process.launch_tor( tor_cmd = tor_cmd, torrc_path = os.path.join(self._test_dir, 'torrc'), - completion_percent = 100 if test.Target.ONLINE in self.attribute_targets else 5, + completion_percent = 100 if test.Target.ONLINE in self.attribute_targets else 0, init_msg_handler = lambda line: println(' %s' % line, SUBSTATUS), take_ownership = True, )

1 0