tor-commits December 2012

tor-commits@lists.torproject.org

17 participants
1600 discussions

r25944: {website} add a cute little 'internet freedom' badge next to the flash (website/trunk/docs/en)
by Roger Dingledine 16 Dec '12

16 Dec '12

Author: arma Date: 2012-12-16 09:43:22 +0000 (Sun, 16 Dec 2012) New Revision: 25944 Modified: website/trunk/docs/en/pluggable-transports.wml Log: add a cute little 'internet freedom' badge next to the flashproxy stanza Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2012-12-15 06:27:01 UTC (rev 25943) +++ website/trunk/docs/en/pluggable-transports.wml 2012-12-16 09:43:22 UTC (rev 25944) @@ -53,7 +53,10 @@ <a href="https://gitweb.torproject.org/flashproxy.git">git repository</a>, and <a href="http://crypto.stanford.edu/flashproxy/flashproxy.pdf">design paper</a>. - Maintained by David Fifield. <br> + Maintained by David Fifield. + <iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" + height="15" frameborder="0" scrolling="no"></iframe> + <br> Status: <em>Implemented and tested, but there are no bundles yet; <a href="https://crypto.stanford.edu/flashproxy/#how-to">need manual setup.</a></em>

1 0

[stem/master] The str_tools functions didn't handle negative values
by atagar＠torproject.org 16 Dec '12

16 Dec '12

