November 2017 - tor-commits - lists.torproject.org

[nyx/master] Include manifest when packaging
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit 0be8024a819fd88812862ab8aa57beb3fd83a509 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 5 14:41:15 2017 -0800 Include manifest when packaging Stem dynamically generates a manifest to instruct distutil what to include and exclude. Doing the same here. --- setup.py | 72 +++++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/setup.py b/setup.py index 5a24ca2..db63e61 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ SUMMARY = 'Terminal status monitor for Tor (https://www.torproject.org/)' DRY_RUN_SUMMARY = 'Ignore this package. This is dry-run release creation to work around PyPI limitations (https://github.com/pypa/packaging-problems/issues/74#issuecomment-260716129)' DESCRIPTION = """ -Nyx is a command-line monitor for Tor. With this you can get detailed real-time information about your relay such as bandwidth usage, connections, logs, and much more. For more information see `Nyx's homepage <https://nyx.torproject.org/>`_ +Nyx is a command-line monitor for Tor. With this you can get detailed real-time information about your relay such as bandwidth usage, connections, logs, and much more. For more information see `Nyx's homepage <https://nyx.torproject.org/>`_. Quick Start ----------- @@ -39,6 +39,22 @@ To install you can either use... ... or install from the source tarball. Nyx supports both the python 2.x and 3.x series. """ +MANIFEST = """ +include LICENSE +include MANIFEST.in +include nyx.1 +include run_tests.py +graft test +graft web +global-exclude __pycache__ +global-exclude *.orig +global-exclude *.pyc +global-exclude *.swp +global-exclude *.swo +global-exclude *~ +""".strip() + + class NyxInstaller(install): """ Nyx installer. This adds the following additional options... @@ -116,25 +132,35 @@ class NyxInstaller(install): setup_dir = os.path.dirname(os.path.join(os.getcwd(), __file__)) os.chdir(setup_dir) -setup( - name = 'nyx-dry-run' if DRY_RUN else 'nyx', - version = nyx.__version__, - description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, - long_description = DESCRIPTION, - license = nyx.__license__, - author = nyx.__author__, - author_email = nyx.__contact__, - url = nyx.__url__, - packages = ['nyx', 'nyx.panel'], - keywords = 'tor onion controller', - install_requires = ['stem>=1.6.0'], - package_data = {'nyx': ['settings/*']}, - cmdclass = {'install': NyxInstaller}, - classifiers = [ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console :: Curses', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Topic :: Security', - ], -) +with open('MANIFEST.in', 'w') as manifest_file: + manifest_file.write(MANIFEST) + +try: + setup( + name = 'nyx-dry-run' if DRY_RUN else 'nyx', + version = nyx.__version__, + description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, + long_description = DESCRIPTION, + license = nyx.__license__, + author = nyx.__author__, + author_email = nyx.__contact__, + url = nyx.__url__, + packages = ['nyx', 'nyx.panel'], + keywords = 'tor onion controller', + install_requires = ['stem>=1.6.0'], + package_data = {'nyx': ['settings/*']}, + cmdclass = {'install': NyxInstaller}, + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Console :: Curses', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + 'Topic :: Security', + ], + ) +finally: + if os.path.exists('MANIFEST.in'): + os.remove('MANIFEST.in') + + if os.path.exists('MANIFEST'): + os.remove('MANIFEST')

1 0

[nyx/master] Installing fails with 'error: option --single-version-externally-managed not recognized'
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit c9bddc096a4e60d4ffdc420af5a77d9a0031cc39 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 6 11:20:28 2017 -0800 Installing fails with 'error: option --single-version-externally-managed not recognized' Damn that was a pita. Pip expects that cmdclasses are the setuptools version, and chokes in a confusing fashion when using distutils instead. See the comment for details. --- nyx.1 | 3 ++- nyx/__init__.py | 2 +- setup.py | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/nyx.1 b/nyx.1 index d32e0ab..f779372 100644 --- a/nyx.1 +++ b/nyx.1 @@ -19,7 +19,8 @@ As a curses interface Nyx is particularly well suited for ssh connections, tty terminals, and command-line aficionados to check the status of tor. Nyx can be customized through a configuration file located at -\fB~/.nyx/config\fR. For options see our \fBnyxrc.sample\fR. +\fB~/.nyx/config\fR. For options see +\fBhttps://nyx.torproject.org/#configuration\fR. .SH OPTIONS .TP diff --git a/nyx/__init__.py b/nyx/__init__.py index 65102b0..48dd767 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.0.1' +__version__ = '2.0.2' __release_date__ = 'November 5, 2017' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' diff --git a/setup.py b/setup.py index dc3fb51..37923cc 100644 --- a/setup.py +++ b/setup.py @@ -82,15 +82,39 @@ class NyxInstaller(install): ... will cause that resource to be omitted. """ + # We don't actually use single-version-externally-managed. Unfortunately pip + # has a bug where it expects any cmdclass to be setuptools, otherwise it + # fails with... + # + # % sudo pip install nyx + # ... + # Installing collected packages: nyx + # Running setup.py install for nyx ... error + # Complete output from command /usr/bin/python -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-EOQT9b/nyx/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" install --record /tmp/pip-PHiCsl-record/install-record.txt --single-version-externally-managed --compile: + # usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] + # or: -c --help [cmd1 cmd2 ...] + # or: -c --help-commands + # or: -c cmd --help + # + # error: option --single-version-externally-managed not recognized + # + # We have a few options to sidestep this... + # + # * Have users install with 'sudo pip install --egg nyx' instead. + # * Extend setuptools.command.install, which has the argument. + # * Hack in a no-op argument to sidestep as we do here. + user_options = install.user_options + [ ('man-page=', None, 'man page location'), ('sample-path=', None, 'example nyxrc location'), + ('single-version-externally-managed', None, ''), # needed to sidestep pip bug ] def initialize_options(self): install.initialize_options(self) self.man_page = None self.sample_path = None + self.single_version_externally_managed = None def run(self): install.run(self)

