tor-commits June 2013

tor-commits@lists.torproject.org

19 participants
1571 discussions

[chutney/master] Make chutney exit with -1 on failure.
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit 19abaf8052e8a561536ec102f1c4f624d2494de6 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Make chutney exit with -1 on failure. If the function implementing the command (the verb, in argv[1]) return False, exit with -1. Else exit with 0 as before. --- lib/chutney/TorNet.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 3ec33b6..e79f0a8 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -673,7 +673,7 @@ def runConfigFile(verb, f): print "Error: I don't know how to %s." % verb return - getattr(network,verb)() + return getattr(network,verb)() def main(): global _BASE_ENVIRON @@ -687,7 +687,10 @@ def main(): sys.exit(1) f = open(sys.argv[2]) - runConfigFile(sys.argv[1], f) + result = runConfigFile(sys.argv[1], f) + if result is False: + return -1 + return 0 if __name__ == '__main__': - main() + sys.exit(main())

1 0

[chutney/master] Add some documentation and comments.
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit 69301e1cb215576ff116b285f9098c243d1eeaf5 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Add some documentation and comments. --- lib/chutney/Traffic.py | 49 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 9b0a1f7..ab9a578 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -6,19 +6,38 @@ # restrict, so long as you retain the above notice(s) and this license # in all redistributed copies and derived works. There is no warranty. +# Do select/read/write for binding to a port, connecting to it and +# write, read what's written and verify it. You can connect over a +# SOCKS proxy (like Tor). +# +# You can create a TrafficTester and give it an IP address/host and +# port to bind to. If a Source is created and added to the +# TrafficTester, it will connect to the address/port it was given at +# instantiation and send its data. A Source can be configured to +# connect over a SOCKS proxy. When everything is set up, you can +# invoke TrafficTester.run() to start running. The TrafficTester will +# accept the incoming connection and read from it, verifying the data. +# +# For example code, see main() below. + import socket import select import struct import errno +# Set debug_flag=True in order to debug this program or to get hints +# about what's going wrong in your system. debug_flag = False def debug(s): + "Print a debug message on stdout if debug_flag is True." if debug_flag: print("DEBUG: %s" % s) def socks_cmd(addr_port): """ + Return a SOCKS command for connecting to addr_port. + SOCKSv4: https://en.wikipedia.org/wiki/SOCKS#Protocol SOCKSv5: RFC1928, RFC1929 """ @@ -63,6 +82,7 @@ class TestSuite(object): return('%d/%d/%d' % (self.not_done, self.successes, self.failures)) class Peer(object): + "Base class for Listener, Source and Sink." LISTENER = 1 SOURCE = 2 SINK = 3 @@ -84,6 +104,7 @@ class Peer(object): return self.type == self.SINK class Listener(Peer): + "A TCP listener, binding, listening and accepting new connections." def __init__(self, tt, endpoint): super(Listener, self).__init__(Peer.LISTENER, tt) self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) @@ -97,11 +118,17 @@ class Listener(Peer): self.tt.add(Sink(self.tt, newsock)) class Sink(Peer): + "A data sink, reading from its peer and verifying the data." def __init__(self, tt, s): super(Sink, self).__init__(Peer.SINK, tt, s) self.inbuf = '' def on_readable(self): + """Invoked when the socket becomes readable. + Return 0 on finished, successful verification. + -1 on failed verification + >0 if more data needs to be read + """ return self.verify(self.tt.data) def verify(self, data): @@ -115,6 +142,8 @@ class Sink(Peer): return len(data) - len(self.inbuf) class Source(Peer): + """A data source, connecting to a TCP server, optionally over a + SOCKS proxy, sending data.""" NOT_CONNECTED = 0 CONNECTING = 1 CONNECTING_THROUGH_PROXY = 2 @@ -143,6 +172,10 @@ class Source(Peer): raise def on_readable(self): + """Invoked when the socket becomes readable. + Return -1 on failure + >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)) if len(self.inbuf) == 8: @@ -168,6 +201,11 @@ class Source(Peer): return False def on_writable(self): + """Invoked when the socket becomes writable. + Return 0 when done writing + -1 on failure (like connection refused) + >0 if more data needs to be written + """ if self.state == self.CONNECTING: if self.proxy is None: self.state = self.CONNECTED @@ -189,6 +227,13 @@ class Source(Peer): return len(self.outbuf) # When 0, we're being removed. class TrafficTester(): + """ + Hang on select.select() and dispatch to Sources and Sinks. + Time out after self.timeout seconds. + Keep track of successful and failed data verification using a + TestSuite. + Return True if all tests succeed, else False. + """ def __init__(self, endpoint, data={}, timeout=3): self.listener = Listener(self, endpoint) self.pending_close = [] @@ -246,8 +291,8 @@ class TrafficTester(): self.remove(p) for fd in sets[1]: # writable fd's - p = self.peers.get(fd) # Might have been removed above. - if p is not None: + p = self.peers.get(fd) + if p is not None: # Might have been removed above. n = p.on_writable() if n == 0: self.remove(p)

