May 2013 - tor-commits - lists.torproject.org

[compass/master] Fix country output when not grouping by country.
by karsten＠torproject.org 22 May '13

22 May '13

commit e2919efca7cb750f8941488b85e41234d27e93ed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 22 13:49:06 2013 +0200 Fix country output when not grouping by country. Based on a patch by Lunar <lunar(a)torproject.org>. Fixes #8931. --- compass.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compass.py b/compass.py index 956e26d..05de2f5 100755 --- a/compass.py +++ b/compass.py @@ -380,6 +380,7 @@ class RelayStats(object): group_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) relays_in_group, exits_in_group, guards_in_group = 0, 0, 0 ases_in_group = set() + countries_in_group = set() result = util.Result() for relay in group: for weight in RelayStats.WEIGHTS: @@ -400,6 +401,7 @@ class RelayStats(object): else: result.guard = '-' result.cc = relay.get('country', '??').upper() + countries_in_group.add(result.cc) result.as_no = relay.get('as_number', '??') result.as_name = relay.get('as_name', '??') result.as_info = "%s %s" %(result.as_no, result.as_name) @@ -414,9 +416,9 @@ class RelayStats(object): result.exit = "(%d)" % exits_in_group result.guard = "(%d)" % guards_in_group if not options.by_as and not options.ases: - result.as_info = "(%s)" % len(ases_in_group) + result.as_info = "(%d)" % len(ases_in_group) if not options.by_country and not options.country: - options.country = "*" + result.cc = "(%d)" % len(countries_in_group) #Include our weight values for weight in group_weights.iterkeys():

1 0

[stem/master] Processing controller descriptors as bytes
by atagar＠torproject.org 22 May '13

22 May '13

commit ad82c905347f3e5849930fdb3e63721b294d38b4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 21 21:30:49 2013 -0700 Processing controller descriptors as bytes When descriptor content was fetched by the Controller it was first converted to unicode, then back into bytes. As a result descriptors with content that couldn't be converted (usually on the contact line) got mangled, and this in turn caused our check of its signature to fail. Caught thanks to aj00200 on... https://trac.torproject.org/8755 --- stem/control.py | 23 ++++++++++++----------- test/mocking.py | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/stem/control.py b/stem/control.py index 9ea77f8..6ec0006 100644 --- a/stem/control.py +++ b/stem/control.py @@ -151,11 +151,12 @@ import stem.response.events import stem.socket import stem.util.connection import stem.util.enum +import stem.util.str_tools import stem.util.tor_tools import stem.version from stem import UNDEFINED, CircStatus, Signal -from stem.util import log, str_tools +from stem.util import log # state changes a control socket can have @@ -1018,8 +1019,8 @@ class Controller(BaseController): else: raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) - desc_content = self.get_info(query) - return stem.descriptor.microdescriptor.Microdescriptor(str_tools._to_bytes(desc_content)) + desc_content = self.get_info(query, get_bytes = True) + return stem.descriptor.microdescriptor.Microdescriptor(desc_content) except Exception as exc: if default == UNDEFINED: raise exc @@ -1107,8 +1108,8 @@ class Controller(BaseController): else: raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) - desc_content = self.get_info(query) - return stem.descriptor.server_descriptor.RelayDescriptor(str_tools._to_bytes(desc_content)) + desc_content = self.get_info(query, get_bytes = True) + return stem.descriptor.server_descriptor.RelayDescriptor(desc_content) except Exception as exc: if default == UNDEFINED: raise exc @@ -1141,9 +1142,9 @@ class Controller(BaseController): # # https://trac.torproject.org/8248 - desc_content = self.get_info("desc/all-recent") + desc_content = self.get_info("desc/all-recent", get_bytes = True) - for desc in stem.descriptor.server_descriptor._parse_file(io.BytesIO(str_tools._to_bytes(desc_content))): + for desc in stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_content)): yield desc except Exception as exc: if default == UNDEFINED: @@ -1186,8 +1187,8 @@ class Controller(BaseController): else: raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) - desc_content = self.get_info(query) - return stem.descriptor.router_status_entry.RouterStatusEntryV2(str_tools._to_bytes(desc_content)) + desc_content = self.get_info(query, get_bytes = True) + return stem.descriptor.router_status_entry.RouterStatusEntryV2(desc_content) except Exception as exc: if default == UNDEFINED: raise exc @@ -1215,10 +1216,10 @@ class Controller(BaseController): # # https://trac.torproject.org/8248 - desc_content = self.get_info("ns/all") + desc_content = self.get_info("ns/all", get_bytes = True) desc_iterator = stem.descriptor.router_status_entry._parse_file( - io.BytesIO(str_tools._to_bytes(desc_content)), + io.BytesIO(desc_content), True, entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV2, ) diff --git a/test/mocking.py b/test/mocking.py index 50a0f0e..3b165d8 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -293,7 +293,7 @@ def return_for_args(args_to_return_value, default = None, is_method = False): def raise_exception(exception): - def _raise(*args): + def _raise(*args, **kwargs): raise exception return _raise

