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

[tor/master] Teach format_changelog to sort and collate sections.
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit 45f534e6df6f576f7721f7aa81bf86265477c838 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 19 12:44:19 2014 -0400 Teach format_changelog to sort and collate sections. Give it options to turn off collation and/or wrapping. --- scripts/maint/format_changelog.py | 109 +++++++++++++++++++++++++++++++++---- 1 file changed, 99 insertions(+), 10 deletions(-) diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 32a3d74..c84bf3c 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -12,6 +12,7 @@ import os import re import sys +import optparse # ============================== # Oh, look! It's a cruddy approximation to Knuth's elegant text wrapping @@ -186,8 +187,49 @@ def body_parser(line): else: print "Weird line %r"%line +def clean_head(head): + return head + +def head_score(s): + m = re.match(r'^ +o (.*)', s) + if not m: + print >>sys.stderr, "Can't score %r"%s + return 99999 + lw = m.group(1).lower() + if lw.startswith("security") and "feature" not in lw: + score = -300 + elif lw.startswith("deprecated versions"): + score = -200 + elif "build require" in lw: + score = -100 + elif lw.startswith("major feature"): + score = 00 + elif lw.startswith("major bug"): + score = 50 + elif lw.startswith("major"): + score = 70 + elif lw.startswith("minor feature"): + score = 200 + elif lw.startswith("minor bug"): + score = 250 + elif lw.startswith("minor"): + score = 270 + else: + score = 1000 + + if 'secur' in lw: + score -= 2 + + if "(other)" in lw: + score += 2 + + if '(' not in lw: + score -= 1 + + return score + class ChangeLog(object): - def __init__(self): + def __init__(self, wrapText=True): self.prehead = [] self.mainhead = None self.headtext = [] @@ -195,6 +237,7 @@ class ChangeLog(object): self.sections = [] self.cursection = None self.lineno = 0 + self.wrapText = wrapText def addLine(self, tp, line): self.lineno += 1 @@ -249,6 +292,11 @@ class ChangeLog(object): self.lint_item(item_line, grafs, head_type) def dumpGraf(self,par,indent1,indent2=-1): + if not self.wrapText: + for line in par: + print line + return + if indent2 == -1: indent2 = indent1 text = " ".join(re.sub(r'\s+', ' ', line.strip()) for line in par) @@ -258,6 +306,22 @@ class ChangeLog(object): initial_indent=" "*indent1, subsequent_indent=" "*indent2)) + def collateAndSortSections(self): + heads = [] + sectionsByHead = { } + for _, head, items in self.sections: + head = clean_head(head) + try: + s = sectionsByHead[head] + except KeyError: + s = sectionsByHead[head] = [] + heads.append( (head_score(head), head, s) ) + + s.extend(items) + + heads.sort() + self.sections = [ (0, head, items) for _,head,items in heads ] + def dump(self): if self.prehead: self.dumpGraf(self.prehead, 0) @@ -279,20 +343,36 @@ class ChangeLog(object): print print -CL = ChangeLog() -parser = head_parser - -if len(sys.argv) == 1: +op = optparse.OptionParser(usage="usage: %prog [options] [filename]") +op.add_option('-W', '--no-wrap', action='store_false', + dest='wrapText', default=True, + help='Do not re-wrap paragraphs') +op.add_option('-S', '--no-sort', action='store_false', + dest='sort', default=True, + help='Do not sort or collate sections') +op.add_option('-o', '--output', dest='output', + default=None, metavar='FILE', help="write output to FILE") + +options,args = op.parse_args() + +if len(args) > 1: + op.error("Too many arguments") +elif len(args) == 0: fname = 'ChangeLog' else: - fname = sys.argv[1] + fname = args[0] -fname_new = fname+".new" +if options.output == None: + options.output = fname -sys.stdin = open(fname, 'r') +if fname != '-': + sys.stdin = open(fname, 'r') nextline = None +CL = ChangeLog(wrapText=options.wrapText) +parser = head_parser + for line in sys.stdin: line = line.rstrip() tp = parser(line) @@ -307,7 +387,15 @@ for line in sys.stdin: CL.lint() -sys.stdout = open(fname_new, 'w') +if options.output != '-': + fname_new = options.output+".new" + fname_out = options.output + sys.stdout = open(fname_new, 'w') +else: + fname_new = fname_out = None + +if options.sort: + CL.collateAndSortSections() CL.dump() @@ -317,4 +405,5 @@ if nextline is not None: for line in sys.stdin: sys.stdout.write(line) -os.rename(fname_new, fname) +if fname_new is not None: + os.rename(fname_new, fname_out)

