- tor-commits - lists.torproject.org

[tor-browser-bundle/maint-5.0] Release preparations for 5.0.7
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 40b2d143983121f9bfe967effeece534d8cad5d9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 5 10:06:20 2016 +0000 Release preparations for 5.0.7 --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 9 ++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cca1175..40eaa17 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.0.7 -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.0.6 -- December 18 2015 * All Platforms * Bug 17877: Tor Browser 5.0.5 is using the wrong Mozilla build tag diff --git a/gitian/versions b/gitian/versions index 1633312..c41a675 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,11 +8,11 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.7 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -57,7 +57,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -86,7 +86,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4be39a9..d6a39ac 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a1 - release: 5.0.6 + release: 5.0.7 versions: - 5.0.6: + 5.0.7: platformVersion: 38.5.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0.6 + download_url: https://www.torproject.org/dist/torbrowser/5.0.7 incremental_from: - - 5.0.4 - - 5.0.5 + - 5.0.6 migrate_archs: osx32: osx64 osx32:

1 0

[tor/master] Unit tests for getpw* functions
by nickm＠torproject.org 05 Jan '16

05 Jan '16

commit 7660471054e2ee6568ddbbadbd9190f9ca4efb5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 3 09:00:30 2016 -0800 Unit tests for getpw* functions --- src/test/test_util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 73b4307..bf789c5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -14,6 +14,9 @@ #include "memarea.h" #include "util_process.h" +#ifdef HAVE_PWD_H +#include <pwd.h> +#endif #ifdef HAVE_SYS_UTIME_H #include <sys/utime.h> #endif @@ -4626,6 +4629,44 @@ test_util_touch_file(void *arg) ; } +#ifndef _WIN32 +static void +test_util_pwdb(void *arg) +{ + (void) arg; + const struct passwd *me = NULL, *me2, *me3; + char *name = NULL; + char *dir = NULL; + + /* Uncached case. */ + /* Let's assume that we exist. */ + me = tor_getpwuid(getuid()); + tt_assert(me != NULL); + name = tor_strdup(me->pw_name); + + /* Uncached case */ + me2 = tor_getpwnam(name); + tt_assert(me2 != NULL); + tt_int_op(me2->pw_uid, OP_EQ, getuid()); + + /* Cached case */ + me3 = tor_getpwuid(getuid()); + tt_assert(me3 != NULL); + tt_str_op(me3->pw_name, OP_EQ, name); + + me3 = tor_getpwnam(name); + tt_assert(me3 != NULL); + tt_int_op(me3->pw_uid, OP_EQ, getuid()); + + dir = get_user_homedir(name); + tt_assert(dir != NULL); + + done: + tor_free(name); + tor_free(dir); +} +#endif + #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -4710,6 +4751,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(writepid, 0), UTIL_TEST(get_avail_disk_space, 0), UTIL_TEST(touch_file, 0), + UTIL_TEST_NO_WIN(pwdb, TT_FORK), END_OF_TESTCASES };

1 0

[tor/master] Explicitly test our get/set_uint{8, 16, 32, 64}.
by nickm＠torproject.org 05 Jan '16

05 Jan '16

