June 2015 - tor-commits - lists.torproject.org

[meek/master] Use new convention for Temporary errors from AcceptSocks.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit 9300eeb31c74035fd829da3cce9782d5b6e800c2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 27 20:14:34 2015 -0700 Use new convention for Temporary errors from AcceptSocks. https://trac.torproject.org/projects/tor/ticket/14135 https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=5… --- meek-client/meek-client.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 6198d37..2b8bbaa 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -303,10 +303,10 @@ func acceptLoop(ln *pt.SocksListener) error { conn, err := ln.AcceptSocks() if err != nil { log.Printf("error in AcceptSocks: %s", err) - if e, ok := err.(net.Error); ok && !e.Temporary() { - return err + if e, ok := err.(net.Error); ok && e.Temporary() { + continue } - continue + return err } go func() { err := handler(conn)

1 0

[goptlib/master] Don't report errors that are not caused by Accept in AcceptSocks.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit 50b39b746c6ff34bf31977b658848d876ee84fbf Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 24 01:58:25 2015 -0700 Don't report errors that are not caused by Accept in AcceptSocks. This means that anything that is not a net.Error, or is a net.Error but is not Temporary, should be considered to be a permanent error by the caller. Sample code now shows the new error-checking convention. Previously, we used the convention that a non-net.Error should be considered temporary, because it could have been caused by a failed SOCKS negotiation, for example. Now those errors are simply not returned to the caller. See https://trac.torproject.org/projects/tor/ticket/14135. In summary, previous behavior is this: net.Error, Temporary: caller should try again net.Error, non-Temporary: caller should quit other errors: caller should try again It is now this: net.Error, Temporary: caller should try again net.Error, non-Temporary: caller should quit other errors: caller should quit But now the "other errors" such as those caused by a bad SOCKS negotiation will not be reported by AcceptSocks. The practical effect of this change is almost nil; even if callers don't update their error-checking code, the only change is in the "other errors" that don't arise in normal use. --- examples/dummy-client/dummy-client.go | 6 +++--- examples/dummy-server/dummy-server.go | 6 +++--- pt.go | 12 ++++++------ socks.go | 23 ++++++++++++----------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 5d99b0c..045a8f2 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -71,10 +71,10 @@ func acceptLoop(ln *pt.SocksListener) error { for { conn, err := ln.AcceptSocks() if err != nil { - if e, ok := err.(net.Error); ok && !e.Temporary() { - return err + if e, ok := err.(net.Error); ok && e.Temporary() { + continue } - continue + return err } go handler(conn) } diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index ea91be9..70251ea 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -68,10 +68,10 @@ func acceptLoop(ln net.Listener) error { for { conn, err := ln.Accept() if err != nil { - if e, ok := err.(net.Error); ok && !e.Temporary() { - return err + if e, ok := err.(net.Error); ok && e.Temporary() { + continue } - continue + return err } go handler(conn) } diff --git a/pt.go b/pt.go index fc2141e..a8c815e 100644 --- a/pt.go +++ b/pt.go @@ -23,10 +23,10 @@ // for { // conn, err := ln.AcceptSocks() // if err != nil { -// if e, ok := err.(net.Error); ok && !e.Temporary() { -// return err +// if e, ok := err.(net.Error); ok && e.Temporary() { +// continue // } -// continue +// return err // } // go handler(conn) // } @@ -80,10 +80,10 @@ // for { // conn, err := ln.Accept() // if err != nil { -// if e, ok := err.(net.Error); ok && !e.Temporary() { -// return err +// if e, ok := err.(net.Error); ok && e.Temporary() { +// continue // } -// continue +// return err // } // go handler(conn) // } diff --git a/socks.go b/socks.go index eba318b..9a764b8 100644 --- a/socks.go +++ b/socks.go @@ -73,10 +73,10 @@ func (conn *SocksConn) Reject() error { // conn, err := ln.AcceptSocks() // if err != nil { // log.Printf("accept error: %s", err) -// if e, ok := err.(net.Error); ok && !e.Temporary() { -// break +// if e, ok := err.(net.Error); ok && e.Temporary() { +// continue // } -// continue +// break // } // go handleConn(conn) // } @@ -118,16 +118,17 @@ func (ln *SocksListener) Accept() (net.Conn, error) { // for { // conn, err := ln.AcceptSocks() // if err != nil { -// if e, ok := err.(net.Error); ok && !e.Temporary() { -// log.Printf("permanent accept error; giving up: %s", err) -// break +// if e, ok := err.(net.Error); ok && e.Temporary() { +// log.Printf("temporary accept error; trying again: %s", err) +// continue // } -// log.Printf("temporary accept error; trying again: %s", err) -// continue +// log.Printf("permanent accept error; giving up: %s", err) +// break // } // go handleConn(conn) // } func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { +retry: c, err := ln.Listener.Accept() if err != nil { return nil, err @@ -137,17 +138,17 @@ func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { err = conn.SetDeadline(time.Now().Add(socksRequestTimeout)) if err != nil { conn.Close() - return nil, err + goto retry } conn.Req, err = readSocks4aConnect(conn) if err != nil { conn.Close() - return nil, err + goto retry } err = conn.SetDeadline(time.Time{}) if err != nil { conn.Close() - return nil, err + goto retry } return conn, nil }