1 0

[tor/master] format_changelog.py: learn about the ReleaseNotes format
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit 1405fbcc5862388b859d975ff7b8f95350d46240 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 19 11:47:16 2014 -0400 format_changelog.py: learn about the ReleaseNotes format --- scripts/maint/format_changelog.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index f67e89b..32a3d74 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -156,10 +156,13 @@ TP_SECHEAD = 3 TP_ITEMFIRST = 4 TP_ITEMBODY = 5 TP_END = 6 +TP_PREHEAD = 7 def head_parser(line): - if re.match(r'^[A-Z]', line): + if re.match(r'^Changes in', line): return TP_MAINHEAD + elif re.match(r'^[A-Za-z]', line): + return TP_PREHEAD elif re.match(r'^ o ', line): return TP_SECHEAD elif re.match(r'^\s*$', line): @@ -178,11 +181,14 @@ def body_parser(line): return TP_BLANK elif re.match(r'^Changes in', line): return TP_END + elif re.match(r'^\s+\S', line): + return TP_HEADTEXT else: print "Weird line %r"%line class ChangeLog(object): def __init__(self): + self.prehead = [] self.mainhead = None self.headtext = [] self.curgraf = None @@ -197,6 +203,9 @@ class ChangeLog(object): assert not self.mainhead self.mainhead = line + elif tp == TP_PREHEAD: + self.prehead.append(line) + elif tp == TP_HEADTEXT: if self.curgraf is None: self.curgraf = [] @@ -250,6 +259,9 @@ class ChangeLog(object): subsequent_indent=" "*indent2)) def dump(self): + if self.prehead: + self.dumpGraf(self.prehead, 0) + print print self.mainhead for par in self.headtext: self.dumpGraf(par, 2)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit d315b8e8bc712f881fcc70624cb135a8e3855f63 Merge: e1a25f0 d1fa016 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 3 19:57:41 2014 -0400 Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5 changes/bug13325 | 4 ++++ configure.ac | 4 ++++ src/common/tortls.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 46 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.5] Disable SSLv3 unconditionally. Closes ticket 13426.
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit af73d3e4d83ba7f404068008ad617e02b8a0a77b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 15 11:50:05 2014 -0400 Disable SSLv3 unconditionally. Closes ticket 13426. The POODLE attack doesn't affect Tor, but there's no reason to tempt fate: SSLv3 isn't going to get any better. --- changes/disable_sslv3 | 4 ++++ src/common/tortls.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/disable_sslv3 b/changes/disable_sslv3 new file mode 100644 index 0000000..bb4c2df --- /dev/null +++ b/changes/disable_sslv3 @@ -0,0 +1,4 @@ + o Major security fixes: + - Disable support for SSLv3. All versions of OpenSSL in use with + Tor today support TLS 1.0 or later, so we can safely turn off + support for this old (and insecure) protocol. Fixes bug 13426. diff --git a/src/common/tortls.c b/src/common/tortls.c index 60aac64..11fe220 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1176,10 +1176,11 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, goto error; #endif - /* Tell OpenSSL to use SSL3 or TLS1 but not SSL2. */ + /* Tell OpenSSL to use TLS 1.0 or later but not SSL2 or SSL3. */ if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); /* Disable TLS1.1 and TLS1.2 if they exist. We need to do this to * workaround a bug present in all OpenSSL 1.0.1 versions (as of 1 @@ -1204,6 +1205,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, SSL_CTX_set_options(result->ctx, SSL_OP_NO_TICKET); #endif + /* XXX This block is now obsolete. */ if ( #ifdef DISABLE_SSL3_HANDSHAKE 1 ||

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit 943fd4a252ad252d7d594622d5988634ddf8f1fc Merge: 288b3ec c1c83eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 16 09:08:32 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/disable_sslv3 | 4 ++++ src/common/tortls.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc src/common/tortls.c index c13b12f,11fe220..4222f6d --- a/src/common/tortls.c +++ b/src/common/tortls.c @@@ -1276,11 -1180,8 +1276,12 @@@ tor_tls_context_new(crypto_pk_t *identi if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); + /* Prefer the server's ordering of ciphers: the client's ordering has + * historically been chosen for fingerprinting resistance. */ + SSL_CTX_set_options(result->ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); + /* Disable TLS1.1 and TLS1.2 if they exist. We need to do this to * workaround a bug present in all OpenSSL 1.0.1 versions (as of 1 * June 2012), wherein renegotiating while using one of these TLS @@@ -1302,18 -1200,12 +1303,19 @@@ * using them can make our perfect forward secrecy a little worse, *and* * create an opportunity to fingerprint us (since it's unusual to use them * with TLS sessions turned off). + * + * In 0.2.4, clients advertise support for them though, to avoid a TLS + * distinguishability vector. This can give us worse PFS, though, if we + * get a server that doesn't set SSL_OP_NO_TICKET. With luck, there will + * be few such servers by the time 0.2.4 is more stable. */ #ifdef SSL_OP_NO_TICKET - SSL_CTX_set_options(result->ctx, SSL_OP_NO_TICKET); + if (! is_client) { + SSL_CTX_set_options(result->ctx, SSL_OP_NO_TICKET); + } #endif + /* XXX This block is now obsolete. */ if ( #ifdef DISABLE_SSL3_HANDSHAKE 1 ||

