December 2012 - tor-commits - lists.torproject.org

[stem/master] Add test cases for ORCONN events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 04633d4243f88f232a39daf5cbffbb228ee8f6bf Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:44:35 2012 -0700 Add test cases for ORCONN events Rename ORCONN_CONNECTED to ORCONN_LAUNCHED and use ORCONN_CONNECTED for more complex _parse() method test. Adds three bad events to trigger exceptions in _parse(). Move sample lines to alphabetic position among other sample cases. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 66 ++++++++++++++++++++++++++++++----------- 1 files changed, 48 insertions(+), 18 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 48aab32..db33367 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -190,6 +190,24 @@ s Fast HSDir Named Stable V2Dir Valid 650 OK """ +# ORCONN events from starting tor 0.2.2.39 via TBB + +ORCONN_CLOSED = "650 ORCONN $A1130635A0CDA6F60C276FBF6994EFBD4ECADAB1~tama CLOSED REASON=DONE" +ORCONN_CONNECTED = "650 ORCONN 127.0.0.1:9000 CONNECTED NCIRCS=20" +ORCONN_LAUNCHED = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon LAUNCHED" + +ORCONN_CONNECTED_BAD_1 = "650 ORCONN \ +$7ED90E2833EE38A75795BA9237B0A4560E5=GreenD \ +LAUNCHED" + +ORCONN_CONNECTED_BAD_2 = "650 ORCONN \ +127.0.0.1:001 \ +CONNECTED" + +ORCONN_CONNECTED_BAD_3 = "650 ORCONN \ +127.0.0.1:9000 \ +CONNECTED NCIRCS=too_many" + # STATUS_* events that I was able to easily trigger. Most came from starting # TBB, then listening while it bootstrapped. @@ -266,11 +284,6 @@ STREAM_DNS_REQUEST = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:15297 \ PURPOSE=DNS_REQUEST" -# ORCONN events from starting tor 0.2.2.39 via TBB - -ORCONN_CONNECTED = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon CONNECTED" -ORCONN_CLOSED = "650 ORCONN $A1130635A0CDA6F60C276FBF6994EFBD4ECADAB1~tama CLOSED REASON=DONE" - # NEWDESC events. I've never actually seen multiple descriptors in an event, # but the spec allows for it. @@ -638,19 +651,6 @@ class TestEvents(unittest.TestCase): self.assertEqual([expected_desc], event.desc) def test_orconn_event(self): - event = _get_event(ORCONN_CONNECTED) - - self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) - self.assertEqual(ORCONN_CONNECTED.lstrip("650 "), str(event)) - self.assertEqual("$7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon", event.endpoint) - self.assertEqual("7ED90E2833EE38A75795BA9237B0A4560E51E1A0", event.endpoint_fingerprint) - self.assertEqual("GreenDragon", event.endpoint_nickname) - self.assertEqual(None, event.endpoint_address) - self.assertEqual(None, event.endpoint_port) - self.assertEqual(ORStatus.CONNECTED, event.status) - self.assertEqual(None, event.reason) - self.assertEqual(None, event.circ_count) - event = _get_event(ORCONN_CLOSED) self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) @@ -663,6 +663,36 @@ class TestEvents(unittest.TestCase): self.assertEqual(ORStatus.CLOSED, event.status) self.assertEqual(ORClosureReason.DONE, event.reason) self.assertEqual(None, event.circ_count) + + event = _get_event(ORCONN_CONNECTED) + + self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) + self.assertEqual(ORCONN_CONNECTED.lstrip("650 "), str(event)) + self.assertEqual("127.0.0.1:9000", event.endpoint) + self.assertEqual(None, event.endpoint_fingerprint) + self.assertEqual(None, event.endpoint_nickname) + self.assertEqual('127.0.0.1', event.endpoint_address) + self.assertEqual(9000, event.endpoint_port) + self.assertEqual(ORStatus.CONNECTED, event.status) + self.assertEqual(None, event.reason) + self.assertEqual(20, event.circ_count) + + event = _get_event(ORCONN_LAUNCHED) + + self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) + self.assertEqual(ORCONN_LAUNCHED.lstrip("650 "), str(event)) + self.assertEqual("$7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon", event.endpoint) + self.assertEqual("7ED90E2833EE38A75795BA9237B0A4560E51E1A0", event.endpoint_fingerprint) + self.assertEqual("GreenDragon", event.endpoint_nickname) + self.assertEqual(None, event.endpoint_address) + self.assertEqual(None, event.endpoint_port) + self.assertEqual(ORStatus.LAUNCHED, event.status) + self.assertEqual(None, event.reason) + self.assertEqual(None, event.circ_count) + + self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_1) + self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_2) + self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_3) def test_signal_event(self): event = _get_event("650 SIGNAL DEBUG")

1 0

[stem/master] Add test case for invalid STATUS_* event type
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 58c48067ba1b901bdb1d4151181949591c97b60a Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:12:28 2012 -0700 Add test case for invalid STATUS_* event type Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 21b5fa5..a632125 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -264,6 +264,9 @@ STATUS_SERVER_DNS_UP = "650 STATUS_SERVER NOTICE NAMESERVER_STATUS \ NS=205.171.3.25 \ STATUS=UP" +# unknown STATUS_* event type +STATUS_SPECIFIC_CONSENSUS_ARRIVED = "650 STATUS_SPECIFIC NOTICE CONSENSUS_ARRIVED" + # STREAM events from tor 0.2.3.16 for visiting the google front page STREAM_NEW = "650 STREAM 18 NEW 0 \ @@ -870,6 +873,12 @@ class TestEvents(unittest.TestCase): self.assertEqual(expected_attr, event.keyword_args) + def test_status_event_bug(self): + # briefly insert a fake value in EVENT_TYPE_TO_CLASS + stem.response.events.EVENT_TYPE_TO_CLASS['STATUS_SPECIFIC'] = stem.response.events.StatusEvent + self.assertRaises(ValueError, _get_event, STATUS_SPECIFIC_CONSENSUS_ARRIVED) + del stem.response.events.EVENT_TYPE_TO_CLASS['STATUS_SPECIFIC'] + def test_stream_event(self): event = _get_event(STREAM_NEW)

1 0

[stem/master] FIX: include positional argument name which is missing proper quoting
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 8a0c9f58046670c7a808e2e4a79b82244405e847 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:05:13 2012 -0700 FIX: include positional argument name which is missing proper quoting This was discovered with a spot coverage test. These were the only lines not run in the Event class while I was adding tests for the stem.response.events module. I just *had* to write a test for these two lines and it turned out they had a problem. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/response/events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 4e0aef8..889f93b 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -96,11 +96,11 @@ class Event(stem.response.ControlMessage): attr_values = [positional.pop(0)] if not attr_values[0].startswith('"'): - raise stem.ProtocolError("The %s value should be quoted, but didn't have a starting quote: %s" % self) + raise stem.ProtocolError("The %s value should be quoted, but didn't have a starting quote: %s" % (attr_name, self)) while True: if not positional: - raise stem.ProtocolError("The %s value should be quoted, but didn't have an ending quote: %s" % self) + raise stem.ProtocolError("The %s value should be quoted, but didn't have an ending quote: %s" % (attr_name, self)) attr_values.append(positional.pop(0)) if attr_values[-1].endswith('"'): break

1 0

[stem/master] Add tests for stem.response.events.Event
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 26a39c9ac5bf77860f2a10dd776c95ce46ef6380 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:13:38 2012 -0700 Add tests for stem.response.events.Event This tests the base class used to build named event classes (e.g. ADDRMAP, BW, CIRC, etc.). Mainly this documents existing behavior so we can check future changes to the class do not surprise us with breakage. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 1a40958..91eaa18 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -235,6 +235,16 @@ class TestEvents(unittest.TestCase): time.sleep(0.2) events_thread.join() + def test_event(self): + # synthetic, contrived message construction to reach the blank event check + self.assertRaises(ProtocolError, stem.response.convert, "EVENT", stem.response.ControlMessage([('', '', '')], ''), arrived_at = 25) + + # Event._parse_message() on an unknown event type + event = _get_event('650 NONE SOLID "NON SENSE" condition=MEH quoted="1 2 3"') + self.assertEqual("NONE", event.type) + self.assertEqual(["SOLID", '"NON', 'SENSE"'], event.positional_args) + self.assertEqual({"condition":"MEH", "quoted":"1 2 3"}, event.keyword_args) + def test_log_events(self): event = _get_event("650 DEBUG connection_edge_process_relay_cell(): Got an extended cell! Yay.")

1 0

[stem/master] Unit tests for event error conditions
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit a201c0c5f4b92b119f89fa39bd43680d67a64817 Merge: e30f2df 256676d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 15 13:46:08 2012 -0800 Unit tests for event error conditions Testing expansion from Sean for malformed event content, plus a couple fixes. https://trac.torproject.org/7736 stem/response/events.py | 7 +- test/unit/response/events.py | 288 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 250 insertions(+), 45 deletions(-)

1 0

[stem/master] Add test cases for STREAM events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit b3aca85301439fd2441d098775b9c56d7365c506 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:28:25 2012 -0700 Add test cases for STREAM events These test events exercise all the exceptions in StreamEvent._parse() and the case of an empty target address:port. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 7fb39c6..bda2d5a 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -295,6 +295,19 @@ STREAM_DNS_REQUEST = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:15297 \ PURPOSE=DNS_REQUEST" +STREAM_SENTCONNECT_BAD_1 = "650 STREAM 18 SENTCONNECT 26" +STREAM_SENTCONNECT_BAD_2 = "650 STREAM 18 SENTCONNECT 26 encrypted.google.com" +STREAM_SENTCONNECT_BAD_3 = "650 STREAM 18 SENTCONNECT 26 encrypted.google.com:https" + +STREAM_DNS_REQUEST_BAD_1 = "650 STREAM 1113 NEW 0 www.google.com:0 \ +SOURCE_ADDR=127.0.0.1 \ +PURPOSE=DNS_REQUEST" + +STREAM_DNS_REQUEST_BAD_2 = "650 STREAM 1113 NEW 0 www.google.com:0 \ +SOURCE_ADDR=127.0.0.1:dns \ +PURPOSE=DNS_REQUEST" + + def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert("EVENT", controller_event, arrived_at = 25) @@ -1023,6 +1036,29 @@ class TestEvents(unittest.TestCase): self.assertEqual("127.0.0.1", event.source_address) self.assertEqual(15297, event.source_port) self.assertEqual(StreamPurpose.DNS_REQUEST, event.purpose) + + event = _get_event(STREAM_SENTCONNECT_BAD_1) + + self.assertTrue(isinstance(event, stem.response.events.StreamEvent)) + self.assertEqual(STREAM_SENTCONNECT_BAD_1.lstrip("650 "), str(event)) + self.assertEqual("18", event.id) + self.assertEqual(StreamStatus.SENTCONNECT, event.status) + self.assertEqual("26", event.circ_id) + self.assertEqual(None, event.target) + self.assertEqual(None, event.target_address) + self.assertEqual(None, event.target_port) + self.assertEqual(None, event.reason) + self.assertEqual(None, event.remote_reason) + self.assertEqual(None, event.source) + self.assertEqual(None, event.source_addr) + self.assertEqual(None, event.source_address) + self.assertEqual(None, event.source_port) + self.assertEqual(None, event.purpose) + + self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_2) + self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_3) + self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_1) + self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_2) def test_stream_bw_event(self): event = _get_event("650 STREAM_BW 2 15 25")

1 0

[stem/master] Move NEWDESC sample events to alphabetic position
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 38190ab9cbedf9844022fe02f4385f1b129c5f52 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:15:53 2012 -0700 Move NEWDESC sample events to alphabetic position Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index a632125..7fb39c6 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -181,6 +181,13 @@ s Fast Guard Running Stable Valid 650 OK """ +# NEWDESC events. I've never actually seen multiple descriptors in an event, +# but the spec allows for it. + +NEWDESC_SINGLE = "650 NEWDESC $B3FA3110CC6F42443F039220C134CBD2FC4F0493=Sakura" +NEWDESC_MULTIPLE = "650 NEWDESC $BE938957B2CA5F804B3AFC2C1EE6673170CDBBF8=Moonshine \ +$B4BE08B22D4D2923EDC3970FD1B93D0448C6D8FF~Unnamed" + # NS event from tor v0.2.1.30. NS_EVENT = """650+NS @@ -288,13 +295,6 @@ STREAM_DNS_REQUEST = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:15297 \ PURPOSE=DNS_REQUEST" -# NEWDESC events. I've never actually seen multiple descriptors in an event, -# but the spec allows for it. - -NEWDESC_SINGLE = "650 NEWDESC $B3FA3110CC6F42443F039220C134CBD2FC4F0493=Sakura" -NEWDESC_MULTIPLE = "650 NEWDESC $BE938957B2CA5F804B3AFC2C1EE6673170CDBBF8=Moonshine \ -$B4BE08B22D4D2923EDC3970FD1B93D0448C6D8FF~Unnamed" - def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert("EVENT", controller_event, arrived_at = 25)

