tor-commits January 2019

tor-commits@lists.torproject.org

15 participants
2081 discussions

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Jan '19

02 Jan '19

commit f31429157b682f247e323295b0ba35d8a259faa2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 2 23:15:52 2019 +0000 Update translations for liveusb-creator --- he/he.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/he/he.po b/he/he.po index a0425b1af..9af82658b 100644 --- a/he/he.po +++ b/he/he.po @@ -5,7 +5,7 @@ # Translators: # aharon, 2012 # Dvir Rosen <ndvnis(a)gmail.com>, 2014 -# ION, 2017-2018 +# ION, 2017-2019 # Johnny Diralenzo, 2015 # Kunda, 2014 # Vladi Pryadko <hunter.pry(a)gmail.com>, 2013 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-02 13:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-01-02 22:57+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -312,17 +312,17 @@ msgstr "אזהרה: כלי זה צריך להיות מופעל כמנהלן. כ #: ../tails_installer/gui.py:381 msgid "Tails Installer" -msgstr "המתקין של Tails" +msgstr "מתקין Tails" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated" -msgstr "" +msgstr "מתקין Tails מיושן" #: ../tails_installer/gui.py:443 msgid "" "To install a new Tails, see the <a href='https://tails.boum.org/install/'>installation documentation</a>.\n" "To upgrade an existing Tails, see the <a href='https://tails.boum.org/upgrade/'>upgrade documentation</a>." -msgstr "" +msgstr "כדי להתקין Tails חדש, ראה את <a href='https://tails.boum.org/install/'>תיעוד ההתקנה</a>.\nכדי לשדרג את Tails, ראה את <a href='https://tails.boum.org/upgrade/'>תיעוד השדרוג</a>." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails"

1 0

[stem/master] Separate Query exception attributes
by atagar＠torproject.org 02 Jan '19

02 Jan '19

commit aebf3e4e573858b0a4f77939429c89700a07c78c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 2 13:56:21 2019 -0800 Separate Query exception attributes Oops, commit cc43a6c both broke our unit tests and is incorrect in that it changes the Query's 'error' attribute to a completely different type. The error attribute is public so we cannot change it. Simply storing exception metadata as a separate private attribute for the time being. In stem 2.x we'll be able to drop this whole thing because without requiring python 2.x compatibility we can re-raise exceptions while retaining their stacktrace. --- stem/descriptor/remote.py | 11 +++++++---- test/unit/descriptor/remote.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 20622cce..9ccfaced 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -423,7 +423,8 @@ class Query(object): self.fall_back_to_authority = fall_back_to_authority self.content = None - self.error = None + self.error = None # TODO: maybe remove in favor of error_attr in stem 2.x + self._error_attr = None self.is_done = False self.download_url = None @@ -518,7 +519,7 @@ class Query(object): # When we drop python 2.x support we should replace this with the # 'raise from' option above. - exc_type, exc_value, exc_traceback = self.error + exc_type, exc_value, exc_traceback = self._error_attr stacktrace = 'Original traceback:\n' + ''.join(traceback.format_exception(exc_type, exc_value, exc_traceback)[1:]) raise exc_type(str(exc_value) + '\n\n' + stacktrace) @@ -552,7 +553,8 @@ class Query(object): for desc in results: yield desc except ValueError as exc: - self.error = sys.exc_info() # encountered a parsing error + self.error = exc # encountered a parsing error + self._error_attr = sys.exc_info() if suppress: return @@ -606,7 +608,8 @@ class Query(object): return self._download_descriptors(retries - 1, timeout) else: log.debug("Unable to download descriptors from '%s': %s" % (self.download_url, exc)) - self.error = sys.exc_info() + self.error = exc + self._error_attr = sys.exc_info() finally: self.is_done = True diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index aab5f5d6..d2688775 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -162,7 +162,7 @@ class TestDescriptorDownloader(unittest.TestCase): validate = True, ) - self.assertRaisesWith(stem.ProtocolError, "Response should begin with HTTP success, but was 'HTTP/1.0 500 Kaboom'", request.run) + self.assertRaisesRegexp(stem.ProtocolError, "^Response should begin with HTTP success, but was 'HTTP/1.0 500 Kaboom'", request.run) @patch(URL_OPEN, _dirport_mock(TEST_DESCRIPTOR)) def test_using_dirport(self):

