October 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Add --transport option to reg programs.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit bef75a430ad9f1aeb1a6be6fe4cd7f780be38e03 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 22:50:33 2013 -0700 Add --transport option to reg programs. --- flashproxy-reg-appspot | 9 ++++++++- flashproxy-reg-email | 7 ++++++- flashproxy-reg-http | 7 ++++++- flashproxy-reg-url | 9 +++++++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 163ec24..dc8a5aa 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -93,10 +93,13 @@ external IP address is guessed). encrypt registrations to the given PEM-formatted public key (default built-in). -h, --help show this help. + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -182,6 +185,8 @@ def generate_url(addr): raise ValueError("Can't find executable directory for registration helpers") command = [os.path.join(script_dir, FLASHPROXY_REG_URL)] command += ["-f", urlparse.urlunparse(("https", FRONT_DOMAIN, "/", "", "", ""))] + if options.transport is not None: + command += ["--transport", options.transport] if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] command.append(format_addr(addr)) @@ -267,7 +272,7 @@ def get_external_ip(): finally: f.close() -opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help", "unsafe-logging"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help", "transport=", "unsafe-logging"]) for o, a in opt: if o == "-4": options.address_family = socket.AF_INET @@ -280,6 +285,8 @@ for o, a in opt: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False diff --git a/flashproxy-reg-email b/flashproxy-reg-email index add5e97..95edfbf 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -122,12 +122,15 @@ This program requires the M2Crypto library for Python. -h, --help show this help. -s, --smtp=HOST[:PORT] use the given SMTP server (default "%(smtp_addr)s"). + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), "email_addr": DEFAULT_EMAIL_ADDRESS, "smtp_addr": format_addr((DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT)), + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -218,7 +221,7 @@ def get_facilitator_pubkey(): options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp=", "transport=", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -237,6 +240,8 @@ for o, a in opts: sys.exit() elif o == "-s" or o == "--smtp": options.smtp_addr = parse_addr_spec(a, DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 4c776c3..100edd9 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -32,11 +32,14 @@ remote address registered is "%(remote_addr)s". -f, --facilitator=URL register with the given facilitator (default "%(fac_url)s"). -h, --help show this help. + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL, "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -108,7 +111,7 @@ def build_reg(addr, transport): options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help", "transport=", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -119,6 +122,8 @@ for o, a in opts: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False diff --git a/flashproxy-reg-url b/flashproxy-reg-url index e947650..c8ebd44 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -47,11 +47,14 @@ default PORT is %(port)d. --facilitator-pubkey=FILENAME encrypt registrations to the given PEM-formatted public key (default built-in). - -h, --help show this help.\ + -h, --help show this help. + --transport=TRANSPORT register using the given transport + (default "%(transport)s").\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL, "port": DEFAULT_REMOTE_PORT, + "transport": DEFAULT_TRANSPORT, } def parse_addr_spec(spec, defhost = None, defport = None): @@ -118,7 +121,7 @@ def get_facilitator_pubkey(): options.facilitator_url = DEFAULT_FACILITATOR_URL -opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help", "transport="]) for o, a in opt: if o == "-f" or o == "--facilitator": options.facilitator_url = a @@ -127,6 +130,8 @@ for o, a in opt: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--transport": + options.transport = a if len(args) != 1: usage(sys.stderr)

1 0

[flashproxy/master] Tolerate other URL parameters in client regisration lines.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 3e80ad4f244841beb53f23d70f13bd925c9bc48d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:06:00 2013 -0700 Tolerate other URL parameters in client regisration lines. --- facilitator/facilitator-reg-daemon | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index 2cb2904..ed9eb7e 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -7,6 +7,7 @@ import socket import sys import threading import time +import urlparse import fac @@ -81,9 +82,14 @@ def find_client_addr(body): client=... Returns None if no client line was found.""" for line in body.splitlines(): - if line.startswith("client="): - _, client_spec = line.split("=", 1) - return fac.parse_addr_spec(client_spec) + try: + qs = urlparse.parse_qs(line, keep_blank_values=True, strict_parsing=True) + except ValueError: + continue + client_specs = qs["client"] + if len(client_specs) != 1: + continue + return fac.parse_addr_spec(client_specs[0]) return None class Handler(SocketServer.StreamRequestHandler):

1 0

[check/master] Add Last-Modified header to bulk exit list.
by arlo＠torproject.org 10 Oct '13

10 Oct '13

commit e76ca136419cf7802ac172221dc80fd765ea1ba7 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 10 10:43:25 2013 -0700 Add Last-Modified header to bulk exit list. --- handlers.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handlers.go b/handlers.go index cd8e815..3a91087 100644 --- a/handlers.go +++ b/handlers.go @@ -117,6 +117,8 @@ func BulkHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain port, port_str := GetQS(q, "port", 80) n, n_str := GetQS(q, "n", 16) + w.Header().Set("Last-Modified", Exits.UpdateTime.UTC().Format(http.TimeFormat)) + str := fmt.Sprintf("# This is a list of all Tor exit nodes from the past %d hours that can contact %s on port %d #\n", n, ip, port) str += fmt.Sprintf("# You can update this list by visiting https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=%s%s%s #\n", ip, port_str, n_str) str += fmt.Sprintf("# This file was generated on %v #\n", Exits.UpdateTime.UTC().Format(time.UnixDate))

1 0

[stem/master] Revert "Chaching version comparison and hash function"
by atagar＠torproject.org 10 Oct '13

10 Oct '13

commit 94b4924a3970fe3877b276ad2d07ccd149ed8d3a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 10 08:51:59 2013 -0700 Revert "Chaching version comparison and hash function" Wow, shame on me for not even running unit tests. This causes version comparisons to infinitely recurse - hot. --- stem/version.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/stem/version.py b/stem/version.py index 613c4a5..68faa36 100644 --- a/stem/version.py +++ b/stem/version.py @@ -187,7 +187,6 @@ class Version(object): return self.version_str - @lru_cache() def _compare(self, other, method): """ Compares version ordering according to the spec. @@ -248,7 +247,6 @@ class Version(object): return self._compare(other, lambda s, o: s >= o) - @lru_cache() def __hash__(self): my_hash = 0

