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

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 3b533bda2625f7682ea0d4780b87860e06184dc2 Merge: 6045c26d8 de129e69b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 20:16:02 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[webwml/master] Unstable tor is now 0.3.4.6-rc
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 56c95f5ebdab1b786b3f456d2d1d6189682ed892 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 19:59:49 2018 -0400 Unstable tor is now 0.3.4.6-rc --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index edcf4329..9dbd67f5 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.3.9 -export DEVTAG=tor-0.3.4.5-rc +export DEVTAG=tor-0.3.4.6-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index bb234cd5..ada5f1f5 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.3.9</define-tag> -<define-tag version-alpha whitespace=delete>0.3.4.5-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.3.4.6-rc</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[stem/master] ControlMessage equality and hashing
by atagar＠torproject.org 07 Aug '18

07 Aug '18

commit b48ce682ef1a5fc1d4237d106700ec929f49246b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 7 15:04:20 2018 -0700 ControlMessage equality and hashing Interesting! Previously I implemented comparability for a single event type but that's all. I'm surprised we've gone this long without needing it. Messages have only three things we need to account for in the hash... * The message content (ie. the bytes we got from tor). * The message class, if we've casted ourselves to something. * The arrived_at timestamp if this is an event. That's it. Everything else is derived from those. Changing hash_attr()'s parent argument back to a class because a boolean makes it pretty likely we'll hit an invinite loop. In this case we hit it because we had the following object hierarchy... ControlMessage <= has a hash method Event <= has a hash method BandwidthEvent <= our object type If our Event class' hash method calls super it will return the Event class, not ControlMessage, causing us to loop indefinitely. Changing hash_attr() so it takes an explicit reference for our parent instead. --- docs/change_log.rst | 1 + stem/__init__.py | 2 +- stem/directory.py | 4 ++-- stem/response/__init__.py | 17 +++++++++++--- stem/response/events.py | 43 ++++++++++------------------------- stem/util/__init__.py | 6 +++-- test/unit/response/control_message.py | 24 +++++++++++++++++++ 7 files changed, 58 insertions(+), 39 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 282a02c8..362e4e10 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -58,6 +58,7 @@ The following are only available within Stem's `git repository * Added the delivered_read, delivered_written, overhead_read, and overhead_written attributes to :class:`~stem.response.events.CircuitBandwidthEvent` (:spec:`fbb38ec`) * The *config* attribute of :class:`~stem.response.events.ConfChangedEvent` couldn't represent tor configuration options with multiple values. It has been replaced with new *changed* and *unset* attributes. * Replaced socket's :func:`~stem.socket.ControlPort.get_address`, :func:`~stem.socket.ControlPort.get_port`, and :func:`~stem.socket.ControlSocketFile.get_socket_path` with attributes + * :class:`~stem.response.ControlMessage` is now comparable and hashable * Removed 'raw' argument from :func:`~stem.socket.ControlSocket.send` * **Descriptors** diff --git a/stem/__init__.py b/stem/__init__.py index 6da73320..1679b0a0 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -601,7 +601,7 @@ class ORPort(Endpoint): def __hash__(self): if self._hash is None: - self._hash = stem.util._hash_attr(self, 'link_protocols', parent = True) + self._hash = stem.util._hash_attr(self, 'link_protocols', parent = Endpoint) return self._hash diff --git a/stem/directory.py b/stem/directory.py index 020ac696..5d243707 100644 --- a/stem/directory.py +++ b/stem/directory.py @@ -316,7 +316,7 @@ class Authority(Directory): def __hash__(self): if self._hash is None: - self._hash = stem.util._hash_attr(self, 'v3ident', 'is_bandwidth_authority', parent = True) + self._hash = stem.util._hash_attr(self, 'v3ident', 'is_bandwidth_authority', parent = Directory) return self._hash @@ -521,7 +521,7 @@ class Fallback(Directory): def __hash__(self): if self._hash is None: - self._hash = stem.util._hash_attr(self, 'has_extrainfo', 'header', parent = True) + self._hash = stem.util._hash_attr(self, 'has_extrainfo', 'header', parent = Directory) return self._hash diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 327be819..54eb9c44 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -16,9 +16,7 @@ Parses replies from the control socket. |- from_str - provides a ControlMessage for the given string |- is_ok - response had a 250 status |- content - provides the parsed message content - |- raw_content - unparsed socket data - |- __str__ - content stripped of protocol formatting - +- __iter__ - ControlLine entries for the content of the message + +- raw_content - unparsed socket data ControlLine - String subclass with methods for parsing controller responses. |- remainder - provides the unparsed content @@ -36,6 +34,7 @@ import re import threading import stem.socket +import stem.util import stem.util.str_tools __all__ = [ @@ -129,6 +128,9 @@ class ControlMessage(object): Message from the control socket. This is iterable and can be stringified for individual message components stripped of protocol formatting. Messages are never empty. + + .. versionchanged:: 1.7.0 + Implemented equality and hashing. """ @staticmethod @@ -299,6 +301,15 @@ class ControlMessage(object): return ControlLine(content) + def __hash__(self): + return stem.util._hash_attr(self, '_raw_content') + + def __eq__(self, other): + return hash(self) == hash(other) if isinstance(other, ControlMessage) else False + + def __ne__(self, other): + return not self == other + class ControlLine(str): """ diff --git a/stem/response/events.py b/stem/response/events.py index 5623d1a7..37b60b38 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -57,6 +57,7 @@ class Event(stem.response.ControlMessage): self.type = str(self).split()[0] self.arrived_at = arrived_at + self._hash = None # if we're a recognized event type then translate ourselves into that subclass @@ -71,6 +72,12 @@ class Event(stem.response.ControlMessage): self._parse() + def __hash__(self): + if self._hash is None: + self._hash = stem.util._hash_attr(self, 'arrived_at', parent = stem.response.ControlMessage) + + return self._hash + def _parse_standard_attr(self): """ Most events are of the form... @@ -410,41 +417,15 @@ class CircuitEvent(Event): self._log_if_unrecognized('remote_reason', stem.CircClosureReason) def _compare(self, other, method): + # sorting circuit events by their identifier + if not isinstance(other, CircuitEvent): return False - for attr in ('id', 'status', 'path', 'build_flags', 'purpose', 'hs_state', 'rend_query', 'created', 'reason', 'remote_reason', 'socks_username', 'socks_password'): - my_attr = getattr(self, attr) - other_attr = getattr(other, attr) - - # Our id attribute is technically a string, but Tor conventionally uses - # ints. Attempt to handle as ints if that's the case so we get numeric - # ordering. - - if attr == 'id' and my_attr and other_attr: - if my_attr.isdigit() and other_attr.isdigit(): - my_attr = int(my_attr) - other_attr = int(other_attr) - - if my_attr is None: - my_attr = '' - - if other_attr is None: - other_attr = '' - - if my_attr != other_attr: - return method(my_attr, other_attr) - - return True - - def __hash__(self): - return hash(str(self).strip()) - - def __eq__(self, other): - return self._compare(other, lambda s, o: s == o) + my_id = getattr(self, 'id') + their_id = getattr(other, 'id') - def __ne__(self, other): - return not self == other + return method(my_id, their_id) if my_id != their_id else method(hash(self), hash(other)) def __gt__(self, other): return self._compare(other, lambda s, o: s > o) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index cc40bd0a..f0c2397b 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -130,10 +130,12 @@ def _hash_attr(obj, *attributes, **kwargs): :param Object obj: object to be hashed :param list attributes: attribute names to take into account - :param bool parent: include parent's hash value + :param class parent: include parent's hash value """ - my_hash = super(type(obj), obj).__hash__() if kwargs.get('parent') else 0 + parent_class = kwargs.get('parent') + + my_hash = parent_class.__hash__(obj) if parent_class else 0 my_hash = my_hash * 1024 + hash(str(type(obj))) for attr in attributes: diff --git a/test/unit/response/control_message.py b/test/unit/response/control_message.py index 8b05d6a8..abf5debf 100644 --- a/test/unit/response/control_message.py +++ b/test/unit/response/control_message.py @@ -168,6 +168,30 @@ class TestControlMessage(unittest.TestCase): control_socket_file = control_socket.makefile() self.assertRaises(stem.SocketClosed, stem.socket.recv_message, control_socket_file) + def test_equality(self): + msg = stem.response.ControlMessage.from_str(EVENT_BW) + event_msg = stem.response.ControlMessage.from_str(EVENT_BW, 'EVENT') + + # basic check for identical and differing events + + self.assertEqual(msg, stem.response.ControlMessage.from_str(EVENT_BW)) + self.assertNotEqual(msg, stem.response.ControlMessage.from_str(EVENT_CIRC_TIMEOUT)) + + # casting to different message types should cause us to mismatch + + self.assertNotEqual(event_msg, msg) + stem.response.convert('EVENT', msg) + self.assertEqual(event_msg, msg) + + # events also take into account when they were received + + event1 = stem.response.ControlMessage.from_str(EVENT_BW, 'EVENT', arrived_at = 123) + event2 = stem.response.ControlMessage.from_str(EVENT_BW, 'EVENT', arrived_at = 456) + event3 = stem.response.ControlMessage.from_str(EVENT_BW, 'EVENT', arrived_at = 123) + + self.assertNotEqual(event1, event2) + self.assertEqual(event1, event3) + def _assert_message_parses(self, controller_reply): """ Performs some basic sanity checks that a reply mirrors its parsed result.

