tor-commits August 2018

tor-commits@lists.torproject.org

17 participants
2581 discussions

[tor/master] rust/protover: fix ProtoEntry::from_str docs
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 7bb658a63371df07f04054931606e6145a3816f6 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Aug 7 14:35:17 2018 +0000 rust/protover: fix ProtoEntry::from_str docs Texxt was copied from a function that returned a single tuple in 88b2f170e451567a3b0095a420544a675a5826b0. --- src/rust/protover/protover.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 933defa70..ad1fd446e 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -206,9 +206,7 @@ impl FromStr for ProtoEntry { /// /// # Returns /// - /// A `Result` whose `Ok` value is a `ProtoEntry`, where the - /// first element is the subprotocol type (see `protover::Protocol`) and the last - /// element is an ordered set of `(low, high)` unique version numbers which are supported. + /// A `Result` whose `Ok` value is a `ProtoEntry`. /// Otherwise, the `Err` value of this `Result` is a `ProtoverError`. fn from_str(protocol_entry: &str) -> Result<ProtoEntry, ProtoverError> { let mut proto_entry: ProtoEntry = ProtoEntry::default();

1 0

[tor/master] Merge remote-tracking branch 'onionk/rust-docs1'
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 042aed3f1d3c0da10cce451f103735036407aa53 Merge: 64d9ea141 fc7fed615 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:07:06 2018 -0400 Merge remote-tracking branch 'onionk/rust-docs1' src/rust/protover/protover.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/master] rust/protover: fix parsing docs
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit e65a4fa42cdb3a2a0419e6178e1c141c98b28088 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Aug 7 14:52:16 2018 +0000 rust/protover: fix parsing docs The function takes an already validated utf-8 string, and it never checks if the version numbers are an empty string. That parse error happens later. Fix on 701c2b69f52cb4db46aa7455904e518b35fafc1a --- src/rust/protover/protover.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index ad1fd446e..f8e64c822 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -452,8 +452,9 @@ impl UnvalidatedProtoEntry { /// following are true: /// /// * If a protocol name is an empty string, e.g. `"Cons=1,3 =3-5"`. - /// * If a protocol name cannot be parsed as utf-8. - /// * If the version numbers are an empty string, e.g. `"Cons="`. + /// * If an entry has no equals sign, e.g. `"Cons=1,3 Desc"`. + /// * If there is leading or trailing whitespace, e.g. `" Cons=1,3 Link=3"`. + /// * If there is any other extra whitespice, e.g. `"Cons=1,3 Link=3"`. fn parse_protocol_and_version_str<'a>( protocol_string: &'a str, ) -> Result<Vec<(&'a str, &'a str)>, ProtoverError> {

1 0

[tor/master] In addrs_in_same_network_family(), choose IP subnet size based on IP type
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 64d9ea1413e541eec36f927494fa296eb368dfaa Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Aug 16 08:19:52 2018 -0400 In addrs_in_same_network_family(), choose IP subnet size based on IP type --- changes/bug15518 | 6 ++++++ src/feature/nodelist/nodelist.c | 10 +++++++++- src/test/test_address.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/changes/bug15518 b/changes/bug15518 new file mode 100644 index 000000000..13ed4f527 --- /dev/null +++ b/changes/bug15518 @@ -0,0 +1,6 @@ + o Minor bugfixes (ipv6): + - In addrs_in_same_network_family(), we choose the subnet size based + on the IP version (IPv4 or IPv6). Previously, we chose a fixed subnet + size of /16 for both IPv4 and IPv6 addresses. Fixes bug 15518; bugfix + on 0.3.5.1-alpha. Patch by Neel Chauhan. + diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 03122ba0f..75a08fe75 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1792,7 +1792,15 @@ int addrs_in_same_network_family(const tor_addr_t *a1, const tor_addr_t *a2) { - return 0 == tor_addr_compare_masked(a1, a2, 16, CMP_SEMANTIC); + switch (tor_addr_family(a1)) { + case AF_INET: + return 0 == tor_addr_compare_masked(a1, a2, 16, CMP_SEMANTIC); + case AF_INET6: + return 0 == tor_addr_compare_masked(a1, a2, 32, CMP_SEMANTIC); + default: + /* If not IPv4 or IPv6, return 0. */ + return 0; + } } /** Return true if <b>node</b>'s nickname matches <b>nickname</b> diff --git a/src/test/test_address.c b/src/test/test_address.c index abe7c2c0a..7e2ccc1b5 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -24,6 +24,8 @@ #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ #include "core/or/or.h" +#include "feature/nodelist/nodelist.h" +#include "lib/net/address.h" #include "lib/net/address.h" #include "test/test.h" #include "test/log_test_helpers.h" @@ -1139,6 +1141,36 @@ test_address_tor_addr_eq_ipv4h(void *ignored) tor_free(a); } +static void +test_address_tor_addr_in_same_network_family(void *ignored) +{ + (void)ignored; + tor_addr_t a, b; + + tor_addr_parse(&a, "8.8.8.8"); + tor_addr_parse(&b, "8.8.4.4"); + tt_int_op(addrs_in_same_network_family(&a, &b), OP_EQ, 1); + + tor_addr_parse(&a, "8.8.8.8"); + tor_addr_parse(&b, "1.1.1.1"); + tt_int_op(addrs_in_same_network_family(&a, &b), OP_EQ, 0); + + tor_addr_parse(&a, "8.8.8.8"); + tor_addr_parse(&b, "2001:4860:4860::8844"); + tt_int_op(addrs_in_same_network_family(&a, &b), OP_EQ, 0); + + tor_addr_parse(&a, "2001:4860:4860::8888"); + tor_addr_parse(&b, "2001:4860:4860::8844"); + tt_int_op(addrs_in_same_network_family(&a, &b), OP_EQ, 1); + + tor_addr_parse(&a, "2001:4860:4860::8888"); + tor_addr_parse(&b, "2001:470:20::2"); + tt_int_op(addrs_in_same_network_family(&a, &b), OP_EQ, 0); + + done: + return; +} + #define ADDRESS_TEST(name, flags) \ { #name, test_address_ ## name, flags, NULL, NULL } @@ -1170,6 +1202,7 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_to_ipv4n, 0), ADDRESS_TEST(tor_addr_to_mapped_ipv4h, 0), ADDRESS_TEST(tor_addr_eq_ipv4h, 0), + ADDRESS_TEST(tor_addr_in_same_network_family, 0), END_OF_TESTCASES };

1 0

[onionoo/master] Bump version to 6.2-1.17.1-dev.
by karsten＠torproject.org 17 Aug '18

17 Aug '18

commit ed0097f274a8fb98df71c1d7e0bfe8f069e80b1a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 17 14:31:50 2018 +0200 Bump version to 6.2-1.17.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 41b64e8..0bb3019 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="6.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.17.1"/> + value="${onionoo.protocol.version}-1.17.1-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Improves AS number parameter parsing
by karsten＠torproject.org 17 Aug '18

17 Aug '18

commit 405faa26c694f0d3c323357f0b3d501a3edd0b7d Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Fri Aug 17 08:55:04 2018 +0100 Improves AS number parameter parsing * AS0 is an allowed value. This is used for unknown AS numbers. * Leading zeros are stripped from the AS number. * If an AS number is larger than the maximum possible (in 32-bits) then this will be treated as an error. * Tests are increased to cover additional cases. Fixes: #27163 --- CHANGELOG.md | 7 +++++ .../torproject/onionoo/server/ResourceServlet.java | 12 ++++++-- .../onionoo/server/ResourceServletTest.java | 36 +++++++++++++++++++++- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84c6dd8..0ce49b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 6.2-1.17.1 - 2018-08-?? + + * Minor changes + - Parsing of the "as" parameter allows AS0 to be specified. It will now + strip leading zeros. Specifying an AS number larger than the maximum + possible with 32-bits will be treated as an error. + # Changes in version 6.2-1.17.0 - 2018-08-16 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 15087de..afcb867 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -502,7 +502,7 @@ public class ResourceServlet extends HttpServlet { } private static Pattern asNumberParameterPattern = - Pattern.compile("((^|,)([aA][sS])?[1-9][0-9]{0,9})+$"); + Pattern.compile("((^|,)([aA][sS])?0*[0-9]{1,10})+$"); private String[] parseAsNumberParameter(String parameter) { if (!asNumberParameterPattern.matcher(parameter).matches()) { @@ -512,8 +512,14 @@ public class ResourceServlet extends HttpServlet { String[] parameterParts = parameter.toUpperCase().split(","); String[] parsedParameter = new String[parameterParts.length]; for (int i = 0; i < parameterParts.length; i++) { - parsedParameter[i] = (!parameterParts[i].startsWith("AS") ? "AS" : "") - + parameterParts[i]; + boolean asPrefix = parameterParts[i].startsWith("AS"); + Long asNumber = Long.parseLong(asPrefix + ? parameterParts[i].substring(2) : parameterParts[i]); + if (asNumber > 4294967295L) { + /* AS number was too large */ + return null; + } + parsedParameter[i] = "AS" + asNumber.toString(); } return parsedParameter; } diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 923fb6e..bc01003 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -178,7 +178,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-22 20:00:00"), false, new TreeSet<>(Arrays.asList(new String[] { "Fast", "Running", "Unnamed", "V2Dir", "Valid" })), 63L, "a1", - DateTimeHelper.parse("2013-04-16 18:00:00"), "AS6830", + DateTimeHelper.parse("2013-04-16 18:00:00"), null, "liberty global operations b.v.", "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", @@ -1167,6 +1167,12 @@ public class ResourceServletTest { } @Test(timeout = 100) + public void testAsas8767WithLeadingZeros() { + this.assertSummaryDocument( + "/summary?as=as008767", 1, new String[] { "TorkaZ" }, 0, null); + } + + @Test(timeout = 100) public void testAsAsSpace8767() { this.assertErrorStatusCode( "/summary?as=AS 8767", 400); @@ -1179,6 +1185,34 @@ public class ResourceServletTest { } @Test(timeout = 100) + public void testAsUnknown() { + this.assertSummaryDocument("/summary?as=0", 1, + new String[] {"TimMayTribute"}, 0, null); + } + + @Test(timeout = 100) + public void testAsAsUnknown() { + this.assertSummaryDocument("/summary?as=as0", 1, + new String[] {"TimMayTribute"}, 0, null); + } + + @Test(timeout = 100) + public void testAsAsUnknownWithLeadingZeros() { + this.assertSummaryDocument("/summary?as=as0000", 1, + new String[] {"TimMayTribute"}, 0, null); + } + + @Test(timeout = 100) + public void testAsTooLarge() { + this.assertErrorStatusCode("/summary?as=4294967296", 400); + } + + @Test(timeout = 100) + public void testAsNegative() { + this.assertErrorStatusCode("/summary?as=-3", 400); + } + + @Test(timeout = 100) public void testAsNameComcast() { this.assertSummaryDocument("/summary?as_name=Comcast", 1, null, 0, null); }