1 0

[tor/release-0.2.5] Merge branch 'no_sslv3_023' into maint-0.2.3
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit c1c83eb376a7c89fadb01d1c7082d4aa4125333d Merge: 0eec8e2 af73d3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 16 09:08:09 2014 -0400 Merge branch 'no_sslv3_023' into maint-0.2.3 changes/disable_sslv3 | 4 ++++ src/common/tortls.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit 22b9caf0ae42132bc8107d990b3ebb969394c90f Merge: d315b8e 943fd4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 16 09:08:52 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/disable_sslv3 | 4 ++++ src/common/tortls.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit f77d8901fc6e3836a2ef6e1ee58004dfb0546675 Merge: a64f3ab ab4b296 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 19 11:13:09 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 changes/13295 | 5 +++++ changes/bug13325 | 4 ++++ changes/bug8093 | 3 +++ changes/disable_sslv3 | 4 ++++ configure.ac | 4 ++++ src/common/sandbox.c | 21 +++++++++++++++++++ src/common/sandbox.h | 2 ++ src/common/tortls.c | 52 +++++++++++++++++++++++++++++++++++++---------- src/or/relay.c | 2 +- src/tools/tor-resolve.c | 2 ++ 10 files changed, 87 insertions(+), 12 deletions(-)

1 0