1 0

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

07 Aug '18

commit 77704db1e7de946d557d747cd255ca6ab4c6154c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 7 15:45:10 2018 +0000 Update translations for bridgedb --- ml/LC_MESSAGES/bridgedb.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po index 81b9aa74e..64c28a9d3 100644 --- a/ml/LC_MESSAGES/bridgedb.po +++ b/ml/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Christy K Kurian <christykurian2494(a)gmail.com>, 2018 # NITHIN S SABU <nithinsn(a)protonmail.com>, 2018 # Salman Faris <farissalmannbr(a)gmail.com>, 2015 msgid "" @@ -10,8 +11,8 @@ 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-08-04 13:57+0000\n" -"Last-Translator: NITHIN S SABU <nithinsn(a)protonmail.com>\n" +"PO-Revision-Date: 2018-08-07 15:44+0000\n" +"Last-Translator: Christy K Kurian <christykurian2494(a)gmail.com>\n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,11 +81,11 @@ msgstr "നിങ്ങളുടെ ക്യു ആർ കോഡ് ലഭ് 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 "ഇൗ QR കോഡിൽ നിങ്ങളുടെ ബ്രിഡ്ജ് ലൈൻ അടങ്ങിയിരിക്കുന്നു. നിങ്ങളുടെ മൊബൈൽ ഫോണിലേക്കോ മറ്റു ഉപകരണങ്ങളിലേക്കോ ബ്രിഡ്ജ് ലൈൻ കോപ്പി ചെയ്യുവാൻ ഇത് ഒരു QR കോഡ് റീഡറിന്റെ സഹായത്തോടെ സ്കാൻ ചെയ്യുക." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "തൽസമയം ഒരു ബ്രിഡ്ജും ലഭ്യമല്ല." #: bridgedb/https/templates/bridges.html:132 #, python-format @@ -96,17 +97,17 @@ msgstr "" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "സ്റ്റെപ് %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "ടോർ ബ്രൗസർ %s ഡൗൺലോഡ് ചെയ്യുക %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "സ്റ്റെപ് %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format @@ -116,7 +117,7 @@ msgstr "" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "സ്റ്റെപ് %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format @@ -134,7 +135,7 @@ msgstr "" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "" +msgstr "കൂടുതൽ ക്രമീകരണങ്ങൾ " #: bridgedb/https/templates/options.html:86 msgid "No" @@ -142,7 +143,7 @@ msgstr "വേണ്ട" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "ഒന്നുമില്ല" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -162,7 +163,7 @@ msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[ഇത് ഒരു സ്വയം നിർമിത സന്ദേശം ആകുന്നു; ദയവായി ഇതിന് പ്രതികരണം നൽകാതിരിക്കുക.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:"

