May 2017 - tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 08 May '17

08 May '17

commit 7783e3a788c6bf5f5c4bc90382cb2bf1fb6a9aad Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 8 07:45:15 2017 +0000 Update translations for torcheck_completed --- id/torcheck.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index a4f6f2b..cf7a1b4 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -2,26 +2,26 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Anthony Santana, 2014 +# anzhyo, 2014 # brain90 <gibransyah(a)gmail.com>, 2012 # cholif yulian <cholifyulian123(a)gmail.com>, 2015 # Ferriandy Chianiago <gpl4all(a)gmail.com>, 2015 # brain90 <gibransyah(a)gmail.com>, 2012 -# Mohamad Hasan Al Banna <se7entime(a)protonmail.com>, 2014 +# Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>, 2014 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 -# Mohamad Hasan Al Banna <se7entime(a)protonmail.com>, 2016 -# Mohamad Hasan Al Banna <se7entime(a)protonmail.com>, 2016 +# Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>, 2016 +# Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>, 2016 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 -# ba dwi <slamet.badwi(a)gmail.com>, 2014 +# Badwi <slamet.badwi(a)gmail.com>, 2014 # sutama tamasu <sutamatamasu(a)yahoo.com>, 2013 # sutama tamasu <sutamatamasu(a)yahoo.com>, 2013 -# zk <zamani.karmana(a)gmail.com>, 2015 +# zk, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Mohamad Hasan Al Banna <se7entime(a)protonmail.com>\n" +"PO-Revision-Date: 2017-05-08 07:32+0000\n" +"Last-Translator: Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 May '17

08 May '17

commit cef89eeab4090e92e67ee58be42296ad3f81831f Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 8 07:45:10 2017 +0000 Update translations for torcheck --- id/torcheck.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index a4f6f2b..cf7a1b4 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -2,26 +2,26 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Anthony Santana, 2014 +# anzhyo, 2014 # brain90 <gibransyah(a)gmail.com>, 2012 # cholif yulian <cholifyulian123(a)gmail.com>, 2015 # Ferriandy Chianiago <gpl4all(a)gmail.com>, 2015 # brain90 <gibransyah(a)gmail.com>, 2012 -# Mohamad Hasan Al Banna <se7entime(a)protonmail.com>, 2014 +# Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>, 2014 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 -# Mohamad Hasan Al Banna <se7entime(a)protonmail.com>, 2016 -# Mohamad Hasan Al Banna <se7entime(a)protonmail.com>, 2016 +# Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>, 2016 +# Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>, 2016 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 -# ba dwi <slamet.badwi(a)gmail.com>, 2014 +# Badwi <slamet.badwi(a)gmail.com>, 2014 # sutama tamasu <sutamatamasu(a)yahoo.com>, 2013 # sutama tamasu <sutamatamasu(a)yahoo.com>, 2013 -# zk <zamani.karmana(a)gmail.com>, 2015 +# zk, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Mohamad Hasan Al Banna <se7entime(a)protonmail.com>\n" +"PO-Revision-Date: 2017-05-08 07:32+0000\n" +"Last-Translator: Mohamad Hasan Al Banna <se7entime(a)openmailbox.org>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[chutney/master] Traffic.py: Actually detect EOF
by teor＠torproject.org 08 May '17

08 May '17