1 0

[meek/master] Use the new TOR_PT_PROXY interface from #12125.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit eafbc1d735f8980180bf8d3afb57440470a537c7 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 24 13:48:38 2015 -0700 Use the new TOR_PT_PROXY interface from #12125. --- meek-client/meek-client.go | 17 ++++------ meek-client/proxy.go | 52 ---------------------------- meek-client/proxy_test.go | 81 -------------------------------------------- 3 files changed, 6 insertions(+), 144 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 7ac6eae..6198d37 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -389,8 +389,8 @@ func main() { // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default - // ProxyFromEnvironment setting. Proxy is overridden below if proxyURL - // is set. + // ProxyFromEnvironment setting. Proxy is overridden below if + // options.ProxyURL is set. httpTransport = *http.DefaultTransport.(*http.Transport) httpTransport.Proxy = nil @@ -398,27 +398,22 @@ func main() { if err != nil { log.Fatalf("error in ClientSetup: %s", err) } - ptProxyURL, err := PtGetProxyURL() - if err != nil { - PtProxyError(err.Error()) - log.Fatalf("can't get managed proxy configuration: %s", err) - } // Command-line proxy overrides managed configuration. if options.ProxyURL == nil { - options.ProxyURL = ptProxyURL + options.ProxyURL = ptInfo.ProxyURL } // Check whether we support this kind of proxy. if options.ProxyURL != nil { err = checkProxyURL(options.ProxyURL) if err != nil { - PtProxyError(err.Error()) + pt.ProxyError(err.Error()) log.Fatal(fmt.Sprintf("proxy error: %s", err)) } log.Printf("using proxy %s", options.ProxyURL.String()) httpTransport.Proxy = http.ProxyURL(options.ProxyURL) - if ptProxyURL != nil { - PtProxyDone() + if ptInfo.ProxyURL != nil { + pt.ProxyDone() } } diff --git a/meek-client/proxy.go b/meek-client/proxy.go deleted file mode 100644 index 9b7f27d..0000000 --- a/meek-client/proxy.go +++ /dev/null @@ -1,52 +0,0 @@ -package main - -import ( - "fmt" - "net/url" - "os" -) - -import "git.torproject.org/pluggable-transports/goptlib.git" - -// The code in this file has to do with configuring an upstream proxy, whether -// through the command line or the managed interface of proposal 232 -// (TOR_PT_PROXY). -// -// https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-tran… - -// Get the upstream proxy URL. Returns nil if no proxy is requested. The -// function ensures that the Scheme and Host fields are set; i.e., that the URL -// is absolute. This function reads the environment variable TOR_PT_PROXY. -// -// This function doesn't check that the scheme is one of Tor's supported proxy -// schemes; that is, one of "http", "socks5", or "socks4a". The caller must be -// able to handle any returned scheme (which may be by calling PtProxyError if -// it doesn't know how to handle the scheme). -func PtGetProxyURL() (*url.URL, error) { - rawurl := os.Getenv("TOR_PT_PROXY") - if rawurl == "" { - return nil, nil - } - u, err := url.Parse(rawurl) - if err != nil { - return nil, err - } - if u.Scheme == "" { - return nil, fmt.Errorf("missing scheme") - } - if u.Host == "" { - return nil, fmt.Errorf("missing host") - } - return u, nil -} - -// Emit a PROXY-ERROR line with explanation text. -func PtProxyError(msg string) { - fmt.Fprintf(pt.Stdout, "PROXY-ERROR %s\n", msg) -} - -// Emit a PROXY DONE line. Call this after parsing the return value of -// PtGetProxyURL. -func PtProxyDone() { - fmt.Fprintf(pt.Stdout, "PROXY DONE\n") -} diff --git a/meek-client/proxy_test.go b/meek-client/proxy_test.go deleted file mode 100644 index 77123b9..0000000 --- a/meek-client/proxy_test.go +++ /dev/null @@ -1,81 +0,0 @@ -package main - -import ( - "os" - "testing" -) - -func TestGetProxyURL(t *testing.T) { - badTests := [...]string{ - "bogus", - "http:", - "://127.0.0.1", - "//127.0.0.1", - "http:127.0.0.1", - "://[::1]", - "//[::1]", - "http:[::1]", - "://localhost", - "//localhost", - "http:localhost", - } - goodTests := [...]struct { - input, expected string - }{ - {"http://127.0.0.1", "http://127.0.0.1"}, - {"http://127.0.0.1:8080", "http://127.0.0.1:8080"}, - {"http://127.0.0.1:8080/", "http://127.0.0.1:8080/"}, - {"http://127.0.0.1:8080/path", "http://127.0.0.1:8080/path"}, - {"http://[::1]", "http://[::1]"}, - {"http://[::1]:8080", "http://[::1]:8080"}, - {"http://[::1]:8080/", "http://[::1]:8080/"}, - {"http://[::1]:8080/path", "http://[::1]:8080/path"}, - {"http://localhost", "http://localhost"}, - {"http://localhost:8080", "http://localhost:8080"}, - {"http://localhost:8080/", "http://localhost:8080/"}, - {"http://localhost:8080/path", "http://localhost:8080/path"}, - {"http://user@localhost:8080", "http://user@localhost:8080"}, - {"http://user:password@localhost:8080", "http://user:password@localhost:8080"}, - {"socks5://localhost:1080", "socks5://localhost:1080"}, - {"socks4a://localhost:1080", "socks4a://localhost:1080"}, - {"unknown://localhost/whatever", "unknown://localhost/whatever"}, - } - /* - No port: reject; or infer from scheme? - http://localhost - socks4a://localhost - socks5://localhost - Port without host: probably reject? - http://:8080 - socks4a://:1080 - socks5://:1080 - */ - - os.Clearenv() - u, err := PtGetProxyURL() - if err != nil { - t.Errorf("empty environment unexpectedly returned an error: %s", err) - } - if u != nil { - t.Errorf("empty environment returned %q", u) - } - - for _, input := range badTests { - os.Setenv("TOR_PT_PROXY", input) - u, err = PtGetProxyURL() - if err == nil { - t.Errorf("TOR_PT_PROXY=%q unexpectedly succeeded and returned %q", input, u) - } - } - - for _, test := range goodTests { - os.Setenv("TOR_PT_PROXY", test.input) - u, err := PtGetProxyURL() - if err != nil { - t.Errorf("TOR_PT_PROXY=%q unexpectedly returned an error: %s", test.input, err) - } - if u == nil || u.String() != test.expected { - t.Errorf("TOR_PT_PROXY=%q → %q (expected %q)", test.input, u, test.expected) - } - } -}