1 0

[stem/master] Support for getting byte content from get_info
by atagar＠torproject.org 22 May '13

22 May '13

commit a94f1f0a51faacf1fda5350cdfd489d45b41adc4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 20 09:35:45 2013 -0700 Support for getting byte content from get_info Adding an optional flag to get byte content from get_info rather than a str. This only effects python 3.x. --- stem/control.py | 9 ++++++++- stem/response/getinfo.py | 15 +++++++++------ test/unit/response/getinfo.py | 13 +++++++------ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/stem/control.py b/stem/control.py index a4dde55..9ea77f8 100644 --- a/stem/control.py +++ b/stem/control.py @@ -711,7 +711,7 @@ class Controller(BaseController): import stem.connection stem.connection.authenticate(self, *args, **kwargs) - def get_info(self, params, default = UNDEFINED): + def get_info(self, params, default = UNDEFINED, get_bytes = False): """ Queries the control socket for the given GETINFO option. If provided a default then that's returned if the GETINFO option is undefined or the @@ -720,6 +720,7 @@ class Controller(BaseController): :param str,list params: GETINFO option or options to be queried :param object default: response if the query fails + :param bool get_bytes: provides **bytes** values rather than a **str** under python 3.x :returns: Response depends upon how we were called as follows... @@ -781,6 +782,12 @@ class Controller(BaseController): response = self.msg("GETINFO %s" % " ".join(params)) stem.response.convert("GETINFO", response) response.assert_matches(params) + + # usually we want unicode values under python 3.x + + if stem.prereq.is_python_3() and not get_bytes: + response.entries = dict((k, stem.util.str_tools._to_unicode(v)) for (k, v) in response.entries.items()) + reply.update(response.entries) if self.is_caching_enabled(): diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index 1d749e4..998041d 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -9,7 +9,7 @@ class GetInfoResponse(stem.response.ControlMessage): """ Reply for a GETINFO query. - :var dict entries: mapping between the queried options and their values + :var dict entries: mapping between the queried options and their bytes values """ def _parse_message(self): @@ -26,9 +26,9 @@ class GetInfoResponse(stem.response.ControlMessage): # 250 OK self.entries = {} - remaining_lines = list(self) + remaining_lines = [content for (code, div, content) in self.content(get_bytes = True)] - if not self.is_ok() or not remaining_lines.pop() == "OK": + if not self.is_ok() or not remaining_lines.pop() == b"OK": unrecognized_keywords = [] for code, _, line in self.content(): if code == '552' and line.startswith("Unrecognized key \"") and line.endswith("\""): @@ -41,15 +41,18 @@ class GetInfoResponse(stem.response.ControlMessage): while remaining_lines: try: - key, value = remaining_lines.pop(0).split("=", 1) + key, value = remaining_lines.pop(0).split(b"=", 1) except ValueError: raise stem.ProtocolError("GETINFO replies should only contain parameter=value mappings:\n%s" % self) + if stem.prereq.is_python_3(): + key = stem.util.str_tools._to_unicode(key) + # if the value is a multiline value then it *must* be of the form # '<key>=\n<value>' - if "\n" in value: - if not value.startswith("\n"): + if b"\n" in value: + if not value.startswith(b"\n"): raise stem.ProtocolError("GETINFO response contained a multi-line value that didn't start with a newline:\n%s" % self) value = value[1:] diff --git a/test/unit/response/getinfo.py b/test/unit/response/getinfo.py index b6d2c8d..082bafc 100644 --- a/test/unit/response/getinfo.py +++ b/test/unit/response/getinfo.py @@ -7,6 +7,7 @@ import unittest import stem.response import stem.response.getinfo import stem.socket +import stem.util.str_tools from test import mocking @@ -72,7 +73,7 @@ class TestGetInfoResponse(unittest.TestCase): control_message = mocking.get_message(SINGLE_RESPONSE) stem.response.convert("GETINFO", control_message) - self.assertEqual({"version": "0.2.3.11-alpha-dev"}, control_message.entries) + self.assertEqual({"version": b"0.2.3.11-alpha-dev"}, control_message.entries) def test_batch_response(self): """ @@ -83,9 +84,9 @@ class TestGetInfoResponse(unittest.TestCase): stem.response.convert("GETINFO", control_message) expected = { - "version": "0.2.3.11-alpha-dev", - "address": "67.137.76.214", - "fingerprint": "5FDE0422045DF0E1879A3738D09099EB4A0C5BA0", + "version": b"0.2.3.11-alpha-dev", + "address": b"67.137.76.214", + "fingerprint": b"5FDE0422045DF0E1879A3738D09099EB4A0C5BA0", } self.assertEqual(expected, control_message.entries) @@ -100,8 +101,8 @@ class TestGetInfoResponse(unittest.TestCase): stem.response.convert("GETINFO", control_message) expected = { - "version": "0.2.3.11-alpha-dev (git-ef0bc7f8f26a917c)", - "config-text": "\n".join(MULTILINE_RESPONSE.splitlines()[2:8]), + "version": b"0.2.3.11-alpha-dev (git-ef0bc7f8f26a917c)", + "config-text": b"\n".join(stem.util.str_tools._to_bytes(MULTILINE_RESPONSE).splitlines()[2:8]), } self.assertEqual(expected, control_message.entries)