commit 57082b7a5ca3a58181818b823e90bec036043a98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 2 20:28:43 2017 -0400 Traffic.py: Actually detect EOF If recv() returns an empty string, that's the last you'll be getting from it. --- lib/chutney/Traffic.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index a22d16b..e1677fd 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -157,7 +157,12 @@ class Sink(Peer): if self.repetitions == 0 or len(self.tt.data) == 0: debug("no verification required - no data") return 0 - self.inbuf += self.s.recv(len(data) - len(self.inbuf)) + inp = self.s.recv(len(data) - len(self.inbuf)) + debug("Verify: received %d bytes"% len(inp)) + if len(inp) == 0: + debug("EOF on fd %s" % self.fd()) + return -1 + self.inbuf += inp debug("successfully received (bytes=%d)" % len(self.inbuf)) while len(self.inbuf) >= len(data): assert(len(self.inbuf) <= len(data) or self.repetitions > 1) @@ -224,7 +229,12 @@ class Source(Peer): >0 if more data needs to be read or written """ if self.state == self.CONNECTING_THROUGH_PROXY: - self.inbuf += self.s.recv(8 - len(self.inbuf)) + inp = self.s.recv(8 - len(self.inbuf)) + debug("-- connecting through proxy, got %d bytes"%len(inp)) + if len(inp) == 0: + debug("EOF on fd %d"%self.fd()) + return -1 + self.inbuf += inp if len(self.inbuf) == 8: if ord(self.inbuf[0]) == 0 and ord(self.inbuf[1]) == 0x5a: debug("proxy handshake successful (fd=%d)" % self.fd())

1 0

[chutney/master] Traffic.py: make want_to_write() correct
by teor＠torproject.org 08 May '17

08 May '17

commit 4f1d926c2b2be807237df8b5d8b24e821b421184 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 2 20:29:22 2017 -0400 Traffic.py: make want_to_write() correct The first two parts were correct before: CONNECTING sockets should check for write, and any socket with a nonempty outbuf should try to write it. But the third was wrong: only CONNECTED sockets should try to write because their repetitions and data fields are set -- because on_writable does not actually do anything with those fields unless the state happens to be CONNECTED. --- lib/chutney/Traffic.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index e1677fd..03fc3e3 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -258,8 +258,15 @@ class Source(Peer): 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)) + if self.state == self.CONNECTING: + return True + if len(self.outbuf) > 0: + return True + if (self.state == self.CONNECTED and + self.repetitions > 0 and + len(self.data) > 0): + return True + return False def on_writable(self): """Invoked when the socket becomes writable.

1 0

[chutney/master] Merge remote-tracking branch 'nickm/misc_bugs'
by teor＠torproject.org 08 May '17

08 May '17

commit 3a3c1d5020d259e1243b8b4bd28be9c417b2c002 Merge: 8822169 dcaa921 Author: teor <teor2345(a)gmail.com> Date: Mon May 8 15:50:58 2017 +1000 Merge remote-tracking branch 'nickm/misc_bugs' lib/chutney/Traffic.py | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-)

1 0

[chutney/master] Numerous additional debugging logs
by teor＠torproject.org 08 May '17

08 May '17

commit dcaa92183bd4bb978802faf417a3ad9bafd207c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 2 20:31:24 2017 -0400 Numerous additional debugging logs These have helped me track down a couple of issues in traffic.py --- lib/chutney/Traffic.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 03fc3e3..cbeddd7 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -218,6 +218,7 @@ class Source(Peer): self.state = self.CONNECTING dest = self.proxy or self.dest try: + debug("socket %d connecting to %r..."%(self.fd(),dest)) self.s.connect(dest) except socket.error as e: if e[0] != errno.EINPROGRESS: @@ -306,7 +307,7 @@ class Source(Peer): debug("successfully sent (bytes=%d)" % n) self._sent_no_bytes = 0 else: - debug("BUG: sent no bytes") + debug("BUG: sent no bytes (out of %d; state is %s)"% (len(self.outbuf), self.state)) self._sent_no_bytes += 1 # We can't retry too fast, otherwise clients burn all their HSDirs if self._sent_no_bytes >= 2: @@ -382,6 +383,7 @@ class TrafficTester(): # debug("rset %s wset %s" % (rset, wset)) sets = select.select(rset, wset, [], 1) if all(len(s) == 0 for s in sets): + debug("Decrementing timeout.") self.timeout -= 1 continue @@ -391,6 +393,7 @@ class TrafficTester(): continue p = self.peers[fd] n = p.on_readable() + debug("On read, fd %d for %s said %d"%(fd, p, n)) if n > 0: # debug("need %d more octets from fd %d" % (n, fd)) pass @@ -398,6 +401,7 @@ class TrafficTester(): self.tests.success() self.remove(p) else: # Failure. + debug("Got a failure reading fd %d for %s" % (fd,p)) self.tests.failure() if p.is_sink(): print("verification failed!") @@ -407,9 +411,11 @@ class TrafficTester(): p = self.peers.get(fd) if p is not None: # Might have been removed above. n = p.on_writable() + debug("On write, fd %d said %d"%(fd, n)) if n == 0: self.remove(p) elif n < 0: + debug("Got a failure writing fd %d for %s" % (fd,p)) self.tests.failure() self.remove(p) @@ -423,6 +429,8 @@ class TrafficTester(): if not debug_flag: sys.stdout.write('\n') sys.stdout.flush() + debug("Done with run(); all_done == %s and failure_count == %s" + %(self.tests.all_done(), self.tests.failure_count())) return self.tests.all_done() and self.tests.failure_count() == 0