1 0

[stem/master] Remove hardcoded buffer size from ORPort sockets
by atagar＠torproject.org 02 Jan '19

02 Jan '19

commit e2d8575ce491e40f4412efc6a12db31158c7e7dc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 2 12:32:23 2019 -0800 Remove hardcoded buffer size from ORPort sockets When reading ORPort data that exceeded a hardcode (and arbitrary) buffer size we cropped the content. This was caught by starlight when attempting to use one of our demo scripts... https://trac.torproject.org/projects/tor/ticket/28961 https://stem.torproject.org/tutorials/examples/download_descriptor.html Original traceback: File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 589, in _download_descriptors self.content, self.reply_headers = _download_from_orport(endpoint, self.compression, self.resource) File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 998, in _download_from_orport response = b''.join([cell.data for cell in circ.send(RelayCommand.DATA, request, stream_id = 1)]) File "/home/atagar/Desktop/stem/stem/client/__init__.py", line 268, in send decrypted_cell, backward_key, backward_digest = stem.client.cell.RelayCell.decrypt(self.relay.link_protocol, encrypted_cell, self.backward_key, self.backward_digest) File "/home/atagar/Desktop/stem/stem/client/cell.py", line 412, in decrypt raise stem.ProtocolError('RELAY cells should be %i bytes, but received %i' % (link_protocol.fixed_cell_length, len(content))) ProtocolError: RELAY cells should be 512 bytes, but received 464 I'm unhappy with this approach, but after three days of chewing on this it's the least bad approach I've come up with and seems to work. Patches welcome if there's a smarter way of going about this. --- stem/client/__init__.py | 43 ++++++++++++++++++++++++++++++++++++++----- stem/socket.py | 26 ++++++++++++++++++-------- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 3fb68a69..1da008fb 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -130,6 +130,38 @@ class Relay(object): return Relay(conn, link_protocol) + def _msg(self, cell): + """ + Sends a cell on the ORPort and provides the response we receive in reply. + + Unfortunately unlike control sockets, ORPorts don't have generalized rules + for predictable message IO. With control sockets... + + * Each message we send receives a single reply. + * We may also receive asynchronous events marked with a 650 status. + + ORPorts by contrast receive variable length cells with differing rules on + their arrival. As such making a best effort attempt at a send-and-receive + method in which we do the following... + + * Discard any existing unread data from the socket. + * Send our request. + * Await up to a second for a reply. + + It's quite possible this is a stupid approach. If so, patches welcome. + + :param stem.client.cell.Cell cell: cell to be sent + + :returns: **generator** with the cells received in reply + """ + + self._orport.recv(timeout = 0) # discard unread data + self._orport.send(cell.pack(self.link_protocol)) + response = self._orport.recv(timeout = 1) + + for received_cell in stem.client.cell.Cell.pop(response, self.link_protocol): + yield received_cell + def is_alive(self): """ Checks if our socket is currently connected. This is a pass-through for our @@ -170,15 +202,16 @@ class Relay(object): circ_id = max(self._circuits) + 1 if self._circuits else self.link_protocol.first_circ_id create_fast_cell = stem.client.cell.CreateFastCell(circ_id) - self._orport.send(create_fast_cell.pack(self.link_protocol)) + created_fast_cell = None - response = stem.client.cell.Cell.unpack(self._orport.recv(), self.link_protocol) - created_fast_cells = filter(lambda cell: isinstance(cell, stem.client.cell.CreatedFastCell), response) + for cell in self._msg(create_fast_cell): + if isinstance(cell, stem.client.cell.CreatedFastCell): + created_fast_cell = cell + break - if not created_fast_cells: + if not created_fast_cell: raise ValueError('We should get a CREATED_FAST response from a CREATE_FAST request') - created_fast_cell = list(created_fast_cells)[0] kdf = KDF.from_value(create_fast_cell.key_material + created_fast_cell.key_material) if created_fast_cell.derivative_key != kdf.key_hash: diff --git a/stem/socket.py b/stem/socket.py index 2040b950..9290d6c6 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -91,10 +91,6 @@ ERROR_MSG = 'Error while receiving a control message (%s): %s' TRUNCATE_LOGS = 10 -# maximum number of bytes to read at a time from a relay socket - -MAX_READ_BUFFER_LEN = 10 * 1024 * 1024 - class BaseSocket(object): """ @@ -389,10 +385,13 @@ class RelaySocket(BaseSocket): self._send(message, lambda s, sf, msg: _write_to_socket(sf, msg)) - def recv(self): + def recv(self, timeout = None): """ Receives a message from the relay. + :param float timeout: maxiumum number of seconds to await a response, this + blocks indefinitely if **None** + :returns: bytes for the message received :raises: @@ -400,10 +399,21 @@ class RelaySocket(BaseSocket): * :class:`stem.SocketClosed` if the socket closes before we receive a complete message """ - # TODO: Is MAX_READ_BUFFER_LEN defined in the spec? Not sure where it came - # from. + def wrapped_recv(s, sf): + if timeout is None: + return s.recv() + else: + s.setblocking(0) + s.settimeout(timeout) + + try: + return s.recv() + except ssl.SSLWantReadError: + return None + finally: + s.setblocking(1) - return self._recv(lambda s, sf: s.recv(MAX_READ_BUFFER_LEN)) + return self._recv(wrapped_recv) def is_localhost(self): return self.address == '127.0.0.1'