1 0

[goptlib/master] Add support for TOR_PT_PROXY.
by dcf＠torproject.org 28 Jun '15

28 Jun '15

commit d433318f1635b9d14b29236df7556cb42378932b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 24 13:25:06 2015 -0700 Add support for TOR_PT_PROXY. https://trac.torproject.org/projects/tor/ticket/12125 Adds two new functions: ProxyError ProxyDone and one new member to ClientInfo: ProxyURL *url.URL --- examples/dummy-client/dummy-client.go | 5 +++ proxy_test.go | 80 +++++++++++++++++++++++++++++++++ pt.go | 66 ++++++++++++++++++++++++++- 3 files changed, 150 insertions(+), 1 deletion(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index cbb2d38..5d99b0c 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -88,6 +88,11 @@ func main() { os.Exit(1) } + if ptInfo.ProxyURL != nil { + pt.ProxyError("proxy is not supported") + os.Exit(1) + } + listeners := make([]net.Listener, 0) for _, methodName := range ptInfo.MethodNames { switch methodName { diff --git a/proxy_test.go b/proxy_test.go new file mode 100644 index 0000000..c7a113b --- /dev/null +++ b/proxy_test.go @@ -0,0 +1,80 @@ +package pt + +import ( + "os" + "testing" +) + +func TestGetProxyURL(t *testing.T) { + badTests := [...]string{ + "bogus", + "http:", + "://127.0.0.1", + "//127.0.0.1", + "http:127.0.0.1", + "://[::1]", + "//[::1]", + "http:[::1]", + "://localhost", + "//localhost", + "http:localhost", + // No port in these. + "http://127.0.0.1", + "socks4a://127.0.0.1", + "socks5://127.0.0.1", + "http://127.0.0.1:", + "http://[::1]", + "http://localhost", + "unknown://localhost/whatever", + // No host in these. + "http://:8080", + "socks4a://:1080", + "socks5://:1080", + } + goodTests := [...]struct { + input, expected string + }{ + {"http://127.0.0.1:8080", "http://127.0.0.1:8080"}, + {"http://127.0.0.1:8080/", "http://127.0.0.1:8080/"}, + {"http://127.0.0.1:8080/path", "http://127.0.0.1:8080/path"}, + {"http://[::1]:8080", "http://[::1]:8080"}, + {"http://[::1]:8080/", "http://[::1]:8080/"}, + {"http://[::1]:8080/path", "http://[::1]:8080/path"}, + {"http://localhost:8080", "http://localhost:8080"}, + {"http://localhost:8080/", "http://localhost:8080/"}, + {"http://localhost:8080/path", "http://localhost:8080/path"}, + {"http://user@localhost:8080", "http://user@localhost:8080"}, + {"http://user:password@localhost:8080", "http://user:password@localhost:8080"}, + {"socks5://localhost:1080", "socks5://localhost:1080"}, + {"socks4a://localhost:1080", "socks4a://localhost:1080"}, + {"unknown://localhost:9999/whatever", "unknown://localhost:9999/whatever"}, + } + + os.Clearenv() + u, err := getProxyURL() + if err != nil { + t.Errorf("empty environment unexpectedly returned an error: %s", err) + } + if u != nil { + t.Errorf("empty environment returned %q", u) + } + + for _, input := range badTests { + os.Setenv("TOR_PT_PROXY", input) + u, err = getProxyURL() + if err == nil { + t.Errorf("TOR_PT_PROXY=%q unexpectedly succeeded and returned %q", input, u) + } + } + + for _, test := range goodTests { + os.Setenv("TOR_PT_PROXY", test.input) + u, err := getProxyURL() + if err != nil { + t.Errorf("TOR_PT_PROXY=%q unexpectedly returned an error: %s", test.input, err) + } + if u == nil || u.String() != test.expected { + t.Errorf("TOR_PT_PROXY=%q → %q (expected %q)", test.input, u, test.expected) + } + } +} diff --git a/pt.go b/pt.go index d2e7dc1..fc2141e 100644 --- a/pt.go +++ b/pt.go @@ -39,6 +39,12 @@ // if err != nil { // os.Exit(1) // } +// if ptInfo.ProxyURL != nil { +// // you need to interpret the proxy URL yourself +// // call pt.ProxyDone instead if it's a type you understand +// pt.ProxyError("proxy %s is not supported") +// os.Exit(1) +// } // for _, methodName := range ptInfo.MethodNames { // switch methodName { // case "foo": @@ -119,6 +125,9 @@ // Extended ORPort Authentication: // https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-aut…. // +// Pluggable Transport through SOCKS proxy: +// https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-tran… +// // The package implements a SOCKS4a server sufficient for a Tor client transport // plugin. // @@ -135,6 +144,7 @@ import ( "fmt" "io" "net" + "net/url" "os" "strconv" "strings" @@ -286,6 +296,12 @@ func SmethodError(methodName, msg string) error { return doError("SMETHOD-ERROR", methodName, msg) } +// Emit a PROXY-ERROR line with explanation text. Returns a representation of +// the error. +func ProxyError(msg string) error { + return doError("PROXY-ERROR %s\n", msg) +} + // Emit a CMETHOD line. socks must be "socks4" or "socks5". Call this once for // each listening client SOCKS port. func Cmethod(name string, socks string, addr net.Addr) { @@ -326,6 +342,11 @@ func SmethodsDone() { line("SMETHODS", "DONE") } +// Emit a PROXY DONE line. Call this after parsing ClientInfo.ProxyURL. +func ProxyDone() { + fmt.Fprintf(Stdout, "PROXY DONE\n") +} + // Get a pluggable transports version offered by Tor and understood by us, if // any. The only version we understand is "1". This function reads the // environment variable TOR_PT_MANAGED_TRANSPORT_VER. @@ -370,10 +391,48 @@ func getClientTransports(star []string) ([]string, error) { return strings.Split(clientTransports, ","), nil } +// Get the upstream proxy URL. Returns nil if no proxy is requested. The +// function ensures that the Scheme and Host fields are set; i.e., that the URL +// is absolute. It additionally checks that the Host field contains both a host +// and a port part. This function reads the environment variable TOR_PT_PROXY. +// +// This function doesn't check that the scheme is one of Tor's supported proxy +// schemes; that is, one of "http", "socks5", or "socks4a". The caller must be +// able to handle any returned scheme (which may be by calling ProxyError if +// it doesn't know how to handle the scheme). +func getProxyURL() (*url.URL, error) { + rawurl := os.Getenv("TOR_PT_PROXY") + if rawurl == "" { + return nil, nil + } + u, err := url.Parse(rawurl) + if err != nil { + return nil, err + } + if u.Scheme == "" { + return nil, fmt.Errorf("missing scheme") + } + if u.Host == "" { + return nil, fmt.Errorf("missing authority") + } + host, port, err := net.SplitHostPort(u.Host) + if err != nil { + return nil, err + } + if host == "" { + return nil, fmt.Errorf("missing host") + } + if port == "" { + return nil, fmt.Errorf("missing port") + } + return u, nil +} + // This structure is returned by ClientSetup. It consists of a list of method -// names. +// names and the upstream proxy URL, if any. type ClientInfo struct { MethodNames []string + ProxyURL *url.URL } // Check the client pluggable transports environment, emitting an error message @@ -401,6 +460,11 @@ func ClientSetup(star []string) (info ClientInfo, err error) { return } + info.ProxyURL, err = getProxyURL() + if err != nil { + return + } + return info, nil }

