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

[nyx/master] Fix installation unit test
by atagar＠torproject.org 11 Nov '17

11 Nov '17

commit 5efaaa6cf6a971219bf27278fe0344fb647daa84 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 10 11:49:48 2017 -0800 Fix installation unit test Adjustments to our setup.py broke the installation test. Got really sure why it started causing errors about pth but easy enough to work around. --- test/installation.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/installation.py b/test/installation.py index d37d852..ee64e29 100644 --- a/test/installation.py +++ b/test/installation.py @@ -1,4 +1,3 @@ -import glob import os import shutil import subprocess @@ -17,23 +16,26 @@ class TestInstallation(unittest.TestCase): self.skipTest('(only for git checkout)') original_cwd = os.getcwd() + site_packages = '/tmp/nyx_test/lib/python%i.%i/site-packages/' % sys.version_info[:2] try: os.chdir(base_directory) - stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/nyx_test') + os.makedirs(site_packages) + stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/nyx_test', env = {'PYTHONPATH': site_packages}) stem.util.system.call(sys.executable + ' setup.py clean --all') # tidy up the build directory - site_packages_paths = glob.glob('/tmp/nyx_test/lib*/*/site-packages') - if len(site_packages_paths) != 1: - self.fail('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths) + if not os.path.exists(site_packages): + self.fail('We should have a site-packages located at: %s' % site_packages) - self.assertEqual(nyx.__version__, stem.util.system.call([sys.executable, '-c', "import sys;sys.path.insert(0, '%s');import nyx;print(nyx.__version__)" % site_packages_paths[0]])[0]) + self.assertEqual(nyx.__version__, stem.util.system.call([sys.executable, '-c', "import sys;sys.path.insert(0, '%s');import nyx;print(nyx.__version__)" % site_packages])[0]) - process_path = [site_packages_paths[0]] + sys.path + process_path = [site_packages] + sys.path process = subprocess.Popen(['/tmp/nyx_test/bin/nyx', '--help'], stdout = subprocess.PIPE, env = {'PYTHONPATH': ':'.join(process_path)}) stdout = process.communicate()[0] self.assertTrue(stdout.startswith(b'Usage nyx [OPTION]')) finally: - shutil.rmtree('/tmp/nyx_test') + if os.path.exists('/tmp/nyx_test'): + shutil.rmtree('/tmp/nyx_test') + os.chdir(original_cwd)

1 0

[nyx/master] Clean up egg after unit tests
by atagar＠torproject.org 11 Nov '17

11 Nov '17