1 0

[nyx/master] Dry-run packaging and update installation attributes
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit 590a245efbb6fd6ac0ba149daf3d0d7ac283949b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 5 13:12:21 2017 -0800 Dry-run packaging and update installation attributes Modeling our packaging after Stem, with support for release dry-runs. --- nyx/__init__.py | 6 +++--- setup.py | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 5a8de5d..4133c1d 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,11 +89,11 @@ except ImportError: sys.exit(1) -__version__ = '1.4.6-dev' -__release_date__ = 'April 28, 2011' +__version__ = '2.0.0' +__release_date__ = 'November 5, 2017' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' -__url__ = 'http://www.atagar.com/arm/' +__url__ = 'https://nyx.torproject.org/' __license__ = 'GPLv3' __all__ = [ diff --git a/setup.py b/setup.py index d463c2a..5a24ca2 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ import gzip import os import stat +import sys import sysconfig import nyx @@ -14,6 +15,30 @@ from distutils.core import setup from distutils.command.install import install +if '--dryrun' in sys.argv: + DRY_RUN = True + sys.argv.remove('--dryrun') +else: + DRY_RUN = False + +SUMMARY = 'Terminal status monitor for Tor (https://www.torproject.org/)' +DRY_RUN_SUMMARY = 'Ignore this package. This is dry-run release creation to work around PyPI limitations (https://github.com/pypa/packaging-problems/issues/74#issuecomment-260716129)' + +DESCRIPTION = """ +Nyx is a command-line monitor for Tor. With this you can get detailed real-time information about your relay such as bandwidth usage, connections, logs, and much more. For more information see `Nyx's homepage <https://nyx.torproject.org/>`_ + +Quick Start +----------- + +To install you can either use... + +:: + + pip install nyx + +... or install from the source tarball. Nyx supports both the python 2.x and 3.x series. +""" + class NyxInstaller(install): """ Nyx installer. This adds the following additional options... @@ -92,16 +117,24 @@ setup_dir = os.path.dirname(os.path.join(os.getcwd(), __file__)) os.chdir(setup_dir) setup( - name = 'nyx', + name = 'nyx-dry-run' if DRY_RUN else 'nyx', version = nyx.__version__, - description = 'Terminal status monitor for Tor <https://www.torproject.org/>', + description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, + long_description = DESCRIPTION, license = nyx.__license__, author = nyx.__author__, author_email = nyx.__contact__, url = nyx.__url__, packages = ['nyx', 'nyx.panel'], keywords = 'tor onion controller', - install_requires = ['stem>=1.4.1'], + install_requires = ['stem>=1.6.0'], package_data = {'nyx': ['settings/*']}, cmdclass = {'install': NyxInstaller}, + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Console :: Curses', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + 'Topic :: Security', + ], )

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit 25fe36be61a9c37ceb45376f9a5f69e01a990366 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 19:20:18 2017 +0000 Update translations for tails-greeter-2 --- ar/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/ar.po b/ar/ar.po index 9fd5ee777..8d5df11c6 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -35,7 +35,7 @@ msgstr "" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "تأكيد " #: ../data/greeter.ui.h:5 msgid "Confirm your administration password"