1 0

[chutney/master] Make tor clean up connections before stopping a chutney network
by teor＠torproject.org 08 May '17

08 May '17

commit 4334644994f32395a2858773b638430d50ff402e Author: teor <teor2345(a)gmail.com> Date: Mon Apr 10 13:15:12 2017 +1000 Make tor clean up connections before stopping a chutney network This increases integration test coverage, and improves the reliability of any statistics being gathered on chutney networks. Implements feature #21901. --- lib/chutney/TorNet.py | 10 ++++++++++ tools/test-network.sh | 2 ++ torrc_templates/common.i | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 6e3b77a..e61e425 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -982,17 +982,27 @@ class Network(object): if c.isRunning(): c.stop(sig=sig) print("Waiting for nodes to finish.") + wrote_dot = False for n in range(15): time.sleep(1) if all(not c.isRunning() for c in controllers): + # make the output clearer by adding a newline + if wrote_dot: + sys.stdout.write("\n") + sys.stdout.flush() # check for stale lock file when Tor crashes for c in controllers: c.cleanup_lockfile() return sys.stdout.write(".") + wrote_dot = True sys.stdout.flush() for c in controllers: c.check(listNonRunning=False) + # make the output clearer by adding a newline + if wrote_dot: + sys.stdout.write("\n") + sys.stdout.flush() def ConfigureNodes(nodelist): diff --git a/tools/test-network.sh b/tools/test-network.sh index 9da20b1..79cce9c 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -292,6 +292,8 @@ if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then # work around a bug/feature in make -j2 (or more) # where make hangs if any child processes are still alive "$CHUTNEY" stop "$CHUTNEY_NETWORK" + # Give tor time to exit gracefully + sleep 3 "$WARNINGS" exit "$VERIFY_EXIT_STATUS" else diff --git a/torrc_templates/common.i b/torrc_templates/common.i index bca0407..39c76f8 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -36,7 +36,8 @@ DataDirectory $dir RunAsDaemon 1 ConnLimit $connlimit Nickname $nick -ShutdownWaitLength 0 +# Let tor close connections gracefully before exiting +ShutdownWaitLength 2 DisableDebuggerAttachment 0 ControlPort $controlport

1 0

[chutney/master] Add documentation comments for some chutney internal options
by teor＠torproject.org 08 May '17

08 May '17