1 0

[onionoo/release] Removes DetailsDocumentFields interface
by karsten＠torproject.org 17 Aug '18

17 Aug '18

commit 6baeaa81ffd5d076afc2e800fb1b030ba7cbcc53 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Fri Aug 17 09:48:36 2018 +0100 Removes DetailsDocumentFields interface This interface only ever provided two of the many fields in details documents. Fixes: #27180 --- .../org/torproject/onionoo/docs/DetailsDocumentFields.java | 13 ------------- .../org/torproject/onionoo/server/OrderParameterValues.java | 10 ++++------ .../java/org/torproject/onionoo/server/ResponseBuilder.java | 5 ++--- .../onionoo/server/SummaryDocumentComparatorTest.java | 3 +-- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocumentFields.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocumentFields.java deleted file mode 100644 index 2abcd53..0000000 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocumentFields.java +++ /dev/null @@ -1,13 +0,0 @@ -/* Copyright 2017--2018 The Tor Project - * See LICENSE for licensing information */ - -package org.torproject.onionoo.docs; - -/** Provides constants for details document field names. */ -public interface DetailsDocumentFields { - - public static final String FIRST_SEEN = "first_seen"; - - public static final String CONSENSUS_WEIGHT = "consensus_weight"; -} - diff --git a/src/main/java/org/torproject/onionoo/server/OrderParameterValues.java b/src/main/java/org/torproject/onionoo/server/OrderParameterValues.java index 6f76a5f..ebfda12 100644 --- a/src/main/java/org/torproject/onionoo/server/OrderParameterValues.java +++ b/src/main/java/org/torproject/onionoo/server/OrderParameterValues.java @@ -3,22 +3,20 @@ package org.torproject.onionoo.server; -import org.torproject.onionoo.docs.DetailsDocumentFields; - /** Provides constants for order parameter values. */ public class OrderParameterValues { private static final String DESCENDING = "-"; - public static final String FIRST_SEEN_ASC = DetailsDocumentFields.FIRST_SEEN; + public static final String FIRST_SEEN_ASC = "first_seen"; public static final String FIRST_SEEN_DES = - DESCENDING + DetailsDocumentFields.FIRST_SEEN; + DESCENDING + FIRST_SEEN_ASC; public static final String CONSENSUS_WEIGHT_ASC = - DetailsDocumentFields.CONSENSUS_WEIGHT; + "consensus_weight"; public static final String CONSENSUS_WEIGHT_DES = - DESCENDING + DetailsDocumentFields.CONSENSUS_WEIGHT; + DESCENDING + CONSENSUS_WEIGHT_ASC; } diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index a5bce5f..8b350b0 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -6,7 +6,6 @@ package org.torproject.onionoo.server; import org.torproject.onionoo.docs.BandwidthDocument; import org.torproject.onionoo.docs.ClientsDocument; import org.torproject.onionoo.docs.DetailsDocument; -import org.torproject.onionoo.docs.DetailsDocumentFields; import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.SummaryDocument; @@ -261,7 +260,7 @@ public class ResponseBuilder { } else if (field.equals("last_changed_address_or_port")) { dd.setLastChangedAddressOrPort( detailsDocument.getLastChangedAddressOrPort()); - } else if (field.equals(DetailsDocumentFields.FIRST_SEEN)) { + } else if (field.equals("first_seen")) { dd.setFirstSeen(detailsDocument.getFirstSeen()); } else if (field.equals("running")) { dd.setRunning(detailsDocument.getRunning()); @@ -285,7 +284,7 @@ public class ResponseBuilder { dd.setAsNumber(detailsDocument.getAsNumber()); } else if (field.equals("as_name")) { dd.setAsName(detailsDocument.getAsName()); - } else if (field.equals(DetailsDocumentFields.CONSENSUS_WEIGHT)) { + } else if (field.equals("consensus_weight")) { dd.setConsensusWeight(detailsDocument.getConsensusWeight()); } else if (field.equals("verified_host_names")) { dd.setVerifiedHostNames(detailsDocument.getVerifiedHostNames()); diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index c87fa42..44db510 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -6,7 +6,6 @@ package org.torproject.onionoo.server; import static org.junit.Assert.assertEquals; import org.torproject.onionoo.docs.DateTimeHelper; -import org.torproject.onionoo.docs.DetailsDocumentFields; import org.torproject.onionoo.docs.SummaryDocument; import org.hamcrest.Matchers; @@ -73,7 +72,7 @@ public class SummaryDocumentComparatorTest { public SummaryDocumentComparatorTest(String order, long[] vals) { for (int i = 0; i < sd.length; i++) { sd[i] = createSummaryDoc(); - if (order.contains(DetailsDocumentFields.FIRST_SEEN)) { + if (order.contains("first_seen")) { sd[i].setFirstSeenMillis(vals[i]); } else { sd[i].setConsensusWeight(vals[i]);