1 0

[stem/master] Event testing revisions
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 256676d5e686fb544927a715335c567d693254cc Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 15 13:06:41 2012 -0800 Event testing revisions Minor revisions for the prior event testing additions... * Adding comments saying how the 'BAD' events are malformed. Some of them took me a few seconds to figure out. :) * Renaming the 'ORCONN_CONNECTED_BAD_*' events to 'ORCONN_BAD_*' since it's not especially important that these are connection events (and in one case it isn't). * Putting ORCONN_BAD_* events on a single line to match the non-bad counterparts. The rough convention that I've been using is to add a newline if there's either a key/value argument or a really long positional arg. * Renaming ADDRMAP_BAD_3 to ADDRMAP_ERROR_EVENT. I like the ADDRMAP_BAD_1 and ADDRMAP_BAD_2 names since they make it clear that they're malformed input. However, ADDRMAP_BAD_3 is a valid response where tor is conveying that an error occurred. * Actually, I think that your STREAM_SENTCONNECT_BAD_1 event reveals a bug. The spec doesn't seem to indicate that the target is optional, so making it mandatory. --- stem/response/events.py | 3 +- test/unit/response/events.py | 93 +++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 889f93b..c8e10f3 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -757,8 +757,7 @@ class StreamEvent(Event): def _parse(self): if self.target is None: - self.target_address = None - self.target_port = None + raise stem.ProtocolError("STREAM event didn't have a target: %s" % self) else: if not ':' in self.target: raise stem.ProtocolError("Target location must be of the form 'address:port': %s" % self) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index bda2d5a..91276b7 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -17,12 +17,15 @@ from test import mocking ADDRMAP = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13" \ EXPIRES="2012-11-19 08:50:13"' + +ADDRMAP_ERROR_EVENT = '650 ADDRMAP www.atagar.com <error> "2012-11-19 00:50:13" \ +error=yes EXPIRES="2012-11-19 08:50:13"' + ADDRMAP_BAD_1 = '650 ADDRMAP www.atagar.com 75.119.206.243 2012-11-19 00:50:13" \ EXPIRES="2012-11-19 08:50:13"' + ADDRMAP_BAD_2 = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13 \ EXPIRES="2012-11-19 08:50:13"' -ADDRMAP_BAD_3 = '650 ADDRMAP www.atagar.com <error> "2012-11-19 00:50:13" \ -error=yes EXPIRES="2012-11-19 08:50:13"' # BUILDTIMEOUT_SET event from tor 0.2.3.16. @@ -203,17 +206,9 @@ ORCONN_CLOSED = "650 ORCONN $A1130635A0CDA6F60C276FBF6994EFBD4ECADAB1~tama CLOSE ORCONN_CONNECTED = "650 ORCONN 127.0.0.1:9000 CONNECTED NCIRCS=20" ORCONN_LAUNCHED = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon LAUNCHED" -ORCONN_CONNECTED_BAD_1 = "650 ORCONN \ -$7ED90E2833EE38A75795BA9237B0A4560E5=GreenD \ -LAUNCHED" - -ORCONN_CONNECTED_BAD_2 = "650 ORCONN \ -127.0.0.1:001 \ -CONNECTED" - -ORCONN_CONNECTED_BAD_3 = "650 ORCONN \ -127.0.0.1:9000 \ -CONNECTED NCIRCS=too_many" +ORCONN_BAD_1 = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E5=GreenD LAUNCHED" +ORCONN_BAD_2 = "650 ORCONN 127.0.0.1:001 CONNECTED" +ORCONN_BAD_3 = "650 ORCONN 127.0.0.1:9000 CONNECTED NCIRCS=too_many" # STATUS_* events that I was able to easily trigger. Most came from starting # TBB, then listening while it bootstrapped. @@ -384,18 +379,19 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.error) self.assertEqual(datetime.datetime(2012, 11, 19, 8, 50, 13), event.utc_expiry) - self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_1) - self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_2) - - event = _get_event(ADDRMAP_BAD_3) + event = _get_event(ADDRMAP_ERROR_EVENT) self.assertTrue(isinstance(event, stem.response.events.AddrMapEvent)) - self.assertEqual(ADDRMAP_BAD_3.lstrip("650 "), str(event)) + self.assertEqual(ADDRMAP_ERROR_EVENT.lstrip("650 "), str(event)) self.assertEqual("www.atagar.com", event.hostname) self.assertEqual(None, event.destination) self.assertEqual(datetime.datetime(2012, 11, 19, 0, 50, 13), event.expiry) self.assertEqual("yes", event.error) self.assertEqual(datetime.datetime(2012, 11, 19, 8, 50, 13), event.utc_expiry) + + # malformed content where quotes are missing + self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_1) + self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_2) def test_authdir_newdesc_event(self): # TODO: awaiting test data - https://trac.torproject.org/7534 @@ -421,6 +417,7 @@ class TestEvents(unittest.TestCase): self.assertEqual(21850, event.close_timeout) self.assertEqual(0.072581, event.close_rate) + # malformed content where we get non-numeric values self.assertRaises(ProtocolError, _get_event, BUILD_TIMEOUT_EVENT_BAD_1) self.assertRaises(ProtocolError, _get_event, BUILD_TIMEOUT_EVENT_BAD_2) @@ -467,9 +464,6 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) - self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_1) - self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_2) - event = _get_event(CIRC_EXTENDED) self.assertTrue(isinstance(event, stem.response.events.CircuitEvent)) @@ -544,6 +538,12 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.created) self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) + + # malformed TIME_CREATED timestamp + self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_1) + + # invalid circuit id + self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_2) def test_circ_minor_event(self): event = _get_event(CIRC_MINOR_EVENT) @@ -561,7 +561,10 @@ class TestEvents(unittest.TestCase): self.assertEqual(CircPurpose.TESTING, event.old_purpose) self.assertEqual(None, event.old_hs_state) + # malformed TIME_CREATED timestamp self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_1) + + # invalid circuit id self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_2) def test_clients_seen_event(self): @@ -573,11 +576,22 @@ class TestEvents(unittest.TestCase): self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) + # CountrySummary's 'key=value' mappings are replaced with 'key:value' self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_1) + + # CountrySummary's country codes aren't two letters self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_2) + + # CountrySummary's mapping contains a non-numeric value self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_3) + + # CountrySummary has duplicate country codes (multiple 'au=' mappings) self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_4) + + # IPVersions's 'key=value' mappings are replaced with 'key:value' self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_5) + + # IPVersions's mapping contains a non-numeric value self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_6) def test_conf_changed(self): @@ -707,9 +721,14 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.circ_count) - self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_1) - self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_2) - self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_3) + # malformed fingerprint + self.assertRaises(ProtocolError, _get_event, ORCONN_BAD_1) + + # invalid port number ('001') + self.assertRaises(ProtocolError, _get_event, ORCONN_BAD_2) + + # non-numeric NCIRCS + self.assertRaises(ProtocolError, _get_event, ORCONN_BAD_3) def test_signal_event(self): event = _get_event("650 SIGNAL DEBUG") @@ -1037,27 +1056,19 @@ class TestEvents(unittest.TestCase): self.assertEqual(15297, event.source_port) self.assertEqual(StreamPurpose.DNS_REQUEST, event.purpose) - event = _get_event(STREAM_SENTCONNECT_BAD_1) - - self.assertTrue(isinstance(event, stem.response.events.StreamEvent)) - self.assertEqual(STREAM_SENTCONNECT_BAD_1.lstrip("650 "), str(event)) - self.assertEqual("18", event.id) - self.assertEqual(StreamStatus.SENTCONNECT, event.status) - self.assertEqual("26", event.circ_id) - self.assertEqual(None, event.target) - self.assertEqual(None, event.target_address) - self.assertEqual(None, event.target_port) - self.assertEqual(None, event.reason) - self.assertEqual(None, event.remote_reason) - self.assertEqual(None, event.source) - self.assertEqual(None, event.source_addr) - self.assertEqual(None, event.source_address) - self.assertEqual(None, event.source_port) - self.assertEqual(None, event.purpose) + # missing target + self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_1) + # target is missing a port self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_2) + + # target's port is malformed self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_3) + + # SOURCE_ADDR is missing a port self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_1) + + # SOURCE_ADDR's port is malformed self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_2) def test_stream_bw_event(self):