1 0

[tor/master] Whoops; fix linux build again
by nickm＠torproject.org 28 Jun '15

28 Jun '15

commit f491aed8d03810271f800a04ed1d5f9e76f5af1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 27 22:41:39 2015 -0400 Whoops; fix linux build again --- src/ext/readpassphrase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/readpassphrase.c b/src/ext/readpassphrase.c index 7bdecaf..ab71935 100644 --- a/src/ext/readpassphrase.c +++ b/src/ext/readpassphrase.c @@ -30,7 +30,7 @@ #include <signal.h> #include <ctype.h> #include <fcntl.h> -#include <readpassphrase.h> +#include "tor_readpassphrase.h" #include <errno.h> #include <string.h> #include <unistd.h>

1 0

[nyx/master] Menus caused stacktrace when you pressed 'm'
by atagar＠torproject.org 28 Jun '15

28 Jun '15

commit 4de4e4ca8a719196b971e9e13ebc0f61b67123bb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 27 16:04:59 2015 -0700 Menus caused stacktrace when you pressed 'm' Issue spotted by Steven. Revisions to popup handling broke the menu... Traceback (most recent call last): File "./run_nyx", line 8, in <module> nyx.main() File "/home/atagar/Desktop/nyx/nyx/__init__.py", line 30, in main nyx.starter.main() File "/home/atagar/Desktop/nyx/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/nyx/nyx/starter.py", line 91, in main curses.wrapper(nyx.controller.start_nyx) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 594, in start_nyx nyx.menu.menu.show_menu() File "/home/atagar/Desktop/nyx/nyx/menu/menu.py", line 119, in show_menu _draw_submenu(cursor, 1, 1, selection_left) File "/home/atagar/Desktop/nyx/nyx/menu/menu.py", line 159, in _draw_submenu popup, _, _ = nyx.popups.init(len(submenu.get_children()), menu_width, top, left, below_static = False) AttributeError: 'module' object has no attribute 'init' --- nyx/menu/menu.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 34e9a67..ef36063 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -156,12 +156,10 @@ def _draw_submenu(cursor, level, top, left): label_format = ' %%-%is%%-%is%%-%is ' % (prefix_col_size, middle_col_size, suffix_col_size) menu_width = len(label_format % ('', '', '')) - popup, _, _ = nyx.popups.init(len(submenu.get_children()), menu_width, top, left, below_static = False) + with nyx.popups.popup_window(len(submenu.get_children()), menu_width, top, left, below_static = False) as (popup, _, _): + if not popup: + return - if not popup: - return - - try: # sets the background color popup.win.bkgd(' ', curses.A_STANDOUT | ui_tools.get_color('red')) @@ -183,5 +181,3 @@ def _draw_submenu(cursor, level, top, left): # shows the next submenu _draw_submenu(cursor, level + 1, top + selection_top, left + menu_width) - finally: - nyx.popups.finalize()

