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

[bridgedb/master] Add more parser logging to Bridges.parseStatusFile().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 54c5063cae2057a92e813a314fec78da2a7960d4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Dec 10 11:20:37 2013 +0000 Add more parser logging to Bridges.parseStatusFile(). * FIXES part of #9377 --- lib/bridgedb/Bridges.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a080331..57f7a03 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -502,6 +502,14 @@ def parseStatusFile(networkstatusFile): if line.startswith("r "): (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport) = networkstatus.parseRLine(line) + logging.debug("Parsed networkstatus line:") + logging.debug(" Nickname: %s" % nickname) + logging.debug(" Identity: %s" % toHex(ID)) + logging.debug(" Descriptor: %s" % descDigest) + logging.debug(" Timestamp: %s" % timestamp) + logging.debug(" ORAddress: %s" % ORaddr) + logging.debug(" ORport: %s" % ORport) + logging.debug(" dirport: %s" % dirport) elif ID and line.startswith("a "): try: @@ -515,7 +523,9 @@ def parseStatusFile(networkstatusFile): elif ID and timestamp and line.startswith("s "): running, stable = networkstatus.parseSLine(line) - + logging.debug("Bridges.parseStatusFile(): "\ + "yielding %s running=%s stable=%s oraddrs=%s ts=%s" + % (toHex(ID), running, stable, or_addresses, timestamp)) yield ID, running, stable, or_addresses, timestamp (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport,

1 0

[bridgedb/master] Update unittest parameter docstrings for parseRLine() tests.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d4be25c38b00a61c414eb84d5a39bb595971846d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 03:19:39 2013 +0000 Update unittest parameter docstrings for parseRLine() tests. --- lib/bridgedb/test/test_parse_networkstatus.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py index b964b22..9e82b25 100644 --- a/lib/bridgedb/test/test_parse_networkstatus.py +++ b/lib/bridgedb/test/test_parse_networkstatus.py @@ -48,13 +48,14 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): #: An OR nickname string. To be valid, it should be 1-19 alphanumeric #: upper or lower cased characters. nick = 'Testing' - #: A base64-encoded SHA-1 digest of the DER-formatted ASN.1-encoded public - #: portion of an OR identity key, with any trailing base64 padding (any - #: '=' characters) removed. + #: A base64-encoded, SHA-1 digest of the DER-formatted, ASN.1-encoded, + #: public portion of an OR identity key, with any trailing base64 padding + #: (any '=' characters) removed. ident = 'bXw2N1K9AAKR5undPaTgNUySNxI' - #: A base64-encoded SHA-1 digest of the OR [bridge-]server-descriptor - #: document (the whole thing, up until the 'router signature' line, but not - #: included the signature thereafter). + #: A base64-encoded, SHA-1 digest of the OR + #: `@type-[bridge-]server-descriptor` document (the whole thing, up until + #: the 'router signature' line, but not including the signature thereafter), + #: with any trailing base64 padding (any '=' characters) removed. desc = 'Z6cisoPT9s6hEd4JkHFAlIWAwXQ' #: An ISO-8661 formatted timestamp, with a space separator (rather than a #: 'T' character).

1 0

[bridgedb/master] Add base64 padding to networkstatus 'descDigest' field.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 74a63e2e814a406db22e8c09aa0a4d038d9ce2b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 01:01:16 2013 +0000 Add base64 padding to networkstatus 'descDigest' field. The trailing '='s in the "descriptor digest" field of an `@type-bridge-networkstatus` descriptor are removed before placing them in the descriptor. Therefore, before un-base64-encoding this field, we must re-add the trailing '='s character padding back in, the same as we already to for the "identity digest" field on that same descriptor line. * FIXES a bug in function `bridgedb.parse.networkstatus.parseRLine()` which resulted in the "descriptor digest" field (and all fields after it on the 'r'-line) being set to `None`, due to a base64 decoding error from missing '=' character padding. --- lib/bridgedb/parse/networkstatus.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index 293fdd0..7fd9e18 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -128,7 +128,8 @@ def parseRLine(line): ID = None else: try: - descDigest = binascii.a2b_base64(fields[2]) + paddedDigest = padBase64(fields[2]) + descDigest = binascii.b2a_base64(paddedDigest) timestamp = time.mktime(time.strptime(" ".join(fields[3:5]), "%Y-%m-%d %H:%M:%S")) ORaddr = fields[5]