1 0

[stem/master] Normalize ControlMessage content to be bytes
by atagar＠torproject.org 22 May '13

22 May '13

commit 0362564cc8e1d48ebf7b61c75550fa9e1c4fd321 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 19 17:29:43 2013 -0700 Normalize ControlMessage content to be bytes The socket module's recv_message function converted read content to be a str (bytes in python 2.x and unicode in python 3.x). In 99.9% of the cases this is exactly what we want, but in a few edge cases we actually want byte content under python 3.x. For instance, in #8755 descriptors with non-unicode contact lines are being altered by the socket module, causing our validation of their signature to fail. Functionally this commit should have no effect besides adding the option to get byte content from the ControlMessage. The tests seem happy so fingers crossed! --- stem/response/__init__.py | 32 +++++++++++++++++++++++++++----- stem/socket.py | 40 +++++++++++++++++++++------------------- stem/util/log.py | 8 +++++++- 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 92e4527..01af23e 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -167,7 +167,7 @@ class ControlMessage(object): return False - def content(self): + def content(self, get_bytes = False): """ Provides the parsed message content. These are entries of the form... @@ -189,19 +189,33 @@ class ControlMessage(object): For data entries the content is the full multi-line payload with newline linebreaks and leading periods unescaped. + The **status_code** and **divider** are both strings (**bytes** in python + 2.x and **unicode** in python 3.x). The **content** however is **bytes** if + **get_bytes** is **True**. + + :param bool get_bytes: provides **bytes** for the **content** rather than a **str** + :returns: **list** of (str, str, str) tuples for the components of this message """ - return list(self._parsed_content) + if stem.prereq.is_python_3() and not get_bytes: + return [(code, div, stem.util.str_tools._to_unicode(content)) for (code, div, content) in self._parsed_content] + else: + return list(self._parsed_content) - def raw_content(self): + def raw_content(self, get_bytes = False): """ Provides the unparsed content read from the control socket. + :param bool get_bytes: if **True** then this provides **bytes** rather than a **str** + :returns: **str** of the socket data used to generate this message """ - return self._raw_content + if stem.prereq.is_python_3() and not get_bytes: + return stem.util.str_tools._to_unicode(self._raw_content) + else: + return self._raw_content def __str__(self): """ @@ -235,6 +249,9 @@ class ControlMessage(object): """ for _, _, content in self._parsed_content: + if stem.prereq.is_python_3(): + content = stem.util.str_tools._to_unicode(content) + yield ControlLine(content) def __len__(self): @@ -249,7 +266,12 @@ class ControlMessage(object): :returns: :class:`~stem.response.ControlLine` at the index """ - return ControlLine(self._parsed_content[index][2]) + content = self._parsed_content[index][2] + + if stem.prereq.is_python_3(): + content = stem.util.str_tools._to_unicode(content) + + return ControlLine(content) class ControlLine(str): diff --git a/stem/socket.py b/stem/socket.py index bfe5839..379e5ec 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -464,15 +464,16 @@ def recv_message(control_file): a complete message """ - parsed_content, raw_content = [], "" + parsed_content, raw_content = [], b"" logging_prefix = "Error while receiving a control message (%s): " while True: try: - line = control_file.readline() + # From a real socket readline() would always provide bytes, but during + # tests we might be given a StringIO in which case it's unicode under + # python 3.x. - if stem.prereq.is_python_3(): - line = stem.util.str_tools._to_unicode(line) + line = stem.util.str_tools._to_bytes(control_file.readline()) except AttributeError: # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' @@ -509,17 +510,21 @@ def recv_message(control_file): prefix = logging_prefix % "ProtocolError" log.info(prefix + "line too short, \"%s\"" % log.escape(line)) raise stem.ProtocolError("Badly formatted reply line: too short") - elif not re.match(r'^[a-zA-Z0-9]{3}[-+ ]', line): + elif not re.match(b'^[a-zA-Z0-9]{3}[-+ ]', line): prefix = logging_prefix % "ProtocolError" log.info(prefix + "malformed status code/divider, \"%s\"" % log.escape(line)) raise stem.ProtocolError("Badly formatted reply line: beginning is malformed") - elif not line.endswith("\r\n"): + elif not line.endswith(b"\r\n"): prefix = logging_prefix % "ProtocolError" log.info(prefix + "no CRLF linebreak, \"%s\"" % log.escape(line)) raise stem.ProtocolError("All lines should end with CRLF") line = line[:-2] # strips off the CRLF - status_code, divider, content = line[:3], line[3], line[4:] + status_code, divider, content = line[:3], line[3:4], line[4:] + + if stem.prereq.is_python_3(): + status_code = stem.util.str_tools._to_unicode(status_code) + divider = stem.util.str_tools._to_unicode(divider) if divider == "-": # mid-reply line, keep pulling for more content @@ -528,8 +533,8 @@ def recv_message(control_file): # end of the message, return the message parsed_content.append((status_code, divider, content)) - log_message = raw_content.replace("\r\n", "\n").rstrip() - log.trace("Received from tor:\n" + log_message) + log_message = raw_content.replace(b"\r\n", b"\n").rstrip() + log.trace("Received from tor:\n" + stem.util.str_tools._to_unicode(log_message)) return stem.response.ControlMessage(parsed_content, raw_content) elif divider == "+": @@ -538,10 +543,7 @@ def recv_message(control_file): while True: try: - line = control_file.readline() - - if stem.prereq.is_python_3(): - line = stem.util.str_tools._to_unicode(line) + line = stem.util.str_tools._to_bytes(control_file.readline()) except socket.error as exc: prefix = logging_prefix % "SocketClosed" log.info(prefix + "received an exception while mid-way through a data reply (exception: \"%s\", read content: \"%s\")" % (exc, log.escape(raw_content))) @@ -549,11 +551,11 @@ def recv_message(control_file): raw_content += line - if not line.endswith("\r\n"): + if not line.endswith(b"\r\n"): prefix = logging_prefix % "ProtocolError" log.info(prefix + "CRLF linebreaks missing from a data reply, \"%s\"" % log.escape(raw_content)) raise stem.ProtocolError("All lines should end with CRLF") - elif line == ".\r\n": + elif line == b".\r\n": break # data block termination line = line[:-2] # strips off the CRLF @@ -561,22 +563,22 @@ def recv_message(control_file): # lines starting with a period are escaped by a second period (as per # section 2.4 of the control-spec) - if line.startswith(".."): + if line.startswith(b".."): line = line[1:] # appends to previous content, using a newline rather than CRLF # separator (more conventional for multi-line string content outside # the windows world) - content += "\n" + line + content += b"\n" + line parsed_content.append((status_code, divider, content)) else: # this should never be reached due to the prefix regex, but might as well # be safe... prefix = logging_prefix % "ProtocolError" - log.warn(prefix + "\"%s\" isn't a recognized divider type" % line) - raise stem.ProtocolError("Unrecognized divider type '%s': %s" % (divider, line)) + log.warn(prefix + "\"%s\" isn't a recognized divider type" % divider) + raise stem.ProtocolError("Unrecognized divider type '%s': %s" % (divider, stem.util.str_tools._to_unicode(line))) def send_formatting(message): diff --git a/stem/util/log.py b/stem/util/log.py index ca69e7f..6446c23 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -50,7 +50,9 @@ them at your own risk.** import logging +import stem.prereq import stem.util.enum +import stem.util.str_tools # Logging runlevels. These are *very* commonly used so including shorter # aliases (so they can be referenced as log.DEBUG, log.WARN, etc). @@ -118,13 +120,17 @@ def logging_level(runlevel): def escape(message): """ - Escapes specific sequences for logging (newlines, tabs, carriage returns). + Escapes specific sequences for logging (newlines, tabs, carriage returns). If + the input is **bytes** then this converts it to **unicode** under python 3.x. :param str message: string to be escaped :returns: str that is escaped """ + if stem.prereq.is_python_3(): + message = stem.util.str_tools._to_unicode(message) + for pattern, replacement in (("\n", "\\n"), ("\r", "\\r"), ("\t", "\\t")): message = message.replace(pattern, replacement)