1 0

[nyx/master] Stacktrace when showing connection panel's count dialog
by atagar＠torproject.org 27 Jun '15

27 Jun '15

commit 5969f127efef63cde02fcfe4b2617ee741b638c7 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 8 08:33:08 2015 -0700 Stacktrace when showing connection panel's count dialog Simple error when pressing 'c' on the connection panel... Traceback (most recent call last): File "./run_nyx", line 8, in <module> nyx.main() File "/home/atagar/Desktop/nyx/nyx/__init__.py", line 30, in main nyx.starter.main() File "/home/atagar/Desktop/nyx/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/nyx/nyx/starter.py", line 91, in main curses.wrapper(nyx.controller.start_nyx) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 625, in start_nyx is_keystroke_consumed = panel_impl.handle_key(key) File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 316, in handle_key elif key.match('c') and self.is_clients_allowed(): File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 218, in is_clients_allowed my_fingerprint = self.get_info('fingerprint', None) AttributeError: 'ConnectionPanel' object has no attribute 'get_info' --- nyx/connections/conn_panel.py | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 786cf9c..290cc84 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -137,12 +137,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): """ self._is_tor_running = event_type in (State.INIT, State.RESET) - - if self._is_tor_running: - self._halt_time = None - else: - self._halt_time = time.time() - + self._halt_time = None if self._is_tor_running else time.time() self.redraw(True) def get_pause_time(self): @@ -220,10 +215,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): controller = tor_controller() my_flags = [] - my_fingerprint = self.get_info('fingerprint', None) + my_fingerprint = controller.get_info('fingerprint', None) if my_fingerprint: - my_status_entry = self.controller.get_network_status(my_fingerprint) + my_status_entry = controller.get_network_status(my_fingerprint) if my_status_entry: my_flags = my_status_entry.flags @@ -338,9 +333,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): # run during nyx's interface initialization (otherwise there's a # noticeable pause before the first redraw). - self._cond.acquire() - self._cond.wait(0.2) - self._cond.release() + with self._cond: + self._cond.wait(0.2) + self._update() # populates initial entries self._resolve_apps(False) # resolves initial applications @@ -348,12 +343,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): current_time = time.time() if self.is_paused() or not self._is_tor_running or current_time - last_draw < CONFIG['features.connection.refreshRate']: - self._cond.acquire() - - if not self._halt: - self._cond.wait(0.2) - - self._cond.release() + with self._cond: + if not self._halt: + self._cond.wait(0.2) else: # updates content if their's new results, otherwise just redraws @@ -483,10 +475,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): Halts further resolutions and terminates the thread. """ - self._cond.acquire() - self._halt = True - self._cond.notifyAll() - self._cond.release() + with self._cond: + self._halt = True + self._cond.notifyAll() def _update(self): """

