August 2018 - tor-commits - lists.torproject.org

[stem/master] Lingering thread due to recent event unit tests
by atagar＠torproject.org 13 Aug '18

13 Aug '18

commit bc06836ee87169da8118ff985fc87ea6880ca219 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 12 13:56:45 2018 -0700 Lingering thread due to recent event unit tests Oops, new tests for #27053 didn't close the threads of the mock controller it created. Unit tests passed because we don't check for lingering tests, but if ran along with our integ tests the test run concluded with... Threads lingering after test run: <_MainThread(MainThread, started 140086124480256)> <Thread(Event Notifier, started daemon 140085629839104)> <Thread(Event Notifier, started daemon 140085657794304)> <Thread(Event Notifier, started daemon 140085638756096)> Tracked this down by dumping the internal attributes of those controllers. They had mocks from these tests, providing the eureka to get the root cause. --- docs/change_log.rst | 2 +- test/unit/control/controller.py | 63 +++++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 75a25847..9f4049e6 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -46,8 +46,8 @@ The following are only available within Stem's `git repository * **Controller** - * Documented v3 hidden service support (:trac:`25124`, :spec:`6bd0a69`) * Listener exceptions and malformed events no longer break further event processing (:trac:`27053`) + * Documented v3 hidden service support (:trac:`25124`, :spec:`6bd0a69`) * Added the stem.control.MALFORMED_EVENTS event listener constant * Added support for limiting the maximum number of streams to :func:`~stem.control.Controller.create_ephemeral_hidden_service` (:spec:`2fcb1c2`) * Added a timeout argument to :class:`~stem.control.Controller` methods that could await a response (:trac:`26056`) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index c5809192..8034abe2 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -624,25 +624,30 @@ class TestControl(unittest.TestCase): self.assertRaises(InvalidRequest, self.controller.add_event_listener, Mock(), EventType.SIGNAL) @patch('time.time', Mock(return_value = TEST_TIMESTAMP)) - @patch('stem.control.Controller.is_alive', Mock(return_value = True)) - def test_events_get_received(self): + @patch('stem.control.Controller.is_alive') + def test_events_get_received(self, is_alive_mock): """ Trigger an event, checking that our listeners get notified. """ + is_alive_mock.return_value = True self.controller._launch_threads() - self._emit_event(CIRC_EVENT) - self.circ_listener.assert_called_once_with(CIRC_EVENT) - self.bw_listener.assert_not_called() - self.malformed_listener.assert_not_called() + try: + self._emit_event(CIRC_EVENT) + self.circ_listener.assert_called_once_with(CIRC_EVENT) + self.bw_listener.assert_not_called() + self.malformed_listener.assert_not_called() - self._emit_event(BW_EVENT) - self.bw_listener.assert_called_once_with(BW_EVENT) + self._emit_event(BW_EVENT) + self.bw_listener.assert_called_once_with(BW_EVENT) + finally: + is_alive_mock.return_value = False + self.controller._close() @patch('time.time', Mock(return_value = TEST_TIMESTAMP)) - @patch('stem.control.Controller.is_alive', Mock(return_value = True)) - def test_event_listing_with_error(self): + @patch('stem.control.Controller.is_alive') + def test_event_listing_with_error(self, is_alive_mock): """ Raise an exception in an event listener to confirm it doesn't break our event thread. @@ -650,33 +655,43 @@ class TestControl(unittest.TestCase): self.circ_listener.side_effect = ValueError('boom') + is_alive_mock.return_value = True self.controller._launch_threads() - self._emit_event(CIRC_EVENT) - self.circ_listener.assert_called_once_with(CIRC_EVENT) - self.bw_listener.assert_not_called() - self.malformed_listener.assert_not_called() + try: + self._emit_event(CIRC_EVENT) + self.circ_listener.assert_called_once_with(CIRC_EVENT) + self.bw_listener.assert_not_called() + self.malformed_listener.assert_not_called() - self._emit_event(BW_EVENT) - self.bw_listener.assert_called_once_with(BW_EVENT) + self._emit_event(BW_EVENT) + self.bw_listener.assert_called_once_with(BW_EVENT) + finally: + is_alive_mock.return_value = False + self.controller._close() @patch('time.time', Mock(return_value = TEST_TIMESTAMP)) - @patch('stem.control.Controller.is_alive', Mock(return_value = True)) - def test_event_listing_with_malformed_event(self): + @patch('stem.control.Controller.is_alive') + def test_event_listing_with_malformed_event(self, is_alive_mock): """ Attempt to parse a malformed event emitted from Tor. It's important this doesn't break our event thread. """ + is_alive_mock.return_value = True self.controller._launch_threads() - self._emit_event(BAD_EVENT) - self.circ_listener.assert_not_called() - self.bw_listener.assert_not_called() - self.malformed_listener.assert_called_once() + try: + self._emit_event(BAD_EVENT) + self.circ_listener.assert_not_called() + self.bw_listener.assert_not_called() + self.malformed_listener.assert_called_once() - self._emit_event(BW_EVENT) - self.bw_listener.assert_called_once_with(BW_EVENT) + self._emit_event(BW_EVENT) + self.bw_listener.assert_called_once_with(BW_EVENT) + finally: + is_alive_mock.return_value = False + self.controller._close() @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.5.0.14'))) @patch('stem.control.Controller.msg', Mock(return_value = ControlMessage.from_str('250 OK\r\n')))

