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

[stem/master] Implemented custom sphinx role :trac: for trac tickets
by atagar＠torproject.org 15 Apr '13

15 Apr '13

commit 0567974e7c3e0610dfa62e54b0a96ef54fd59866 Author: Tomasz Kunikowski <tomasz.kunikowski(a)gmail.com> Date: Sun Apr 14 22:29:06 2013 +0200 Implemented custom sphinx role :trac: for trac tickets Modified: docs/conf.py Added: docs/trac.py In accodrance to ticket #8671 Using :trac:`1234` will display 'ticket #1234' --- docs/conf.py | 6 +++- docs/trac.py | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 0bce09f..7723736 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ import sys, os # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath('..')) - +sys.path.append(os.path.abspath('.')) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. @@ -26,7 +26,7 @@ needs_sphinx = '1.1' # required for the sphinx-apidoc command # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'trac'] autodoc_member_order = 'bysource' autodoc_default_flags = ['members', 'show-inheritance', 'undoc-members'] @@ -223,3 +223,5 @@ man_pages = [ ('index', 'stem', u'Stem Documentation', ['%s (%s)' % (__author__, __contact__)], 1) ] + +trac_url = 'https://trac.torproject.org/projects/tor' diff --git a/docs/trac.py b/docs/trac.py new file mode 100644 index 0000000..afc74e8 --- /dev/null +++ b/docs/trac.py @@ -0,0 +1,71 @@ +from docutils.utils import unescape +from docutils.nodes import reference +from docutils.parsers.rst.roles import set_classes + + +def role_trac(name, rawtext, text, lineno, inliner, options={}, content=[]): + """Returns two part tuple consisting of node and system messages. + Both allowed to be empty. + + :param name: The role name used in the document. + :param rawtext: The entire markup snippet, with role. + :param text: The text marked with the role. + :param lineno: The line number where rawtext appears in the input. + :param inliner: The inliner instance that called us. + :param options: Directive options for customization. + :param content: The directive content for customization. + """ + + # checking if the number is valid + try: + ticket_num = int(text) + if ticket_num <= 0: + raise ValueError + + except ValueError: + msg = inliner.reporter.error( + 'Invalid trac ticket: %s' % (text), line=lineno) + prb = inliner.problematic(rawtext, rawtext, msg) + return ([prb], [msg]) + + app = inliner.document.settings.env.app + node = make_link_node(rawtext, app, 'ticket', str(ticket_num), options) + return ([node], []) + + +def make_link_node(rawtext, app, type, slug, options): + """Creates a link to a trac ticket. + + :param rawtext: Text being replaced with link node. + :param app: Sphinx application context + :param type: Link type (issue, changeset, etc.) + :param slug: ID of the thing to link to + :param options: Options dictionary passed to role func. + """ + + # checking if trac_url is set in conf.py + try: + base = app.config.trac_url + if not base: + raise AttributeError + + except AttributeError, e: + raise ValueError('trac_url is not set (%s)' % str(e)) + + slash = '/' if base[-1] != '/' else '' + ref = base + slash + type + '/' + slug + set_classes(options) + name = type + ' #' + unescape(slug) + node = reference(rawtext, name, refuri=ref, **options) + return node + + +def setup(app): + """Installs the plugin. + + :param app: Sphinx application context. + """ + + app.add_role('trac', role_trac) + app.add_config_value('trac_url', None, 'env') + return

1 0

[stem/master] Custom sphinx role for :trac:
by atagar＠torproject.org 15 Apr '13

15 Apr '13