1 0

[bridgedb/master] Remove trailing '='s from unittests for networkstatus.parseRLine().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9822ebba139e528b0ae12c3c0743acfd20ee4bc5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 02:12:07 2013 +0000 Remove trailing '='s from unittests for networkstatus.parseRLine(). Because of the bug fixed in the last commit, two unittests in `test_parse_networkstatus.ParseNetworkStatusRLineTests` now FAIL. They are: ø test_invalidDescriptorDigest_missingBase64padding ø test_invalidIPAddress --- lib/bridgedb/test/test_parse_networkstatus.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py index b34b5a5..b964b22 100644 --- a/lib/bridgedb/test/test_parse_networkstatus.py +++ b/lib/bridgedb/test/test_parse_networkstatus.py @@ -55,7 +55,7 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): #: A base64-encoded SHA-1 digest of the OR [bridge-]server-descriptor #: document (the whole thing, up until the 'router signature' line, but not #: included the signature thereafter). - desc = 'Z6cisoPT9s6hEd4JkHFAlIWAwXQ=' + desc = 'Z6cisoPT9s6hEd4JkHFAlIWAwXQ' #: An ISO-8661 formatted timestamp, with a space separator (rather than a #: 'T' character). ts = '2013-10-31 15:15:15' @@ -181,10 +181,8 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): 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(ident).should.be.equal(self.ident) the(desc).should.be.equal(None) the(ts).should.be.equal(None) @@ -200,10 +198,8 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): 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(ident).should.be.equal(self.ident) the(desc).should.be.equal(None) the(ts).should.be.equal(None) @@ -246,15 +242,11 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): 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) + the(ident).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(b64desc).should.be.equal(self.desc) the(ts).should.be.a(float) the(ip).should.be(None)

1 0

[bridgedb/master] Fix lengths of base64 fields in unittests for parseRLine().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 53b6d4e3d6e66c3b78e5a6b975f9ed7ab5c3a728 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 03:20:24 2013 +0000 Fix lengths of base64 fields in unittests for parseRLine(). In real `@type bridge-networkstatus` documents, the base64 fields are 27 characters in length, not 29 characters. --- lib/bridgedb/test/test_parse_networkstatus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py index 9e82b25..9b17462 100644 --- a/lib/bridgedb/test/test_parse_networkstatus.py +++ b/lib/bridgedb/test/test_parse_networkstatus.py @@ -51,12 +51,12 @@ class ParseNetworkStatusRLineTests(unittest.TestCase): #: A base64-encoded, SHA-1 digest of the DER-formatted, ASN.1-encoded, #: public portion of an OR identity key, with any trailing base64 padding #: (any '=' characters) removed. - ident = 'bXw2N1K9AAKR5undPaTgNUySNxI' + ident = 'bXw2N1K9AAKR5undPaTgNUySN' #: A base64-encoded, SHA-1 digest of the OR #: `@type-[bridge-]server-descriptor` document (the whole thing, up until #: the 'router signature' line, but not including the signature thereafter), #: with any trailing base64 padding (any '=' characters) removed. - desc = 'Z6cisoPT9s6hEd4JkHFAlIWAwXQ' + desc = 'Z6cisoPT9s6hEd4JkHFAlIWAw' #: An ISO-8661 formatted timestamp, with a space separator (rather than a #: 'T' character). ts = '2013-10-31 15:15:15'

1 0