commit de8110fba2b177d0fcd0f1b92a42caae8cf7addf Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 3 08:27:54 2016 -0800 Explicitly test our get/set_uint{8,16,32,64}. --- configure.ac | 1 + src/test/test_util_format.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/configure.ac b/configure.ac index a47cee6..7dfab58 100644 --- a/configure.ac +++ b/configure.ac @@ -391,6 +391,7 @@ AC_CHECK_FUNCS( getrlimit \ gettimeofday \ gmtime_r \ + htonll \ inet_aton \ ioctl \ issetugid \ diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index 705dfcf..45a28cc 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -11,6 +11,44 @@ #define NS_MODULE util_format +#if !defined(HAVE_HTONLL) && !defined(htonll) +#ifdef WORDS_BIGENDIAN +#define htonll(x) (x) +#else +static uint64_t +htonll(uint64_t a) +{ + return htonl((uint32_t)(a>>32)) | (((uint64_t)htonl((uint32_t)a))<<32); +} +#endif +#endif + +static void +test_util_format_unaligned_accessors(void *ignored) +{ + (void)ignored; + char buf[9] = "onionsoup"; // 6f6e696f6e736f7570 + + tt_u64_op(get_uint64(buf+1), OP_EQ, htonll(U64_LITERAL(0x6e696f6e736f7570))); + tt_uint_op(get_uint32(buf+1), OP_EQ, htonl(0x6e696f6e)); + tt_uint_op(get_uint16(buf+1), OP_EQ, htons(0x6e69)); + tt_uint_op(get_uint8(buf+1), OP_EQ, 0x6e); + + set_uint8(buf+7, 0x61); + tt_mem_op(buf, OP_EQ, "onionsoap", 9); + + set_uint16(buf+6, htons(0x746f)); + tt_mem_op(buf, OP_EQ, "onionstop", 9); + + set_uint32(buf+1, htonl(0x78696465)); + tt_mem_op(buf, OP_EQ, "oxidestop", 9); + + set_uint64(buf+1, htonll(U64_LITERAL(0x6266757363617465))); + tt_mem_op(buf, OP_EQ, "obfuscate", 9); + done: + ; +} + static void test_util_format_base64_encode(void *ignored) { @@ -252,6 +290,8 @@ test_util_format_base16_decode(void *ignored) } struct testcase_t util_format_tests[] = { + { "unaligned_accessors", test_util_format_unaligned_accessors, 0, + NULL, NULL }, { "base64_encode", test_util_format_base64_encode, 0, NULL, NULL }, { "base64_decode_nopad", test_util_format_base64_decode_nopad, 0, NULL, NULL },

1 0

[tor/master] Add a test for touch_file
by nickm＠torproject.org 05 Jan '16

05 Jan '16

commit 8aa9ee73dabc8669de7744ddd19da87eef7778da Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 3 08:37:14 2016 -0800 Add a test for touch_file --- src/test/test_util.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 4cf2f9b..f88c297 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -14,6 +14,12 @@ #include "memarea.h" #include "util_process.h" +#ifdef HAVE_SYS_UTIME_H +#include <sys/utime.h> +#endif +#ifdef HAVE_UTIME_H +#include <utime.h> +#endif #ifdef _WIN32 #include <tchar.h> #endif @@ -4599,6 +4605,33 @@ test_util_get_avail_disk_space(void *arg) ; } +static void +test_util_touch_file(void *arg) +{ + (void) arg; + const char *fname = get_fname("touch"); + + const time_t now = time(NULL); + struct stat st; + write_bytes_to_file(fname, "abc", 3, 1); + tt_int_op(0, OP_EQ, stat(fname, &st)); + tt_i64_op(st.st_mtime, OP_GE, now); + + const time_t five_sec_ago = now - 5; + struct utimbuf u = { five_sec_ago, five_sec_ago }; + tt_int_op(0, OP_EQ, utime(fname, &u)); + tt_int_op(0, OP_EQ, stat(fname, &st)); + tt_i64_op(st.st_mtime, OP_EQ, five_sec_ago); + + /* Finally we can touch the file */ + tt_int_op(0, OP_EQ, touch_file(fname)); + tt_int_op(0, OP_EQ, stat(fname, &st)); + tt_i64_op(st.st_mtime, OP_GE, now); + + done: + ; +} + struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_TEST(parse_http_time, 0), @@ -4672,6 +4705,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(ipv4_validation, 0), UTIL_TEST(writepid, 0), UTIL_TEST(get_avail_disk_space, 0), + UTIL_TEST(touch_file, 0), END_OF_TESTCASES };

1 0

[tor/master] Test another codepath in inet_ntop
by nickm＠torproject.org 05 Jan '16

05 Jan '16

commit a8749ea9fd6d2a686293a6f24dec4dd4a52b1e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 3 08:27:44 2016 -0800 Test another codepath in inet_ntop --- src/test/test_addr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 2c25c1e..85130db 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -302,6 +302,7 @@ test_addr_ip6_helpers(void *arg) //test_ntop6_reduces("0:0:0:0:0:0:c0a8:0101", "::192.168.1.1"); test_ntop6_reduces("0:0:0:0:0:ffff:c0a8:0101", "::ffff:192.168.1.1"); + test_ntop6_reduces("0:0:0:0:0:0:c0a8:0101", "::192.168.1.1"); test_ntop6_reduces("002:0:0000:0:3::4", "2::3:0:0:4"); test_ntop6_reduces("0:0::1:0:3", "::1:0:3"); test_ntop6_reduces("008:0::0", "8::");

1 0

[tor/master] clean up the "skip this util test on windows" logic.
by nickm＠torproject.org 05 Jan '16

05 Jan '16

commit c941240f325f312fb8485a2d018ccc183c2b1591 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 3 08:47:14 2016 -0800 clean up the "skip this util test on windows" logic. --- src/test/test_util.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index f88c297..73b4307 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4322,12 +4322,6 @@ test_util_clamp_double_to_int64(void *arg) ; } -#define UTIL_LEGACY(name) \ - { #name, test_util_ ## name , 0, NULL, NULL } - -#define UTIL_TEST(name, flags) \ - { #name, test_util_ ## name, flags, NULL, NULL } - #ifdef FD_CLOEXEC #define CAN_CHECK_CLOEXEC static int @@ -4632,6 +4626,22 @@ test_util_touch_file(void *arg) ; } +#define UTIL_LEGACY(name) \ + { #name, test_util_ ## name , 0, NULL, NULL } + +#define UTIL_TEST(name, flags) \ + { #name, test_util_ ## name, flags, NULL, NULL } + +#ifdef _WIN32 +#define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } +#define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f)) +#define UTIL_LEGACY_NO_WIN(n) UTIL_NO_WIN(n) +#else +#define UTIL_TEST_NO_WIN(n, f) UTIL_TEST(n, (f)) +#define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL } +#define UTIL_LEGACY_NO_WIN(n) UTIL_LEGACY(n) +#endif + struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_TEST(parse_http_time, 0), @@ -4639,9 +4649,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(config_line_quotes), UTIL_LEGACY(config_line_comment_character), UTIL_LEGACY(config_line_escaped_content), -#ifndef _WIN32 - UTIL_LEGACY(expand_filename), -#endif + UTIL_LEGACY_NO_WIN(expand_filename), UTIL_LEGACY(escape_string_socks), UTIL_LEGACY(string_is_key_value), UTIL_LEGACY(strmisc), @@ -4666,13 +4674,9 @@ struct testcase_t util_tests[] = { UTIL_TEST(listdir, 0), UTIL_TEST(parent_dir, 0), UTIL_TEST(ftruncate, 0), -#ifdef _WIN32 - UTIL_TEST(load_win_lib, 0), -#endif -#ifndef _WIN32 - UTIL_TEST(exit_status, 0), - UTIL_TEST(fgets_eagain, 0), -#endif + UTIL_TEST_WIN_ONLY(load_win_lib, 0), + UTIL_TEST_NO_WIN(exit_status, 0), + UTIL_TEST_NO_WIN(fgets_eagain, 0), UTIL_TEST(format_hex_number, 0), UTIL_TEST(format_dec_number, 0), UTIL_TEST(join_win_cmdline, 0),