1 0

[stem/master] Wait for unit tests to consume events
by atagar＠torproject.org 13 Aug '18

13 Aug '18

commit c9cc0f558cfe086d8e72e4fd9bf31c98ad535041 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 12 14:08:09 2018 -0700 Wait for unit tests to consume events On #27053 Dave's reported that even with a bumped sleep these new tests occasionally fail for him. Sleeps within tests are a code stink so I really should do something smarter anyway. Waiting up to five seconds for unit tests to consume the events they emit. When we run both our unit and integ tests the later performs heavy tests asychrously. This tends to peg the CPU while running our unit tests, probably slowing things down enough for them to fail occasionly for Dave. --- test/unit/control/controller.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 8034abe2..eba612fd 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -826,7 +826,14 @@ class TestControl(unittest.TestCase): self.controller._event_queue.put(uncast_event) self.controller._event_notice.set() - # doesn't seem necessary in practice, but since event processing is - # asynchronous giving it a tiny bit of time to get handled + # Wait for the event to get asynchronously consumed. This should happen + # right away, but if the system is bogged down it may take quite a few + # milliseconds. - time.sleep(0.03) + event_sent_at = time.time() + + while not self.controller._event_queue.empty(): + time.sleep(0.01) + + if time.time() - event_sent_at > 5: + self.fail('Event did not get processed after five seconds')

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Aug '18

12 Aug '18