commit f17e370bb75c28c36e5aae1fe942b5bc97ca5438 Merge: fae5b1d 4bdcba0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 14 16:07:18 2013 -0700 Custom sphinx role for :trac: Thanks to ragwater we now have a :trac: role for our docs. With this we no longer need to hardcode ticket urls, and gives a nice template we can use for other customizations. https://trac.torproject.org/8671 http://doughellmann.com/2010/05/defining-custom-roles-in-sphinx.html docs/change_log.rst | 2 +- docs/conf.py | 6 ++- docs/republish.py | 26 +++++++------ docs/trac.py | 72 ++++++++++++++++++++++++++++++++++++ run_tests.py | 2 + stem/connection.py | 8 ++-- stem/control.py | 7 +-- stem/descriptor/microdescriptor.py | 2 +- test/runner.py | 3 +- test/util.py | 1 + 10 files changed, 103 insertions(+), 26 deletions(-)

1 0

[stem/master] Style revisions
by atagar＠torproject.org 15 Apr '13

15 Apr '13

commit 4bdcba090b5a29e2a64c229a5ba9246ddbb59a69 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 14 16:05:03 2013 -0700 Style revisions Our trac.py is based on an external tutorial... http://doughellmann.com/2010/05/defining-custom-roles-in-sphinx.html As such it naturally had different stylistic conventions from stem. There were also some minor points that had some room for simplification. --- docs/republish.py | 25 ++++++----- docs/trac.py | 121 +++++++++++++++++++++++++++-------------------------- 2 files changed, 75 insertions(+), 71 deletions(-) diff --git a/docs/republish.py b/docs/republish.py index 0dbad16..ae783cf 100644 --- a/docs/republish.py +++ b/docs/republish.py @@ -24,40 +24,43 @@ If stem's repository is unchanged then this is a no-op. -r, --repeat RATE tries to republish the site at a set rate, in minutes """ + def run(command, cwd = None): # Runs the given command. This returns the stdout if successful, and raises # an OSError if it fails. - + cmd = subprocess.Popen(command.split(' '), stdout = subprocess.PIPE, stderr = subprocess.PIPE, cwd = cwd) - + if cmd.wait() == 0: return cmd.communicate()[0] else: stdout, stderr = cmd.communicate() raise OSError("'%s' failed\n stdout: %s\n stderr: %s" % (command, stdout.strip(), stderr.strip())) + def republish_site(): # Checks if stem's repository has changed, rebuilding the site if so. Ideally # we'd use plumbing commands to check this but... meh. Patches welcome. - + if 'Already up-to-date.' not in run('git pull', cwd = '/home/stem/stem'): start_time = time.time() LOGGER.log(logging.INFO, "Stem's repository has changed. Republishing...") run('make html', cwd = '/home/stem/stem/docs') run('sudo -u mirroradm static-master-update-component stem.torproject.org') - + runtime = int(time.time() - start_time) LOGGER.log(logging.INFO, " site republished (took %s seconds)" % runtime) + if __name__ == '__main__': - try: + try: opts = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED)[0] except getopt.GetoptError, exc: print "%s (for usage provide --help)" % exc sys.exit(1) - + repeat_rate = None - + for opt, arg in opts: if opt in ("-r", "--repeat"): if arg.isdigit(): @@ -68,15 +71,15 @@ if __name__ == '__main__': elif opt in ("-h", "--help"): print HELP_MSG sys.exit() - + if repeat_rate: LOGGER.log(logging.INFO, "Starting stem site republisher") - latest_run = 0 # unix timestamp for when we last ran - + latest_run = 0 # unix timestamp for when we last ran + while True: while time.time() < (latest_run + repeat_rate * 60): time.sleep(15) - + try: latest_run = time.time() republish_site() diff --git a/docs/trac.py b/docs/trac.py index d2459dd..7af5440 100644 --- a/docs/trac.py +++ b/docs/trac.py @@ -4,68 +4,69 @@ from docutils.parsers.rst.roles import set_classes def role_trac(name, rawtext, text, lineno, inliner, options={}, content=[]): - """Returns two part tuple consisting of node and system messages. - Both allowed to be empty. - - :param name: The role name used in the document. - :param rawtext: The entire markup snippet, with role. - :param text: The text marked with the role. - :param lineno: The line number where rawtext appears in the input. - :param inliner: The inliner instance that called us. - :param options: Directive options for customization. - :param content: The directive content for customization. - """ - - # checking if the number is valid - try: - ticket_num = int(text) - if ticket_num <= 0: - raise ValueError - - except ValueError: - msg = inliner.reporter.error( - 'Invalid trac ticket: %s' % (text), line=lineno) - prb = inliner.problematic(rawtext, rawtext, msg) - return ([prb], [msg]) - - app = inliner.document.settings.env.app - node = make_link_node(rawtext, app, 'ticket', str(ticket_num), options) - return ([node], []) - - -def make_link_node(rawtext, app, type, slug, options): - """Creates a link to a trac ticket. - - :param rawtext: Text being replaced with link node. - :param app: Sphinx application context - :param type: Link type (issue, changeset, etc.) - :param slug: ID of the thing to link to - :param options: Options dictionary passed to role func. - """ - - # checking if trac_url is set in conf.py - try: - base = app.config.trac_url - if not base: - raise AttributeError - - except AttributeError, e: - raise ValueError('trac_url is not set (%s)' % str(e)) - - slash = '/' if base[-1] != '/' else '' - ref = base + slash + slug - set_classes(options) - name = type + ' ' + unescape(slug) - node = reference(rawtext, name, refuri=ref, **options) - return node + """ + Returns two part tuple consisting of node and system messages. Both allowed + to be empty. + + :param name: the role name used in the document + :param rawtext: the entire markup snippet, with role + :param text: the text marked with the role + :param lineno: the line number where rawtext appears in the input + :param inliner: the inliner instance that called us + :param options: directive options for customization + :param content: the directive content for customization + """ + + # checking if the number is valid + try: + ticket_num = int(text) + + if ticket_num <= 0: + raise ValueError + except ValueError: + msg = inliner.reporter.error( + 'Invalid trac ticket: %s' % (text), line=lineno) + prb = inliner.problematic(rawtext, rawtext, msg) + + return ([prb], [msg]) + + app = inliner.document.settings.env.app + + return ( + [make_link_node(rawtext, app, 'ticket', str(ticket_num), options)], + [], + ) + + +def make_link_node(rawtext, app, link_type, slug, options): + """ + Creates a link to a trac ticket. + + :param rawtext: text being replaced with link node + :param app: sphinx application context + :param link_type: link type (issue, changeset, etc.) + :param slug: ID of the thing to link to + :param options: options dictionary passed to role func + """ + + trac_base_url = getattr(app.config, 'trac_url', None) + + if not trac_base_url: + raise ValueError('trac_url is not set') + + ref = trac_base_url.rstrip('/') + '/' + slug + set_classes(options) + name = link_type + ' ' + unescape(slug) # sets the text to 'ticket 345' + + return reference(rawtext, name, refuri = ref, **options) def setup(app): - """Installs the plugin. + """ + Installs the plugin. - :param app: Sphinx application context. - """ + :param app: sphinx application context + """ - app.add_role('trac', role_trac) - app.add_config_value('trac_url', None, 'env') - return + app.add_role('trac', role_trac) + app.add_config_value('trac_url', None, 'env')