commit fc4bdf7ab686b4bbd12e3aefc83d78d0a171df60 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 15 16:22:30 2012 -0800 The str_tools functions didn't handle negative values Functions like str_tools.get_size_label() provided labels using the smallest unit type if the count was negative. For instance, '-2000000' would be translated into '-2000000 B' rather than '-1 MB'. An inline comment seems to indicate that this was on purpose, but I haven't a clue why. Fixing it. --- stem/util/str_tools.py | 8 +++++--- test/unit/util/str_tools.py | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 6c36cd0..776ed48 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -280,14 +280,16 @@ def _get_label(units, count, decimal, is_long): (count_per_unit, short_label, long_label) :param int count: number of base units being converted :param int decimal: decimal precision of label - :param bool is_long: uses the long label if **True&&, short label otherwise + :param bool is_long: uses the long label if **True**, short label otherwise """ # formatted string for the requested number of digits label_format = "%%.%if" % decimal - # for zero or negative values use the smallest units - if count < 1: + if count < 0: + label_format = "-" + label_format + count = abs(count) + elif count == 0: units_label = units[-1][2] + "s" if is_long else units[-1][1] return "%s%s" % (label_format % count, units_label) diff --git a/test/unit/util/str_tools.py b/test/unit/util/str_tools.py index e91e324..84fd850 100644 --- a/test/unit/util/str_tools.py +++ b/test/unit/util/str_tools.py @@ -39,6 +39,7 @@ class TestStrTools(unittest.TestCase): self.assertEquals('0.00 B', str_tools.get_size_label(0, 2)) self.assertEquals('-10 B', str_tools.get_size_label(-10)) self.assertEquals('80 b', str_tools.get_size_label(10, is_bytes = False)) + self.assertEquals('-1 MB', str_tools.get_size_label(-2000000)) # checking that we round down self.assertEquals('23.43 Kb', str_tools.get_size_label(3000, 2, is_bytes = False))

1 0

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

15 Dec '12

commit 48daff039d95d8223ecd83cbd3af59a2ee00dc37 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:58:08 2012 -0700 Add test cases for BUILDTIMEOUT_SET events Check integer and float conversion failures raise a ProtocolError. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 595ae8c..18ce4bd 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -36,6 +36,26 @@ TIMEOUT_RATE=0.137097 \ CLOSE_MS=21850 \ CLOSE_RATE=0.072581" +BUILD_TIMEOUT_EVENT_BAD_1 = "650 BUILDTIMEOUT_SET COMPUTED \ +TOTAL_TIMES=one_twenty_four \ +TIMEOUT_MS=9019 \ +XM=1375 \ +ALPHA=0.855662 \ +CUTOFF_QUANTILE=0.800000 \ +TIMEOUT_RATE=0.137097 \ +CLOSE_MS=21850 \ +CLOSE_RATE=0.072581" + +BUILD_TIMEOUT_EVENT_BAD_2 = "650 BUILDTIMEOUT_SET COMPUTED \ +TOTAL_TIMES=124 \ +TIMEOUT_MS=9019 \ +XM=1375 \ +ALPHA=0.855662 \ +CUTOFF_QUANTILE=zero_point_eight \ +TIMEOUT_RATE=0.137097 \ +CLOSE_MS=21850 \ +CLOSE_RATE=0.072581" + # CIRC events from tor v0.2.3.16 CIRC_LAUNCHED = "650 CIRC 7 LAUNCHED \ @@ -316,6 +336,9 @@ class TestEvents(unittest.TestCase): self.assertEqual(0.137097, event.timeout_rate) self.assertEqual(21850, event.close_timeout) self.assertEqual(0.072581, event.close_rate) + + self.assertRaises(ProtocolError, _get_event, BUILD_TIMEOUT_EVENT_BAD_1) + self.assertRaises(ProtocolError, _get_event, BUILD_TIMEOUT_EVENT_BAD_2) def test_bw_event(self): event = _get_event("650 BW 15 25")

1 0

[stem/master] Add test case for missing BW read value
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 97dc4108404a1c0f676845538a542f98085ffb4a Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:34:59 2012 -0700 Add test case for missing BW read value Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 5422f50..595ae8c 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -338,6 +338,7 @@ class TestEvents(unittest.TestCase): self.assertEqual(20, event.written) self.assertEqual({'OR': '5', 'EXIT': '500'}, event.keyword_args) + self.assertRaises(ProtocolError, _get_event, "650 BW") self.assertRaises(ProtocolError, _get_event, "650 BW 15") self.assertRaises(ProtocolError, _get_event, "650 BW -15 25") self.assertRaises(ProtocolError, _get_event, "650 BW 15 -25")

1 0

[stem/master] Test error conditions for ADDRMAP events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit f1b81e062c2b1ec646f99b346b98dd3d4ec38057 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:30:40 2012 -0700 Test error conditions for ADDRMAP events Add tests for missing quotes before (ADDRMAP_BAD_1) and after (ADDRMAP_BAD_2) the expiry positional argument. Add a test for an error event (ADDRMAP_BAD_3), constructed from control-spec.txt. Also, move the sample event lines to their alphabetic position in the list of other event samples. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 91eaa18..5422f50 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -13,6 +13,17 @@ import stem.util.log from stem import * # enums and exceptions from test import mocking +# ADDRMAP event + +ADDRMAP = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13" \ +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. BUILD_TIMEOUT_EVENT = "650 BUILDTIMEOUT_SET COMPUTED \ @@ -193,12 +204,6 @@ NEWDESC_SINGLE = "650 NEWDESC $B3FA3110CC6F42443F039220C134CBD2FC4F0493=Sakura" NEWDESC_MULTIPLE = "650 NEWDESC $BE938957B2CA5F804B3AFC2C1EE6673170CDBBF8=Moonshine \ $B4BE08B22D4D2923EDC3970FD1B93D0448C6D8FF~Unnamed" -# ADDRMAP event -# TODO: it would be nice to have an example of an error event - -ADDRMAP = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13" \ -EXPIRES="2012-11-19 08:50:13"' - def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert("EVENT", controller_event, arrived_at = 25) @@ -274,6 +279,19 @@ class TestEvents(unittest.TestCase): self.assertEqual(datetime.datetime(2012, 11, 19, 0, 50, 13), event.expiry) 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) + + self.assertTrue(isinstance(event, stem.response.events.AddrMapEvent)) + self.assertEqual(ADDRMAP_BAD_3.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) def test_authdir_newdesc_event(self): # TODO: awaiting test data - https://trac.torproject.org/7534

1 0

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

15 Dec '12

commit df01f3737143545493652437680db52ea8e7f337 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:20:13 2012 -0700 Add test cases for CLIENTS_SEEN event These sample events hit every exception possible in the ClientsSeenEvent _parse() method. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 100d357..48aab32 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -125,6 +125,36 @@ TimeStarted="2008-12-25 23:50:43" \ CountrySummary=us=16,de=8,uk=8 \ IPVersions=v4=16,v6=40' +CLIENTS_SEEN_EVENT_BAD_1 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us:16,de:8,uk:8 \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_2 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=usa=16,unitedkingdom=8 \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_3 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=eight \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_4 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=au=16,au=8,au=8 \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_5 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=8 \ +IPVersions=v4:16,v6:40' + +CLIENTS_SEEN_EVENT_BAD_6 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=8 \ +IPVersions=v4=sixteen,v6=40' + # CONF_CHANGED event from tor 0.2.3.16. CONF_CHANGED_EVENT = """650-CONF_CHANGED @@ -512,6 +542,13 @@ class TestEvents(unittest.TestCase): self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) + + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_1) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_2) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_3) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_4) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_5) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_6) def test_conf_changed(self): event = _get_event(CONF_CHANGED_EVENT)