commit 6797bffd007ec390e834552960b015f29c154332 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 12 19:45:10 2018 +0000 Update translations for bridgedb --- pa/LC_MESSAGES/bridgedb.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po index 182ea5a88..89205162b 100644 --- a/pa/LC_MESSAGES/bridgedb.po +++ b/pa/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # A S Alam <alam.yellow(a)gmail.com>, 2014 +# SONIA SINGLA <soniasingla.1812(a)gmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 18:46+0000\n" -"Last-Translator: A S Alam <alam.yellow(a)gmail.com>\n" +"PO-Revision-Date: 2018-08-12 19:43+0000\n" +"Last-Translator: SONIA SINGLA <soniasingla.1812(a)gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,35 +33,35 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "ਅਫ਼ਸੋਸ ਹੈ ਕਿ ਤੁਹਾਡੀ ਬੇਨਤੀ ਵਿਚ ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ ਹੈ " #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "ਇੱਕ ਬੱਗ ਦੀ ਰਿਪੋਰਟ ਕਰੋ" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "ਸੂਤਰ ਸੰਕੇਤਾਵਲੀ" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "ਲਾਗ ਬਦਲੋ" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "ਸੰਪਰਕ ਕਰੋ" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "ਸਾਰਿਆ ਨੂੰ ਚੁਣੋ" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "QR ਕੋਡ ਦਿਖਾਓ" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "ਤੁਹਾਡੀ ਪੁੱਲ ਲਾਈਨ ਲਈ QRCode" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -69,17 +70,17 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "ਓਹ, ਸਪੈਗੇਟੀਓਸ!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "ਅਜਿਹਾ ਲਗਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ QRcode ਨੂੰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਇੱਕ ਤਰੁੱਟੀ ਹੋਈ ਸੀ" #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "ਇਸ QRCode ਵਿੱਚ ਤੁਹਾਡੀਆਂ ਬ੍ਰਿਜ ਲਾਈਨਾਂ ਸ਼ਾਮਿਲ ਹਨ ਆਪਣੇ ਪੁੱਲ ਸਤਰਾਂ ਨੂੰ ਮੋਬਾਈਲ ਅਤੇ ਹੋਰ ਡਿਵਾਈਸਾਂ ਤੇ ਕਾਪੀ ਕਰਨ ਲਈ ਇਸ ਨੂੰ QRCode ਰੀਡਰ ਨਾਲ ਸਕੈਨ ਕਰੋ" #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..."

1 0

[translation-tools/master] remove tor-launcher-progress. ref: https://gitweb.torproject.org/tor-launcher.git/commit/?id=09234581a042a648e99e2981799e2c4dbf53100c
by emmapeel＠torproject.org 12 Aug '18

12 Aug '18

commit 41291d1c453910db518b9628fd67d80b57f56466 Author: emma peel <emma.peel(a)riseup.net> Date: Sun Aug 12 14:09:01 2018 +0000 remove tor-launcher-progress. ref: https://gitweb.torproject.org/tor-launcher.git/commit/?id=09234581a042a648e… --- config | 1 - 1 file changed, 1 deletion(-) diff --git a/config b/config index 4a42fc7..7c2fed6 100644 --- a/config +++ b/config @@ -33,7 +33,6 @@ torbutton-abouttorproperties torbutton-abouttorproperties_completed torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed torcheck torcheck_completed tor-launcher-properties tor-launcher-properties_completed -tor-launcher-progress tor-launcher-progress_completed tor-launcher-network-settings tor-launcher-network-settings_completed whisperback whisperback_completed support-portal support-portal_completed"

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 12 Aug '18

12 Aug '18

commit 0eceae61d2a8f230e87476958220f4225134e555 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 12 08:45:09 2018 +0000 Update translations for abouttor-homepage_completed --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 9ebd84522..9d5065de6 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Kullanım Kılavuzu"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> -<!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Çalıştır »"> +<!ENTITY aboutTor.helpInfo3.label "Bir Tor Aktarıcı Düğümü İşletin»"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Gönüllü Destekte Bulunun »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 12 Aug '18

12 Aug '18

commit 1f2db2be2b5b680f83e2c53c1f892aa01a5972b5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 12 08:45:04 2018 +0000 Update translations for abouttor-homepage --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 9ebd84522..9d5065de6 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Kullanım Kılavuzu"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> -<!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Çalıştır »"> +<!ENTITY aboutTor.helpInfo3.label "Bir Tor Aktarıcı Düğümü İşletin»"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Gönüllü Destekte Bulunun »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 12 Aug '18

12 Aug '18

commit 92638a79b4019c3adc072d74d248b3f6a7305c36 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 12 05:45:16 2018 +0000 Update translations for bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 0341671cf..072cfc7f2 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-06-22 05:22+0000\n" +"PO-Revision-Date: 2018-08-12 05:26+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Ek olarak BridgeDB %s hiçbir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz köprüye sahiptir. Kulağa iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda İnternet kısıtlamalarını aşmaya yardım edebilirler.\n\n" +msgstr "Ayrıca BridgeDB %s üzerinde herhangi bir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz vanilla köprüsü bulunur. Kulağa pek iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda İnternet engellemelerini aşmaya yardım edebilir.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Aug '18