1 0

[torbutton/maint-1.9.7] Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi
by gk＠torproject.org 06 Nov '17

06 Nov '17

commit 40f35d5b280cf694d2a6cb3ade734511eed5593e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 26 22:04:43 2017 -0700 Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9e18adb..4fa2fb9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2357,7 +2357,7 @@ function torbutton_update_noscript_button() // Returns true if we should show the tor browser manual. function torbutton_show_torbrowser_manual() { - let availableLocales = ["en", "es", "fr", "pt", "zh"]; + let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"]; let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2); return availableLocales.indexOf(shortLocale) >= 0; }

1 0

[torbutton/master] Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi
by gk＠torproject.org 06 Nov '17

06 Nov '17

commit 87e57187a18290b7f7bc02eefde8d9ba369f18f7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 26 22:04:43 2017 -0700 Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9e18adb..4fa2fb9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2357,7 +2357,7 @@ function torbutton_update_noscript_button() // Returns true if we should show the tor browser manual. function torbutton_show_torbrowser_manual() { - let availableLocales = ["en", "es", "fr", "pt", "zh"]; + let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"]; let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2); return availableLocales.indexOf(shortLocale) >= 0; }

1 0

[webwml/master] Add George to people page
by atagar＠torproject.org 06 Nov '17

06 Nov '17

