- tor-commits - lists.torproject.org

[arm/master] Monkey patch for ACS disabling
by atagar＠torproject.org 01 Dec '11

01 Dec '11

commit bd94f0f5ef5490a48828aebfd4c11e39111daaa9 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 30 10:36:15 2011 -0800 Monkey patch for ACS disabling Making manual ACS disabling transparent to the rest of the interface by monkey patching the ord values of ACS entries to '+', '-', or '|'. This has the advantage that the rest of the arm interface doesn't need to be aware of this complication, however it doesn't address the builtin box() function usage, which still makes most dialogs render incorrectly. --- src/util/panel.py | 25 +++++-------------------- src/util/uiTools.py | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index c0c13d8..50ae2c0 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -23,8 +23,7 @@ FORMAT_TAGS = {"": (_noOp, curses.A_BOLD), "<h>": (_noOp, curses.A_STANDOUT)} for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTools.getColor, colorLabel) -CONFIG = {"features.acsSupport": True, - "log.panelRecreated": log.DEBUG} +CONFIG = {"log.panelRecreated": log.DEBUG} # prevents curses redraws if set HALT_ACTIVITY = False @@ -426,11 +425,7 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxX - x) - - if CONFIG["features.acsSupport"]: - self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) - else: - self.addstr(y, x, "-" * drawLength, attr) + self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) except: # in edge cases drawing could cause a _curses.error pass @@ -450,12 +445,7 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxY - y) - - if CONFIG["features.acsSupport"]: - self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) - else: - for i in range(drawLength): - self.addch(y + i, x, "|", attr) + self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) except: # in edge cases drawing could cause a _curses.error pass @@ -696,13 +686,8 @@ class Panel(): # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1) - - if CONFIG["features.acsSupport"]: - self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) - self.addch(drawBottom, drawLeft, curses.ACS_HLINE) - else: - self.addch(drawBottom, drawLeft + 1, "+") - self.addch(drawBottom, drawLeft, "-") + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) def _resetSubwindow(self): """ diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 51f5fee..bc1fefe 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -338,15 +338,9 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners - if CONFIG["features.acsSupport"]: - panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) - panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - else: - panel.addch(top, left, "+", attr) - panel.addch(top, left + width - 1, "+", attr) - panel.addch(top + height - 1, left, "+", attr) - panel.addch(top + height - 1, left + width - 1, "+", attr) + panel.addch(top, left, curses.ACS_ULCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) + panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) def isSelectionKey(key): """ @@ -714,6 +708,21 @@ def _initColors(): global COLOR_ATTR_INITIALIZED, COLOR_IS_SUPPORTED if not COLOR_ATTR_INITIALIZED: + # hack to replace all ACS characters with '+' if ACS support has been + # manually disabled + if not CONFIG["features.acsSupport"]: + for item in curses.__dict__: + if item.startswith("ACS_"): + curses.__dict__[item] = ord('+') + + # replace a few common border pipes that are better rendered as '|' or + # '-' instead + + curses.ACS_SBSB = ord('|') + curses.ACS_VLINE = ord('|') + curses.ACS_BSBS = ord('-') + curses.ACS_HLINE = ord('-') + COLOR_ATTR_INITIALIZED = True COLOR_IS_SUPPORTED = False if not CONFIG["features.colorInterface"]: return

1 0

[arm/master] Option for disabling ACS support
by atagar＠torproject.org 30 Nov '11

30 Nov '11