[bridgedb/master] Fix an error where `PortList`s could not be indexed by strings.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit fd62b1261ef5d3c28506191759176d3ae2a71676 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Dec 10 11:27:35 2013 +0000 Fix an error where `PortList`s could not be indexed by strings. The `long` in #10333 should index the PortList as a string, not an integer. * FIXES #10333 --- lib/bridgedb/parse/addr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index 7347bd1..927de2f 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -368,5 +368,4 @@ class PortList(object): :rtype: integer :returns: The ``port``, if it is in this PortList. """ - portlist = list(self.ports) - return portlist[portlist.index(port)] + return list(self.ports)[port]

1 0

[bridgedb/master] Merge branch 'fix/10333-index-by-0L_r2' into fix/9462-refactor-netstatus-parsers_r9462C_r2
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 3817ac07746bfa0631a09b6a46112f3ac560d3d2 Merge: 53b6d4e fd62b12 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 04:02:49 2013 +0000 Merge branch 'fix/10333-index-by-0L_r2' into fix/9462-refactor-netstatus-parsers_r9462C_r2 lib/bridgedb/parse/addr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[bridgedb/master] Fix two unittests for PortList.__getitem__().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit b6a9b30ec431fdcf7c72971970d2fa37c7144b4a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 04:13:36 2013 +0000 Fix two unittests for PortList.__getitem__(). * FIXES two unittests which erroneously passed before the previous commit which fixed #10333, and then erroneously failed after the fix. They should now correctly test indexing the portlist. --- lib/bridgedb/test/test_parse_addr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index a7d02e3..25e7019 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -583,13 +583,13 @@ class PortListTest(unittest.TestCase): """Test ``__getitem__`` with a port number in the PortList.""" ports = (443, 9001, 9030) portList = addr.PortList(*ports) - self.assertTrue(portList.__getitem__(443)) + self.assertTrue(portList.__getitem__(0)) def test_getitem_shouldNotContain(self): """Test ``__getitem__`` with a port number not in the PortList.""" ports = (443, 9001, 9030) portList = addr.PortList(*ports) - self.assertRaises(ValueError, portList.__getitem__, 555) + self.assertRaises(IndexError, portList.__getitem__, 555) def test_mixedArgs(self): """Create a :class:`addr.PortList` with mixed type parameters."""

1 0

[bridgedb/master] Make PortList.__getitem__ unittest more explicit.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit a9ac97a321db144c5179eb6cab368f1d4773db7a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 04:35:20 2013 +0000 Make PortList.__getitem__ unittest more explicit. --- lib/bridgedb/test/test_parse_addr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index 25e7019..e29c554 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -583,7 +583,7 @@ class PortListTest(unittest.TestCase): """Test ``__getitem__`` with a port number in the PortList.""" ports = (443, 9001, 9030) portList = addr.PortList(*ports) - self.assertTrue(portList.__getitem__(0)) + self.assertEqual(portList.__getitem__(0), 9001) def test_getitem_shouldNotContain(self): """Test ``__getitem__`` with a port number not in the PortList."""

1 0

[bridgedb/master] Add two unittests for PortList.__getitem__ to debug #10333.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 63b5a6e3f334a0e6ba09a316692cb2a32d01df49 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 11 04:35:48 2013 +0000 Add two unittests for PortList.__getitem__ to debug #10333. --- lib/bridgedb/test/test_parse_addr.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index e29c554..9714cc1 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -591,6 +591,18 @@ class PortListTest(unittest.TestCase): portList = addr.PortList(*ports) self.assertRaises(IndexError, portList.__getitem__, 555) + def test_getitem_string(self): + """Test ``__getitem__`` with a string.""" + ports = (443, 9001, 9030) + portList = addr.PortList(*ports) + self.assertRaises(TypeError, portList.__getitem__, '443') + + def test_getitem_long(self): + """Test ``__getitem__`` with a string.""" + ports = (443, 9001, 9030) + portList = addr.PortList(*ports) + self.assertEqual(portList.__getitem__(long(0)), 9001) + def test_mixedArgs(self): """Create a :class:`addr.PortList` with mixed type parameters.""" firstList = addr.PortList('1111,2222,3333')

1 0