12 Aug '18

commit ba7e37e336e93ac98a09e28b89fc08aed0cbd411 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 12 05:45:10 2018 +0000 Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 0341671cf..072cfc7f2 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-06-22 05:22+0000\n" +"PO-Revision-Date: 2018-08-12 05:26+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Ek olarak BridgeDB %s hiçbir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz köprüye sahiptir. Kulağa iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda İnternet kısıtlamalarını aşmaya yardım edebilirler.\n\n" +msgstr "Ayrıca BridgeDB %s üzerinde herhangi bir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz vanilla köprüsü bulunur. Kulağa pek iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda İnternet engellemelerini aşmaya yardım edebilir.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?"

1 0

[stem/master] Listener exceptions and malformed events broke event loop
by atagar＠torproject.org 12 Aug '18

12 Aug '18

commit ed6460df4a6fa8446a1e2923bddde652f5d91ed7 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 10 03:30:47 2018 -0700 Listener exceptions and malformed events broke event loop When a listener raised an uncaught exception or tor provides a malformed event we terminated our event loop, preventing any further events from being handled. I haven't seen this nail us in practice but definitely both oversights. https://trac.torproject.org/projects/tor/ticket/27053 --- docs/change_log.rst | 2 ++ stem/control.py | 25 +++++++++++++++++++++---- test/unit/control/controller.py | 18 +++++++++--------- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 362e4e10..75a25847 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,8 @@ The following are only available within Stem's `git repository * **Controller** * Documented v3 hidden service support (:trac:`25124`, :spec:`6bd0a69`) + * Listener exceptions and malformed events no longer break further event processing (:trac:`27053`) + * Added the stem.control.MALFORMED_EVENTS event listener constant * Added support for limiting the maximum number of streams to :func:`~stem.control.Controller.create_ephemeral_hidden_service` (:spec:`2fcb1c2`) * Added a timeout argument to :class:`~stem.control.Controller` methods that could await a response (:trac:`26056`) * Stacktrace if :func:`stem.connection.connect` had a string port argument diff --git a/stem/control.py b/stem/control.py index 7e1d1286..05cf44ce 100644 --- a/stem/control.py +++ b/stem/control.py @@ -286,6 +286,8 @@ from stem.util import log EVENTS_LISTENING_TIMEOUT = 0.1 +MALFORMED_EVENTS = 'MALFORMED_EVENTS' + # state changes a control socket can have State = stem.util.enum.Enum('INIT', 'RESET', 'CLOSED') @@ -3057,6 +3059,13 @@ class Controller(BaseController): If a new control connection is initialized then this listener will be reattached. + If tor emits a malformed event it can be received by listening for the + stem.control.MALFORMED_EVENTS constant. + + .. versionchanged:: 1.7.0 + Listener exceptions and malformed events no longer break further event + processing. Added the **MALFORMED_EVENTS** constant. + :param functor listener: function to be called when an event is received :param stem.control.EventType events: event types to be listened for @@ -3874,13 +3883,21 @@ class Controller(BaseController): log.warn('We were unable assert ownership of tor through TAKEOWNERSHIP, despite being configured to be the owning process through __OwningControllerProcess. (%s)' % response) def _handle_event(self, event_message): - stem.response.convert('EVENT', event_message, arrived_at = time.time()) + try: + stem.response.convert('EVENT', event_message, arrived_at = time.time()) + event_type = event_message.type + except stem.ProtocolError as exc: + log.error('Tor sent a malformed event (%s): %s' % (exc, event_message)) + event_type = MALFORMED_EVENTS with self._event_listeners_lock: - for event_type, event_listeners in list(self._event_listeners.items()): - if event_type == event_message.type: + for listener_type, event_listeners in list(self._event_listeners.items()): + if listener_type == event_type: for listener in event_listeners: - listener(event_message) + try: + listener(event_message) + except Exception as exc: + log.warn('Event listener raised an uncaught exception (%s): %s' % (exc, event_message)) def _attach_listeners(self): """ diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index fa934f34..c5809192 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -15,7 +15,7 @@ import stem.util.system import stem.version from stem import ControllerError, DescriptorUnavailable, InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest -from stem.control import _parse_circ_path, Listener, Controller, EventType +from stem.control import MALFORMED_EVENTS, _parse_circ_path, Listener, Controller, EventType from stem.response import ControlMessage from stem.exit_policy import ExitPolicy @@ -49,6 +49,9 @@ class TestControl(unittest.TestCase): self.bw_listener = Mock() self.controller.add_event_listener(self.bw_listener, EventType.BW) + self.malformed_listener = Mock() + self.controller.add_event_listener(self.malformed_listener, MALFORMED_EVENTS) + def test_event_description(self): self.assertEqual("Logging at the debug runlevel. This is low level, high volume information about tor's internals that generally isn't useful to users.", stem.control.event_description('DEBUG')) self.assertEqual('Event emitted every second with the bytes sent and received by tor.', stem.control.event_description('BW')) @@ -632,6 +635,7 @@ class TestControl(unittest.TestCase): self._emit_event(CIRC_EVENT) self.circ_listener.assert_called_once_with(CIRC_EVENT) self.bw_listener.assert_not_called() + self.malformed_listener.assert_not_called() self._emit_event(BW_EVENT) self.bw_listener.assert_called_once_with(BW_EVENT) @@ -644,9 +648,6 @@ class TestControl(unittest.TestCase): event thread. """ - self.skipTest('BUG: stem not working in this regard, about to fix') - return - self.circ_listener.side_effect = ValueError('boom') self.controller._launch_threads() @@ -654,6 +655,7 @@ class TestControl(unittest.TestCase): self._emit_event(CIRC_EVENT) self.circ_listener.assert_called_once_with(CIRC_EVENT) self.bw_listener.assert_not_called() + self.malformed_listener.assert_not_called() self._emit_event(BW_EVENT) self.bw_listener.assert_called_once_with(BW_EVENT) @@ -666,14 +668,12 @@ class TestControl(unittest.TestCase): doesn't break our event thread. """ - self.skipTest('BUG: stem not working in this regard, about to fix') - return - self.controller._launch_threads() self._emit_event(BAD_EVENT) - self.circ_listener.assert_called_once_with(CIRC_EVENT) + self.circ_listener.assert_not_called() self.bw_listener.assert_not_called() + self.malformed_listener.assert_called_once() self._emit_event(BW_EVENT) self.bw_listener.assert_called_once_with(BW_EVENT) @@ -814,4 +814,4 @@ class TestControl(unittest.TestCase): # doesn't seem necessary in practice, but since event processing is # asynchronous giving it a tiny bit of time to get handled - time.sleep(0.005) + time.sleep(0.03)

1 0

[torspec/master] dir-spec: Authorities should only read V3BandwidthsFile once per vote
by nickm＠torproject.org 11 Aug '18

11 Aug '18

commit b155c2e13d96c204121503df9e5aa22d30f3f9da Author: teor <teor2345(a)gmail.com> Date: Wed Jul 18 11:15:42 2018 +1000 dir-spec: Authorities should only read V3BandwidthsFile once per vote Closes 26827. --- dir-spec.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 7da4c9a..8da28c4 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2631,6 +2631,10 @@ http://<hostname>/tor/status-vote/next/authority.z + To avoid inconsistent reads, authorities SHOULD only read the bandwidth + file once per voting period. Further processing and serving SHOULD use a + cached copy. + The bandwidth list format is described in bandwidth-file-spec.txt. The standard URLs for bandwidth list files first-appeared in Tor 0.3.5.

1 0