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

[tor/master] Changes file for 19063; use the BUG macro
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 1160ac1283a076acc6c660827ebeb84a111f27cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 12:38:15 2016 -0400 Changes file for 19063; use the BUG macro --- changes/bug19063 | 4 ++++ src/common/util.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug19063 b/changes/bug19063 new file mode 100644 index 0000000..1002009 --- /dev/null +++ b/changes/bug19063 @@ -0,0 +1,4 @@ + o Minor features (code safety): + - In our integer-parsing functions, check that the maxiumum + value given is no smaller than the minimum value. Closes ticket + 19063; patch from U+039b. diff --git a/src/common/util.c b/src/common/util.c index 97a7e72..4b6df81 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1112,7 +1112,7 @@ tor_digest256_is_zero(const char *digest) if (!next && *endptr) \ goto err; \ /* Illogical (max, min) inputs? */ \ - if (max < min) \ + if (BUG(max < min)) \ goto err; \ /* Is r within limits? */ \ if (r < min || r > max) \

1 0

[tor/master] Fix #19063: Add check in utility macro
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 58e6a6aaebc32683f041925351d8a8101c86abda Author: U+039b <*(a)0x39b.fr> Date: Sat Jun 18 18:43:44 2016 +0200 Fix #19063: Add check in utility macro --- src/common/util.c | 3 +++ src/test/test_util.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 7217cdc..97a7e72 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1111,6 +1111,9 @@ tor_digest256_is_zero(const char *digest) /* Were there unexpected unconverted characters? */ \ if (!next && *endptr) \ goto err; \ + /* Illogical (max, min) inputs? */ \ + if (max < min) \ + goto err; \ /* Is r within limits? */ \ if (r < min || r > max) \ goto err; \ diff --git a/src/test/test_util.c b/src/test/test_util.c index 893fc34..9086437 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1501,6 +1501,11 @@ test_util_strmisc(void *arg) tt_int_op(-50L,OP_EQ, tor_parse_long("-50 plus garbage",10,-100,100,&i,&cp)); tt_int_op(1,OP_EQ, i); tt_str_op(cp,OP_EQ, " plus garbage"); + /* Illogical min max */ + tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,4,&i,NULL)); + tt_int_op(0,OP_EQ, i); + tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,100,-100,&i,NULL)); + tt_int_op(0,OP_EQ, i); /* Out of bounds */ tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,100,&i,NULL)); tt_int_op(0,OP_EQ, i);

1 0

[chutney/master] use CHUTNEY_DATA_DIR in one more place
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 9e329c4319cde98a846032528ca017a22c2a3a40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 12:32:28 2016 -0400 use CHUTNEY_DATA_DIR in one more place --- lib/chutney/TorNet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 57d19e0..0eb4a76 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -807,7 +807,8 @@ class Network(object): self._nodes.append(n) def move_aside_nodes(self): - nodesdir = os.path.join(os.getcwd(), 'net', 'nodes') + net_base_dir = os.environ.get('CHUTNEY_DATA_DIR', 'net') + nodesdir = os.path.join(net_base_dir, 'nodes') if not os.path.exists(nodesdir): return

1 0