1 0

[tor/master] Merge remote-tracking branch 'sysrqb/bug9950'
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 43f95e38abefced37ad24966d56298e972cebf81 Merge: df4693f 528e3bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:27:28 2013 -0400 Merge remote-tracking branch 'sysrqb/bug9950' src/or/confparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Free the smartlist after parsing csv config option
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 528e3bf8921372db9a97a9c624288e44f756188a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Oct 9 22:49:46 2013 +0000 Free the smartlist after parsing csv config option Bugfix on 1293835440dd4debf6fbfc66e755d9b9384aa362, which implemented 6752: Not in any released tor. --- src/or/confparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/confparse.c b/src/or/confparse.c index f2ada4f..c5400a6 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -392,7 +392,7 @@ config_assign_value(const config_format_t *fmt, void *options, "Interval in '%s %s' is malformed or out of bounds.", c->key, c->value); SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp)); - smartlist_clear(csv_str); + smartlist_free(csv_str); return -1; } csv_int = tor_malloc_zero(sizeof(int)); @@ -401,7 +401,7 @@ config_assign_value(const config_format_t *fmt, void *options, } SMARTLIST_FOREACH_END(str); SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp)); - smartlist_clear(csv_str); + smartlist_free(csv_str); break; case CONFIG_TYPE_LINELIST:

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit df4693fed57d0a0026186beaa6bb819b854c5b10 Merge: 3d817fa 2c7ed04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:24:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'bug9644_024' into maint-0.2.4
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 2c7ed0406f04caa1609014f66c08964c8b38d0b9 Merge: 7b1b8c3 7dbf667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:23:46 2013 -0400 Merge branch 'bug9644_024' into maint-0.2.4 changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

1 0

[tor/master] When freeing a cert_list_t, avoid memory leak.
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 7dbf66713f22b5e04a36d300307a4df7e375e76b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 19 12:22:49 2013 -0400 When freeing a cert_list_t, avoid memory leak. We were freeing these on exit, but when we added the dl_status_map field to them in fddb814f, we forgot to arrange for it to be freed. I've moved the cert_list_free() code into its own function, and added an appropriate dsmap_free() call. Fixes bug 9644; bugfix on 0.2.4.13-alpha. --- changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/changes/bug9644 b/changes/bug9644 new file mode 100644 index 0000000..51c58a5 --- /dev/null +++ b/changes/bug9644 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a small memory leak on exit. (We weren't freeing directory + authority certificate download statuses.) Fixes bug 9644; bugfix + on 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c2220f4..c28de24 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -241,6 +241,27 @@ get_cert_list(const char *id_digest) return cl; } +/** Release all space held by a cert_list_t */ +static void +cert_list_free(cert_list_t *cl) +{ + if (!cl) + return; + + SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, + authority_cert_free(cert)); + smartlist_free(cl->certs); + dsmap_free(cl->dl_status_map, tor_free_); + tor_free(cl); +} + +/** Wrapper for cert_list_free so we can pass it to digestmap_free */ +static void +cert_list_free_(void *cl) +{ + cert_list_free(cl); +} + /** Reload the cached v3 key certificates from the cached-certs file in * the data directory. Return 0 on success, -1 on failure. */ int @@ -3324,13 +3345,7 @@ routerlist_free_all(void) smartlist_free(fallback_dir_servers); trusted_dir_servers = fallback_dir_servers = NULL; if (trusted_dir_certs) { - DIGESTMAP_FOREACH(trusted_dir_certs, key, cert_list_t *, cl) { - SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, - authority_cert_free(cert)); - smartlist_free(cl->certs); - tor_free(cl); - } DIGESTMAP_FOREACH_END; - digestmap_free(trusted_dir_certs, NULL); + digestmap_free(trusted_dir_certs, cert_list_free_); trusted_dir_certs = NULL; } }

1 0

[tor/maint-0.2.4] Merge branch 'bug9644_024' into maint-0.2.4
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 2c7ed0406f04caa1609014f66c08964c8b38d0b9 Merge: 7b1b8c3 7dbf667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:23:46 2013 -0400 Merge branch 'bug9644_024' into maint-0.2.4 changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

1 0