1 0

[nyx/master] Show microdescriptors in the descriptor popup
by atagar＠torproject.org 27 Jun '15

27 Jun '15

commit a40455b571d7585fbc501c276a18367393b85db3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 20 12:24:50 2015 -0700 Show microdescriptors in the descriptor popup Our popup that shows relay descriptors only supported server descriptors and the consensus since it predated microdescriptors. Including those if it's available. --- nyx/connections/descriptor_popup.py | 51 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/nyx/connections/descriptor_popup.py b/nyx/connections/descriptor_popup.py index 0409ab8..144407a 100644 --- a/nyx/connections/descriptor_popup.py +++ b/nyx/connections/descriptor_popup.py @@ -16,9 +16,8 @@ from stem.util import str_tools LINE_NUM_COLOR = 'yellow' HEADER_COLOR = 'cyan' -HEADER_PREFIX = ['ns/id/', 'desc/id/'] +HEADER_PREFIX = ['Consensus:', 'Microdescriptor:', 'Server Descriptor:'] -SIG_COLOR = 'red' SIG_START_KEYS = ['-----BEGIN RSA PUBLIC KEY-----', '-----BEGIN SIGNATURE-----'] SIG_END_KEYS = ['-----END RSA PUBLIC KEY-----', '-----END SIGNATURE-----'] @@ -58,7 +57,7 @@ def show_descriptor_popup(conn_panel): if fingerprint == 'UNKNOWN': fingerprint = None - display_text = get_display_text(fingerprint) + display_text = _display_text(fingerprint) display_color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] show_line_number = fingerprint is not None @@ -92,10 +91,11 @@ def show_descriptor_popup(conn_panel): scroll, is_changed = new_scroll, True elif key.is_selection() or key.match('d'): is_done = True # closes popup - elif key.match('left', 'right'): - # navigation - pass on to conn_panel and recreate popup - - conn_panel.handle_key(panel.KeyInput(curses.KEY_UP) if key.match('left') else panel.KeyInput(curses.KEY_DOWN)) + elif key.match('left'): + conn_panel.handle_key(panel.KeyInput(curses.KEY_UP)) + break + elif key.match('right'): + conn_panel.handle_key(panel.KeyInput(curses.KEY_DOWN)) break finally: conn_panel.set_title_visible(True) @@ -103,34 +103,32 @@ def show_descriptor_popup(conn_panel): panel.CURSES_LOCK.release() -def get_display_text(fingerprint): +def _display_text(fingerprint): """ - Provides the descriptor and consensus entry for a relay. This is a list of - lines to be displayed by the dialog. + Provides the descriptors for a relay. + + :param str fingerprint: relay fingerprint to be looked up + + :returns: **list** with the lines that should be displayed in the dialog """ if not fingerprint: return [UNRESOLVED_MSG] - controller, description = tor_controller(), [] + controller = tor_controller() + router_status_entry = controller.get_network_status(fingerprint, None) + microdescriptor = controller.get_microdescriptor(fingerprint, None) + server_descriptor = controller.get_server_descriptor(fingerprint, None) - description.append('ns/id/%s' % fingerprint) - consensus_entry = controller.get_info('ns/id/%s' % fingerprint, None) + description = 'Consensus:\n\n%s' % (router_status_entry if router_status_entry else ERROR_MSG) - if consensus_entry: - description += consensus_entry.split('\n') - else: - description += [ERROR_MSG, ''] - - description.append('desc/id/%s' % fingerprint) - descriptor_entry = controller.get_info('desc/id/%s' % fingerprint, None) + if server_descriptor: + description += '\n\nServer Descriptor:\n\n%s' % server_descriptor - if descriptor_entry: - description += descriptor_entry.split('\n') - else: - description += [ERROR_MSG] + if microdescriptor: + description += '\n\nMicrodescriptor:\n\n%s' % microdescriptor - return description + return description.split('\n') def get_preferred_size(text, max_width, show_line_number): @@ -208,14 +206,11 @@ def draw(popup, fingerprint, display_text, display_color, scroll, show_line_numb elif line_text in SIG_START_KEYS: keyword, value = line_text, '' is_encryption_block = True - draw_format = SIG_COLOR elif line_text in SIG_END_KEYS: keyword, value = line_text, '' is_encryption_block = False - draw_format = SIG_COLOR elif is_encryption_block: keyword, value = '', line_text - draw_format = SIG_COLOR elif ' ' in line_text: div_index = line_text.find(' ') keyword, value = line_text[:div_index], line_text[div_index:]