[chutney/master] Fix PEP8 errors
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 45463f00ab59a74f66ce30781946b6f17f18574c Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Jan 14 09:45:51 2015 +0100 Fix PEP8 errors --- lib/chutney/Templating.py | 3 +- lib/chutney/TorNet.py | 167 ++++++++++++++++++++-------------------------- lib/chutney/Traffic.py | 44 ++++++------ 3 files changed, 97 insertions(+), 117 deletions(-) diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py index a8f638f..de3de90 100644 --- a/lib/chutney/Templating.py +++ b/lib/chutney/Templating.py @@ -144,7 +144,8 @@ class Environ(_DictWrapper): Environ, any keys not found in this Environ are searched for in the parent. - >>> animal = Environ(mobile=True,legs=4,can_program=False,can_meow=False) + >>> animal = Environ(mobile=True,legs=4,can_program=False, + can_meow=False) >>> biped = Environ(animal,legs=2) >>> cat = Environ(animal,can_meow=True) >>> human = Environ(biped,feathers=False,can_program=True) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 6a507e8..57d19e0 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -10,10 +10,7 @@ from __future__ import print_function from __future__ import with_statement -# Get verbose tracebacks, so we can diagnose better. import cgitb -cgitb.enable(format="plain") - import os import signal import subprocess @@ -30,6 +27,9 @@ _BASE_ENVIRON = None _TORRC_OPTIONS = None _THE_NETWORK = None +# Get verbose tracebacks, so we can diagnose better. +cgitb.enable(format="plain") + def mkdir_p(d, mode=511): """Create directory 'd' and all of its parents as needed. Unlike @@ -244,15 +244,14 @@ class LocalNodeBuilder(NodeBuilder): "--list-torrc-options", "--hush"] try: - opts = subprocess.check_output(cmdline, - bufsize=-1, + opts = subprocess.check_output(cmdline, bufsize=-1, universal_newlines=True) except OSError as e: # only catch file not found error if e.errno == errno.ENOENT: - print ("Cannot find tor binary %r. Use " - "CHUTNEY_TOR environment variable to set the " - "path, or put the binary into $PATH." % tor) + print("Cannot find tor binary %r. Use " + "CHUTNEY_TOR environment variable to set the " + "path, or put the binary into $PATH." % tor) sys.exit(0) else: raise @@ -278,15 +277,15 @@ class LocalNodeBuilder(NodeBuilder): # check if the first word on the line is a supported option, # preserving empty lines and comment lines sline = line.strip() - if (len(sline) == 0 - or sline[0] == '#' - or sline.split()[0].lower() in lower_opts): + if (len(sline) == 0 or + sline[0] == '#' or + sline.split()[0].lower() in lower_opts): f.writelines([line]) else: # well, this could get spammy # TODO: warn once per option per tor binary # TODO: print tor version? - print (("The tor binary at %r does not support the " + print(("The tor binary at %r does not support the " "option in the torrc line:\n" "%r") % (tor, line.strip())) # we could decide to skip these lines entirely @@ -341,11 +340,11 @@ class LocalNodeBuilder(NodeBuilder): def _makeHiddenServiceDir(self): """Create the hidden service subdirectory for this node. - + The directory name is stored under the 'hs_directory' environment key. It is combined with the 'dir' data directory key to yield the path to the hidden service directory. - + 448 is the decimal representation of the octal number 0700. Since python2 only supports 0700 and python3 only supports 0o700, we can use neither. @@ -420,8 +419,8 @@ class LocalNodeBuilder(NodeBuilder): stdout, stderr = p.communicate() fingerprint = "".join((stdout.rstrip().split('\n')[-1]).split()[1:]) if not re.match(r'^[A-F0-9]{40}$', fingerprint): - print (("Error when calling %r. It gave %r as a fingerprint " - " and %r on stderr.")%(" ".join(cmdline), stdout, stderr)) + print(("Error when calling %r. It gave %r as a fingerprint " + " and %r on stderr.") % (" ".join(cmdline), stdout, stderr)) sys.exit(1) self._env['fingerprint'] = fingerprint @@ -601,18 +600,18 @@ class LocalNodeController(NodeController): sys.stdout.flush() time.sleep(self._env['poll_launch_time']) p.poll() - if p.returncode != None and p.returncode != 0: + if p.returncode is not None and p.returncode != 0: if self._env['poll_launch_time'] is None: print("Couldn't launch %s (%s): %s" % (self._env['nick'], " ".join(cmdline), p.returncode)) else: print("Couldn't poll %s (%s) " - "after waiting %s seconds for launch" - ": %s" % (self._env['nick'], - " ".join(cmdline), - self._env['poll_launch_time'], - p.returncode)) + "after waiting %s seconds for launch" + ": %s" % (self._env['nick'], + " ".join(cmdline), + self._env['poll_launch_time'], + p.returncode)) return False return True @@ -643,21 +642,22 @@ class LocalNodeController(NodeController): if len(stline) > 0: splline = stline.split() # if the line has at least two tokens on it - if (len(splline) > 0 - and splline[0].lower() == "RunAsDaemon".lower() - and splline[1] == "1"): + if (len(splline) > 0 and + splline[0].lower() == "RunAsDaemon".lower() and + splline[1] == "1"): # use the RunAsDaemon value from the torrc # TODO: multiple values? runAsDaemon = True if runAsDaemon: # we must use wait() instead of poll() self._env['poll_launch_time'] = None - return True; + return True else: # we must use poll() instead of wait() if self._env['poll_launch_time'] is None: - self._env['poll_launch_time'] = self._env['poll_launch_time_default'] - return False; + self._env['poll_launch_time'] = \ + self._env['poll_launch_time_default'] + return False DEFAULTS = { 'authority': False, @@ -685,11 +685,11 @@ DEFAULTS = { 'authorities': "AlternateDirAuthority bleargh bad torrc file!", 'bridges': "Bridge bleargh bad torrc file!", 'core': True, - # poll_launch_time: None means wait on launch (requires RunAsDaemon), - # otherwise, poll after that many seconds (can be fractional/decimal) + # poll_launch_time: None means wait on launch (requires RunAsDaemon), + # otherwise, poll after that many seconds (can be fractional/decimal) 'poll_launch_time': None, - # Used when poll_launch_time is None, but RunAsDaemon is not set - # Set low so that we don't interfere with the voting interval + # Used when poll_launch_time is None, but RunAsDaemon is not set + # Set low so that we don't interfere with the voting interval 'poll_launch_time_default': 0.1, # the number of bytes of random data we send on each connection 'data_bytes': int(os.environ.get('CHUTNEY_DATA_BYTES', 10 * 1024)), @@ -777,8 +777,7 @@ class TorEnviron(chutney.Templating.Environ): if my['hs-hostname'] is None: datadir = my['dir'] # a file containing a single line with the hs' .onion address - hs_hostname_file = os.path.join(datadir, - my['hs_directory'], + hs_hostname_file = os.path.join(datadir, my['hs_directory'], 'hostname') try: with open(hs_hostname_file, 'r') as hostnamefp: @@ -787,8 +786,8 @@ class TorEnviron(chutney.Templating.Environ): hostname = hostname.strip() my['hs-hostname'] = hostname except IOError as e: - print("Error: hs %r error %d: %r opening hostname file '%r'" - %(my['nick'], e.errno, e.strerror, hs_hostname_file)) + print("Error: hs %r error %d: %r opening hostname file '%r'" % + (my['nick'], e.errno, e.strerror, hs_hostname_file)) return my['hs-hostname'] @@ -808,7 +807,7 @@ class Network(object): self._nodes.append(n) def move_aside_nodes(self): - nodesdir = os.path.join(os.getcwd(),'net','nodes') + nodesdir = os.path.join(os.getcwd(), 'net', 'nodes') if not os.path.exists(nodesdir): return @@ -817,9 +816,9 @@ class Network(object): i = 0 while os.path.exists(newdir): i += 1 - newdir = "%s.%d" %(newdirbase, i) + newdir = "%s.%d" % (newdirbase, i) - print ("NOTE: renaming %r to %r"%(nodesdir, newdir)) + print("NOTE: renaming %r to %r" % (nodesdir, newdir)) os.rename(nodesdir, newdir) def _checkConfig(self): @@ -876,7 +875,6 @@ class Network(object): # line in wait()ing output print("") return rv - def hup(self): print("Sending SIGHUP to nodes") @@ -917,7 +915,7 @@ class Network(object): def _verify_traffic(self): """Verify (parts of) the network by sending traffic through it and verify what is received.""" - LISTEN_PORT = 4747 # FIXME: Do better! Note the default exit policy. + LISTEN_PORT = 4747 # FIXME: Do better! Note the default exit policy. # HSs must have a HiddenServiceDir with # "HiddenServicePort <HS_PORT> 127.0.0.1:<LISTEN_PORT>" HS_PORT = 5858 @@ -927,8 +925,8 @@ class Network(object): # and a source-sink pair for a (bridge) client to each hidden service DATALEN = self._dfltEnv['data_bytes'] # Print a dot each time a sink verifies this much data - DOTDATALEN = 5 * 1024 * 1024 # Octets. - TIMEOUT = 3 # Seconds. + DOTDATALEN = 5 * 1024 * 1024 # Octets. + TIMEOUT = 3 # Seconds. # Calculate the amount of random data we should use randomlen = self._calculate_randomlen(DATALEN) reps = self._calculate_reps(DATALEN, randomlen) @@ -948,10 +946,7 @@ class Network(object): tmpdata = {} # now make the connections bind_to = ('127.0.0.1', LISTEN_PORT) - tt = chutney.Traffic.TrafficTester(bind_to, - tmpdata, - TIMEOUT, - reps, + tt = chutney.Traffic.TrafficTester(bind_to, tmpdata, TIMEOUT, reps, dot_reps) client_list = filter(lambda n: n._env['tag'] == 'c' or n._env['tag'] == 'bc', @@ -975,15 +970,12 @@ class Network(object): # if a node is used in two paths, we count it twice # this is a lower bound, as cannabilised circuits are one node longer total_path_node_count = 0 - total_path_node_count += self._configure_exits(tt, bind_to, - tmpdata, reps, - client_list, exit_list, - LISTEN_PORT) - total_path_node_count += self._configure_hs(tt, - tmpdata, reps, + total_path_node_count += self._configure_exits(tt, bind_to, tmpdata, + reps, client_list, + exit_list, LISTEN_PORT) + total_path_node_count += self._configure_hs(tt, tmpdata, reps, client_list, hs_list, - HS_PORT, - LISTEN_PORT) + HS_PORT, LISTEN_PORT) print("Transmitting Data:") start_time = time.clock() status = tt.run() @@ -1020,27 +1012,22 @@ class Network(object): # if there are any exits, each client / bridge client transmits # via 4 nodes (including the client) to an arbitrary exit # Each client binds directly to 127.0.0.1:LISTEN_PORT via an Exit relay - def _configure_exits(self, tt, bind_to, - tmpdata, reps, - client_list, exit_list, - LISTEN_PORT): + def _configure_exits(self, tt, bind_to, tmpdata, reps, client_list, + exit_list, LISTEN_PORT): CLIENT_EXIT_PATH_NODES = 4 connection_count = self._dfltEnv['connection_count'] exit_path_node_count = 0 if len(exit_list) > 0: - exit_path_node_count += (len(client_list) - * CLIENT_EXIT_PATH_NODES - * connection_count) + exit_path_node_count += (len(client_list) * + CLIENT_EXIT_PATH_NODES * + connection_count) for op in client_list: print(" Exit to %s:%d via client %s:%s" % ('127.0.0.1', LISTEN_PORT, 'localhost', op._env['socksport'])) for i in range(connection_count): - tt.add(chutney.Traffic.Source(tt, - bind_to, - tmpdata, - ('localhost', - int(op._env['socksport'])), + proxy = ('localhost', int(op._env['socksport'])) + tt.add(chutney.Traffic.Source(tt, bind_to, tmpdata, proxy, reps)) return exit_path_node_count @@ -1050,16 +1037,12 @@ class Network(object): # (including the client and hs) to each hidden service # Instead of binding directly to LISTEN_PORT via an Exit relay, # we bind to hs_hostname:HS_PORT via a hidden service connection - def _configure_hs(self, tt, - tmpdata, reps, - client_list, hs_list, - HS_PORT, + def _configure_hs(self, tt, tmpdata, reps, client_list, hs_list, HS_PORT, LISTEN_PORT): CLIENT_HS_PATH_NODES = 8 connection_count = self._dfltEnv['connection_count'] - hs_path_node_count = (len(hs_list) - * CLIENT_HS_PATH_NODES - * connection_count) + hs_path_node_count = (len(hs_list) * CLIENT_HS_PATH_NODES * + connection_count) # Each client in hs_client_list connects to each hs if self._dfltEnv['hs_multi_client']: hs_client_list = client_list @@ -1073,15 +1056,12 @@ class Network(object): for client in hs_client_list: print(" HS to %s:%d (%s:%d) via client %s:%s" % (hs._env['hs_hostname'], HS_PORT, - '127.0.0.1', LISTEN_PORT, - 'localhost', client._env['socksport'])) + '127.0.0.1', LISTEN_PORT, + 'localhost', client._env['socksport'])) for i in range(connection_count): - tt.add(chutney.Traffic.Source(tt, - hs_bind_to, - tmpdata, - ('localhost', - int(client._env['socksport'])), - reps)) + proxy = ('localhost', int(client._env['socksport'])) + tt.add(chutney.Traffic.Source(tt, hs_bind_to, tmpdata, + proxy, reps)) return hs_path_node_count # calculate the single stream bandwidth and overall tor bandwidth @@ -1098,20 +1078,17 @@ class Network(object): start_time, end_time): # otherwise, if we sent at least 5 MB cumulative total, and # it took us at least a second to send, report bandwidth - MIN_BWDATA = 5 * 1024 * 1024 # Octets. - MIN_ELAPSED_TIME = 1.0 # Seconds. + MIN_BWDATA = 5 * 1024 * 1024 # Octets. + MIN_ELAPSED_TIME = 1.0 # Seconds. cumulative_data_sent = total_path_node_count * data_length elapsed_time = end_time - start_time - if (cumulative_data_sent >= MIN_BWDATA - and elapsed_time >= MIN_ELAPSED_TIME): + if (cumulative_data_sent >= MIN_BWDATA and + elapsed_time >= MIN_ELAPSED_TIME): # Report megabytes per second BWDIVISOR = 1024*1024 - single_stream_bandwidth = (data_length - / elapsed_time - / BWDIVISOR) - overall_bandwidth = (cumulative_data_sent - / elapsed_time - / BWDIVISOR) + single_stream_bandwidth = (data_length / elapsed_time / BWDIVISOR) + overall_bandwidth = (cumulative_data_sent / elapsed_time / + BWDIVISOR) print("Single Stream Bandwidth: %.2f MBytes/s" % single_stream_bandwidth) print("Overall tor Bandwidth: %.2f MBytes/s" @@ -1135,10 +1112,11 @@ def usage(network): def exit_on_error(err_msg): - print ("Error: {0}\n".format(err_msg)) - print (usage(_THE_NETWORK)) + print("Error: {0}\n".format(err_msg)) + print(usage(_THE_NETWORK)) sys.exit(1) + def runConfigFile(verb, data): _GLOBALS = dict(_BASE_ENVIRON=_BASE_ENVIRON, Node=Node, @@ -1163,6 +1141,7 @@ def parseArgs(): exit_on_error("Cannot find networkfile: {0}.".format(sys.argv[2])) return {'network_cfg': sys.argv[2], 'action': sys.argv[1]} + def main(): global _BASE_ENVIRON global _TORRC_OPTIONS diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 7d61759..c118289 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -47,8 +47,8 @@ def socks_cmd(addr_port): SOCKSv4: https://en.wikipedia.org/wiki/SOCKS#Protocol SOCKSv5: RFC1928, RFC1929 """ - ver = 4 # Only SOCKSv4 for now. - cmd = 1 # Stream connection. + ver = 4 # Only SOCKSv4 for now. + cmd = 1 # Stream connection. user = '\x00' dnsname = '' host, port = addr_port @@ -101,7 +101,7 @@ class Peer(object): def __init__(self, ptype, tt, s=None): self.type = ptype - self.tt = tt # TrafficTester + self.tt = tt # TrafficTester if s is not None: self.s = s else: @@ -156,18 +156,17 @@ class Sink(Peer): # shortcut read when we don't ever expect any data if self.repetitions == 0 or len(self.tt.data) == 0: debug("no verification required - no data") - return 0; + return 0 self.inbuf += self.s.recv(len(data) - len(self.inbuf)) debug("successfully received (bytes=%d)" % len(self.inbuf)) while len(self.inbuf) >= len(data): assert(len(self.inbuf) <= len(data) or self.repetitions > 1) if self.inbuf[:len(data)] != data: debug("receive comparison failed (bytes=%d)" % len(data)) - return -1 # Failed verification. + return -1 # Failed verification. # if we're not debugging, print a dot every dot_repetitions reps - elif (not debug_flag - and self.tt.dot_repetitions > 0 - and self.repetitions % self.tt.dot_repetitions == 0): + elif (not debug_flag and self.tt.dot_repetitions > 0 and + self.repetitions % self.tt.dot_repetitions == 0): sys.stdout.write('.') sys.stdout.flush() # repeatedly check data against self.inbuf if required @@ -246,11 +245,11 @@ class Source(Peer): return -1 assert(8 - len(self.inbuf) > 0) return 8 - len(self.inbuf) - return self.want_to_write() # Keep us around for writing if needed + return self.want_to_write() # Keep us around for writing if needed def want_to_write(self): - return (self.state == self.CONNECTING or len(self.outbuf) > 0 - or (self.repetitions > 0 and len(self.data) > 0)) + return (self.state == self.CONNECTING or len(self.outbuf) > 0 or + (self.repetitions > 0 and len(self.data) > 0)) def on_writable(self): """Invoked when the socket becomes writable. @@ -287,18 +286,19 @@ class Source(Peer): # it should print length of the data sent # but the code works as long as this doesn't keep on happening if n > 0: - debug("successfully sent (bytes=%d)" % n) - self._sent_no_bytes = 0 + debug("successfully sent (bytes=%d)" % n) + self._sent_no_bytes = 0 else: - debug("BUG: sent no bytes") - self._sent_no_bytes += 1 - if self._sent_no_bytes >= 10: - print("Send no data %d times. Stalled." % (self._sent_no_bytes)) - sys.exit(-1) - time.sleep(1) + debug("BUG: sent no bytes") + self._sent_no_bytes += 1 + if self._sent_no_bytes >= 10: + print("Send no data %d times. Stalled." % + (self._sent_no_bytes)) + sys.exit(-1) + time.sleep(1) self.outbuf = self.outbuf[n:] if self.state == self.CONNECTING_THROUGH_PROXY: - return 1 # Keep us around. + return 1 # Keep us around. debug("bytes remaining on outbuf (bytes=%d)" % len(self.outbuf)) # calculate the actual length of data remaining, including reps # When 0, we're being removed. @@ -336,7 +336,7 @@ class TrafficTester(): self.data = {} self.dot_repetitions = dot_repetitions debug("listener fd=%d" % self.listener.fd()) - self.peers = {} # fd:Peer + self.peers = {} # fd:Peer def sinks(self): return self.get_by_ptype(Peer.SINK) @@ -385,7 +385,7 @@ class TrafficTester(): print("verification failed!") self.remove(p) - for fd in sets[1]: # writable fd's + for fd in sets[1]: # writable fd's p = self.peers.get(fd) if p is not None: # Might have been removed above. n = p.on_writable()