1 0

r26191: {website} Tweak a couple paragraphs for better phrasing. (website/trunk/about/en)
by Mike Perry 22 May '13

22 May '13

Author: mikeperry Date: 2013-05-22 01:20:19 +0000 (Wed, 22 May 2013) New Revision: 26191 Modified: website/trunk/about/en/jobs-senior-qa.wml Log: Tweak a couple paragraphs for better phrasing. Modified: website/trunk/about/en/jobs-senior-qa.wml =================================================================== --- website/trunk/about/en/jobs-senior-qa.wml 2013-05-21 00:25:47 UTC (rev 26190) +++ website/trunk/about/en/jobs-senior-qa.wml 2013-05-22 01:20:19 UTC (rev 26191) @@ -15,10 +15,10 @@ <p> +The Tor Project seeks to deploy nightly builds and continuous integration for +as many of its key software components and platform combinations as possible. Your job would be build and deploy the initial functional versions of a wide -range of testing frameworks and continuous integration systems. The Tor -Project seeks to deploy nightly builds and continuous integration for as many -of its key software components and platform combinations as possible. +range of testing frameworks and continuous integration systems. </p> @@ -45,7 +45,7 @@ Have experience programming in multiple languages, including Java, python/ruby, bash scripting, and Javascript. You must also have experience -working with multiple testing/automation frameworks on multiple platforms. +working with testing/automation frameworks on multiple platforms. </li>