1 0

[depictor/master] Replace the usage of the is_bwauth stem attribute that is deprecated now
by tom＠torproject.org 07 Aug '18

07 Aug '18

commit 339c90d2d20a41f2d98900d7e42e576e65c740b8 Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Aug 7 10:30:21 2018 -0500 Replace the usage of the is_bwauth stem attribute that is deprecated now --- data/consensus.cfg | 7 +++++++ utility.py | 8 +++++++- website.py | 23 +++++++++++++---------- write_website.py | 5 ++++- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/data/consensus.cfg b/data/consensus.cfg index ca11041..41a4147 100644 --- a/data/consensus.cfg +++ b/data/consensus.cfg @@ -12,6 +12,13 @@ graph_logical_max 25000 # we highlight clockskew that is 20 seconds or greater clockskew_threshold 20 +# bwauths that should be graphed + +bwauths maatuska +bwauths faravahar +bwauths bastet +bwauths moria1 + # recognized tor consensus parameters known_params bwweightscale diff --git a/utility.py b/utility.py index 6b2ee54..c931c59 100755 --- a/utility.py +++ b/utility.py @@ -11,6 +11,11 @@ import stem.util.enum from stem.util.lru_cache import lru_cache +config = {'bwauths': []} +def set_config(c): + global config + config = c + @lru_cache() def get_dirauths(): #Remove any BridgeAuths @@ -18,7 +23,8 @@ def get_dirauths(): @lru_cache() def get_bwauths(): - return dict((k.lower(), v) for (k, v) in stem.descriptor.remote.get_authorities().items() if v.is_bandwidth_authority) + global config + return dict((k.lower(), v) for (k, v) in stem.descriptor.remote.get_authorities().items() if v.nickname.lower() in config['bwauths']) downloader = stem.descriptor.remote.DescriptorDownloader( timeout = 30, diff --git a/website.py b/website.py index 7baa0f8..0405099 100755 --- a/website.py +++ b/website.py @@ -18,7 +18,7 @@ from Crypto.PublicKey import RSA import stem.descriptor.remote -from utility import get_dirauths, get_bwauths, unix_time, FileMock +from utility import set_config, get_dirauths, get_bwauths, unix_time, FileMock class WebsiteWriter: consensus = None @@ -1680,6 +1680,18 @@ if __name__ == '__main__': """ import stem import pickle + CONFIG = stem.util.conf.config_dict('consensus', { + 'known_params': [], + 'bwauths': [], + 'ignore_fallback_authorities': False, + 'graph_logical_min': 125, + 'graph_logical_max': 25000, + 'clockskew_threshold': 0, + }) + config = stem.util.conf.get_config("consensus") + config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) + set_config(CONFIG) + w = WebsiteWriter() c = pickle.load(open('consensus.p', 'rb')) @@ -1690,15 +1702,6 @@ if __name__ == '__main__': w.set_fallback_dirs(f) - CONFIG = stem.util.conf.config_dict('consensus', { - 'known_params': [], - 'ignore_fallback_authorities': False, - 'graph_logical_min': 125, - 'graph_logical_max': 25000, - 'clockskew_threshold': 0, - }) - config = stem.util.conf.get_config("consensus") - config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) w.set_config(CONFIG) w.write_website(os.path.join(os.path.dirname(__file__), 'out', \ diff --git a/write_website.py b/write_website.py index f79e2c3..538c10c 100755 --- a/write_website.py +++ b/write_website.py @@ -32,13 +32,14 @@ from graphs import GraphWriter # dir-source line: dir-source authority_name v3ident hostname ip DirPort OrPort # r line: r nickname base64(fingerprint + "=") -> python -c "x = ''; import sys; import base64; sys.stdout.write(''.join('{:02x}'.format(ord(c)) for c in base64.b64decode(x)))" +#Also make sure to define the list of bwauths in the consensus.cfg file + #stem.descriptor.remote.DIRECTORY_AUTHORITIES = { #'Faravahar': DirectoryAuthority( # nickname = 'Faravahar', # address = '154.35.175.225', # or_port = 443, # dir_port = 80, -# is_bandwidth_authority = True, # fingerprint = 'CF6D0AAFB385BE71B8E111FC5CFF4B47923733BC', # v3ident = 'EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97', # ), @@ -46,6 +47,7 @@ from graphs import GraphWriter CONFIG = stem.util.conf.config_dict('consensus', { 'known_params': [], + 'bwauths': [], 'ignore_fallback_authorities' : False, 'graph_logical_min' : 125, 'graph_logical_max' : 25000, @@ -56,6 +58,7 @@ def main(): # loads configuration data config = stem.util.conf.get_config("consensus") config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) + set_config(CONFIG) consensuses, consensus_fetching_issues, consensus_fetching_runtimes = get_consensuses() votes, vote_fetching_issues, vote_fetching_runtimes = get_votes()

