January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Do not check IP validity in parse.addr.isIPv4() and parse.addr.isIPv6().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 823aa3a239bb09f8fbcbc64b6d22c2605150ce77 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 04:34:52 2013 +0000 Do not check IP validity in parse.addr.isIPv4() and parse.addr.isIPv6(). We only want to know if it is IPv4 or IPv6, *not* if it conforms to all kinds of crazy routing RFCs. --- lib/bridgedb/parse/addr.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py … [View More]

1 0

[bridgedb/master] Remove except handler which never gets executed in bridgedb.parse.addr.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit de3657f419577e165550830bb38ca701c93cc800 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 04:30:17 2013 +0000 Remove except handler which never gets executed in bridgedb.parse.addr. --- lib/bridgedb/parse/addr.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index 6274c23..6a3ed52 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -170,8 +170,6 @@ def isIPAddress(ip, … [View More]

1 0

[bridgedb/master] Stop parsing immediately if there is an invalid port in an addr.PortList.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit dd6eea76b85d7f71f108ea3cc55df0638521655e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 04:41:07 2013 +0000 Stop parsing immediately if there is an invalid port in an addr.PortList. This ensures that an addr.InvalidPort exception is raised when an invalid port is discovered, without continuing to parse the rest of the ports. The end result, i.e. when/if an exception is raised, stays exactly the same. This just operates more efficiently … [View More]

1 0

[bridgedb/master] Don't add duplicate ports to an addr.PortList.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 57a902b2e77d31066aee9400d5f4102e0fdc8432 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 04:44:12 2013 +0000 Don't add duplicate ports to an addr.PortList. --- lib/bridgedb/parse/addr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index ed00925..6d72e21 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -341,7 +341,7 @@ class PortList(object): … [View More]

1 0

[bridgedb/master] Change parameter `x` → `port` in addr.PortList.__getitem__().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9494506655a027e5c8daca475daad2acf4c0ae2b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 04:45:39 2013 +0000 Change parameter `x` → `port` in addr.PortList.__getitem__(). --- lib/bridgedb/parse/addr.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index 0c50934..7347bd1 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -361,12 +361,12 @@ class … [View More]

1 0

[bridgedb/master] Refactor unittests for bridgedb.parse.networkstatus.parseRLine().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 56f7a51adbe2278bc7894390f5c1f5bf29b517c2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 12:54:10 2013 +0000 Refactor unittests for bridgedb.parse.networkstatus.parseRLine(). --- lib/bridgedb/test/test_parse_networkstatus.py | 210 +++++++++++++++++++++---- 1 file changed, 180 insertions(+), 30 deletions(-) diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py index 830f96c..5467a85 100644 --- a/lib/… [View More]bridgedb/test/test_parse_networkstatus.py +++ b/lib/bridgedb/test/test_parse_networkstatus.py @@ -16,7 +16,11 @@ module is functioning correctly. """ from __future__ import print_function +from __future__ import unicode_literals +import binascii + +from twisted.python import log from twisted.trial import unittest from bridgedb.parse import networkstatus @@ -24,6 +28,14 @@ import sure from sure import this, these, those, the, it +logFormat = "%(created)d [%(levelname)s] %(module)s.%(funcName)s(): " +logFormat += "%(message)s" +networkstatus.logging.basicConfig( + filename='test_parse_networkstatus.log', + level=networkstatus.logging.DEBUG, + flags='w', format=logFormat) + + class ParseNetworkStatusRLineTests(unittest.TestCase): """Tests for :func:`bridgedb.parse.networkstatus.parseRLine`.""" @@ -36,25 +48,62 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): port = '9001' dirp = '0' + def makeRLine(self, *args, **kwargs): + """Concatenate parameters into an 'r'-line and store the result as + ``self.line``. + + To create an invalid networkstatus 'r'-line, for example with an + invalid IP address, use me like this: + + >>> makeRLine(ip='0.0.0.0') + + :keywords: The keyword arguments may be any of the class variables, + i.e. 'nick' or 'ident', and the variables should be similar to the + defaults in the class variables. If not given as parameters, the + class variables will be used. + """ + line = [] + for kw in ('pre', 'nick', 'ident', 'desc', 'ts', 'ip', 'port', 'dirp'): + if kw in kwargs.keys(): + if kwargs[kw]: + line.append(kwargs[kw]) + elif kwargs[kw] is False: + pass + else: + line.append(getattr(self, kw, '')) + + self.line = ' '.join([l for l in line]).strip() + log.msg("\n Testing networkstatusline:\n %r..." % self.line) + self.assertTrue(self.line != '') + + def tearDown(self): + self.line = '' + + def assertAllFieldsAreNone(self, fields): + """Assert that every field in the iterable ``fields`` is None.""" + for field in fields: + self.assertTrue(field is None) + def test_missingPrefix(self): - line = ' '.join([self.nick, self.ident, self.desc, - self.ts, self.ip, self.port, self.dirp]) - self.assertRaises(networkstatus.NetworkstatusParsingError, - networkstatus.parseRLine, line) + """Test a networkstatus 'r'-line that is missing the 'r ' prefix.""" + self.makeRLine(pre=False) + fields = networkstatus.parseRLine(self.line) + self.assertAllFieldsAreNone(fields) def test_wrongNumberOfFields(self): - line = ' '.join([self.pre, self.nick, self.ident, self.ts, self.ip]) - self.assertRaises(networkstatus.NetworkstatusParsingError, - networkstatus.parseRLine, line) + """Test a line missing digest, ORPort, and DirPort fields.""" + self.makeRLine(desc=False, port=False, dirp=False) + fields = networkstatus.parseRLine(self.line) + self.assertAllFieldsAreNone(fields) def test_wrongFieldOrder(self): - line = ' '.join([self.pre, self.nick, self.desc, self.ident, - self.ts, self.ip, self.port, self.dirp]) - fields = networkstatus.parseRLine(line) + """Test a line with the identity and descriptor digests switched.""" + self.makeRLine(desc=self.ident, ident=self.desc) + fields = networkstatus.parseRLine(self.line) nick, others = fields[0], fields[1:] this(nick).should.be.ok - this(nick).should.be.a(str) + this(nick).should.be.a(basestring) this(nick).should.equal(self.nick) the(others).should.be.a(tuple) @@ -62,31 +111,132 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): for other in others: the(other).should.be(None) - def test_invalidTimestampMissingDate(self): - line = ' '.join([self.pre, self.nick, self.ident, self.desc, - '15:15:15', self.ip, self.port, self.dirp]) - self.assertRaises(networkstatus.NetworkstatusParsingError, - networkstatus.parseRLine, line) + def test_invalidNicknameNonAlphanumeric(self): + """Test a line with a non-alphanumeric router nickname.""" + self.makeRLine(nick='abcdef/*comment*/') + fields = networkstatus.parseRLine(self.line) + nick, ident, desc = fields[:3] + this(nick).should.be(None) + the(ident).should.be.a(basestring) + the(desc).should.be(None) + + def test_invalidNicknameTooLong(self): + """Test a line with a router nickname which is way too long.""" + self.makeRLine(nick='ThisIsAReallyReallyLongRouterNickname') + fields = networkstatus.parseRLine(self.line) + nick, ident, desc = fields[:3] + this(nick).should.be(None) + the(ident).should.be.a(basestring) + the(desc).should.be(None) - def test_invalidBase64(self): - line = ' '.join([self.pre, self.nick, '%$>#@,<', self.desc, - self.ts, self.ip, self.port, self.dirp]) - nick, ident, desc, ts, ip, port, dirp = networkstatus.parseRLine(line) + def test_invalidIdentBase64(self): + """Test line with '%$>@,<' for an identity digest.""" + self.makeRLine(ident='%$>#@,<') + (nick, ident, desc, ts, + ip, port, dirp) = networkstatus.parseRLine(self.line) the(nick).should.be.ok - the(nick).should.be.a(str) + the(nick).should.be.a(basestring) the(nick).should.equal(self.nick) - the(ident).should.be(None) the(desc).should.be(None) + def test_invalidIdentSingleQuoteChar(self): + """Test a line with a single quote character for the identity digest.""" + self.makeRLine(ident=chr(0x27)) + fields = networkstatus.parseRLine(self.line) + nick, ident, desc = fields[:3] + + the(nick).should.be.ok + the(nick).should.be.a(basestring) + the(nick).should.be.equal(str(self.nick)) + the(ident).should.be.equal(None) + the(desc).should.be.equal(None) + + def test_invalidDescriptorDigest(self): + """Test an 'r'-line with invalid base64 descriptor digest.""" + self.makeRLine(desc='敃噸襶') + fields = networkstatus.parseRLine(self.line) + nick, ident, desc, ts, ip = fields[:5] + + the(nick).should.be.ok + the(nick).should.be.a(basestring) + the(nick).should.be.equal(str(self.nick)) + + b64ident = binascii.b2a_base64(ident).strip().rstrip('==') + the(ident).should.be.a(basestring) + this(b64ident).should.be.a(basestring) + this(b64ident).should.be.equal(self.ident) + + the(desc).should.be.equal(None) + the(ts).should.be.equal(None) + the(ip).should.be.equal(None) + + def test_invalidDescriptorDigest_missingBase64padding(self): + """Test a line with invalid base64 (no padding) descriptor digest.""" + self.makeRLine(desc=self.desc.rstrip('==')) + fields = networkstatus.parseRLine(self.line) + nick, ident, desc, ts, ip = fields[:5] + + the(nick).should.be.ok + the(nick).should.be.a(basestring) + the(nick).should.be.equal(str(self.nick)) + + b64ident = binascii.b2a_base64(ident).strip().rstrip('==') + the(ident).should.be.a(basestring) + this(b64ident).should.be.a(basestring) + this(b64ident).should.be.equal(self.ident) + + the(desc).should.be.equal(None) + the(ts).should.be.equal(None) + the(ip).should.be.equal(None) + + def test_missingAfterDesc(self): + """Test a line that has a valid descriptor digest, and is missing + everything after the descriptor digest, i.e. the timestamp, IP address, + and DirPort. + """ + self.makeRLine(nick='missingAfterDesc', ts=False, ip=False, dirp=False) + fields = networkstatus.parseRLine(self.line) + self.assertAllFieldsAreNone(fields) + + def test_missingAfterIdent(self): + """Test a line that and is missing the descriptor digest and + everything after it, i.e. the timestamp, IP address, and DirPort. + """ + self.makeRLine(nick='noDesc', desc=False, ts=False, + ip=False, dirp=False) + fields = networkstatus.parseRLine(self.line) + self.assertAllFieldsAreNone(fields) + def test_invalidTimestamp(self): - line = ' '.join([self.pre, self.nick, self.ident, self.desc, - '123456789 987654321', self.ip, self.port, self.dirp]) - fields = networkstatus.parseRLine(line) - + """Test line with two large integers for the timestamp.""" + self.makeRLine(ts='123456789 987654321') + fields = networkstatus.parseRLine(self.line) + + def test_invalidTimestampMissingDate(self): + """Test a line where the timestamp is missing the date portion.""" + self.makeRLine(ts='15:15:15') + fields = networkstatus.parseRLine(self.line) + self.assertAllFieldsAreNone(fields) + def test_invalidIPAddress(self): - line = ' '.join([self.pre, self.nick, self.ident, self.desc, - self.ts, '0.0.0.0', self.port, self.dirp]) - fields = networkstatus.parseRLine(line) - + """Test a line with an invalid IP address.""" + self.makeRLine(ip='0.0.0.0') + fields = networkstatus.parseRLine(self.line) + nick, ident, desc, ts, ip, port = fields[:6] + + the(nick).should.be.equal(self.nick) + + b64ident = binascii.b2a_base64(ident).strip().strip('==') + the(ident).should.be.a(basestring) + this(b64ident).should.be.a(basestring) + this(b64ident).should.be.equal(self.ident) + + b64desc = binascii.b2a_base64(desc).strip() + the(desc).should.be.a(basestring) + this(b64desc).should.be.a(basestring) + this(b64desc).should.be.equal(self.desc) + + the(ts).should.be.a(float) + the(ip).should.be(None) [View Less]

1 0

[bridgedb/master] Remove an unexecuted `except` branch from addr.PortList.add().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit aaa053993ac49b2420d01290ea068e6894273f65 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 7 04:44:44 2013 +0000 Remove an unexecuted `except` branch from addr.PortList.add(). --- lib/bridgedb/parse/addr.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index 6d72e21..0c50934 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -338,8 +338,6 @@ class PortList(object): … [View More]

1 0

[bridgedb/master] Make loop varnames in FilteredBridgeSplitter.addRing() more descriptive.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit ee902b5c89ddba47b13e25a12818bc91e3441fd8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Nov 15 13:45:11 2013 +0000 Make loop varnames in FilteredBridgeSplitter.addRing() more descriptive. --- lib/bridgedb/Bridges.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index f11a45e..036df88 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1038,12 +1038,11 @@ class … [View More]

1 0

[bridgedb/master] Rename `ring` → `subring` in FilteredBridgeSplitter.addRing().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit ddb15741e169f3c9870d067dc406c18ab3e1cb07 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Nov 15 13:43:55 2013 +0000 Rename `ring` → `subring` in FilteredBridgeSplitter.addRing(). --- lib/bridgedb/Bridges.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a59c56d..f11a45e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1045,7 +1045,7 @@ class … [View More]

1 0

[bridgedb/master] Keep a counter on total bridges inserted into a hashring.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 068ac5bbe640e98b800ff2a09eb82117f34cb650 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Nov 15 13:49:02 2013 +0000 Keep a counter on total bridges inserted into a hashring. --- lib/bridgedb/Bridges.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 7e24dbe..a11cd48 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1074,9 +1074,13 @@ class FilteredBridgeSplitter(BridgeHolder): … [View More]

1 0