commit cd5bcc6ee1dfb6bffaab1bd4444335aa63e265ec Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 11 13:28:46 2017 -0800 Clean up egg after unit tests Our installation unit test results in a couple egg things. Cleaning those up afterward. --- run_tests.py | 9 ++++----- test/__init__.py | 2 ++ test/installation.py | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/run_tests.py b/run_tests.py index a9dd98a..0aeac4f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -16,10 +16,9 @@ import stem.util.system import stem.util.test_tools import nyx +import test -NYX_BASE = os.path.dirname(__file__) - -SRC_PATHS = [os.path.join(NYX_BASE, path) for path in ( +SRC_PATHS = [os.path.join(test.NYX_BASE, path) for path in ( 'nyx', 'test', 'run_tests.py', @@ -32,9 +31,9 @@ SRC_PATHS = [os.path.join(NYX_BASE, path) for path in ( def main(): nyx.PAUSE_TIME = 0.000001 # make pauses negligibly low since our tests trigger things rapidly test_config = stem.util.conf.get_config('test') - test_config.load(os.path.join(NYX_BASE, 'test', 'settings.cfg')) + test_config.load(os.path.join(test.NYX_BASE, 'test', 'settings.cfg')) - orphaned_pyc = stem.util.test_tools.clean_orphaned_pyc(NYX_BASE) + orphaned_pyc = stem.util.test_tools.clean_orphaned_pyc([test.NYX_BASE]) for path in orphaned_pyc: print('Deleted orphaned pyc file: %s' % path) diff --git a/test/__init__.py b/test/__init__.py index 7f7f19d..b259f7b 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -4,6 +4,7 @@ Unit tests for nyx. import collections import inspect +import os import time import unittest @@ -28,6 +29,7 @@ __all__ = [ 'tracker', ] +NYX_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) OUR_SCREEN_SIZE = None TEST_SCREEN_SIZE = nyx.curses.Dimensions(80, 25) diff --git a/test/installation.py b/test/installation.py index ee64e29..4b89177 100644 --- a/test/installation.py +++ b/test/installation.py @@ -6,6 +6,7 @@ import unittest import nyx import stem.util.system +import test class TestInstallation(unittest.TestCase): @@ -35,7 +36,8 @@ class TestInstallation(unittest.TestCase): self.assertTrue(stdout.startswith(b'Usage nyx [OPTION]')) finally: - if os.path.exists('/tmp/nyx_test'): - shutil.rmtree('/tmp/nyx_test') + for path in ('/tmp/nyx_test', os.path.join(test.NYX_BASE, 'dist'), os.path.join(test.NYX_BASE, 'nyx.egg-info')): + if os.path.exists(path): + shutil.rmtree(path) os.chdir(original_cwd)

1 0

[nyx/master] Make intermediate data directories
by atagar＠torproject.org 11 Nov '17

11 Nov '17

commit 8ee3971432099ab0c986b6a8cc3fa1212cbe85e2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 10 11:50:50 2017 -0800 Make intermediate data directories Oops, when creating our data directory we didn't recurse. In practice this is generally fine since we're making a directory in the user's home, but if the user customized it they'd likely nail this. --- nyx/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index ce1f8c5..256764f 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -75,7 +75,7 @@ SQLITE_UNAVAILABLE_FREEBSD = """\ Python's sqlite3 module is unavailable. Please run... sudo pkg install py%i%i-sqlite3 -""" % (sys.version_info[:2]) +""" % sys.version_info[:2] try: import sqlite3 @@ -337,7 +337,7 @@ def data_directory(filename, config): if not os.path.exists(data_dir): try: - os.mkdir(data_dir) + os.makedirs(data_dir) except OSError as exc: stem.util.log.log_once('nyx.data_directory_unavailable', stem.util.log.NOTICE, 'Unable to create a data directory at %s (%s). This is fine, but caching is disabled meaning performance will be diminished a bit.' % (data_dir, exc)) return None

1 0

[nyx/master] Add version 2.0 section header to changelog
by atagar＠torproject.org 11 Nov '17

11 Nov '17

commit 3edf5525dd4526d12b2089a3e1c3ba0d03e8d9b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 11 12:49:01 2017 -0800 Add version 2.0 section header to changelog --- web/changelog/index.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/changelog/index.html b/web/changelog/index.html index 174aaa7..a2df205 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -44,6 +44,7 @@ <ul> <li><b><a href="#versioning">Versioning</a></b></li> + <li><b><a href="#version-2-0">Version 2.0 (November 5th, 2017)</a></b></li> <li><b><a href="#unreleased">Unreleased</a></b></li> <li><b><a href="legacy.html">Version 1.x</a></b></li> </ul> @@ -65,8 +66,11 @@ <a href="#unreleased" class="section-title">Unreleased</a> <p>The following are only available within Nyx's <a href="#git">git repository</a>.</p> - <p>From a user perspective little has changed, but this release is nothing less than a complete rewrite of our codebase. This adds long overdue <b>support for python 3.x</b>, test coverage, and migrate from TorCtl to <a href="https://stem.torproject.org/">Stem</a>.</p> - <p>Python 2.5 and 2.6 is no longer supported. Hopefully by now nobody will miss it. :P</p> + + <div id="version-2-0" class="section"></div> + <a href="#version-2-0" class="section-title">Version 2.0 (November 5th, 2017)</a> + + <p>Long belated update that's <b><a href="http://blog.atagar.com/nyx-release-2-0/">nothing less than a complete rewrite</a></b>! Also see <a href="https://blog.torproject.org/meet-nyx-command-line-tor-relay-monitor">Tor's blog announcement</a>. Adds long overdue <b>python 3.x support</b>, test coverage, and migrate from TorCtl to <a href="https://stem.torproject.org/">Stem</a>, and more...</p> <br>

1 0

[nyx/master] Add my 2009 interview with Brenno de Winter
by atagar＠torproject.org 11 Nov '17

11 Nov '17

commit f8b48cbe4572626b9172c885c2bcea4d51e3d8c3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 11 13:09:25 2017 -0800 Add my 2009 interview with Brenno de Winter --- web/HFM_INT_0001.mp3 | Bin 0 -> 2819925 bytes web/index.html | 1 + 2 files changed, 1 insertion(+) diff --git a/web/HFM_INT_0001.mp3 b/web/HFM_INT_0001.mp3 new file mode 100644 index 0000000..bff4029 Binary files /dev/null and b/web/HFM_INT_0001.mp3 differ diff --git a/web/index.html b/web/index.html index df517e6..4f1b426 100644 --- a/web/index.html +++ b/web/index.html @@ -114,6 +114,7 @@ <div class="answer"> <p>Nyx is a command-line application for monitoring real time <a href="https://www.torproject.org/">Tor</a> status information. This includes bandwidth usage, logs, connections, configuration, and more.</p> <p>As a curses interface Nyx is particularly well suited for ssh connections, tty terminals, and command-line aficionados.</p> + <p>For a bit of its history see my <a href="HFM_INT_0001.mp3">2009 interview by Brenno Winter</a>.</p> </div> </li>

1 0

[nyx/master] Add Slackware to download page
by atagar＠torproject.org 11 Nov '17

11 Nov '17

commit 7f6e8a4d8d22fa54aabce2e88100eca8a3326632 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 11 14:07:55 2017 -0800 Add Slackware to download page --- web/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/index.html b/web/index.html index 4f1b426..b536114 100644 --- a/web/index.html +++ b/web/index.html @@ -381,13 +381,13 @@ sudo python setup.py install</pre><br></li> <p>Package maintained by Jesse for Gentoo.</p> <pre>% sudo emerge arm</pre> </div> + --> <div class="platform"> - <a href="https://slackbuilds.org/repository/13.37/network/arm/" id="slackware"><img src="images/download/slackware.png" alt="Slackware"></a> - <a href="https://slackbuilds.org/repository/13.37/network/arm/" class="platform-title">Slackware</a> - <p>Package maintained by pyllyukko for <a href="http://slackbuilds.org/howto/">Slackware</a>.</p> + <a href="https://slackbuilds.org/repository/14.2/python/nyx/" id="slackware"><img src="images/download/slackware.png" alt="Slackware"></a> + <a href="https://slackbuilds.org/repository/14.2/python/nyx/" class="platform-title">Slackware</a> + <p>Package maintained by Markus for <a href="http://slackbuilds.org/howto/">Slackware</a>.</p> </div> - --> <div class="platform"> <a href="https://www.freshports.org/security/nyx/" id="freebsd"><img src="images/download/freebsd.png" alt="FreeBSD"></a>

1 0

[tor/master] Merge branch 'bug24247_032'
by nickm＠torproject.org 11 Nov '17

11 Nov '17

commit 11eaf208c0aaa7c252ead6343ea65a3576227d69 Merge: 2ed4a3e61 a7ca71cf6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 11 14:46:33 2017 -0500 Merge branch 'bug24247_032' changes/bug24247 | 6 ++++++ src/test/fuzz/fuzzing_common.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keys
by nickm＠torproject.org 11 Nov '17

11 Nov '17

commit a7ca71cf6b2fb46b049442569188ce046cfd6c34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 11 14:42:39 2017 -0500 Fix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keys This function -- a mock replacement used only for fuzzing -- would have a buffer overflow if it got an RSA key whose modulus was under 20 bytes long. Fortunately, Tor itself does not appear to have a bug here. Fixes bug 24247; bugfix on 0.3.0.3-alpha when fuzzing was introduced. Found by OSS-Fuzz; this is OSS-Fuzz issue 4177. --- changes/bug24247 | 6 ++++++ src/test/fuzz/fuzzing_common.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug24247 b/changes/bug24247 new file mode 100644 index 000000000..1f4ddcdde --- /dev/null +++ b/changes/bug24247 @@ -0,0 +1,6 @@ + o Minor bugfixes (fuzzing): + - Fix a bug in our fuzzing mock replacement for crypto_pk_checksig(), to + correctly handle cases where a caller gives it an RSA key of under 160 + bits. (This is not actually a bug in Tor itself, but wrather in our + fuzzing code.) Fixes bug 24247; bugfix on 0.3.0.3-alpha. + Found by OSS-Fuzz as issue 4177. diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 7ebddde1a..1e98eb6c8 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -28,8 +28,9 @@ mock_crypto_pk_public_checksig__nocheck(const crypto_pk_t *env, char *to, (void)fromlen; /* We could look at from[0..fromlen-1] ... */ tor_assert(tolen >= crypto_pk_keysize(env)); - memset(to, 0x01, 20); - return 20; + size_t siglen = MIN(20, crypto_pk_keysize(env)); + memset(to, 0x01, siglen); + return (int)siglen; } static int

1 0

[tor/master] new email address for yuri; close 24241
by nickm＠torproject.org 11 Nov '17

11 Nov '17

commit 2ed4a3e61e76179b6aa108c379236b3a2173d3e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 11 12:47:13 2017 -0500 new email address for yuri; close 24241 --- doc/HACKING/ReleasingTor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index fc7326934..9cbc8710b 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -171,7 +171,7 @@ new Tor release: - {mike} at tig dot as - {tails-rm} at boum dot org - {simon} at sdeziel.info - - {yuri} at rawbw.com + - {yuri} at freebsd.org - {mh+tor} at scrit.ch 4. Add the version number to Trac. To do this, go to Trac, log in,

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 11 Nov '17

11 Nov '17

commit ef9251157707aa77e1ba888a34bf65027188f2be Merge: 5a21b2708 5348c8996 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 11 12:23:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2017-11-06 | 4 + src/config/geoip | 9406 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 848 ++++- 3 files changed, 6426 insertions(+), 3832 deletions(-)

1 0