1 0

[chutney/master] Exit with 255 since that's more explicit.
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit acb1aa3c2987eab96f86df87c26ddeaa7c646d45 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Exit with 255 since that's more explicit. Rationale behind exit(-1) is that it turns into highest available number which hopefully won't collide with a wrapping shell script trying to exit with different codes depending on error (like 1, 2, 3). --- lib/chutney/Traffic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 694cd87..9b0a1f7 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -275,7 +275,7 @@ def main(): if success: return 0 - return -1 + return 255 if __name__ == '__main__': sys.exit(main())

1 0

[chutney/master] Merge remote-tracking branch 'linus/bug8531'
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit 0351b06584cec37254dec1f6c8281f22b7798c22 Merge: 1678c99 2b948b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 13:08:15 2013 -0400 Merge remote-tracking branch 'linus/bug8531' lib/chutney/TorNet.py | 36 +++++- lib/chutney/Traffic.py | 328 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 361 insertions(+), 3 deletions(-)

1 0

[chutney/master] Return 1 from Source.on_readable() when connected over proxy.
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit 2b948b5631ba6c5acfc381050520dc32dfac9a2e Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Return 1 from Source.on_readable() when connected over proxy. We used to return 8 by accident (8 minus length of emptied inbuf). This is more explicit. --- lib/chutney/Traffic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index ab9a578..7202c3d 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -185,11 +185,13 @@ class Source(Peer): self.inbuf = '' self.outbuf = self.data debug("successfully connected (fd=%d)" % self.fd()) + return 1 # Keep us around for writing. else: debug("proxy handshake failed (0x%x)! (fd=%d)" % (ord(self.inbuf[1]), self.fd())) self.state = self.NOT_CONNECTED return -1 + assert(8 - len(self.inbuf) > 0) return 8 - len(self.inbuf) return 1 # Keep us around for writing.

1 0