1 0

[stem/master] Script for republishing stem's site
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 22286e9dc3fea710182984dd320f4e419cc5a425 Merge: 6711458 9a1601d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 14 09:27:50 2012 -0800 Script for republishing stem's site Now that we're moving our site from ReadTheDocs to a tpo host (staticiforme) we need our own method for automatically republishing our sphinx docs. To do this we're using a cron process that runs every five minutes which... * Pulls stem's git repo. If it has changed... * Run 'make html' to rebuild the docs. * Republish the content by calling 'static-master-update-component'. Many thanks to weasel for working with me on this, and pointing out the numerous mistakes I've been making. docs/republish | 7 ++++ docs/republish.py | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/tutorial.rst | 8 ++-- stem/__init__.py | 2 +- 4 files changed, 99 insertions(+), 5 deletions(-)

1 0

[stem/master] Remove extra checks for circuit id and stream id validity
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit e30f2df26221004fc2c535e5ef5e0b2c8518e3b2 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 17:12:27 2012 -0700 Remove extra checks for circuit id and stream id validity CircuitID and StreamID may not be None, so raise ProtocolError if either ID is None. Inside is_valid_circuit_id() and is_valid_stream_id(), isinstance(entry, str) already returns False if None is checked. Add None as invalid IDs in tests. NOTE: Do not try this with is_valid_fingerprint() and is_valid_nickname(), as the fingerprint or nickname may be None in certain cases. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/response/events.py | 6 +++--- test/unit/util/tor_tools.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 8c9cc2b..4e0aef8 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -326,7 +326,7 @@ class CircuitEvent(Event): except ValueError, exc: raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) - if self.id is not None and not tor_tools.is_valid_circuit_id(self.id): + if not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) self._log_if_unrecognized('status', stem.CircStatus) @@ -381,7 +381,7 @@ class CircMinorEvent(Event): except ValueError, exc: raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) - if self.id is not None and not tor_tools.is_valid_circuit_id(self.id): + if not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) self._log_if_unrecognized('event', stem.CircEvent) @@ -811,7 +811,7 @@ class StreamBwEvent(Event): _VERSION_ADDED = stem.version.Version('0.1.2.8-beta') def _parse(self): - if self.id is not None and not tor_tools.is_valid_stream_id(self.id): + if not tor_tools.is_valid_stream_id(self.id): raise stem.ProtocolError("Stream IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) elif not self.written: raise stem.ProtocolError("STREAM_BW event is missing its written value") diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index 32581e9..0c0e6e2 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -43,6 +43,7 @@ class TestTorTools(unittest.TestCase): ) invalid_nicknames = ( + None, "", "toolongggggggggggggg", "bad_character", @@ -66,6 +67,7 @@ class TestTorTools(unittest.TestCase): ) invalid_circuit_ids = ( + None, "", 0, 2,

1 0