1 0

[nyx/master] Reordering show_write_dialog() method
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit e55c870f80cb8cb1fdf465822aaa38bc5b0d5366 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 3 12:32:42 2016 -0800 Reordering show_write_dialog() method Just shuffling a method around so all our show_*_dialog() are together. --- nyx/config_panel.py | 79 +++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 669e50e..dfb6188 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -164,46 +164,6 @@ class ConfigPanel(panel.Panel): self._sort_order = results self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) - def handle_key(self, key): - if key.is_scroll(): - page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT - 2 - is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) - - if is_changed: - self.redraw(True) - elif key.is_selection(): - selection = self._scroller.get_cursor_selection(self._get_config_options()) - initial_value = selection.value() if selection.is_set() else '' - new_value = nyx.popups.input_prompt('%s Value (esc to cancel): ' % selection.name, initial_value) - - if new_value != initial_value: - try: - if selection.value_type == 'Boolean': - # if the value's a boolean then allow for 'true' and 'false' inputs - - if new_value.lower() == 'true': - new_value = '1' - elif new_value.lower() == 'false': - new_value = '0' - elif selection.value_type == 'LineList': - new_value = new_value.split(',') # set_conf accepts list inputs - - tor_controller().set_conf(selection.name, new_value) - self.redraw(True) - except Exception as exc: - nyx.popups.show_msg('%s (press any key)' % exc) - elif key.match('a'): - self._show_all = not self._show_all - self.redraw(True) - elif key.match('s'): - self.show_sort_dialog() - elif key.match('w'): - self.show_write_dialog() - else: - return False - - return True - def show_write_dialog(self): """ Confirmation dialog for saving tor's configuration. @@ -275,6 +235,45 @@ class ConfigPanel(panel.Panel): except IOError as exc: nyx.popups.show_msg('Unable to save configuration (%s)' % exc.strerror, 2) + def handle_key(self, key): + if key.is_scroll(): + page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT - 2 + is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) + + if is_changed: + self.redraw(True) + elif key.is_selection(): + selection = self._scroller.get_cursor_selection(self._get_config_options()) + initial_value = selection.value() if selection.is_set() else '' + new_value = nyx.popups.input_prompt('%s Value (esc to cancel): ' % selection.name, initial_value) + + if new_value != initial_value: + try: + if selection.value_type == 'Boolean': + # if the value's a boolean then allow for 'true' and 'false' inputs + + if new_value.lower() == 'true': + new_value = '1' + elif new_value.lower() == 'false': + new_value = '0' + elif selection.value_type == 'LineList': + new_value = new_value.split(',') # set_conf accepts list inputs + + tor_controller().set_conf(selection.name, new_value) + self.redraw(True) + except Exception as exc: + nyx.popups.show_msg('%s (press any key)' % exc) + elif key.match('a'): + self._show_all = not self._show_all + self.redraw(True) + elif key.match('s'): + self.show_sort_dialog() + elif key.match('w'): + self.show_write_dialog() + else: + return False + + return True def get_help(self): return [