1 0

[flashproxy/master] Irnogre imaplib.error in addition to imaplib.abort after disconnect.
by dcf＠torproject.org 21 May '13

21 May '13

commit e72677805d144d01f79dc1ff40184deaec27f683 Author: David Fifield <david(a)bamsoftware.com> Date: Tue May 21 16:47:18 2013 -0700 Irnogre imaplib.error in addition to imaplib.abort after disconnect. --- facilitator/facilitator-email-poller | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index f72222f..b70e649 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -336,7 +336,7 @@ while True: try: imap.close() imap.logout() - except imaplib.IMAP4.abort: + except (imaplib.IMAP4.abort, imaplib.IMAP4.error): pass # Don't reconnect too fast.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 21 May '13

21 May '13

commit feeef00a6ad4629ab0d73b85195c0c9c8e9d57f0 Merge: cb488f9 30c06c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 21 13:46:28 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8093.part1 | 3 +++ src/or/relay.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-)

1 0

[tor/master] Downgrade the unexpected sendme cell warnings for 0.2.4
by nickm＠torproject.org 21 May '13

21 May '13

commit 30c06c187a0b649bd2d30edc0b16e2376f74ad9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 21 13:45:21 2013 -0400 Downgrade the unexpected sendme cell warnings for 0.2.4 See discussion on #8093 --- changes/bug8093.part1 | 3 +++ src/or/relay.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug8093.part1 b/changes/bug8093.part1 new file mode 100644 index 0000000..2450794 --- /dev/null +++ b/changes/bug8093.part1 @@ -0,0 +1,3 @@ + o Minor features: + - Downgrade "unexpected SENDME" warnings to protocol-warn for 0.2.4, + for bug 8093. diff --git a/src/or/relay.c b/src/or/relay.c index 52ff32f..d57ceaa 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1494,9 +1494,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (layer_hint) { if (layer_hint->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ - log_fn(LOG_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from exit relay. " + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected sendme cell from exit relay. " "Closing circ."); return -END_CIRC_REASON_TORPROTOCOL; } @@ -1507,9 +1506,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } else { if (circ->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ - log_fn(LOG_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from client. " + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected sendme cell from client. " "Closing circ (window %d).", circ->package_window); return -END_CIRC_REASON_TORPROTOCOL;