1 0

[chutney/master] Remove trailing spaces
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit ac238871481916c3d3378ba0435192fcd4ca813a Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jan 29 15:55:44 2016 +0100 Remove trailing spaces --- tools/hsaddress.sh | 4 ++-- tools/warnings.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh index 5810114..b89fc6d 100755 --- a/tools/hsaddress.sh +++ b/tools/hsaddress.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Usage: +# Usage: # cd YOUR-CHUTNEY-DIRECTORY # tools/hsaddress.sh [hs_node] # Output: for each HS outputs its onion address. If the argument node is @@ -14,7 +14,7 @@ TARGET=hidden_service/hostname function usage() { echo "Usage: $NAME [hs_node]" - exit 1 + exit 1 } function show_address() { diff --git a/tools/warnings.sh b/tools/warnings.sh index fc34419..41c9a86 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -6,7 +6,7 @@ # Output: for each node outputs its warnings and the number of times that # warning has ocurred. If the argument node is specified, it only shows # the warnings of that node. -# Examples: tools/warnings.sh +# Examples: tools/warnings.sh # tools/warnings.sh 000a function show_warnings() { @@ -29,15 +29,15 @@ NAME=$(basename "$0") DEST=net/nodes [ -d net/nodes ] || { echo "$NAME: no logs available"; exit 1; } -if [ $# -eq 0 ]; -then +if [ $# -eq 0 ]; +then for dir in $DEST/*; do [ -e ${dir}/info.log ] || continue - show_warnings $dir + show_warnings $dir done elif [ $# -eq 1 ]; -then +then [ -e $DEST/$1/info.log ] || { echo "$NAME: no log available"; exit 1; } show_warnings $DEST/$1 else