1 0

[nyx/master] Merge _load_config_options() into constructor
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit 5bb4a7ffe0168a5994b6b94f214642cbbb1151a4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 2 15:52:24 2016 -0800 Merge _load_config_options() into constructor We no longer support disconnecting from one tor instance and attaching to a completely different one (always a truly screwy use case). As such we no longer need to re-load configuration information. This simplifies our constructor quite a bit. --- nyx/config_panel.py | 70 ++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 04d9bc3..e06f082 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -78,7 +78,7 @@ class ConfigEntry(object): :returns: **True** if the option has a custom value, **False** otherwise """ - return bool(tor_controller().get_conf(self.name, [], False)) + return bool(tor_controller().get_conf(self.name, None)) def sort_value(self, attr): """ @@ -111,75 +111,49 @@ class ConfigEntry(object): class ConfigPanel(panel.Panel): """ - Renders a listing of the tor or nyx configuration state, allowing options to - be selected and edited. + Editor for tor's configuration. """ def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, 'configuration', 0) - self._conf_contents = [] - self._conf_important_contents = [] + self._contents = [] self._scroller = ui_tools.Scroller(True) self._sort_order = CONFIG['features.config.order'] self._show_all = False # show all options, or just the 'important' ones - tor_controller().add_status_listener(self.reset_listener) - self._load_config_options() - - def reset_listener(self, controller, event_type, _): - # fetches configuration options if a new instance, otherewise keeps our - # current contents - - if event_type == stem.control.State.INIT: - self._load_config_options() - - def _load_config_options(self): - """ - Fetches the configuration options available from tor or nyx. - """ - try: manual = stem.manual.Manual.from_man() except IOError as exc: log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) manual = stem.manual.Manual.from_cache() - self._conf_contents = [] - self._conf_important_contents = [] - - config_names = tor_controller().get_info('config/names', None) + try: + for line in tor_controller().get_info('config/names').splitlines(): + # Lines of the form "<option> <type>[ <documentation>]". Documentation + # was apparently only in old tor versions like 0.2.1.25. - if config_names: - for line in config_names.strip().split('\n'): - # lines are of the form "<option> <type>[ <documentation>]", like: - # UseEntryGuards Boolean - # documentation is aparently only in older versions (for instance, - # 0.2.1.25) + if ' ' not in line: + continue - line_comp = line.strip().split(' ') - conf_option, conf_type = line_comp[0], line_comp[1] + line_comp = line.split() + name, value_type = line_comp[0], line_comp[1] # skips private and virtual entries if not configured to show them - if not CONFIG['features.config.state.showPrivateOptions'] and conf_option.startswith('__'): + if name.startswith('__') and not CONFIG['features.config.state.showPrivateOptions']: continue - elif not CONFIG['features.config.state.showVirtualOptions'] and conf_type == 'Virtual': + elif value_type == 'Virtual' and not CONFIG['features.config.state.showVirtualOptions']: continue - self._conf_contents.append(ConfigEntry(conf_option, conf_type, manual)) - - # mirror listing with only the important configuration options - - self._conf_important_contents = filter(lambda entry: stem.manual.is_important(entry.name), self._conf_contents) - - # if there aren't any important options then show everything + self._contents.append(ConfigEntry(name, value_type, manual)) + except stem.ControllerError as exc: + log.warn("Unable to determine the configuration options tor supports: %s" % exc) - if not self._conf_important_contents: - self._conf_important_contents = self._conf_contents + self._important_contents = filter(lambda entry: stem.manual.is_important(entry.name), self._contents) - self._conf_contents = sorted(self._conf_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) - self._conf_important_contents = sorted(self._conf_important_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + self._important_contents = sorted(self._important_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) def get_selection(self): """ @@ -198,8 +172,8 @@ class ConfigPanel(panel.Panel): if results: self._sort_order = results - self._conf_contents = sorted(self._conf_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) - self._conf_important_contents = sorted(self._conf_important_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + self._important_contents = sorted(self._important_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) def handle_key(self, key): if key.is_scroll(): @@ -413,7 +387,7 @@ class ConfigPanel(panel.Panel): break def _get_config_options(self): - return self._conf_contents if self._show_all else self._conf_important_contents + return self._contents if self._show_all else self._important_contents def _draw_selection_panel(self, selection, width, detail_panel_height, is_scrollbar_visible): """