[tor/release-0.2.5] Downgrade 'unexpected sendme cell from client' to PROTOCOL_WARN
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit ab4b29625db720817f9af502199ebf1ee3ac5af7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 16 13:04:11 2014 -0400 Downgrade 'unexpected sendme cell from client' to PROTOCOL_WARN Closes 8093. --- changes/bug8093 | 3 +++ src/or/relay.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug8093 b/changes/bug8093 new file mode 100644 index 0000000..f0fbc61 --- /dev/null +++ b/changes/bug8093 @@ -0,0 +1,3 @@ + o Downgraded warnings: + - Downgrade the severity of the 'unexpected sendme cell from client' from + 'warn' to 'protocol warning'. Closes ticket 8093. diff --git a/src/or/relay.c b/src/or/relay.c index 4d71157..9407df0 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1718,7 +1718,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (circ->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { static struct ratelim_t client_warn_ratelim = RATELIM_INIT(600); - log_fn_ratelim(&client_warn_ratelim, LOG_WARN, LD_PROTOCOL, + log_fn_ratelim(&client_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL, "Unexpected sendme cell from client. " "Closing circ (window %d).", circ->package_window);

1 0

[tor/release-0.2.5] Don't use the getaddrinfo sandbox cache from tor-resolve
by nickm＠torproject.org 19 Oct '14

19 Oct '14

commit 09951bea7fe30cd91d8a4dee95278218f0aa199e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 29 12:57:07 2014 -0400 Don't use the getaddrinfo sandbox cache from tor-resolve Fixes bug 13295; bugfix on 0.2.5.3-alpha. The alternative here is to call crypto_global_init() from tor-resolve, but let's avoid linking openssl into tor-resolve for as long as we can. --- changes/13295 | 5 +++++ src/common/sandbox.c | 21 +++++++++++++++++++++ src/common/sandbox.h | 2 ++ src/tools/tor-resolve.c | 2 ++ 4 files changed, 30 insertions(+) diff --git a/changes/13295 b/changes/13295 new file mode 100644 index 0000000..4334325 --- /dev/null +++ b/changes/13295 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable sandbox name resolver cache when running tor-resolve: + tor-resolve doesn't use the sandbox code, and turning it on was + breaking attempts to do tor-resolve on a non-default server on + Linux. Fixes bug 13295; bugfix on 0.2.5.3-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 05b91be..dbbaa59 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1385,6 +1385,18 @@ HT_GENERATE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, cached_getaddrinfo_items_eq, 0.6, tor_malloc_, tor_realloc_, tor_free_); +/** If true, don't try to cache getaddrinfo results. */ +static int sandbox_getaddrinfo_cache_disabled = 0; + +/** Tell the sandbox layer not to try to cache getaddrinfo results. Used as in + * tor-resolve, when we have no intention of initializing crypto or of + * installing the sandbox.*/ +void +sandbox_disable_getaddrinfo_cache(void) +{ + sandbox_getaddrinfo_cache_disabled = 1; +} + int sandbox_getaddrinfo(const char *name, const char *servname, const struct addrinfo *hints, @@ -1393,6 +1405,10 @@ sandbox_getaddrinfo(const char *name, const char *servname, int err; struct cached_getaddrinfo_item_t search, *item; + if (sandbox_getaddrinfo_cache_disabled) { + return getaddrinfo(name, NULL, hints, res); + } + if (servname != NULL) { log_warn(LD_BUG, "called with non-NULL servname"); return EAI_NONAME; @@ -1834,5 +1850,10 @@ sandbox_is_active(void) { return 0; } + +void +sandbox_disable_getaddrinfo_cache(void) +{ +} #endif diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 20d5d50..35d8777 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -208,5 +208,7 @@ int sandbox_init(sandbox_cfg_t* cfg); /** Return true iff the sandbox is turned on. */ int sandbox_is_active(void); +void sandbox_disable_getaddrinfo_cache(void); + #endif /* SANDBOX_H_ */ diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 306f6c6..480c7e5 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -8,6 +8,7 @@ #include "../common/util.h" #include "address.h" #include "../common/torlog.h" +#include "sandbox.h" #include <stdio.h> #include <stdlib.h> @@ -344,6 +345,7 @@ main(int argc, char **argv) log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t)); init_logging(); + sandbox_disable_getaddrinfo_cache(); arg = &argv[1]; n_args = argc-1;

1 0