commit 3f0e8734eb0df79c0ccfd7a457fd373ab39430cf Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 6 10:06:37 2017 -0800 Add George to people page --- about/en/corepeople.wml | 120 ++++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 56 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 68b4dbad..f1f4d6cf 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -254,6 +254,16 @@ table.people tr td:first-child { </td> <td> + <a id="gman999"></a> + <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> + <div class="name"><a href="#gman999">George</a></div> + <div class="field"><b>IRC:</b> gman999</div> + <div class="description">Tor BSD Diversity Project member, long-time relay operator, trainer.</div> + </td> + </tr> + + <tr> + <td> <a id="GeKo"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=35CD74C24A9B15A19E1A81A1…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> @@ -261,9 +271,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> GeKo</div> <div class="description">Currently lead of the Tor Browser team.</div> </td> - </tr> - <tr> <td> <a id="asn"></a> <div class="photo"><img src="$(IMGROOT)/people/asn.png" alt="asn" /></div> @@ -272,7 +280,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> asn</div> <div class="description">Onion services. Security analysis. Used to obfsproxy. Follower of the onion.</div> </td> + </tr> + <tr> <td> <a id="saint"></a> <div class="photo"><img src="$(IMGROOT)/people/saint.png" alt="saint" /></div> @@ -282,9 +292,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> saint</div> <div class="description">Tamper-resistant software distribution, censorship detection, <a href="https://github.com/glamrock/cupcake">Cupcake</a>, and security training of activists and domestic violence survivors.</div> </td> - </tr> - <tr> <td> <a id="irl"></a> <div class="photo"><img src="$(IMGROOT)/people/irl.png" alt="irl" /></div> @@ -294,7 +302,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> irl</div> <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://atlas.torproject.org/">Atlas</a>.</div> </td> + </tr> + <tr> <td> <a id="ian"></a> <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div> @@ -302,9 +312,7 @@ table.people tr td:first-child { <div class="name"><a href="#ian">Ian Goldberg</a></div> <div class="description"><a href="https://cs.uwaterloo.ca/~iang/">Professor of CS</a> at the <a href="https://uwaterloo.ca/">University of Waterloo</a>, developing <a href="https://otr.cypherpunks.ca/">Off-the-Record Messaging</a> among other things.</div> </td> - </tr> - <tr> <td> <a id="intrigeri"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -312,7 +320,9 @@ table.people tr td:first-child { <div class="name"><a href="#intrigeri">intrigeri</a></div> <div class="description">Our main interface with the <a href="https://tails.boum.org/">Tails</a> project.</div> </td> + </tr> + <tr> <td> <a id="isabela"></a> <div class="photo"><img src="$(IMGROOT)/people/isabela.png" alt="isabela" /></div> @@ -322,9 +332,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> isabela</div> <div class="description">Coordinates Tor's development teams and roadmaps. Keeps track of priorities, and ensures Tor always thinks of the "user first".</div> </td> - </tr> - <tr> <td> <a id="isis"></a> <div class="photo"><img src="$(IMGROOT)/people/isis.png" alt="isis" /></div> @@ -334,7 +342,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> isis</div> <div class="description">Tor developer working on censorship circumvention, <a href="https://gitweb.torproject.org/bridgedb.git">BridgeDB</a>, and cryptographic research, design, and implementations.</div> </td> + </tr> + <tr> <td> <a id="ilv"></a> <div class="photo"><img src="$(IMGROOT)/people/ilv.png" alt="ilv" /></div> @@ -343,9 +353,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ilv</div> <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>, focused on Latin America. Works in <a href="https://www.derechosdigitales.org">Derechos Digitales</a>.</div> </td> - </tr> - <tr> <td> <a id="iwakeh"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -353,7 +361,9 @@ table.people tr td:first-child { <div class="name"><a href="#iwakeh">iwakeh</a></div> <div class="description">Speaks Java and other languages, streamlines build processes, and scrutinizes mathematical concepts behind aggregating tons of Tor network data.</div> </td> + </tr> + <tr> <td> <a id="qbi"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -363,9 +373,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> qbi</div> <div class="description">Volunteer that helped translate the website, is part of TorServers.net, and Tor's sysadmin team.</div> </td> - </tr> - <tr> <td> <a id="jselon"></a> <div class="photo"><img src="$(IMGROOT)/people/jselon.png" alt="jselon" /></div> @@ -374,7 +382,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> jselon</div> <div class="description">Event Coordination, donor management, general office operations.</div> </td> + </tr> + <tr> <td> <a id="julius"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -383,9 +393,7 @@ table.people tr td:first-child { <div class="name"><a href="#julius">Julius Mittenzwei</a></div> <div class="description">Germany-based lawyer and Internet activist.</div> </td> - </tr> - <tr> <td> <a id="juris"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -394,7 +402,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> juris</div> <div class="description">Board member of torservers.net.</div> </td> + </tr> + <tr> <td> <a id="karsten"></a> <div class="photo"><img src="$(IMGROOT)/people/karsten.png" alt="karsten" /></div> @@ -403,9 +413,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> karsten</div> <div class="description">Primary researcher and developer into <a href="https://metrics.torproject.org/">anonymous metrics</a> which started as a National Science Foundation grant.</div> </td> - </tr> - <tr> <td> <a id="kat5"></a> <div class="photo"><img src="$(IMGROOT)/people/kat5.png" alt="kat5" /></div> @@ -413,7 +421,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> kat5</div> <div class="description">Volunteer on the Community Team. Helps with t-shirts for relay operators and other odds and ends.</div> </td> + </tr> + <tr> <td> <a id="ailanthus"></a> <div class="photo"><img src="$(IMGROOT)/people/ailanthus.png" alt="ailanthus" /></div> @@ -423,16 +433,16 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ailanthus</div> <div class="description">Writes about Tor in mainstream and technical publications and conducts community workshops to teach people about Tor.</div> </td> - </tr> - <tr> <td> <a id="leif"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#leif">Leif Ryge</a></div> <div class="description">Works on security analysis, designer of "bananaphone" transport.</div> </td> + </tr> + <tr> <td> <a id="linda"></a> <div class="photo"><img src="$(IMGROOT)/people/linda.png" alt="linda" /></div> @@ -441,9 +451,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> linda</div> <div class="description">UX team lead.</div> </td> - </tr> - <tr> <td> <a id="ln5"></a> <div class="photo"><img src="$(IMGROOT)/people/ln5.png" alt="ln5" /></div> @@ -453,7 +461,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ln5</div> <div class="description">Swedish advocate and Tor Board member. Works on implementing IPv6 in Tor, build automation, and runs a directory authority.</div> </td> + </tr> + <tr> <td> <a id="agrabeli"></a> <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div> @@ -463,9 +473,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> agrabeli</div> <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div> </td> - </tr> - <tr> <td> <a id="mcs"></a> <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div> @@ -474,7 +482,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> mcs</div> <div class="description">Developer on the Tor Browser team.</div> </td> + </tr> + <tr> <td> <a id="matt"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -482,9 +492,7 @@ table.people tr td:first-child { <div class="name"><a href="#matt">Matt Blaze</a></div> <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div> </td> - </tr> - <tr> <td> <a id="pastly"></a> <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div> @@ -493,7 +501,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> pastly</div> <div class="description"><a href="http://mattttttssi4lhud.onion/">Implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. Helps safely measure Tor. Says helpful things on IRC.</div> </td> + </tr> + <tr> <td> <a id="sysrqb"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -503,9 +513,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sysrqb</div> <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div> </td> - </tr> - <tr> <td> <a id="meejah"></a> <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div> @@ -515,7 +523,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> meejah</div> <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div> </td> + </tr> + <tr> <td> <a id="mtigas"></a> <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div> @@ -525,9 +535,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> mtigas</div> <div class="description">Works on <a href="https://mike.tig.as/onionbrowser/">Onion Browser</a>, iOS, and hacker-journalist at <a href="https://www.propublica.org/">ProPublica</a> running their <a href="https://www.propub3r6espa33w.onion/">onion service</a>.</div> </td> - </tr> - <tr> <td> <a id="moritz"></a> <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div> @@ -536,7 +544,9 @@ table.people tr td:first-child { <div class="name"><a href="#moritz">Moritz Bartl</a></div> <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div> </td> + </tr> + <tr> <td> <a id="n8fr8"></a> <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div> @@ -545,9 +555,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> n8fr8</div> <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div> </td> - </tr> - <tr> <td> <a id="nickcalyx"></a> <div class="photo"><img src="$(IMGROOT)/people/nickcalyx.png" alt="nickcalyx" /></div> @@ -557,7 +565,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickcalyx</div> <div class="description">Runs a directory authority.</div> </td> + </tr> + <tr> <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> @@ -565,9 +575,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickhopper</div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> - </tr> - <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -577,7 +585,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickm</div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> + </tr> + <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -586,9 +596,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> boklm</div> <div class="description">Works on Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -598,7 +606,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> + </tr> + <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -606,9 +616,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> - </tr> - <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -617,7 +625,9 @@ table.people tr td:first-child { <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> + </tr> + <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -627,9 +637,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> - </tr> - <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -637,7 +645,9 @@ table.people tr td:first-child { <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> + </tr> + <tr> <td> <a id="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -646,9 +656,7 @@ table.people tr td:first-child { <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> - </tr> - <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -658,7 +666,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> + </tr> + <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -668,9 +678,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> - </tr> - <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -680,16 +688,16 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> + </tr> + <tr> <td> <a id="roya"></a> <div class="photo"><img src="$(IMGROOT)/people/roya.png" alt="roya" /></div> <div class="name"><a href="#roya">Roya Ensafi</a></div> <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div> </td> - </tr> - <tr> <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -697,7 +705,9 @@ table.people tr td:first-child { <div class="name"><a href="#sajolida">sajolida</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> + </tr> + <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -705,9 +715,7 @@ table.people tr td:first-child { <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> - </tr> - <tr> <td> <a id="serene"></a> <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div> @@ -716,7 +724,9 @@ table.people tr td:first-child { <div class="name"><a href="#serene">Serene</a></div> <div class="description">Snowflake and Pluggable Transports developer.</div> </td> + </tr> + <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -726,9 +736,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ssteele</div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> - </tr> - <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -738,7 +746,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> + </tr> + <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -748,9 +758,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> - </tr> - <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -760,7 +768,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> stephw</div> <div class="description">Directs communications.</div> </td> + </tr> + <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -770,9 +780,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sjmurdoch</div> <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div> </td> - </tr> - <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -781,7 +789,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> + </tr> + <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -791,9 +801,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> catalyst</div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> - </tr> - <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -802,7 +810,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> teor</div> <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> </td> + </tr> + <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -812,9 +822,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> tjr</div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>

1 0

[tor/maint-0.3.2] Merge branch 'bug24150_032_squashed' into maint-0.3.2
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 7d767706ef9d46738028ed3990d638283929fd85 Merge: bebdd9105 5240afa71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 12:59:23 2017 -0500 Merge branch 'bug24150_032_squashed' into maint-0.3.2 changes/bug24150 | 4 ++++ src/or/hs_descriptor.c | 11 ++++++++++- src/test/fuzz/fuzz_hsdescv3.c | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.2] Fix a memory leak on decryption non-failure of v3 hsdesc
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 5240afa713581a0bbba64547e00107a9cbf17f21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 5 12:21:16 2017 -0500 Fix a memory leak on decryption non-failure of v3 hsdesc If it decrypts something that turns out to start with a NUL byte, then decrypt_desc_layer() will return 0 to indicate the length of its result. But 0 also indicates an error, which causes the result not to be freed by decrypt_desc_layer()'s callers. Since we're trying to stabilize 0.3.2.x, I've opted for the simpler possible fix here and made it so that an empty decrypted string will also count as an error. Fixes bug 24150 and OSS-Fuzz issue 3994. The original bug was present but unreachable in 0.3.1.1-alpha. I'm calling this a bugfix on 0.3.2.1-alpha since that's the first version where you could actually try to decrypt these descriptors. --- changes/bug24150 | 4 ++++ src/or/hs_descriptor.c | 11 ++++++++++- src/test/fuzz/fuzz_hsdescv3.c | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug24150 b/changes/bug24150 new file mode 100644 index 000000000..cfda7c40d --- /dev/null +++ b/changes/bug24150 @@ -0,0 +1,4 @@ + o Minor bugfixes (v3 onion services): + - Fix a memory leak when decrypting a badly formatted v3 onion + service descriptor. Fixes bug 24150; bugfix on 0.3.2.1-alpha. + Found by OSS-Fuzz; this is OSS-Fuzz issue 3994. diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index a8ff3471c..170886694 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1302,7 +1302,11 @@ encrypted_data_length_is_valid(size_t len) * <b>encrypted_blob_size</b>. Use the descriptor object <b>desc</b> to * generate the right decryption keys; set <b>decrypted_out</b> to the * plaintext. If <b>is_superencrypted_layer</b> is set, this is the outter - * encrypted layer of the descriptor. */ + * encrypted layer of the descriptor. + * + * On any error case, including an empty output, return 0 and set + * *<b>decrypted_out</b> to NULL. + */ MOCK_IMPL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, const uint8_t *encrypted_blob, @@ -1382,6 +1386,11 @@ decrypt_desc_layer,(const hs_descriptor_t *desc, } } + if (result_len == 0) { + /* Treat this as an error, so that somebody will free the output. */ + goto err; + } + /* Make sure to NUL terminate the string. */ decrypted[encrypted_len] = '\0'; *decrypted_out = (char *) decrypted; diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 30e82c925..428774e33 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -50,7 +50,13 @@ mock_decrypt_desc_layer(const hs_descriptor_t *desc, *decrypted_out = tor_memdup_nulterm( encrypted_blob + HS_DESC_ENCRYPTED_SALT_LEN, encrypted_blob_size - overhead); - return strlen(*decrypted_out); + size_t result = strlen(*decrypted_out); + if (result) { + return result; + } else { + tor_free(*decrypted_out); + return 0; + } } int