1 0

[nyx/master] Don't cache manual information
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit 0dc05a1169608c53b4d6a83cb1889a90d89fd3d3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 1 17:54:40 2016 -0800 Don't cache manual information We only need the manual when constructing the ConfigEntry instances. This doesn't make much of a difference since they still keep references to individual entries, but still no need for the @lru_cache. --- nyx/config/attributes.cfg | 2 +- nyx/config_panel.py | 60 ++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/nyx/config/attributes.cfg b/nyx/config/attributes.cfg index 3685673..1942de9 100644 --- a/nyx/config/attributes.cfg +++ b/nyx/config/attributes.cfg @@ -84,7 +84,7 @@ attr.config.category_color Hidden Service => cyan attr.config.category_color Testing => white attr.config.category_color Unknown => white -attr.config.sort_color Option => blue +attr.config.sort_color Name => blue attr.config.sort_color Value => cyan attr.config.sort_color Value Type => green attr.config.sort_color Category => red diff --git a/nyx/config_panel.py b/nyx/config_panel.py index b17511f..04d9bc3 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -15,12 +15,6 @@ from nyx.util import panel, tor_config, tor_controller, ui_tools from stem.util import conf, enum, log, str_tools -try: - # added in python 3.2 - from functools import lru_cache -except ImportError: - from stem.util.lru_cache import lru_cache - SortAttr = enum.Enum('NAME', 'VALUE', 'VALUE_TYPE', 'CATEGORY', 'USAGE', 'SUMMARY', 'DESCRIPTION', 'MAN_PAGE_ENTRY', 'IS_SET') DETAILS_HEIGHT = 6 @@ -42,24 +36,20 @@ CONFIG = conf.config_dict('nyx', { }, conf_handler) -@lru_cache() -def tor_manual(): - try: - return stem.manual.Manual.from_man().config_options - except IOError as exc: - log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) - return stem.manual.Manual.from_cache().config_options - - class ConfigEntry(object): """ - Configuration option in the panel. + Configuration option presented in the panel. + + :var str name: name of the configuration option + :var str value_type: type of value + :var stem.manual.ConfigOption manual: manual information about the option """ - def __init__(self, name, value_type): + def __init__(self, name, value_type, manual): self.name = name self.value_type = value_type - self.manual = tor_manual().get(name, stem.manual.ConfigOption(name)) + self.manual = manual.config_options.get(name, stem.manual.ConfigOption(name)) + self._index = manual.config_options.keys().index(name) if name in manual.config_options else 99999 def value(self): """ @@ -68,20 +58,18 @@ class ConfigEntry(object): :returns: **str** representation of the current config value """ - conf_value = ', '.join(tor_controller().get_conf(self.name, [], True)) + values = tor_controller().get_conf(self.name, [], True) - # provides nicer values for recognized types - - if not conf_value: - conf_value = '<none>' - elif self.value_type == 'Boolean' and conf_value in ('0', '1'): - conf_value = 'False' if conf_value == '0' else 'True' - elif self.value_type == 'DataSize' and conf_value.isdigit(): - conf_value = str_tools.size_label(int(conf_value)) - elif self.value_type == 'TimeInterval' and conf_value.isdigit(): - conf_value = str_tools.time_label(int(conf_value), is_long = True) - - return conf_value + if not values: + return '<none>' + elif self.value_type == 'Boolean' and values[0] in ('0', '1'): + return 'False' if values[0] == '0' else 'True' + elif self.value_type == 'DataSize' and values[0].isdigit(): + return str_tools.size_label(int(values[0])) + elif self.value_type == 'TimeInterval' and values[0].isdigit(): + return str_tools.time_label(int(values[0]), is_long = True) + else: + return ', '.join(values) def is_set(self): """ @@ -116,7 +104,7 @@ class ConfigEntry(object): elif attr == SortAttr.DESCRIPTION: return self.manual.description elif attr == SortAttr.MAN_PAGE_ENTRY: - return tor_manual().keys().index(self.name) if self.name in tor_manual() else 99999 # sorts non-man entries last + return self._index elif attr == SortAttr.IS_SET: return not self.is_set() @@ -151,6 +139,12 @@ class ConfigPanel(panel.Panel): Fetches the configuration options available from tor or nyx. """ + try: + manual = stem.manual.Manual.from_man() + except IOError as exc: + log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) + manual = stem.manual.Manual.from_cache() + self._conf_contents = [] self._conf_important_contents = [] @@ -173,7 +167,7 @@ class ConfigPanel(panel.Panel): elif not CONFIG['features.config.state.showVirtualOptions'] and conf_type == 'Virtual': continue - self._conf_contents.append(ConfigEntry(conf_option, conf_type)) + self._conf_contents.append(ConfigEntry(conf_option, conf_type, manual)) # mirror listing with only the important configuration options