1 0

[metrics-web/master] Update news.json to version 284 of doc/MetricsTimeline.
by karsten＠torproject.org 07 Aug '18

07 Aug '18

commit 33921ae7e07ad5ac34e4a7ba40b626f3eddcc6a2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 7 14:37:48 2018 +0200 Update news.json to version 284 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index f0440a6..03d7f6a 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3291,6 +3291,31 @@ "target" : "https://metrics.torproject.org/userstats-bridge-country.html?start=2018-06-…" } ] }, { + "start" : "2018-07-29", + "ongoing" : true, + "places" : [ "bd" ], + "short_description" : "Protests over road safety in Dhaka, Bangladesh", + "description" : "Protests over road safety in Dhaka, Bangladesh. Reports of mobile network throttling and blocking of Facebook.", + "links" : [ { + "label" : "New York Times article", + "target" : "https://www.nytimes.com/2018/08/05/world/asia/bangladesh-students-protests.…" + }, { + "label" : "Daily Star article on throttling", + "target" : "https://www.thedailystar.net/country/bangladesh-mobile-internet-speed-broug…" + } ] +}, { + "start" : "2018-08-04", + "end" : "2018-08-05", + "short_description" : "Collector was missing consensuses", + "description" : "Collector was missing consensuses. They were recovered via recent relay consensus diffs.", + "links" : [ { + "label" : "metrics-team thread", + "target" : "https://lists.torproject.org/pipermail/metrics-team/2018-August/000869.html" + }, { + "label" : "tor-relays thread", + "target" : "https://lists.torproject.org/pipermail/tor-relays/2018-August/015850.html" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ],

1 0

[tor/master] These changes files are also merged in 0.3.4.6-rc: remove them.
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 8410d3b0ad6b7132452d6979914b20697707ea85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:10:26 2018 -0400 These changes files are also merged in 0.3.4.6-rc: remove them. --- changes/bug26994 | 3 --- changes/bug27003 | 6 ------ 2 files changed, 9 deletions(-) diff --git a/changes/bug26994 b/changes/bug26994 deleted file mode 100644 index 664894a7f..000000000 --- a/changes/bug26994 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (portability): - - Avoid a compilation error in test_bwmgt.c on Solaris 10. - Fixes bug 26994; bugfix on 0.3.4.1-alpha. diff --git a/changes/bug27003 b/changes/bug27003 deleted file mode 100644 index 4f2045afc..000000000 --- a/changes/bug27003 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (event scheduler): - - When we enable a periodic event, schedule it in the event loop - rather than running it immediately. Previously, we would re-run - periodic events immediately in the middle of (for example) - changing our options, with unpredictable effects. Fixes bug - 27003; bugfix on 0.3.4.1-alpha.

1 0

[tor/release-0.3.4] Last two changelog entries for 0.3.4.6-rc
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 6045c26d8442913e936e640fcf165ebfcc9d4bf1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:09:06 2018 -0400 Last two changelog entries for 0.3.4.6-rc --- ChangeLog | 11 +++++++++++ changes/bug26994 | 3 --- changes/bug27003 | 6 ------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41e39982b..84a3f1045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,13 @@ Changes in version 0.3.4.6-rc - 2018-08-06 release candidate: if no serious bugs are found, we expect that the stable 0.3.4 release will be (almost) the same as this release. + o Major bugfixes (event scheduler): + - When we enable a periodic event, schedule it in the event loop + rather than running it immediately. Previously, we would re-run + periodic events immediately in the middle of (for example) + changing our options, with unpredictable effects. Fixes bug 27003; + bugfix on 0.3.4.1-alpha. + o Minor features (compilation): - When building Tor, prefer to use Python 3 over Python 2, and more recent (contemplated) versions over older ones. Closes @@ -38,6 +45,10 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - Fix a number of small memory leaks identified by coverity. Fixes bug 26467; bugfix on numerous Tor versions. + o Minor bugfixes (portability): + - Avoid a compilation error in test_bwmgt.c on Solaris 10. Fixes bug + 26994; bugfix on 0.3.4.1-alpha. + o Minor bugfixes (testing, compatibility): - When running the ntor_ref.py and hs_ntor_ref.py tests, make sure only to pass strings (rather than "bytes" objects) to the Python diff --git a/changes/bug26994 b/changes/bug26994 deleted file mode 100644 index 664894a7f..000000000 --- a/changes/bug26994 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (portability): - - Avoid a compilation error in test_bwmgt.c on Solaris 10. - Fixes bug 26994; bugfix on 0.3.4.1-alpha. diff --git a/changes/bug27003 b/changes/bug27003 deleted file mode 100644 index 4f2045afc..000000000 --- a/changes/bug27003 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (event scheduler): - - When we enable a periodic event, schedule it in the event loop - rather than running it immediately. Previously, we would re-run - periodic events immediately in the middle of (for example) - changing our options, with unpredictable effects. Fixes bug - 27003; bugfix on 0.3.4.1-alpha.

1 0

[tor/master] When enabling periodic events, schedule but don't run them immediately.
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 176999fd955dea5916a560374db7d4efd3a1dad1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 10:03:24 2018 -0400 When enabling periodic events, schedule but don't run them immediately. When we fixed 25939 in f7633c1fcaefe72bf97c001bab9062132c919996, we introduced a call to rescan_periodic_events() from inside the onion service logic. But this meant that we could rescan the event list -- thereby running event callbacks! -- from inside the hidden service code. This could cause us to run some of our event callbacks from an inconsistent state, if we were in the middle of changing options. A related bug (#25761) prevented us from rescanning our periodic events as appropriate, but when we fixed THAT one, this bug reared its ugly head. The fix here is that "enabling" an event should cause us to run it from the event loop, but not immediately from the point where we enable it. Fixes bug 27003; bugfix on 0.3.4.1-alpha. --- changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changes/bug27003 b/changes/bug27003 new file mode 100644 index 000000000..4f2045afc --- /dev/null +++ b/changes/bug27003 @@ -0,0 +1,6 @@ + o Major bugfixes (event scheduler): + - When we enable a periodic event, schedule it in the event loop + rather than running it immediately. Previously, we would re-run + periodic events immediately in the middle of (for example) + changing our options, with unpredictable effects. Fixes bug + 27003; bugfix on 0.3.4.1-alpha. diff --git a/src/or/periodic.c b/src/or/periodic.c index 92fa677f8..9470376d0 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -140,8 +140,8 @@ periodic_event_destroy(periodic_event_item_t *event) event->last_action_time = 0; } -/** Enable the given event which means the event is launched and then the - * event's enabled flag is set. This can be called for an event that is +/** Enable the given event by setting its "enabled" flag and scheduling it to + * run immediately in the event loop. This can be called for an event that is * already enabled. */ void periodic_event_enable(periodic_event_item_t *event) @@ -152,7 +152,9 @@ periodic_event_enable(periodic_event_item_t *event) return; } - periodic_event_launch(event); + tor_assert(event->ev); + event->enabled = 1; + mainloop_event_activate(event->ev); } /** Disable the given event which means the event is destroyed and then the @@ -169,4 +171,3 @@ periodic_event_disable(periodic_event_item_t *event) mainloop_event_cancel(event->ev); event->enabled = 0; } - diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index 34689b64f..f159c4f83 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -106,11 +106,11 @@ test_pe_launch(void *arg) periodic_event_item_t *item = &periodic_events[i]; if (item->roles & PERIODIC_EVENT_ROLE_CLIENT) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); - tt_u64_op(item->last_action_time, OP_NE, 0); } else { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); - tt_u64_op(item->last_action_time, OP_EQ, 0); } + // enabled or not, the event has not yet been run. + tt_u64_op(item->last_action_time, OP_EQ, 0); } /* Remove Client but become a Relay. */ @@ -127,12 +127,9 @@ test_pe_launch(void *arg) /* Only Client role should be disabled. */ if (item->roles == PERIODIC_EVENT_ROLE_CLIENT) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); - /* Was previously enabled so they should never be to 0. */ - tt_u64_op(item->last_action_time, OP_NE, 0); } if (item->roles & PERIODIC_EVENT_ROLE_RELAY) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); - tt_u64_op(item->last_action_time, OP_NE, 0); } /* Non Relay role should be disabled, except for Dirserver. */ if (!(item->roles & roles)) { @@ -330,4 +327,3 @@ struct testcase_t periodic_event_tests[] = { END_OF_TESTCASES }; -

1 0

[tor/master] Merge branch 'bug27003_034_v2' into maint-0.3.4
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 882b2ad0aa46702e8420ef0d4bd788daff6f3ffd Merge: a54e94878 176999fd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:05:51 2018 -0400 Merge branch 'bug27003_034_v2' into maint-0.3.4 changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-)

1 0