1 0

[tor/master] Fix a memory leak on decryption non-failure of v3 hsdesc
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 5240afa713581a0bbba64547e00107a9cbf17f21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 5 12:21:16 2017 -0500 Fix a memory leak on decryption non-failure of v3 hsdesc If it decrypts something that turns out to start with a NUL byte, then decrypt_desc_layer() will return 0 to indicate the length of its result. But 0 also indicates an error, which causes the result not to be freed by decrypt_desc_layer()'s callers. Since we're trying to stabilize 0.3.2.x, I've opted for the simpler possible fix here and made it so that an empty decrypted string will also count as an error. Fixes bug 24150 and OSS-Fuzz issue 3994. The original bug was present but unreachable in 0.3.1.1-alpha. I'm calling this a bugfix on 0.3.2.1-alpha since that's the first version where you could actually try to decrypt these descriptors. --- changes/bug24150 | 4 ++++ src/or/hs_descriptor.c | 11 ++++++++++- src/test/fuzz/fuzz_hsdescv3.c | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug24150 b/changes/bug24150 new file mode 100644 index 000000000..cfda7c40d --- /dev/null +++ b/changes/bug24150 @@ -0,0 +1,4 @@ + o Minor bugfixes (v3 onion services): + - Fix a memory leak when decrypting a badly formatted v3 onion + service descriptor. Fixes bug 24150; bugfix on 0.3.2.1-alpha. + Found by OSS-Fuzz; this is OSS-Fuzz issue 3994. diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index a8ff3471c..170886694 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1302,7 +1302,11 @@ encrypted_data_length_is_valid(size_t len) * <b>encrypted_blob_size</b>. Use the descriptor object <b>desc</b> to * generate the right decryption keys; set <b>decrypted_out</b> to the * plaintext. If <b>is_superencrypted_layer</b> is set, this is the outter - * encrypted layer of the descriptor. */ + * encrypted layer of the descriptor. + * + * On any error case, including an empty output, return 0 and set + * *<b>decrypted_out</b> to NULL. + */ MOCK_IMPL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, const uint8_t *encrypted_blob, @@ -1382,6 +1386,11 @@ decrypt_desc_layer,(const hs_descriptor_t *desc, } } + if (result_len == 0) { + /* Treat this as an error, so that somebody will free the output. */ + goto err; + } + /* Make sure to NUL terminate the string. */ decrypted[encrypted_len] = '\0'; *decrypted_out = (char *) decrypted; diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 30e82c925..428774e33 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -50,7 +50,13 @@ mock_decrypt_desc_layer(const hs_descriptor_t *desc, *decrypted_out = tor_memdup_nulterm( encrypted_blob + HS_DESC_ENCRYPTED_SALT_LEN, encrypted_blob_size - overhead); - return strlen(*decrypted_out); + size_t result = strlen(*decrypted_out); + if (result) { + return result; + } else { + tor_free(*decrypted_out); + return 0; + } } int

1 0