commit b96f129b9349ccfb53d5eeb9c54b4c063fce3804 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 30 10:13:55 2011 -0800 Option for disabling ACS support Some terminals have issues with alternate character support which is widely used by arm for borders. Unfortunatley this makes the interface look pretty crappy... http://www.atagar.com/arm/images/acs_display_failure.png Explaining the issue in the README and adding an option to manually remedy the most obvious broken bits. ACS is used throughout arm so it's gonna take a much more invasive change to allow the user to completely replace ACS usage (for instance, we can't use the curses box() function...). Thanks to Robert for explaining the issue! --- README | 15 ++++++++++++++- armrc.sample | 4 ++++ src/util/panel.py | 25 ++++++++++++++++++++----- src/util/uiTools.py | 14 ++++++++++---- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/README b/README index 87a6141..05f18cb 100644 --- a/README +++ b/README @@ -99,12 +99,25 @@ pid belongs to the open control port. If it's running as a different user (such as being in a chroot jail) then it's probably failing due to permission issues. Arm still runs, just no connection listing or ps stats. -> The bandwidth graph showing up +> The bandwidth graph isn't showing up Some terminals, most notably screen sessions on Gentoo, appear to have a bug where highlighted spaces aren't rendered. A reported workaround is to set: TERM="rxvt-unicode" +> There's borders like 'mwqqqqqqqqj' + +If you're getting something that looks like... +http://www.atagar.com/arm/images/acs_display_failure.png + +then you're encountering a bug between ncurses and your terminal where +alternate character support (ACS) is unavailable. For more information see... +http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing + +Unfortunately there doesn't seem to be a way for arm to automatically detect +and correct this. To work around some of the issues set this in your armrc... +features.acsSupport false + > When I press enter in the connection panel to get details some of the information is either missing or outdated. Why is this? diff --git a/armrc.sample b/armrc.sample index 7daba30..7a611c0 100644 --- a/armrc.sample +++ b/armrc.sample @@ -28,6 +28,10 @@ queries.useProc true # Renders the interface with color if set and the terminal supports it features.colorInterface true +# Uses ACS (alternate character support) to display nice borders. This may not +# work on all terminals. +features.acsSupport true + # Replaces all colored content (ie, anything that isn't white) with this # color. Valid options are: # none, red, green, yellow, blue, cyan, magenta, black, white diff --git a/src/util/panel.py b/src/util/panel.py index 50ae2c0..c0c13d8 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -23,7 +23,8 @@ FORMAT_TAGS = {"": (_noOp, curses.A_BOLD), "<h>": (_noOp, curses.A_STANDOUT)} for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTools.getColor, colorLabel) -CONFIG = {"log.panelRecreated": log.DEBUG} +CONFIG = {"features.acsSupport": True, + "log.panelRecreated": log.DEBUG} # prevents curses redraws if set HALT_ACTIVITY = False @@ -425,7 +426,11 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxX - x) - self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) + + if CONFIG["features.acsSupport"]: + self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) + else: + self.addstr(y, x, "-" * drawLength, attr) except: # in edge cases drawing could cause a _curses.error pass @@ -445,7 +450,12 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxY - y) - self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) + + if CONFIG["features.acsSupport"]: + self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) + else: + for i in range(drawLength): + self.addch(y + i, x, "|", attr) except: # in edge cases drawing could cause a _curses.error pass @@ -686,8 +696,13 @@ class Panel(): # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1) - self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) - self.addch(drawBottom, drawLeft, curses.ACS_HLINE) + + if CONFIG["features.acsSupport"]: + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) + else: + self.addch(drawBottom, drawLeft + 1, "+") + self.addch(drawBottom, drawLeft, "-") def _resetSubwindow(self): """ diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 01d2ad1..51f5fee 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -39,6 +39,7 @@ TIME_UNITS = [(86400.0, "d", " day"), (3600.0, "h", " hour"), Ending = enum.Enum("ELLIPSE", "HYPHEN") SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) CONFIG = {"features.colorInterface": True, + "features.acsSupport": True, "features.printUnicode": True, "log.cursesColorSupport": log.INFO, "log.configEntryTypeError": log.NOTICE} @@ -337,10 +338,15 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners - panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) - panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - panel.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, attr) + if CONFIG["features.acsSupport"]: + panel.addch(top, left, curses.ACS_ULCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) + panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) + else: + panel.addch(top, left, "+", attr) + panel.addch(top, left + width - 1, "+", attr) + panel.addch(top + height - 1, left, "+", attr) + panel.addch(top + height - 1, left + width - 1, "+", attr) def isSelectionKey(key): """