1 0

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

15 Dec '12

commit c5db5cb1be07da0da92b30559557e72285d3fc37 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:00:49 2012 -0700 Add test cases for CIRC events Check ProtocolError is raised when the TIME_CREATED time cannot be parsed or the CiruitID is not valid. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 18ce4bd..47f4567 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -63,6 +63,16 @@ BUILD_FLAGS=NEED_CAPACITY \ PURPOSE=GENERAL \ TIME_CREATED=2012-11-08T16:48:38.417238" +CIRC_LAUNCHED_BAD_1 = "650 CIRC 7 LAUNCHED \ +BUILD_FLAGS=NEED_CAPACITY \ +PURPOSE=GENERAL \ +TIME_CREATED=20121108T164838417238" + +CIRC_LAUNCHED_BAD_2 = "650 CIRC toolong8901234567 LAUNCHED \ +BUILD_FLAGS=NEED_CAPACITY \ +PURPOSE=GENERAL \ +TIME_CREATED=2012-11-08T16:48:38.417238" + CIRC_EXTENDED = "650 CIRC 7 EXTENDED \ $999A226EBED397F331B612FE1E4CFAE5C1F201BA=piyaz \ BUILD_FLAGS=NEED_CAPACITY \ @@ -383,6 +393,9 @@ 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))

1 0

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

15 Dec '12

commit 6cf5422575dd1e3e6fe2237d6bbc2f45e2096e1a Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:09:00 2012 -0700 Add test cases for CIRC_MINOR events Checks the same error conditions added to CIRC event tests in previous commit. Also, swap test_circ_minor_event() and test_clients_seen_event() to alphabetic order of appearance. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 47f4567..100d357 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -104,6 +104,20 @@ PURPOSE=MEASURE_TIMEOUT \ TIME_CREATED=2012-12-03T16:45:33.409602 \ OLD_PURPOSE=TESTING" +CIRC_MINOR_EVENT_BAD_1 = "650 CIRC_MINOR 7 PURPOSE_CHANGED \ +$67B2BDA4264D8A189D9270E28B1D30A262838243~europa1 \ +BUILD_FLAGS=IS_INTERNAL,NEED_CAPACITY \ +PURPOSE=MEASURE_TIMEOUT \ +TIME_CREATED=20121203T164533409602 \ +OLD_PURPOSE=TESTING" + +CIRC_MINOR_EVENT_BAD_2 = "650 CIRC_MINOR toolong8901234567 PURPOSE_CHANGED \ +$67B2BDA4264D8A189D9270E28B1D30A262838243~europa1 \ +BUILD_FLAGS=IS_INTERNAL,NEED_CAPACITY \ +PURPOSE=MEASURE_TIMEOUT \ +TIME_CREATED=2012-12-03T16:45:33.409602 \ +OLD_PURPOSE=TESTING" + # CLIENTS_SEEN example from the spec CLIENTS_SEEN_EVENT = '650 CLIENTS_SEEN \ @@ -471,15 +485,6 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) - def test_clients_seen_event(self): - event = _get_event(CLIENTS_SEEN_EVENT) - - self.assertTrue(isinstance(event, stem.response.events.ClientsSeenEvent)) - self.assertEqual(CLIENTS_SEEN_EVENT.lstrip("650 "), str(event)) - self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) - self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) - self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) - def test_circ_minor_event(self): event = _get_event(CIRC_MINOR_EVENT) @@ -495,6 +500,18 @@ class TestEvents(unittest.TestCase): self.assertEqual(datetime.datetime(2012, 12, 3, 16, 45, 33, 409602), event.created) self.assertEqual(CircPurpose.TESTING, event.old_purpose) self.assertEqual(None, event.old_hs_state) + + self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_1) + self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_2) + + def test_clients_seen_event(self): + event = _get_event(CLIENTS_SEEN_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.ClientsSeenEvent)) + self.assertEqual(CLIENTS_SEEN_EVENT.lstrip("650 "), str(event)) + self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) + self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) + self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) def test_conf_changed(self): event = _get_event(CONF_CHANGED_EVENT)