1 0

[nyx/master] Drop lock when setting config values
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit a7452858b0a89cc57fc1d27951877f26d9bfa8f2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 2 17:05:46 2016 -0800 Drop lock when setting config values Doesn't seem as though it's needed in practice. We already lock when awaiting input. --- nyx/config_panel.py | 65 +++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 43 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 0395baa..0083923 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -147,18 +147,11 @@ class ConfigPanel(panel.Panel): continue self._contents.append(ConfigEntry(name, value_type, manual)) + + self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) except stem.ControllerError as exc: log.warn('Unable to determine the configuration options tor supports: %s' % exc) - self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) - - def get_selection(self): - """ - Provides the currently selected entry. - """ - - return self._scroller.get_cursor_selection(self._get_config_options()) - def show_sort_dialog(self): """ Provides the dialog for sorting our configuration options. @@ -179,40 +172,26 @@ class ConfigPanel(panel.Panel): if is_changed: self.redraw(True) elif key.is_selection(): - # Prompts the user to edit the selected configuration value. The - # interface is locked to prevent updates between setting the value - # and showing any errors. - - with panel.CURSES_LOCK: - selection = self.get_selection() - config_option = selection.name + selection = self._scroller.get_cursor_selection(self._get_config_options()) + initial_value = selection.value() if selection.is_set() else '' + new_value = nyx.popups.input_prompt('%s Value (esc to cancel): ' % selection.name, initial_value) - initial_value = '' if not selection.is_set() else selection.value() - prompt_msg = '%s Value (esc to cancel): ' % config_option - new_value = nyx.popups.input_prompt(prompt_msg, initial_value) - - if new_value is not None and new_value != initial_value: - try: - if selection.value_type == 'Boolean': - # if the value's a boolean then allow for 'true' and 'false' inputs - - if new_value.lower() == 'true': - new_value = '1' - elif new_value.lower() == 'false': - new_value = '0' - elif selection.value_type == 'LineList': - # set_option accepts list inputs when there's multiple values - new_value = new_value.split(',') - - tor_controller().set_conf(config_option, new_value) - - # forces the label to be remade with the new value - - selection.label_cache = None - - self.redraw(True) - except Exception as exc: - nyx.popups.show_msg('%s (press any key)' % exc) + if new_value != initial_value: + try: + if selection.value_type == 'Boolean': + # if the value's a boolean then allow for 'true' and 'false' inputs + + if new_value.lower() == 'true': + new_value = '1' + elif new_value.lower() == 'false': + new_value = '0' + elif selection.value_type == 'LineList': + new_value = new_value.split(',') # set_conf accepts list inputs + + tor_controller().set_conf(selection.name, new_value) + self.redraw(True) + except Exception as exc: + nyx.popups.show_msg('%s (press any key)' % exc) elif key.match('a'): self._show_all = not self._show_all self.redraw(True) @@ -331,7 +310,7 @@ class ConfigPanel(panel.Panel): contents = self._get_config_options() scroll_location = self._scroller.get_scroll_location(contents, height - DETAILS_HEIGHT - 2) - cursor_selection = self.get_selection() + cursor_selection = self._scroller.get_cursor_selection(contents) is_scrollbar_visible = len(contents) > height - DETAILS_HEIGHT - 2 if cursor_selection is not None:

1 0