1 0

[stem/master] Using the :trac: role
by atagar＠torproject.org 15 Apr '13

15 Apr '13

commit 5ab172051665101ce3c8797f3aac24a6d79459e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 14 15:37:17 2013 -0700 Using the :trac: role Replacing our hardcoded trac links with our fancy new :trac: role. --- docs/change_log.rst | 2 +- stem/connection.py | 8 ++++---- stem/control.py | 7 +++---- stem/descriptor/microdescriptor.py | 2 +- test/runner.py | 3 +-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 479cb73..ff5dd21 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -40,7 +40,7 @@ The following are only available within stem's `git repository * **Controller** - * :class:`~stem.response.events.AddrMapEvent` support for the new CACHED argument (`ticket <https://trac.torproject.org/8596>`_, `spec <https://gitweb.torproject.org/torspec.git/commitdiff/25b0d43>`_) + * :class:`~stem.response.events.AddrMapEvent` support for the new CACHED argument (:trac:`8596`, `spec <https://gitweb.torproject.org/torspec.git/commitdiff/25b0d43>`_) * **Website** diff --git a/stem/connection.py b/stem/connection.py index b35bdd7..54404e7 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -479,7 +479,7 @@ def authenticate_password(controller, password, suppress_ctl_errors = True): :func:`~stem.connection.authenticate`, we may mistakenly raise a PasswordAuthRejected rather than IncorrectPassword. This is because we rely on tor's error messaging which is liable to change in future versions - (`ticket <https://trac.torproject.org/4817>`_). + (:trac:`4817`). This can authenticate to either a :class:`~stem.control.BaseController` or :class:`~stem.socket.ControlSocket`. @@ -555,8 +555,8 @@ def authenticate_cookie(controller, cookie_path, suppress_ctl_errors = True): :func:`~stem.connection.authenticate`, we may mistakenly raise a :class:`~stem.connection.CookieAuthRejected` rather than :class:`~stem.connection.IncorrectCookieValue`. This is because we rely on - tor's error messaging which is liable to change in future versions (`ticket - <https://trac.torproject.org/4817>`_). + tor's error messaging which is liable to change in future versions + (:trac:`4817`). This can authenticate to either a :class:`~stem.control.BaseController` or :class:`~stem.socket.ControlSocket`. @@ -781,7 +781,7 @@ def get_protocolinfo(controller): According to the control spec the cookie_file is an absolute path. However, this often is not the case (especially for the Tor Browser Bundle). If the path is relative then we'll make an attempt (which may not work) to correct - this (`ticket <https://trac.torproject.org/1101>`_). + this (:trac:`1101`). This can authenticate to either a :class:`~stem.control.BaseController` or :class:`~stem.socket.ControlSocket`. diff --git a/stem/control.py b/stem/control.py index f3e6d17..aed45ad 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1001,10 +1001,9 @@ class Controller(BaseController): Provides an iterator for all of the microdescriptors that tor presently knows about. - **Tor does not expose this information via the control protocol (`ticket - <https://trac.torproject.org/8323>`_).** Until it does this reads the - microdescriptors from disk, and hence won't work remotely or if we lack - read permissions. + **Tor does not expose this information via the control protocol + (:trac:`8323`).** Until it does this reads the microdescriptors from disk, + and hence won't work remotely or if we lack read permissions. :param list default: items to provide if the query fails diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index ac1eb2e..499e170 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -17,7 +17,7 @@ other descriptors. To do so you need to match the microdescriptor's digest against its corresponding router status entry. For added fun as of this writing the controller doesn't even surface those router status entries -(`ticket <https://trac.torproject.org/7953>`_). +(:trac:`7953`). For instance, here's an example that prints the nickname and fignerprints of the exit relays. diff --git a/test/runner.py b/test/runner.py index 4d8e533..9e4ec83 100644 --- a/test/runner.py +++ b/test/runner.py @@ -396,8 +396,7 @@ class Runner(object): def is_ptraceable(self): """ Checks if tor's 'DisableDebuggerAttachment' option is set. This feature has - a lot of adverse side effects - (`ticket <https://trac.torproject.org/projects/tor/ticket/3313>`_). + a lot of adverse side effects (:trac:`3313`). :returns: True if debugger attachment is allowed, False otherwise """