1 0

[nyx/master] Potential stacktrace when shutting down
by atagar＠torproject.org 27 Jun '15

27 Jun '15

commit 829da61b9494941e27fae17bf9aa35239fa0ddff Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 21 11:13:13 2015 -0700 Potential stacktrace when shutting down Our connection panel was missing a default value, causing exceptions to possibly be uncaught... Traceback (most recent call last): File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner self.run() File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 352, in run self._update() File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 508, in _update for circ in tor_controller().get_circuits(): File "/home/atagar/Desktop/nyx/stem/control.py", line 411, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/nyx/stem/control.py", line 3050, in get_circuits response = self.get_info('circuit-status') File "/home/atagar/Desktop/nyx/stem/control.py", line 558, in msg self._socket.send(message) File "/home/atagar/Desktop/nyx/stem/socket.py", line 122, in send raise stem.SocketClosed() --- nyx/connections/conn_panel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 46c4a7c..fe41507 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -505,7 +505,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): new_connections = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in conn_resolver.get_value()] new_circuits = {} - for circ in tor_controller().get_circuits(): + for circ in tor_controller().get_circuits([]): # Skips established single-hop circuits (these are for directory # fetches, not client circuits)

1 0

[nyx/master] Revise size calculation for the descriptor dialog
by atagar＠torproject.org 27 Jun '15