1 0

[tor/master] Unit tests for our zlib code to test and reject compression bombs.
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit f016213f7fde4a0aac359a324baf42ad2356e169 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 18:08:30 2016 -0400 Unit tests for our zlib code to test and reject compression bombs. --- changes/test_zlib_bombs | 3 +++ src/test/test_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/changes/test_zlib_bombs b/changes/test_zlib_bombs new file mode 100644 index 0000000..26121ed --- /dev/null +++ b/changes/test_zlib_bombs @@ -0,0 +1,3 @@ + o Testing: + - We now have unit tests for our code to reject zlib "compression bombs". + (Fortunately, the code works fine.) diff --git a/src/test/test_util.c b/src/test/test_util.c index c3c6035..8b9d5ea 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1836,6 +1836,53 @@ test_util_gzip(void *arg) tor_free(buf1); } +static void +test_util_gzip_compression_bomb(void *arg) +{ + /* A 'compression bomb' is a very small object that uncompresses to a huge + * one. Most compression formats support them, but they can be a DOS vector. + * In Tor we try not to generate them, and we don't accept them. + */ + (void) arg; + size_t one_million = 1<<20; + char *one_mb = tor_malloc_zero(one_million); + char *result = NULL; + size_t result_len = 0; + tor_zlib_state_t *state = NULL; + + /* Make sure we can't produce a compression bomb */ + tt_int_op(-1, OP_EQ, tor_gzip_compress(&result, &result_len, + one_mb, one_million, + ZLIB_METHOD)); + + /* Here's a compression bomb that we made manually. */ + const char compression_bomb[1039] = + { 0x78, 0xDA, 0xED, 0xC1, 0x31, 0x01, 0x00, 0x00, 0x00, 0xC2, + 0xA0, 0xF5, 0x4F, 0x6D, 0x08, 0x5F, 0xA0 /* .... */ }; + tt_int_op(-1, OP_EQ, tor_gzip_uncompress(&result, &result_len, + compression_bomb, 1039, + ZLIB_METHOD, 0, LOG_WARN)); + + + /* Now try streaming that. */ + state = tor_zlib_new(0, ZLIB_METHOD, HIGH_COMPRESSION); + tor_zlib_output_t r; + const char *inp = compression_bomb; + size_t inlen = 1039; + do { + char *outp = one_mb; + size_t outleft = 4096; /* small on purpose */ + r = tor_zlib_process(state, &outp, &outleft, &inp, &inlen, 0); + tt_int_op(inlen, OP_NE, 0); + } while (r == TOR_ZLIB_BUF_FULL); + + tt_int_op(r, OP_EQ, TOR_ZLIB_ERR); + + done: + tor_free(one_mb); + tor_zlib_free(state); +} + /** Run unit tests for mmap() wrapper functionality. */ static void test_util_mmap(void *arg) @@ -4800,6 +4847,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2), UTIL_LEGACY(gzip), + UTIL_LEGACY(gzip_compression_bomb), UTIL_LEGACY(datadir), UTIL_LEGACY(memarea), UTIL_LEGACY(control_formats),