1 0

[tor/maint-0.3.5] Merge branch 'bug28974_035' into maint-0.3.5
by nickm＠torproject.org 02 Jan '19

02 Jan '19

commit 98755cbddf64860efce6ab357f119b8d7e769a1b Merge: a4b86421d b33bcb1e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 2 16:15:34 2019 -0500 Merge branch 'bug28974_035' into maint-0.3.5 changes/bug28974 | 3 +++ src/lib/fs/freespace.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/maint-0.3.5] Add an errno.h include to freespace.c to fix bug 28974.
by nickm＠torproject.org 02 Jan '19

02 Jan '19

commit b33bcb1e63c25d9107dfb7b1aa7ecd600674b352 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 2 15:19:52 2019 -0500 Add an errno.h include to freespace.c to fix bug 28974. --- changes/bug28974 | 3 +++ src/lib/fs/freespace.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug28974 b/changes/bug28974 new file mode 100644 index 000000000..2d74f5674 --- /dev/null +++ b/changes/bug28974 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix compilation for Android by adding a missing header to + freespace.c. Fixes bug 28974; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/fs/freespace.c b/src/lib/fs/freespace.c index 2dbba3c5f..c18b1e023 100644 --- a/src/lib/fs/freespace.c +++ b/src/lib/fs/freespace.c @@ -19,6 +19,7 @@ #include <windows.h> #endif +#include <errno.h> #include <string.h> /** Return the amount of free disk space we have permission to use, in

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 02 Jan '19

02 Jan '19

commit 3e7f13a4ef6ff96617f26f434efa529bbf17f9ef Merge: eaaeaf793 98755cbdd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 2 16:15:39 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28974 | 3 +++ src/lib/fs/freespace.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/master] Add an errno.h include to freespace.c to fix bug 28974.
by nickm＠torproject.org 02 Jan '19

02 Jan '19

1 0

[tor/master] Merge branch 'bug28974_035' into maint-0.3.5
by nickm＠torproject.org 02 Jan '19

02 Jan '19

1 0

[tor/release-0.3.5] Add an errno.h include to freespace.c to fix bug 28974.
by nickm＠torproject.org 02 Jan '19

02 Jan '19

1 0

[tor/release-0.3.5] Merge branch 'bug28974_035' into maint-0.3.5
by nickm＠torproject.org 02 Jan '19

02 Jan '19

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2019