27 Jun '15

commit bd1ddce03d743352d234aedc8c9c0bd9c87bd646 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 21 11:28:02 2015 -0700 Revise size calculation for the descriptor dialog Tidying up this helper. The way we accounted for the size of line wraps didn't look right since it didn't account for additional content (line number, framing) on the line we wrapped onto. This still isn't quite right since it doesn't account for word breaks but *shrug*, probably good enough in practice. --- nyx/connections/descriptor_popup.py | 36 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/nyx/connections/descriptor_popup.py b/nyx/connections/descriptor_popup.py index 144407a..7eeb9df 100644 --- a/nyx/connections/descriptor_popup.py +++ b/nyx/connections/descriptor_popup.py @@ -59,11 +59,11 @@ def show_descriptor_popup(conn_panel): display_text = _display_text(fingerprint) display_color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] - show_line_number = fingerprint is not None + show_line_numbers = fingerprint is not None # determines the maximum popup size the display_text can fill - popup_height, popup_width = get_preferred_size(display_text, conn_panel.max_x, show_line_number) + popup_height, popup_width = _preferred_size(display_text, conn_panel.max_x, show_line_numbers) with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, height): if popup: @@ -71,7 +71,7 @@ def show_descriptor_popup(conn_panel): while not is_done: if is_changed: - draw(popup, fingerprint, display_text, display_color, scroll, show_line_number) + draw(popup, fingerprint, display_text, display_color, scroll, show_line_numbers) is_changed = False key = control.key_input() @@ -131,31 +131,29 @@ def _display_text(fingerprint): return description.split('\n') -def get_preferred_size(text, max_width, show_line_number): +def _preferred_size(text, max_width, show_line_numbers): """ - Provides the (height, width) tuple for the preferred size of the given text. + Provides the preferred dimensions of our dialog. + + :param list text: lines of text to be shown + :param int max_width: maximum width the dialog can be + :param bool show_line_numbers: if we should leave room for line numbers + + :returns: **tuple** of the preferred (height, width) """ width, height = 0, len(text) + 2 - line_number_width = int(math.log10(len(text))) + 1 + line_number_width = int(math.log10(len(text))) + 2 if show_line_numbers else 0 + max_content_width = max_width - line_number_width - 4 for line in text: - # width includes content, line number field, and border - - line_width = len(line) + 5 - - if show_line_number: - line_width += line_number_width - - width = max(width, line_width) - - # tracks number of extra lines that will be taken due to text wrap - height += (line_width - 2) / max_width + width = min(max_width, max(width, len(line) + line_number_width + 4)) + height += len(line) / max_content_width # extra lines due to text wrap return (height, width) -def draw(popup, fingerprint, display_text, display_color, scroll, show_line_number): +def draw(popup, fingerprint, display_text, display_color, scroll, show_line_numbers): popup.win.erase() popup.win.box() x_offset = 2 @@ -186,7 +184,7 @@ def draw(popup, fingerprint, display_text, display_color, scroll, show_line_numb line_text = display_text[i].strip() x_offset = 2 - if show_line_number: + if show_line_numbers: line_number_label = ('%%%ii' % line_number_width) % (i + 1) popup.addstr(draw_line, x_offset, line_number_label, curses.A_BOLD, LINE_NUM_COLOR)

1 0