commit 762bb838ac5383c61bada5eebeeeda631a17ea3a Author: teor <teor2345(a)gmail.com> Date: Mon Apr 10 13:17:52 2017 +1000 Add documentation comments for some chutney internal options --- lib/chutney/TorNet.py | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index e61e425..5032c2b 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -702,6 +702,7 @@ class LocalNodeController(NodeController): self._env['poll_launch_time_default'] return False +# XXX: document these options DEFAULTS = { 'authority': False, 'bridgeauthority': False, @@ -761,27 +762,32 @@ class TorEnviron(chutney.Templating.Environ): Environment fields provided: - orport, controlport, socksport, dirport: - dir: - nick: - tor_gencert: - auth_passphrase: - torrc_template_path: - hs_hostname: + orport, controlport, socksport, dirport: *Port torrc option + dir: DataDirectory torrc option + nick: Nickname torrc option + tor_gencert: name or path of the tor-gencert binary + auth_passphrase: obsoleted by CookieAuthentication + torrc_template_path: path to chutney torrc_templates directory + hs_hostname: the hostname of the key generated by a hidden service + owning_controller_process: the __OwningControllerProcess torrc line, + or an empty string if tor should continue after the script exits Environment fields used: - nodenum - tag - orport_base, controlport_base, socksport_base, dirport_base - tor-gencert (note hyphen) - chutney_dir - tor - dir - hs_directory - nick (debugging only) - hs-hostname (note hyphen) - - XXXX document the above. Or document all fields in one place? + nodenum: chutney's internal node number for the node + tag: a short text string that represents the type of node + orport_base, controlport_base, socksport_base, dirport_base: the + initial port numbers used by nodenum 0. Each additional node adds + 1 to the port numbers. + tor-gencert (note hyphen): name or path of the tor-gencert binary (if + present) + chutney_dir: directory of the chutney source code + tor: name or path of the tor binary + net_base_dir: path to the chutney net directory + hs_directory: name of the hidden service directory + nick: Nickname torrc option (debugging only) + hs-hostname (note hyphen): cached hidden service hostname value + controlling_pid: the PID of the controlling process. After this + process exits, the child tor processes will exit """ def __init__(self, parent=None, **kwargs):

1 0

[chutney/master] Fix an inconsistent echo call in tools/test-network.sh
by teor＠torproject.org 08 May '17

08 May '17

commit 23207d23bba3c013cefc91c21c1facb33cb7415a Author: teor <teor2345(a)gmail.com> Date: Mon Apr 10 13:16:13 2017 +1000 Fix an inconsistent echo call in tools/test-network.sh No behaviour change --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index 79cce9c..12855bc 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -279,7 +279,7 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then VERIFY_EXIT_STATUS="$?" else $ECHO "Chutney network ready and running. To stop the network, use:" - $ECHO "$CHUTNEY" stop "$CHUTNEY_NETWORK" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" "$WARNINGS" exit 0 fi

1 0

[chutney/master] Edit chutney's docs for recent tor and chutney changes
by teor＠torproject.org 08 May '17

08 May '17

commit 28d245c7a1a3ba60f4eab3015ca37e18883ef1d8 Author: teor <teor2345(a)gmail.com> Date: Wed May 3 09:42:04 2017 +1000 Edit chutney's docs for recent tor and chutney changes --- README | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index d184947..0c98440 100644 --- a/README +++ b/README @@ -42,9 +42,9 @@ Timing Options: --stop-time CHUTNEY_STOP_TIME Traffic Options: - --data CHUTNEY_DATA_BYTES - --connections CHUTNEY_CONNECTIONS - --hs-multi-client CHUTNEY_HS_MULTI_CLIENT + --data CHUTNEY_DATA_BYTES=N + --connections CHUTNEY_CONNECTIONS=N + --hs-multi-client CHUTNEY_HS_MULTI_CLIENT=N Address Options: --ipv4 CHUTNEY_LISTEN_ADDRESS @@ -134,8 +134,8 @@ Changing the network address: Tor network available on the network. IPv6 support for both Tor and Chutney is a work in progress. Currently, - chutney verifies IPv6 client, bridge client, and hidden service - connections. It does not use IPv6 SOCKSPort or Exit traffic. + chutney verifies IPv6 client, bridge client (?), hidden service, and exit + connections. It does not use IPv6 SOCKSPorts or HiddenServicePorts. The configuration files: networks/basic holds the configuration for the network you're configuring

1 0