1 0

[stem/master] Checking for unused tests
by atagar＠torproject.org 14 Apr '13

14 Apr '13

commit fae5b1db09ff925ac41d8bfab36621e29dbf0e69 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 14 14:47:35 2013 -0700 Checking for unused tests Well... shame on me. We've always had a hardcoded list of our tests, but somehow when I moved it to our settings.cfg I missed a few. I'm not so much troubled about that mistake, but more that this mistake went undetected. Adding a check at the start of our tests for this kind of misconfiguration. --- run_tests.py | 1 + test/settings.cfg | 3 +++ test/util.py | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 610f0e2..9929cca 100755 --- a/run_tests.py +++ b/run_tests.py @@ -110,6 +110,7 @@ def main(): Task("checking pyflakes version", test.util.check_pyflakes_version), Task("checking pep8 version", test.util.check_pep8_version), Task("checking for orphaned .pyc files", test.util.clean_orphaned_pyc, (SRC_PATHS,)), + Task("checking for unused tests", test.util.check_for_unused_tests, ((os.path.join(STEM_BASE, 'test'),),)), ) if args.run_python3 and sys.version_info[0] != 3: diff --git a/test/settings.cfg b/test/settings.cfg index a40e1b7..bd3e3cd 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -172,6 +172,9 @@ test.unit_tests |test.unit.response.getinfo.TestGetInfoResponse |test.unit.response.getconf.TestGetConfResponse |test.unit.response.singleline.TestSingleLineResponse +|test.unit.response.authchallenge.TestAuthChallengeResponse +|test.unit.response.protocolinfo.TestProtocolInfoResponse +|test.unit.response.mapaddress.TestMapAddressResponse |test.unit.connection.authentication.TestAuthenticate |test.unit.control.controller.TestControl diff --git a/test/util.py b/test/util.py index 52a9989..623f0cd 100644 --- a/test/util.py +++ b/test/util.py @@ -25,7 +25,8 @@ Tasks are... |- check_python_version - checks our version of python |- check_pyflakes_version - checks our version of pyflakes |- check_pep8_version - checks our version of pep8 - +- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py + |- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py + +- check_for_unused_tests - checks to see if any tests are missing from our settings Testing Python 3 |- python3_prereq - checks that we have python3 and 2to3 @@ -351,6 +352,41 @@ def clean_orphaned_pyc(paths): return ["removed %s" % path for path in orphaned_pyc] +def check_for_unused_tests(paths): + """ + The 'test.unit_tests' and 'test.integ_tests' in our settings.cfg defines the + tests that we run. We do it this way so that we can control the order in + which our tests are run but there's a disadvantage: when we add new test + modules we can easily forget to add it there. + + Checking to see if we have any unittest.TestCase subclasses not covered by + our settings. + + :param list paths: paths to search for unused tests + """ + + unused_tests = [] + + for path in paths: + for py_path in _get_files_with_suffix(path, ".py"): + if _is_test_data(py_path): + continue + + with open(py_path) as f: + file_contents = f.read() + + test_match = re.search("^class (\S*)$unittest.TestCase$:$", file_contents, re.MULTILINE) + + if test_match: + class_name = test_match.groups()[0] + module_name = py_path.replace(os.path.sep, '.')[len(STEM_BASE) + 1:-3] + '.' + class_name + + if not (module_name in CONFIG['test.unit_tests'] or module_name in CONFIG['test.integ_tests']): + unused_tests.append(module_name) + + if unused_tests: + raise ValueError("Test modules are missing from our test/settings.cfg:\n%s" % "\n".join(unused_tests)) + def python3_prereq(): for required_cmd in ("2to3", "python3"): if not stem.util.system.is_available(required_cmd):

