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

[ooni-probe/develop] The socket must be module level global for the test to set options on it.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit c979915c99ad8e5c28a762cae4b5ae44e43190a4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:10:52 2013 +0000 The socket must be module level global for the test to set options on it. --- nettests/experimental/tls_handshake.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 1b66b45..ac94466 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -183,6 +183,7 @@ class TLSHandshakeTest(nettest.NetTestCase): yield self.splitInput(line) def buildSocket(self, addr): + global s ip = IPAddress(addr) ## learn if we're IPv4 or IPv6 if ip.version == 4: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

1 0

[ooni-probe/develop] Fix HostUnreachable docstring to have proper Sphinx formatting.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 9cf3cbcfad9cc93cb85cc31e847859f5760ae97a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:20:52 2013 +0000 Fix HostUnreachable docstring to have proper Sphinx formatting. --- nettests/experimental/tls_handshake.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index e84ffb8..3ab9471 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -99,9 +99,10 @@ class HostUnreachable(Exception): pass class ConnectionTimeout(Exception): - """ - Raised when we receive a :class:`socket.timeout`, in order to pass the - Exception along to :func:`connectionFailed`. + """Raised when we receive a :class:`socket.timeout <timeout>`, in order to + pass the Exception along to + :func:`TLSHandshakeTest.test_handshake.connectionFailed + <connectionFailed>`. """ pass

1 0

[ooni-probe/develop] Bump the version number on HandshakeTest, and rename the usageOptions attribute.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit c78574914e47ec13a8490a02fe34f98785aa4e4d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:23:57 2013 +0000 Bump the version number on HandshakeTest, and rename the usageOptions attribute. --- nettests/experimental/tls_handshake.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index e834a3e..8aa7edf 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -127,10 +127,10 @@ class HandshakeTest(nettest.NetTestCase): name = 'tls-handshake' author = 'Isis Lovecruft <isis(a)torproject.org>' description = 'A test to determing if we can complete a TLS hankshake.' - version = '0.0.2' + version = '0.0.3' requiresRoot = False - usageOptions = UsageOptions + usageOptions = HandshakeOptions inputFile = ['file', 'f', None, 'List of <IP>:<PORT>s to test']

1 0

[ooni-probe/develop] Make 'context' be a class-level attribute and give it a Sphinx :attr: docstring.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 3f51cbb8e267b2cf8a1a8e5d0267da03c80b2f72 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:25:11 2013 +0000 Make 'context' be a class-level attribute and give it a Sphinx :attr: docstring. --- nettests/experimental/tls_handshake.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 8aa7edf..92d9009 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -134,6 +134,9 @@ class HandshakeTest(nettest.NetTestCase): inputFile = ['file', 'f', None, 'List of <IP>:<PORT>s to test'] + #: Default SSL/TLS context method. + context = SSL.Context(SSL.TLSv1_METHOD) + def setUp(self, *args, **kwargs): if self.localOptions: options = self.localOptions

1 0

[ooni-probe/develop] Create a host attribute for storing the --host option, and set self.ciphers.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 06b8f411d6d3bcfe45ea466827e0e12ac6dbac74 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:26:31 2013 +0000 Create a host attribute for storing the --host option, and set self.ciphers. * self.ciphers should exist even if we didn't recieve any localOptions from the runner. --- nettests/experimental/tls_handshake.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 92d9009..35955dc 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -138,9 +138,13 @@ class HandshakeTest(nettest.NetTestCase): context = SSL.Context(SSL.TLSv1_METHOD) def setUp(self, *args, **kwargs): + """Set defaults for a :class:`HandshakeTest <HandshakeTest>`.""" + + self.host = None + self.ciphers = list() + if self.localOptions: options = self.localOptions - self.ciphers = [] ## check that we're testing an IP:PORT, else exit gracefully: if not ((options['host'] and options['port']) or options['file']):

1 0

[ooni-probe/develop] Rename TLSHandshakeTest to HandshakeTest, since it's not only TLS.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 7dfd6f574db5a152457d30eb88eef0f7f663e4b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:23:31 2013 +0000 Rename TLSHandshakeTest to HandshakeTest, since it's not only TLS. --- nettests/experimental/tls_handshake.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 3b94504..e834a3e 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -120,10 +120,9 @@ class HandshakeOptions(usage.Options): ['ssl3', '3', 'Use SSLv3'], ['tls1', 't', 'Use TLSv1'],] -class TLSHandshakeTest(nettest.NetTestCase): - """ - An ooniprobe NetTestCase for determining if we can complete a TLS handshake - with a remote host. +class HandshakeTest(nettest.NetTestCase): + """An ooniprobe NetTestCase for determining if we can complete a TLS/SSL + handshake with a remote host. """ name = 'tls-handshake' author = 'Isis Lovecruft <isis(a)torproject.org>'

1 0