1 0

[stem/master] Change status event type for CONSENSUS_ARRIVED
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 146f32473a3c0f9f91c0e4a721e92906d293a63e Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:11:37 2012 -0700 Change status event type for CONSENSUS_ARRIVED According to control-spec.txt, CONSENSUS_ARRIVED is in the STATUS_GENERAL family. While it is not vital for the faked test events, let's make it accurate. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index db33367..21b5fa5 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -211,7 +211,8 @@ CONNECTED NCIRCS=too_many" # STATUS_* events that I was able to easily trigger. Most came from starting # TBB, then listening while it bootstrapped. -STATUS_CLIENT_CONSENSUS_ARRIVED = "650 STATUS_CLIENT NOTICE CONSENSUS_ARRIVED" +STATUS_GENERAL_CONSENSUS_ARRIVED = "650 STATUS_GENERAL NOTICE CONSENSUS_ARRIVED" + STATUS_CLIENT_ENOUGH_DIR_INFO = "650 STATUS_CLIENT NOTICE ENOUGH_DIR_INFO" STATUS_CLIENT_CIRC_ESTABLISHED = "650 STATUS_CLIENT NOTICE CIRCUIT_ESTABLISHED" @@ -704,11 +705,11 @@ class TestEvents(unittest.TestCase): self.assertEqual(Signal.DUMP, event.signal) def test_status_event_consensus_arrived(self): - event = _get_event(STATUS_CLIENT_CONSENSUS_ARRIVED) + event = _get_event(STATUS_GENERAL_CONSENSUS_ARRIVED) self.assertTrue(isinstance(event, stem.response.events.StatusEvent)) - self.assertEqual(STATUS_CLIENT_CONSENSUS_ARRIVED.lstrip("650 "), str(event)) - self.assertEqual(StatusType.CLIENT, event.status_type) + self.assertEqual(STATUS_GENERAL_CONSENSUS_ARRIVED.lstrip("650 "), str(event)) + self.assertEqual(StatusType.GENERAL, event.status_type) self.assertEqual(Runlevel.NOTICE, event.runlevel) self.assertEqual("CONSENSUS_ARRIVED", event.action) @@ -1048,17 +1049,17 @@ class TestEvents(unittest.TestCase): # Try parsing a valid event. We shouldn't log anything. - _get_event(STATUS_CLIENT_CONSENSUS_ARRIVED) + _get_event(STATUS_GENERAL_CONSENSUS_ARRIVED) self.assertTrue(logging_buffer.is_empty()) self.assertEqual([], list(logging_buffer)) # Parse an invalid runlevel. - _get_event(STATUS_CLIENT_CONSENSUS_ARRIVED.replace("NOTICE", "OMEGA_CRITICAL!!!")) + _get_event(STATUS_GENERAL_CONSENSUS_ARRIVED.replace("NOTICE", "OMEGA_CRITICAL!!!")) logged_events = list(logging_buffer) self.assertEqual(1, len(logged_events)) - self.assertTrue("STATUS_CLIENT event had an unrecognized runlevel" in logged_events[0]) + self.assertTrue("STATUS_GENERAL event had an unrecognized runlevel" in logged_events[0]) stem_logger.removeHandler(logging_buffer)

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2012