[torspec/master] Noting that GETINFO ns/* options provide v3 directory information
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit d2b7ebb098c5cae9c40aaaf2bbc50efe67e1c91f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 20 07:52:00 2013 -0700 Noting that GETINFO ns/* options provide v3 directory information Tor moved from v2 to v3 directory information in commit 3ad6dc0e. Prior to that Tor's 'GETINFO ns/*' options provided v2 information, but since then it's been v3. For more information see... https://trac.torproject.org/7953 Technically this is a tor bug, but it happens to be a convenient one so simply updating our spec. In practice controller authors haven't noticed this discrepancy because v3 router status entries are a superset of the fields in v2. --- control-spec.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 325b33c..b5228c6 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -506,7 +506,7 @@ documents. "ns/id/<OR identity>" or "ns/name/<OR nickname>" -- the latest router - status info (v2 directory style) for a given OR. Router status + status info (v3 directory style) for a given OR. Router status info is as given in dir-spec.txt, and reflects the current beliefs of this Tor about the router in question. Like directory clients, controllers MUST @@ -514,14 +514,18 @@ descriptor digest are those believed to be best by this Tor, not necessarily those for a descriptor that Tor currently has. [First implemented in 0.1.2.3-alpha.] + [In 0.2.0.9-alpha this switched from v2 directory style to v3] - "ns/all" -- Router status info (v2 directory style) for all ORs we - have an opinion about, joined by newlines. [First implemented - in 0.1.2.3-alpha.] + "ns/all" -- Router status info (v3 directory style) for all ORs we + have an opinion about, joined by newlines. + [First implemented in 0.1.2.3-alpha.] + [In 0.2.0.9-alpha this switched from v2 directory style to v3] - "ns/purpose/<purpose>" -- Router status info (v2 directory style) + "ns/purpose/<purpose>" -- Router status info (v3 directory style) for all ORs of this purpose. Mostly designed for /ns/purpose/bridge - queries. [First implemented in 0.2.0.13-alpha.] + queries. + [First implemented in 0.2.0.13-alpha.] + [In 0.2.0.9-alpha this switched from v2 directory style to v3] "desc/all-recent" -- the latest server descriptor for every router that Tor knows about. (See note about desc/id/* and desc/name/* above.)

1 0

[tor/master] Fix bug 9122: don't allow newdefaultoptions to be NULL
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit ca6aacce16ce057bab71900e078a24fcd63d250f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:56:25 2013 -0400 Fix bug 9122: don't allow newdefaultoptions to be NULL (This caused a crash that was reported as bug 9122, but the underlying behavior has been wrong for a while.) Fix on 0.2.3.9-alpha. --- changes/bug9122 | 4 ++++ src/or/config.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug9122 b/changes/bug9122 new file mode 100644 index 0000000..5009da6 --- /dev/null +++ b/changes/bug9122 @@ -0,0 +1,4 @@ + o Major bugfixes: + - When receiving a new configuration file via the control port's + LOADCONF command, do not treat the defaults file as absent. + Fixes bug 9122; bugfix on 0.2.3.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index 55d19b8..725190a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3785,6 +3785,10 @@ options_init_from_string(const char *cf_defaults, const char *cf, newdefaultoptions = config_dup(&options_format, newoptions); } + if (newdefaultoptions == NULL) { + newdefaultoptions = config_dup(&options_format, global_default_options); + } + /* Go through command-line variables too */ retval = config_assign(&options_format, newoptions, global_cmdline_options, 0, 0, msg);

1 0

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

24 Jun '13

commit cde1a2ca059d892a970c57fc265261125aefe2cb Merge: 10480df ca6aacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 12:55:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9122 | 4 ++++ src/or/config.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.2.4] Fix bug 9122: don't allow newdefaultoptions to be NULL
by nickm＠torproject.org 24 Jun '13

24 Jun '13

1 0

[stem/master] Clarifying why test's load_conf() expects an exception
by atagar＠torproject.org 24 Jun '13

24 Jun '13

commit 5f65f786dee22089323febc899bf2c85a53c99aa Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 24 09:23:16 2013 -0700 Clarifying why test's load_conf() expects an exception For a long while I've been puzzled why this load_conf() call asserted an exception. When I ran it in a cusom prompt it ran fine - turned out that it was relying on us having a custom DataDir. Tor balks (rightfully) when we'd shift our DataDir out from a running tor instance. Doing a better job explaining what's up in the comment. --- test/integ/control/controller.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index bc9619c..c4b8fb1 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -545,7 +545,14 @@ class TestController(unittest.TestCase): oldconf = runner.get_torrc_contents() try: - # invalid requests + # Check a request that changes our DataDir. Tor should rightfully balk + # at this... + # + # InvalidRequest: Transition not allowed: Failed to parse/validate + # config: While Tor is running, changing DataDirectory + # ("/home/atagar/Desktop/stem/test/data"->"/home/atagar/.tor") is not + # allowed. + self.assertRaises(stem.InvalidRequest, controller.load_conf, "ContactInfo confloaded") try:

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2013