[ooni-probe/develop] Fix #8440, set the self.host attribute when given the --host option.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 044227d4f553ca4996a6c3e289c0df547025317b Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:29:25 2013 +0000 Fix #8440, set the self.host attribute when given the --host option. * Port option doesn't need to be fixed. It does what the option help string always said it does (which is actually slightly confusing and perhaps should be changed): it sets *all* the hosts' ports to --port. So, given a file of host:ports and a '--host 1.2.3.4:4343' cmdline option, if also given '--port 443', it will check every host, both in the file and the cmdline directives, on port 443. This is useful for checking a specific port, like if we wanted to check TLSv1 on the IMAPS (993) port for every host. --- nettests/experimental/tls_handshake.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 35955dc..1ac3661 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -147,22 +147,11 @@ class HandshakeTest(nettest.NetTestCase): options = self.localOptions ## check that we're testing an IP:PORT, else exit gracefully: - if not ((options['host'] and options['port']) or options['file']): - sys.exit("Need --host and --port, or --file!") + if not (options['host'] or options['file']): + raise SystemExit("Need --host or --file!") + if options['host']: + self.host = options['host'] - ## xxx TODO there's nothing that tells the user they can only have - ## one of the TLS/SSL methods at a time. - - ## set the SSL/TLS method to use: - if options['ssl2']: - if not options['ssl3']: - self.context = SSL.Context(SSL.SSLv2_METHOD) - else: - self.context = SSL.Context(SSL.SSLv23_METHOD) - elif options['ssl3']: - self.context = SSL.Context(SSL.SSLv3_METHOD) - elif options['tls1']: - self.context = SSL.Context(SSL.TLSv1_METHOD) else: try: raise NoSSLContextError(

1 0

[ooni-probe/develop] Fix bug where conflicting SSL context choices was not explained to the user.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit c89288d28281e17dee02400ab03d4e5b1f32864f Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:35:17 2013 +0000 Fix bug where conflicting SSL context choices was not explained to the user. --- nettests/experimental/tls_handshake.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 1ac3661..89a9bd9 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -152,13 +152,23 @@ class HandshakeTest(nettest.NetTestCase): if options['host']: self.host = options['host'] + ## If no context was chosen, explain our default to the user: + if not (options['ssl2'] or options['ssl3'] or options['tls1']): + try: raise SSLContextError('NO_CONTEXT') + except SSLContextError as sce: log.err(sce.message) else: - try: - raise NoSSLContextError( - "No SSL/TLS context chosen! Defaulting to TLSv1...") - except NoSSLContextError, ncse: - log.err(ncse.message) - self.context = SSL.Context(SSL.TLSv1_METHOD) + ## If incompatible contexts were chosen, inform the user: + if options['tls1'] and (options['ssl2'] or options['ssl3']): + try: raise SSLContextError('INCOMPATIBLE') + except SSLContextError as sce: log.err(sce.message) + finally: log.msg('Defaulting to testing only TLSv1.') + elif options['ssl2']: + if not options['ssl3']: + self.context = SSL.Context(SSL.SSLv2_METHOD) + else: + self.context = SSL.Context(SSL.SSLv23_METHOD) + elif options['ssl3']: + self.context = SSL.Context(SSL.SSLv3_METHOD) if not options['ciphersuite']: self.ciphers = firefox_ciphers

1 0

[ooni-probe/develop] Move to call IPAddress explicitly from ipaddr.IPAdress.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 6c2d8901d1bb099d026ddd820f0091a68a9b0b5c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:45:35 2013 +0000 Move to call IPAddress explicitly from ipaddr.IPAdress. --- nettests/experimental/tls_handshake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 3585657..b715387 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -213,7 +213,7 @@ class HandshakeTest(nettest.NetTestCase): def buildSocket(self, addr): global s - ip = IPAddress(addr) ## learn if we're IPv4 or IPv6 + ip = ipaddr.IPAddress(addr) ## learn if we're IPv4 or IPv6 if ip.version == 4: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) elif ip.version == 6:

1 0

[ooni-probe/develop] If no ciphersuite list is provided, explain that we're using firefox's.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 30fed64995cd63225c8856cb65124e9a93a190a1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 22 00:43:40 2013 +0000 If no ciphersuite list is provided, explain that we're using firefox's. --- nettests/experimental/tls_handshake.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 89a9bd9..eab721c 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -170,12 +170,15 @@ class HandshakeTest(nettest.NetTestCase): elif options['ssl3']: self.context = SSL.Context(SSL.SSLv3_METHOD) + ## if we weren't given a file with a list of ciphersuites to use, + ## then use the firefox default list: if not options['ciphersuite']: self.ciphers = firefox_ciphers + log.msg('Using default Firefox ciphersuite list.') else: - ## if we weren't given a file with a list of ciphersuites to - ## use, then use the firefox default list: if os.path.isfile(options['ciphersuite']): + log.msg('Using ciphersuite list from "%s"' + % options['ciphersuite']) with open(options['ciphersuite']) as cipherfile: for line in cipherfile.readlines(): self.ciphers.append(line.strip())

1 0