1 0

[tor/master] Move crypto_global_cleanup() to the bottom of crypto.c.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit a708e85236d17abaf16da4c455af8a776ad2f7b9 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Nov 22 15:11:40 2011 +0100 Move crypto_global_cleanup() to the bottom of crypto.c. --- src/common/crypto.c | 63 ++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index ebaa012..a9d8b04 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -291,37 +291,6 @@ crypto_thread_cleanup(void) ERR_remove_state(0); } -/** Uninitialize the crypto library. Return 0 on success, -1 on failure. - */ -int -crypto_global_cleanup(void) -{ - EVP_cleanup(); - ERR_remove_state(0); - ERR_free_strings(); - -#ifndef DISABLE_ENGINES - ENGINE_cleanup(); -#endif - - CONF_modules_unload(1); - CRYPTO_cleanup_all_ex_data(); -#ifdef TOR_IS_MULTITHREADED - if (_n_openssl_mutexes) { - int n = _n_openssl_mutexes; - tor_mutex_t **ms = _openssl_mutexes; - int i; - _openssl_mutexes = NULL; - _n_openssl_mutexes = 0; - for (i=0;i<n;++i) { - tor_mutex_free(ms[i]); - } - tor_free(ms); - } -#endif - return 0; -} - /** used by tortls.c: wrap an RSA* in a crypto_pk_env_t. */ crypto_pk_env_t * _crypto_new_pk_env_rsa(RSA *rsa) @@ -3090,5 +3059,37 @@ setup_openssl_threading(void) return 0; } #endif + +/** Uninitialize the crypto library. Return 0 on success, -1 on failure. + */ +int +crypto_global_cleanup(void) +{ + EVP_cleanup(); + ERR_remove_state(0); + ERR_free_strings(); + +#ifndef DISABLE_ENGINES + ENGINE_cleanup(); +#endif + + CONF_modules_unload(1); + CRYPTO_cleanup_all_ex_data(); +#ifdef TOR_IS_MULTITHREADED + if (_n_openssl_mutexes) { + int n = _n_openssl_mutexes; + tor_mutex_t **ms = _openssl_mutexes; + int i; + _openssl_mutexes = NULL; + _n_openssl_mutexes = 0; + for (i=0;i<n;++i) { + tor_mutex_free(ms[i]); + } + tor_free(ms); + } +#endif + return 0; +} + /** @} */

1 0

[tor/master] Free the global DH parameters in crypto_global_cleanup().
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 02708b7d8077801c44c944687d8c9f90321a4655 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Nov 22 15:14:59 2011 +0100 Free the global DH parameters in crypto_global_cleanup(). --- src/common/crypto.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index a9d8b04..62b0bce 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3069,6 +3069,13 @@ crypto_global_cleanup(void) ERR_remove_state(0); ERR_free_strings(); + if (dh_param_p) + BN_free(dh_param_p); + if (dh_param_p_tls) + BN_free(dh_param_p_tls); + if (dh_param_g) + BN_free(dh_param_g); + #ifndef DISABLE_ENGINES ENGINE_cleanup(); #endif

1 0

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

30 Nov '11

commit 60b41cd435c0acef274209a2a9b494b5f42964f6 Merge: 29db095 02708b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 13:18:56 2011 -0500 Merge branch 'bug4538_v2' src/common/crypto.c | 70 ++++++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 31 deletions(-)

1 0

r25238: {website} link to the right README for TBB. fixes #4589. (website/trunk/projects/en)
by Andrew Lewman 30 Nov '11

30 Nov '11

Author: phobos Date: 2011-11-30 18:16:28 +0000 (Wed, 30 Nov 2011) New Revision: 25238 Modified: website/trunk/projects/en/torbrowser-details.wml Log: link to the right README for TBB. fixes #4589. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2011-11-26 08:59:52 UTC (rev 25237) +++ website/trunk/projects/en/torbrowser-details.wml 2011-11-30 18:16:28 UTC (rev 25238) @@ -32,7 +32,7 @@ href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">source distribution</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">signature</a>). - See <a href="<tbbrepo>/README">README</a> for + See <a href="<tbbrepo>/README.dev">README</a> for the directory layout and changelog. Build instructions can be found in <a href="<tbbrepo>/build-scripts/INSTALL">build-scripts/INSTALL</a>. </div>

1 0

[tor/master] Detect tor_addr_to_str failure in tor_dup_addr.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3ebe960f3f734322ea3ea471ca6abceb245ca322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 23:04:10 2011 -0500 Detect tor_addr_to_str failure in tor_dup_addr. This avoids a possible strdup of an uninitialized buffer. Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un. --- changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug4529 b/changes/bug4529 new file mode 100644 index 0000000..89d10b2 --- /dev/null +++ b/changes/bug4529 @@ -0,0 +1,5 @@ + o Minor bufixes: + - If we had ever tried to call tor_addr_to_str on an address of + unknown type, we would have done a strdup on an uninitialized + buffer. Now we won't. Fixes bug 4529; bugfix on 0.2.1.3-alpha. + Reported by "troll_un". diff --git a/src/common/address.c b/src/common/address.c index 7fc7301..46ccb1f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -945,8 +945,11 @@ char * tor_dup_addr(const tor_addr_t *addr) { char buf[TOR_ADDR_BUF_LEN]; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return tor_strdup(buf); + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) { + return tor_strdup(buf); + } else { + return tor_strdup("<unknown address type>"); + } } /** Return a string representing the address addr. This string is

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 29db095a35db715f1d84aacae24f00b54aad2507 Merge: 9da99b4 3ebe960 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:41:08 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Detect tor_addr_to_str failure in tor_dup_addr.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3ebe960f3f734322ea3ea471ca6abceb245ca322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 23:04:10 2011 -0500 Detect tor_addr_to_str failure in tor_dup_addr. This avoids a possible strdup of an uninitialized buffer. Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un. --- changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug4529 b/changes/bug4529 new file mode 100644 index 0000000..89d10b2 --- /dev/null +++ b/changes/bug4529 @@ -0,0 +1,5 @@ + o Minor bufixes: + - If we had ever tried to call tor_addr_to_str on an address of + unknown type, we would have done a strdup on an uninitialized + buffer. Now we won't. Fixes bug 4529; bugfix on 0.2.1.3-alpha. + Reported by "troll_un". diff --git a/src/common/address.c b/src/common/address.c index 7fc7301..46ccb1f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -945,8 +945,11 @@ char * tor_dup_addr(const tor_addr_t *addr) { char buf[TOR_ADDR_BUF_LEN]; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return tor_strdup(buf); + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) { + return tor_strdup(buf); + } else { + return tor_strdup("<unknown address type>"); + } } /** Return a string representing the address addr. This string is

1 0

[tor/master] Fix a memory leak in error path of my default-torrc code
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 9da99b4939b66b001cf73b1f12fb71c745461591 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:16:39 2011 -0500 Fix a memory leak in error path of my default-torrc code Fixes Coverity CID # 500 --- src/or/config.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index fb5b49a..391d290 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4399,7 +4399,8 @@ int options_init_from_torrc(int argc, char **argv) { char *cf=NULL, *cf_defaults=NULL; - int i, retval, command; + int i, command; + int retval = -1; static char **backup_argv; static int backup_argc; char *command_arg = NULL; @@ -4466,19 +4467,16 @@ options_init_from_torrc(int argc, char **argv) retval = options_init_from_string(cf_defaults, cf, command, command_arg, &errmsg); - tor_free(cf); - tor_free(cf_defaults); - if (retval < 0) - goto err; - - return 0; err: + + tor_free(cf); + tor_free(cf_defaults); if (errmsg) { log(LOG_WARN,LD_CONFIG,"%s", errmsg); tor_free(errmsg); } - return -1; + return retval < 0 ? -1 : 0; } /** Load the options from the configuration in cf, validate

1 0