1 0

[tor/master] Remove a ridiculous realloc call from torgzip.c
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 358fc026d97f87166dc3059f56012334317de8ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 18:30:23 2016 -0400 Remove a ridiculous realloc call from torgzip.c realloc()ing a thing in order to try to save memory on it just doesn't make sense with today's allocators. Instead, let's use the fact that whenever we decompress something, either it isn't too big, or we chop it up, or we reallocate it. --- src/common/torgzip.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 57994c4..85114e6 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -213,10 +213,6 @@ tor_gzip_compress(char **out, size_t *out_len, * the newly unsigned field isn't negative." */ tor_assert(stream->total_out >= 0); #endif - if (((size_t)stream->total_out) > out_size + 4097) { - /* If we're wasting more than 4k, don't. */ - *out = tor_realloc(*out, stream->total_out + 1); - } if (deflateEnd(stream)!=Z_OK) { log_warn(LD_BUG, "Error freeing gzip structures"); goto err;

1 0

[tor/master] Remove support for zlib <= 1.1
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 808015316a5680003b78393c50b0701c47e1051c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 18:14:51 2016 -0400 Remove support for zlib <= 1.1 zlib 1.2 came out in 2003; earlier versions should be dead by now. Our workaround code was only preventing us from using the gzip encoding (if we decide to do so), and having some dead code linger around in torgzip.c --- changes/zlib_12 | 4 ++++ src/common/torgzip.c | 44 ++++---------------------------------------- src/test/test_util.c | 3 ++- 3 files changed, 10 insertions(+), 41 deletions(-) diff --git a/changes/zlib_12 b/changes/zlib_12 new file mode 100644 index 0000000..3344286 --- /dev/null +++ b/changes/zlib_12 @@ -0,0 +1,4 @@ + o New system requirements: + - We now require zlib version 1.2 or later. (Back when we started, + zlib 1.1 and zlib 1.0 were still found in the wild. 1.2 was released in + 2003. We recommend the latest version.) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 71e55f8..57994c4 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -46,34 +46,16 @@ #include <zlib.h> +#if defined ZLIB_VERNUM && ZLIB_VERNUM < 0x1200 +#error "We require zlib version 1.2 or later." +#endif + static size_t tor_zlib_state_size_precalc(int inflate, int windowbits, int memlevel); /** Total number of bytes allocated for zlib state */ static size_t total_zlib_allocation = 0; -/** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; - * set to -1 if we haven't checked yet. */ -static int gzip_is_supported = -1; - -/** Return true iff we support gzip-based compression. Otherwise, we need to - * use zlib. */ -int -is_gzip_supported(void) -{ - if (gzip_is_supported >= 0) - return gzip_is_supported; - - if (!strcmpstart(ZLIB_VERSION, "0.") || - !strcmpstart(ZLIB_VERSION, "1.0") || - !strcmpstart(ZLIB_VERSION, "1.1")) - gzip_is_supported = 0; - else - gzip_is_supported = 1; - - return gzip_is_supported; -} - /** Return a string representation of the version of the currently running * version of zlib. */ const char * @@ -165,12 +147,6 @@ tor_gzip_compress(char **out, size_t *out_len, *out = NULL; - if (method == GZIP_METHOD && !is_gzip_supported()) { - /* Old zlib version don't support gzip in deflateInit2 */ - log_warn(LD_BUG, "Gzip not supported with zlib %s", ZLIB_VERSION); - goto err; - } - stream = tor_malloc_zero(sizeof(struct z_stream_s)); stream->zalloc = Z_NULL; stream->zfree = Z_NULL; @@ -291,12 +267,6 @@ tor_gzip_uncompress(char **out, size_t *out_len, tor_assert(in); tor_assert(in_len < UINT_MAX); - if (method == GZIP_METHOD && !is_gzip_supported()) { - /* Old zlib version don't support gzip in inflateInit2 */ - log_warn(LD_BUG, "Gzip not supported with zlib %s", ZLIB_VERSION); - return -1; - } - *out = NULL; stream = tor_malloc_zero(sizeof(struct z_stream_s)); @@ -451,12 +421,6 @@ tor_zlib_new(int compress, compress_method_t method, tor_zlib_state_t *out; int bits, memlevel; - if (method == GZIP_METHOD && !is_gzip_supported()) { - /* Old zlib version don't support gzip in inflateInit2 */ - log_warn(LD_BUG, "Gzip not supported with zlib %s", ZLIB_VERSION); - return NULL; - } - if (! compress) { /* use this setting for decompression, since we might have the * max number of window bits */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 8b9d5ea..204d5db 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1737,7 +1737,8 @@ test_util_gzip(void *arg) (void)arg; buf1 = tor_strdup("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ"); tt_assert(detect_compression_method(buf1, strlen(buf1)) == UNKNOWN_METHOD); - if (is_gzip_supported()) { + + if (1) { tt_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, GZIP_METHOD)); tt_assert(buf2);

1 0

[tor/master] Unindent block
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit d937b866999b18e65df3815d0310d9469b15b914 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 12:19:32 2016 -0400 Unindent block --- src/test/test_util.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 204d5db..64eee8c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1738,22 +1738,20 @@ test_util_gzip(void *arg) buf1 = tor_strdup("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ"); tt_assert(detect_compression_method(buf1, strlen(buf1)) == UNKNOWN_METHOD); - if (1) { - tt_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, - GZIP_METHOD)); - tt_assert(buf2); - tt_assert(len1 < strlen(buf1)); - tt_assert(detect_compression_method(buf2, len1) == GZIP_METHOD); - - tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1, - GZIP_METHOD, 1, LOG_INFO)); - tt_assert(buf3); - tt_int_op(strlen(buf1) + 1,OP_EQ, len2); - tt_str_op(buf1,OP_EQ, buf3); - - tor_free(buf2); - tor_free(buf3); - } + tt_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, + GZIP_METHOD)); + tt_assert(buf2); + tt_assert(len1 < strlen(buf1)); + tt_assert(detect_compression_method(buf2, len1) == GZIP_METHOD); + + tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1, + GZIP_METHOD, 1, LOG_INFO)); + tt_assert(buf3); + tt_int_op(strlen(buf1) + 1,OP_EQ, len2); + tt_str_op(buf1,OP_EQ, buf3); + + tor_free(buf2); + tor_free(buf3); tt_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, ZLIB_METHOD));