1 0

[onionoo/release] Bump version to 6.2-1.17.0-dev.
by karsten＠torproject.org 17 Aug '18

17 Aug '18

commit 845e157cc23aff07b6943bc7fa1124d29449f85e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 16 12:21:56 2018 +0200 Bump version to 6.2-1.17.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 7bce955..2cd6a7e 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="6.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.17.0"/> + value="${onionoo.protocol.version}-1.17.0-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Prepare for 6.2-1.17.1 release.
by karsten＠torproject.org 17 Aug '18

17 Aug '18

commit 79de0d2857c5b1fef811054513cec93113867f7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 17 12:30:05 2018 +0200 Prepare for 6.2-1.17.1 release. --- CHANGELOG.md | 22 ++++++++++++---------- build.xml | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ce49b4..4937eb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,20 @@ -# Changes in version 6.2-1.17.1 - 2018-08-?? +# Changes in version 6.2-1.17.1 - 2018-08-17 * Minor changes - - Parsing of the "as" parameter allows AS0 to be specified. It will now - strip leading zeros. Specifying an AS number larger than the maximum - possible with 32-bits will be treated as an error. + - Parsing of the "as" parameter allows AS0 to be specified. It will + now strip leading zeros. Specifying an AS number larger than the + maximum possible with 32-bits will be treated as an error. + # Changes in version 6.2-1.17.0 - 2018-08-16 * Medium changes - The "host_name" field will no longer appear in details documents. - - Names in the "verified_host_names" and "unverified_host_names" fields - are written in a deterministic order. - - If a reverse domain name lookup results in either no names being found - or an error then the lookup will be repeated at the next updater run. + - Names in the "verified_host_names" and "unverified_host_names" + fields are written in a deterministic order. + - If a reverse domain name lookup results in either no names being + found or an error then the lookup will be repeated at the next + updater run. # Changes in version 6.2-1.16.1 - 2018-08-13 @@ -79,8 +81,8 @@ * Minor changes - Don't attempt to un-escape character sequences in contact lines - (like "\uk") that only happen to start like escaped utf-8 characters - (like "\u0055"). + (like "\uk") that only happen to start like escaped utf-8 + characters (like "\u0055"). # Changes in version 5.1-1.11.0 - 2018-03-14 diff --git a/build.xml b/build.xml index 2cd6a7e..41b64e8 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="6.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.17.0-dev"/> + value="${onionoo.protocol.version}-1.17.1"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Prepare for 6.2-1.17.1 release.
by karsten＠torproject.org 17 Aug '18

17 Aug '18

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2018