1 0

[stem/master] Revising ATTACHSTREAM 555 response handling
by atagar＠torproject.org 14 Apr '13

14 Apr '13

commit b36a9e3dc44adfda40390527fbb667a174a4736d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 14 14:20:10 2013 -0700 Revising ATTACHSTREAM 555 response handling Thanks to Roger we now know that a 555 response means that a stream's in a state where it can't be attached. Swapping the exception we raise to UnsatisfiableRequest and adding a little test for this. --- stem/control.py | 8 ++------ test/settings.cfg | 2 ++ test/unit/control/controller.py | 16 +++++++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/stem/control.py b/stem/control.py index 478384a..f3e6d17 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1965,6 +1965,7 @@ class Controller(BaseController): :raises: * :class:`stem.InvalidRequest` if the stream or circuit id were unrecognized + * :class:`UnsatisfiableRequest` if the stream isn't in a state where it can be attached * :class:`stem.OperationFailed` if the stream couldn't be attached for any other reason """ @@ -1982,12 +1983,7 @@ class Controller(BaseController): elif response.code == '551': raise stem.OperationFailed(response.code, response.message) elif response.code == '555': - # TODO: This response has been seen in the wild, but isn't valid - # according to the spec... - # - # https://trac.torproject.org/8701 - - raise stem.OperationFailed(response.code, response.message) + raise stem.UnsatisfiableRequest(response.code, response.message) else: raise stem.ProtocolError("ATTACHSTREAM returned unexpected response code: %s" % response.code) diff --git a/test/settings.cfg b/test/settings.cfg index 9d28f4d..a40e1b7 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -172,6 +172,8 @@ test.unit_tests |test.unit.response.getinfo.TestGetInfoResponse |test.unit.response.getconf.TestGetConfResponse |test.unit.response.singleline.TestSingleLineResponse +|test.unit.connection.authentication.TestAuthenticate +|test.unit.control.controller.TestControl test.integ_tests |test.integ.util.conf.TestConf diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index ccce4df..9efe4bf 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -6,10 +6,11 @@ integ tests, but a few bits lend themselves to unit testing. import unittest import stem.descriptor.router_status_entry +import stem.response import stem.socket import stem.version -from stem import InvalidArguments, InvalidRequest, ProtocolError +from stem import InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest from stem.control import _parse_circ_path, Controller, EventType from stem.exit_policy import ExitPolicy from test import mocking @@ -320,6 +321,19 @@ class TestControl(unittest.TestCase): self.assertEqual(valid_streams[index][2], stream.circ_id) self.assertEqual(valid_streams[index][3], stream.target) + def test_attach_stream(self): + """ + Exercises the attach_stream() method. + """ + + # Response when the stream is in a state where it can't be attached (for + # instance, it's already open). + + response = stem.response.ControlMessage.from_str("555 Connection is not managed by controller.\r\n") + mocking.mock_method(Controller, "msg", mocking.return_value(response)) + + self.assertRaises(UnsatisfiableRequest, self.controller.attach_stream, 'stream_id', 'circ_id') + def test_parse_circ_path(self): """ Exercises the _parse_circ_path() helper function.

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 14 Apr '13