1 0

[tor/master] Restore 8093 log messages to WARN severity, but rate limit
by nickm＠torproject.org 21 May '13

21 May '13

commit f5820a1bf1447299d4dc0c0f1d7daf4b29863b8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 21 14:00:30 2013 -0400 Restore 8093 log messages to WARN severity, but rate limit See #8093 for discussion --- changes/bug8093.part2 | 3 +++ src/or/relay.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug8093.part2 b/changes/bug8093.part2 new file mode 100644 index 0000000..263c7e8 --- /dev/null +++ b/changes/bug8093.part2 @@ -0,0 +1,3 @@ + o Minor features: + - Return the "unexpected sendme" warnings to a warn severity, but make + them rate limited. Related to ticket #8093. diff --git a/src/or/relay.c b/src/or/relay.c index d57ceaa..cef138e 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1494,7 +1494,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (layer_hint) { if (layer_hint->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + static struct ratelim_t exit_warn_ratelim = RATELIM_INIT(600); + log_fn_ratelim(&exit_warn_ratelim, LOG_WARN, LD_PROTOCOL, "Unexpected sendme cell from exit relay. " "Closing circ."); return -END_CIRC_REASON_TORPROTOCOL; @@ -1506,7 +1507,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } else { if (circ->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + static struct ratelim_t client_warn_ratelim = RATELIM_INIT(600); + log_fn_ratelim(&client_warn_ratelim, LOG_WARN, LD_PROTOCOL, "Unexpected sendme cell from client. " "Closing circ (window %d).", circ->package_window);

1 0

[tor/maint-0.2.4] Downgrade the unexpected sendme cell warnings for 0.2.4
by nickm＠torproject.org 21 May '13

21 May '13

commit 30c06c187a0b649bd2d30edc0b16e2376f74ad9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 21 13:45:21 2013 -0400 Downgrade the unexpected sendme cell warnings for 0.2.4 See discussion on #8093 --- changes/bug8093.part1 | 3 +++ src/or/relay.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug8093.part1 b/changes/bug8093.part1 new file mode 100644 index 0000000..2450794 --- /dev/null +++ b/changes/bug8093.part1 @@ -0,0 +1,3 @@ + o Minor features: + - Downgrade "unexpected SENDME" warnings to protocol-warn for 0.2.4, + for bug 8093. diff --git a/src/or/relay.c b/src/or/relay.c index 52ff32f..d57ceaa 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1494,9 +1494,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (layer_hint) { if (layer_hint->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ - log_fn(LOG_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from exit relay. " + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected sendme cell from exit relay. " "Closing circ."); return -END_CIRC_REASON_TORPROTOCOL; } @@ -1507,9 +1506,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } else { if (circ->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ - log_fn(LOG_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from client. " + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected sendme cell from client. " "Closing circ (window %d).", circ->package_window); return -END_CIRC_REASON_TORPROTOCOL;

1 0