1 0

[tor/master] Mark some torgzip lines as unreachable/untestable.
by nickm＠torproject.org 19 Jun '16

19 Jun '16

commit 5a725dab0a29341019e3ceb041d7ad619df05a76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 18:34:33 2016 -0400 Mark some torgzip lines as unreachable/untestable. --- src/common/torgzip.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 85114e6..331bb5a 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -158,9 +158,11 @@ tor_gzip_compress(char **out, size_t *out_len, method_bits(method, HIGH_COMPRESSION), get_memlevel(HIGH_COMPRESSION), Z_DEFAULT_STRATEGY) != Z_OK) { + //LCOV_EXCL_START -- we can only provoke failure by giving junk arguments. log_warn(LD_GENERAL, "Error from deflateInit2: %s", stream->msg?stream->msg:"<no message>"); goto err; + //LCOV_EXCL_STOP } /* Guess 50% compression. */ @@ -214,8 +216,11 @@ tor_gzip_compress(char **out, size_t *out_len, tor_assert(stream->total_out >= 0); #endif if (deflateEnd(stream)!=Z_OK) { + // LCOV_EXCL_START -- unreachable if we handled the zlib structure right + tor_assert_nonfatal_unreached(); log_warn(LD_BUG, "Error freeing gzip structures"); goto err; + // LCOV_EXCL_STOP } tor_free(stream); @@ -274,9 +279,11 @@ tor_gzip_uncompress(char **out, size_t *out_len, if (inflateInit2(stream, method_bits(method, HIGH_COMPRESSION)) != Z_OK) { + // LCOV_EXCL_START -- can only hit this if we give bad inputs. log_warn(LD_GENERAL, "Error from inflateInit2: %s", stream->msg?stream->msg:"<no message>"); goto err; + // LCOV_EXCL_STOP } out_size = in_len * 2; /* guess 50% compression. */ @@ -434,10 +441,10 @@ tor_zlib_new(int compress, compress_method_t method, if (deflateInit2(&out->stream, Z_BEST_COMPRESSION, Z_DEFLATED, bits, memlevel, Z_DEFAULT_STRATEGY) != Z_OK) - goto err; + goto err; // LCOV_EXCL_LINE } else { if (inflateInit2(&out->stream, bits) != Z_OK) - goto err; + goto err; // LCOV_EXCL_LINE } out->allocation = tor_zlib_state_size_precalc(!compress, bits, memlevel);

1 0