14 Apr '13

commit 5665e69dd0076c723660694e421e1b57407c85c2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 14 20:45:10 2013 +0000 Update translations for gettor_completed --- ar/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index c1f898b..5ea3d93 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-14 16:10+0000\n" +"PO-Revision-Date: 2013-04-14 20:44+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -384,7 +384,7 @@ msgstr "linux-i386:\nحزمة متصفح تور لنظام لينكس 32بت." msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr " لاحظ بأن هذا الملف (مجموعة الملفات) قد تكون كبيرة الحجم و تحتاج الى مزود خدمة الايميل لديك ليسمح بمرفقات للايميل بحجم 30 ميغابايت تقريباً." +msgstr " لاحظ بأن هذه الحزمة حجمها كبير و تحتاج الى مزود خدمة الايميل لديك بالسماح بمرفقات للايميل بحجم 30 ميغابايت تقريباً." #: lib/gettor/i18n.py:241 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 14 Apr '13

14 Apr '13

commit 8550a2127348def325a6333a624962fd9e8318e1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 14 20:45:07 2013 +0000 Update translations for gettor --- ar/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index c1f898b..5ea3d93 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-14 16:10+0000\n" +"PO-Revision-Date: 2013-04-14 20:44+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -384,7 +384,7 @@ msgstr "linux-i386:\nحزمة متصفح تور لنظام لينكس 32بت." msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr " لاحظ بأن هذا الملف (مجموعة الملفات) قد تكون كبيرة الحجم و تحتاج الى مزود خدمة الايميل لديك ليسمح بمرفقات للايميل بحجم 30 ميغابايت تقريباً." +msgstr " لاحظ بأن هذه الحزمة حجمها كبير و تحتاج الى مزود خدمة الايميل لديك بالسماح بمرفقات للايميل بحجم 30 ميغابايت تقريباً." #: lib/gettor/i18n.py:241 msgid ""

1 0

[torspec/master] some typo fixes i found in my sandbox
by arma＠torproject.org 14 Apr '13

14 Apr '13

commit d48eaa7db2b165b2e1f5817381d978f498806525 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Apr 14 16:30:51 2013 -0400 some typo fixes i found in my sandbox --- proposals/205-local-dnscache.txt | 7 ++++--- proposals/216-ntor-handshake.txt | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/proposals/205-local-dnscache.txt b/proposals/205-local-dnscache.txt index 624e793..d0a0107 100644 --- a/proposals/205-local-dnscache.txt +++ b/proposals/205-local-dnscache.txt @@ -28,8 +28,9 @@ Status: Closed cache. This lets us implement exit policies and exit enclaves -- if we remember that www.mit.edu is 18.9.22.169 the first time we see it, then we can avoid making future requests for www.mit.edu - via any node that blocks net 18. Also, if there happened to be a - Tor node at 18.9.22.169, we could use that node as an exit enclave. + via any node whose exit policy refuses net 18. Also, if there + happened to be a Tor node at 18.9.22.169, we could use that node as + an exit enclave. But there are security issues with DNS caches. A malicious exit node or DNS server can lie. And unlike other traffic, where the @@ -94,7 +95,7 @@ Status: Closed controller, the configuration file, trackhostexits maps, virtual-address maps, DNS replies, and so on. - With this design, the DNS cache will not be part of the address + With this proposed design, the DNS cache will not be part of the address map. That means that entries in the address map which relied on happening after the DNS cache entries can no longer work so well. These would include: diff --git a/proposals/216-ntor-handshake.txt b/proposals/216-ntor-handshake.txt index e0c4f63..f76e81c 100644 --- a/proposals/216-ntor-handshake.txt +++ b/proposals/216-ntor-handshake.txt @@ -85,7 +85,7 @@ Protocol: The server sends a CREATED cell containing: SERVER_PK: Y -- G_LENGTH bytes - AUTH: H(auth_input, t_mac) -- H_LENGTH byets + AUTH: H(auth_input, t_mac) -- H_LENGTH bytes The client then checks Y is in G^* [see NOTE below], and computes @@ -211,5 +211,3 @@ Test vectors for HKDF-SHA256: b4dc21d69363e2895321c06184879d94b18f0784 11be70b767c7fc40679a9440a0c95ea83a23efbf - -

1 0

[stem/master] Catching 555 response from ATTACHSTREAM
by atagar＠torproject.org 14 Apr '13

14 Apr '13

commit 5268d28c885509de174e5b7c1a657bc0278fd797 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 14 13:22:54 2013 -0700 Catching 555 response from ATTACHSTREAM ATTACHSTREAM should only respond with 250, 552, or 551 according to the spec but someone came across a 555 response in the wild... https://trac.torproject.org/8701 Tentatively handling this with OperationFailed until the spec is updated with more information. --- stem/control.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5b9a8ac..478384a 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1981,6 +1981,13 @@ class Controller(BaseController): raise stem.InvalidRequest(response.code, response.message) elif response.code == '551': raise stem.OperationFailed(response.code, response.message) + elif response.code == '555': + # TODO: This response has been seen in the wild, but isn't valid + # according to the spec... + # + # https://trac.torproject.org/8701 + + raise stem.OperationFailed(response.code, response.message) else: raise stem.ProtocolError("ATTACHSTREAM returned unexpected response code: %s" % response.code)

1 0