December 2012 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 18 Dec '12

18 Dec '12

commit a8788ed498c58327732cea57c415cf91274be555 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 15:16:02 2012 +0000 Update translations for tails-greeter --- ru/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 44d1ea2..5d16ca1 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-12-02 21:41+0000\n" +"PO-Revision-Date: 2012-12-18 15:00+0000\n" "Last-Translator: ddark008 <i(a)ddark008.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "Нет" #: ../glade/persistencewindow.glade.h:6 msgid "Passphrase:" -msgstr "Пароль" +msgstr "Пароль:" #: ../glade/persistencewindow.glade.h:7 msgid "Read-Only?"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Dec '12

18 Dec '12

commit 8d5a8d94bfb48d507cf5b169dd39f5eb3033a273 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 13:15:30 2012 +0000 Update translations for vidalia_help --- da/netview.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/da/netview.po b/da/netview.po index e0464c2..711f188 100644 --- a/da/netview.po +++ b/da/netview.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-18 00:59+0000\n" +"PO-Revision-Date: 2012-12-18 13:11+0000\n" "Last-Translator: c1 <c0ned0ne(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -157,12 +157,12 @@ msgstr "Alle båndbredde angivelser er baseret på et minimum af enten den maksi #. type: Content of: <html><body> #: en/netview.html:122 msgid "<a name=\"details\"/>" -msgstr "" +msgstr "<a name=\"detaljer\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "" +msgstr "Knudepunkets detaljer" #. type: Content of: <html><body><p> #: en/netview.html:125 @@ -172,39 +172,39 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "" +msgstr "Knudepunktets panel med detaljer, på højre side af skærmen, giver information om det eller de aktive knudepunkter som er valgt på <a href=\"#relaylist\">knudepunktslisten</a>. Hvis du har valgt et kredsløb eller en strøm i din liste over aktive kredsløbs og strømme, vil panelet vise detaljer for hvert knudepunkt din trafik passere i gennem." #. type: Content of: <html><body><p> #: en/netview.html:132 msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" -msgstr "" +msgstr "Felterne du kan se i panelet er som følger (<i>Note</i>: disse felter vil kun være synlige såfremt de indeholder en værdi)" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 msgid "<b>Location</b>" -msgstr "" +msgstr "<b>Lokation</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "" +msgstr "Den geografiske placering af dette Tor knudepunkt." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 msgid "<b>IP Address</b>" -msgstr "" +msgstr "<b>IP adresse</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "" +msgstr "IP adresse for kontakt til knudepunktet." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:146 msgid "<b>Platform</b>" -msgstr "" +msgstr "<b>Platform</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:148

1 0

[ooni-probe/master] Cleaned up report generation and results/logging display.
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit d6a73bad105ece35794ad3709f17d1740275554c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 20 14:02:23 2012 +0000 Cleaned up report generation and results/logging display. --- nettests/bridge_reachability/tcpsyn.py | 137 +++++++++++++++----------------- 1 files changed, 64 insertions(+), 73 deletions(-) diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py index bc79a93..e261a83 100644 --- a/nettests/bridge_reachability/tcpsyn.py +++ b/nettests/bridge_reachability/tcpsyn.py @@ -21,10 +21,10 @@ from twisted.python import usage from twisted.internet import reactor, defer, address from ooni import nettest from ooni.utils import net, log +from ooni.utils.otime import timestamp try: from scapy.all import TCP, IP - from scapy.all import sr1 from ooni.utils import txscapy except: log.msg("This test requires scapy, see www.secdev.org/projects/scapy") @@ -32,11 +32,16 @@ except: class UsageOptions(usage.Options): """Options for TCPSynTest.""" - optParameters = [['dst', 'd', None, 'Host IP to ping'], - ['port', 'p', None, 'Host port'], - ['count', 'c', 3, 'Number of SYN packets to send', int], - ['interface', 'i', None, 'Network interface to use'], - ['verbose', 'v', False, 'Show hexdump of responses']] + optParameters = [ + ['dst', 'd', None, 'Host IP to ping'], + ['port', 'p', None, 'Host port'], + ['count', 'c', 3, 'Number of SYN packets to send', int], + ['interface', 'i', None, 'Network interface to use'], + ['hexdump', 'x', False, 'Show hexdump of responses'], + ['pdf', 'y', False, + 'Create pdf of visual representation of packet conversations'], + ['cerealize', 'z', False, + 'Cerealize scapy objects for further scripting']] class TCPSynTest(nettest.NetTestCase): """ @@ -63,7 +68,6 @@ class TCPSynTest(nettest.NetTestCase): for key, value in self.localOptions.items(): log.debug("setting self.%s = %s" % (key, value)) setattr(self, key, value) - if not self.interface: try: iface = net.getDefaultIface() @@ -75,14 +79,27 @@ class TCPSynTest(nettest.NetTestCase): log.msg("Using system default interface: %s" % iface) self.interface = iface + if self.cerealize: + if True: + raise NotImplemented("need handler for type(dictproxy)...") + else: + from Cerealize import cerealizer + self.cheerios = Cerealize.cerealizer() + mind = ['scapy.layers.inet.IP', + 'scapy.base_classes.Packet_metaclass', + 'scapy.plist.SndRcvList'] + for spoon in mind: + __import__(spoon) + self.cheerios.register(spoon) + def addToDestinations(self, addr, port): - try: - dst, dport = net.checkIPandPort(addr, port) - if not dst in self.destinations.keys(): - self.destinations[dst] = {'dst': dst, 'dport': dport} - return (dst, dport) - except Exception, ex: - log.exception(ex) + dst, dport = net.checkIPandPort(addr, port) + if not dst in self.destinations.keys(): + self.destinations[dst] = {'dst': dst, 'dport': dport} + else: + ## XXX implement multiple port or portrange options + log.msg("Multiple port scanning not yet implemented.") + return (dst, dport) def inputProcessor(self, input_file=None): """ @@ -91,11 +108,11 @@ class TCPSynTest(nettest.NetTestCase): """ try: ## get the commandline input, if there is one: - if self.localOptions['dst'] is not None and self.localOptions['port'] is not None: + if self.localOptions['dst'] is not None \ + and self.localOptions['port'] is not None: log.debug("processing commandline destination input") yield self.addToDestinations(self.localOptions['dst'], self.localOptions['port']) - ## get the inputs from inputFile: if input_file and os.path.isfile(input_file): log.debug("processing input file %s" % input_file) @@ -104,7 +121,7 @@ class TCPSynTest(nettest.NetTestCase): if line.startswith('#'): continue one = line.strip() - raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! + raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! yield self.addToDestinations(raw_ip, raw_port) except Exception, ex: log.exception(ex) @@ -120,86 +137,59 @@ class TCPSynTest(nettest.NetTestCase): packets.append(pkt) return packets - def sort_nicely(packets): - """Print the summary of each packet in a list.""" - return [pkt.summary() for pkt in packets] - - def tcp_flags(responses): - """Print summary of hosts which responded with a SYN/ACK.""" - for response in responses: - layer = response.getlayer('TCP') if response.haslayer('TCP') else None - yield layer.sprintf("{TCP:%TCP.flags%}") if layer else None - - def received_syn(responses, flags): - yield responses.filter( - lambda x: (x for x in responses if str(flags) in ['S','SA'])) - def process_packets(packet_list): + """xxx""" results, unanswered = packet_list - log.debug("RESULTS ARE: %s" % results) - log.debug("UNANSWERED: %s" % unanswered) - - for (q, re) in results: + if self.pdf: + pdf_name = self.name +'_'+ timestamp() + try: + results.pdfdump(pdf_name) + except Exception, ex: + log.exception(ex) + else: + log.msg("Visual packet conversation saved to %s.pdf" + % pdf_name) + + for (q, r) in results: request_data = {'summary': q.summary(), 'command': q.command(), - 'object': export_object(q), 'hash': q.hashret(), 'display': q.display(), 'sent_time': q.time} response_data = {'summary': r.summary(), 'command': r.command(), - 'object': export_object(r) 'hash': r.hashret(), 'src': r['IP'].src, 'flags': r['IP'].flags, 'display': r.display(), 'recv_time': r.time, 'delay': r.time - q.time} - if self.verbose: - request_data['hexdump'] = q.hexdump() - response_data['hexdump'] = r.hexdump() - + if self.hexdump: + request_data.update('hexdump', q.hexdump()) + response_data.update('hexdump', r.hexdump()) + if self.cerealize: + pass result_data = (request_data, response_data) - flags = tcp_flags(response) for dest, data in self.destinations.items(): - if data['dst'] == response.src: - if not 'response' in data: - log.msg("%s" % request.summary()) - log.msg("%s" % response.summary()) - data['response'] = [response.summary()] + if data['dst'] == response_data['src']: + if not 'received_response' in data: + if self.hexdump: + log.msg("%s" % request.hexdump()) + log.msg("%s" % response.hexdump()) + else: + log.msg("\n %s\n ==> %s" % (q.summary(), + r.summary())) + data['result'] = [result_data, ] + data['received_response'] = True data['reachable'] = True else: - data['response'].append(response.summary()) - if self.verbose: - log.msg("%s" % request.summary()) - log.msg("%s" % response.hexdump()) - - for unans in unanswered: - process_unanswered(unans) - - #try: - # response.make_table( - # lambda x:( - # (x.src for x in received_syn(response)), - # (x.dport for x in request), - # (x for x in tcp.flags(response)) ) - # ) - #except Exception, ex: - # log.exception(ex) + data['result'].append(result_data) def process_unanswered(unanswer): """Callback function to process unanswered packets.""" - log.msg("unanswered packets:\n%s" - % sort_nicely(unanswer)) - self.report['unanswered'] = sort_nicely(unanswer) - - for dest, data in self.destinations.items(): - if not 'response' in data: - log.msg("No reply from %s." % dest) - data['response'] = None - data['reachable'] = False + #log.debug("%s" % str(unanswer)) return unanswer (addr, port) = self.input @@ -209,6 +199,7 @@ class TCPSynTest(nettest.NetTestCase): d = txscapy.sr(packets, iface=self.interface) d.addCallbacks(process_packets, log.exception) + d.addCallbacks(process_unanswered, log.exception) self.report['destinations'] = self.destinations return d

1 0

[ooni-probe/master] Ported tcpsyn to the new api.
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit 69b43e9867c118fc796e76b11bcb6555f6e54f4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 19 11:43:39 2012 +0000 Ported tcpsyn to the new api. --- nettests/bridge_reachability/tcpsyn.py | 216 ++++++++++++++++++++++++++++++++ ooni/runner.py | 3 +- 2 files changed, 218 insertions(+), 1 deletions(-) diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py new file mode 100644 index 0000000..bc79a93 --- /dev/null +++ b/nettests/bridge_reachability/tcpsyn.py @@ -0,0 +1,216 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# +-----------+ +# | tcpsyn.py | +# +-----------+ +# Send a TCP SYN packet to a test server to check that +# it is reachable. +# +# @authors: Isis Lovecruft, <isis(a)torproject.org> +# @version: 0.0.1-pre-alpha +# @license: copyright (c) 2012 Isis Lovecruft +# see attached LICENCE file +# + +import os +import sys + +from ipaddr import IPAddress +from twisted.python import usage +from twisted.internet import reactor, defer, address +from ooni import nettest +from ooni.utils import net, log + +try: + from scapy.all import TCP, IP + from scapy.all import sr1 + from ooni.utils import txscapy +except: + log.msg("This test requires scapy, see www.secdev.org/projects/scapy") + + +class UsageOptions(usage.Options): + """Options for TCPSynTest.""" + optParameters = [['dst', 'd', None, 'Host IP to ping'], + ['port', 'p', None, 'Host port'], + ['count', 'c', 3, 'Number of SYN packets to send', int], + ['interface', 'i', None, 'Network interface to use'], + ['verbose', 'v', False, 'Show hexdump of responses']] + +class TCPSynTest(nettest.NetTestCase): + """ + Sends only a TCP SYN packet to a host IP:PORT, and waits for either a + SYN/ACK, a RST, or an ICMP error. + + TCPSynTest can take an input file containing one IP:Port pair per line, or + the commandline switches --dst <IP> and --port <PORT> can be used. + """ + name = 'TCP SYN' + author = 'Isis Lovecruft <isis(a)torproject.org>' + description = 'A TCP SYN test to see if a host is reachable.' + version = '0.0.1' + requiresRoot = True + + usageOptions = UsageOptions + inputFile = ['file', 'f', None, 'File of list of IP:PORTs to ping'] + + destinations = {} + + def setUp(self, *a, **kw): + """Configure commandline parameters for TCPSynTest.""" + if self.localOptions: + for key, value in self.localOptions.items(): + log.debug("setting self.%s = %s" % (key, value)) + setattr(self, key, value) + + if not self.interface: + try: + iface = net.getDefaultIface() + except net.IfaceError, ie: + log.msg("Could not find a working network interface!") + except Exception, ex: + log.exception(ex) + else: + log.msg("Using system default interface: %s" % iface) + self.interface = iface + + def addToDestinations(self, addr, port): + try: + dst, dport = net.checkIPandPort(addr, port) + if not dst in self.destinations.keys(): + self.destinations[dst] = {'dst': dst, 'dport': dport} + return (dst, dport) + except Exception, ex: + log.exception(ex) + + def inputProcessor(self, input_file=None): + """ + Pull the IPs and PORTs from the input file, and place them in a dict + for storing test results as they arrive. + """ + try: + ## get the commandline input, if there is one: + if self.localOptions['dst'] is not None and self.localOptions['port'] is not None: + log.debug("processing commandline destination input") + yield self.addToDestinations(self.localOptions['dst'], + self.localOptions['port']) + + ## get the inputs from inputFile: + if input_file and os.path.isfile(input_file): + log.debug("processing input file %s" % input_file) + with open(input_file) as f: + for line in f.readlines(): + if line.startswith('#'): + continue + one = line.strip() + raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! + yield self.addToDestinations(raw_ip, raw_port) + except Exception, ex: + log.exception(ex) + + def test_tcp_syn(self): + """Send the list of SYN packets.""" + try: + def build_packets(addr, port): + """Construct a list of packets to send out.""" + packets = [] + for x in xrange(self.count): + pkt = IP(dst=addr)/TCP(dport=port, flags="S") + packets.append(pkt) + return packets + + def sort_nicely(packets): + """Print the summary of each packet in a list.""" + return [pkt.summary() for pkt in packets] + + def tcp_flags(responses): + """Print summary of hosts which responded with a SYN/ACK.""" + for response in responses: + layer = response.getlayer('TCP') if response.haslayer('TCP') else None + yield layer.sprintf("{TCP:%TCP.flags%}") if layer else None + + def received_syn(responses, flags): + yield responses.filter( + lambda x: (x for x in responses if str(flags) in ['S','SA'])) + + def process_packets(packet_list): + results, unanswered = packet_list + + log.debug("RESULTS ARE: %s" % results) + log.debug("UNANSWERED: %s" % unanswered) + + for (q, re) in results: + request_data = {'summary': q.summary(), + 'command': q.command(), + 'object': export_object(q), + 'hash': q.hashret(), + 'display': q.display(), + 'sent_time': q.time} + response_data = {'summary': r.summary(), + 'command': r.command(), + 'object': export_object(r) + 'hash': r.hashret(), + 'src': r['IP'].src, + 'flags': r['IP'].flags, + 'display': r.display(), + 'recv_time': r.time, + 'delay': r.time - q.time} + if self.verbose: + request_data['hexdump'] = q.hexdump() + response_data['hexdump'] = r.hexdump() + + result_data = (request_data, response_data) + + flags = tcp_flags(response) + for dest, data in self.destinations.items(): + if data['dst'] == response.src: + if not 'response' in data: + log.msg("%s" % request.summary()) + log.msg("%s" % response.summary()) + data['response'] = [response.summary()] + data['reachable'] = True + else: + data['response'].append(response.summary()) + if self.verbose: + log.msg("%s" % request.summary()) + log.msg("%s" % response.hexdump()) + + for unans in unanswered: + process_unanswered(unans) + + #try: + # response.make_table( + # lambda x:( + # (x.src for x in received_syn(response)), + # (x.dport for x in request), + # (x for x in tcp.flags(response)) ) + # ) + #except Exception, ex: + # log.exception(ex) + + def process_unanswered(unanswer): + """Callback function to process unanswered packets.""" + log.msg("unanswered packets:\n%s" + % sort_nicely(unanswer)) + self.report['unanswered'] = sort_nicely(unanswer) + + for dest, data in self.destinations.items(): + if not 'response' in data: + log.msg("No reply from %s." % dest) + data['response'] = None + data['reachable'] = False + return unanswer + + (addr, port) = self.input + packets = build_packets(addr, port) + + results = [] + + d = txscapy.sr(packets, iface=self.interface) + d.addCallbacks(process_packets, log.exception) + self.report['destinations'] = self.destinations + return d + + except Exception, e: + log.exception(e) diff --git a/ooni/runner.py b/ooni/runner.py index f1321cd..41f3178 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -255,7 +255,8 @@ def runTestCases(test_cases, options, # XXX we probably want to add a log.warn() at some point log.msg("Problem in running test") log.exception(ex) - reactor.stop() + if reactor.running: + reactor.stop() oreporter.allDone()

1 0

[ooni-probe/master] Added an exception catching wrapper for quick debugging, and added more documentation.
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit bc187d42b054fdcd06d8ab6ba262bc3bfd1cd71c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Nov 23 05:41:44 2012 +0000 Added an exception catching wrapper for quick debugging, and added more documentation. --- ooni/utils/log.py | 19 +++++++++++++++++++ ooni/utils/net.py | 35 +++++++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 6f4622d..c751571 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -3,6 +3,7 @@ # :authors: Arturo Filastò # :licence: see LICENSE +from functools import wraps import sys import os import traceback @@ -59,6 +60,24 @@ def exception(msg): def exception(*msg): logging.exception(msg) +def catcher(func): + """ + Quick wrapper to add around test methods for debugging purposes, + catches the given Exception. Use like so: + + @log.catcher + def foo(bar): + if bar == 'baz': + raise Exception("catch me no matter what I am") + foo("baz") + """ + def _catcher(*args, **kwargs): + try: + func(*args, **kwargs) + except Exception, exc: + exception(exc) + return _catcher + class LoggerFactory(object): """ This is a logger factory to be used by oonib diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 7c1c2a1..1814df2 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -104,7 +104,6 @@ def capturePackets(pcap_filename): reactor.addSystemEventTrigger('before', 'shutdown', stopCapture) return d - def getClientPlatform(platform_name=None): for name, test in PLATFORMS.items(): if not platform_name or platform_name.upper() == name: @@ -113,7 +112,6 @@ def getClientPlatform(platform_name=None): def getPosixIfaces(): from twisted.internet.test import _posixifaces - log.msg("Attempting to discover network interfaces...") ifaces = _posixifaces._interfaces() ifup = tryInterfaces(ifaces) @@ -121,13 +119,16 @@ def getPosixIfaces(): def getWindowsIfaces(): from twisted.internet.test import _win32ifaces - log.msg("Attempting to discover network interfaces...") ifaces = _win32ifaces._interfaces() ifup = tryInterfaces(ifaces) return ifup def getIfaces(platform_name=None): + """ + Determines if the client's OS is Windows or Posix based, and then calls + the appropriate function for retrieving interfaces. + """ client, test = getClientPlatform(platform_name) if client: if client == ('LINUX' or 'DARWIN') or client[-3:] == 'BSD': @@ -142,8 +143,16 @@ def getIfaces(platform_name=None): def checkInterfaces(ifaces=None, timeout=1): """ + Check given network interfaces to see that they can send and receive + packets. This is similar to :func:`getDefaultIface`, except that function + only retrieves the name of the interface which is associated with the LAN, + whereas this function validates tx/rx capabilities. + @param ifaces: - A dictionary in the form of ifaces['if_name'] = 'if_addr'. + (optional) A dictionary in the form of ifaces['if_name'] = 'if_addr'. + @param timeout: + An integer specifying the number of seconds to timeout if + no reply is received for our pings. """ try: from scapy.all import IP, ICMP @@ -180,6 +189,15 @@ def checkInterfaces(ifaces=None, timeout=1): raise IfaceError def getNonLoopbackIfaces(platform_name=None): + """ + Get the iface names of all client network interfaces which are not + the loopback interface, regardless of whether they route to internal + or external networks. + + @param platform_name: (optional) The client interface, if known. Should + be given precisely as listed in ooni.utils.net.PLATFORMS. + @return: A list of strings of non-loopback iface names. + """ try: ifaces = getIfaces(platform_name) except UnsupportedPlatform, up: @@ -202,7 +220,6 @@ def getNonLoopbackIfaces(platform_name=None): def getNetworksFromRoutes(): """ - Get the networks this client is current on from the kernel routing table. Each network is returned as a :class:`ipaddr.IPNetwork`, with the network range as the name of the network, i.e.: @@ -224,17 +241,15 @@ def getNetworksFromRoutes(): from scapy.all import conf, ltoa, read_routes from ipaddr import IPNetwork, IPAddress - ## Hide the 'no routes' warnings - conf.verb = 0 - + conf.verb = 0 # Hide the warnings networks = [] for nw, nm, gw, iface, addr in read_routes(): n = IPNetwork( ltoa(nw) ) - (n.netmask, n.gateway, n.ipaddr) = [IPAddress(x) for x in [nm, gw, addr]] + (n.netmask, n.gateway, n.ipaddr) = [ IPAddress(x) for x in + [nm, gw, addr] ] n.iface = iface if not n.compressed in networks: networks.append(n) - return networks def getDefaultIface():

1 0

[ooni-probe/master] Removed cerealizer because it sometimes causes the reporter to hang.
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit 20137d4b331ca8d3016708a8641e6f31f0b9ef72 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Nov 25 13:40:14 2012 +0000 Removed cerealizer because it sometimes causes the reporter to hang. --- nettests/bridge_reachability/tcpsyn.py | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py index ed11c9d..54271bf 100644 --- a/nettests/bridge_reachability/tcpsyn.py +++ b/nettests/bridge_reachability/tcpsyn.py @@ -62,7 +62,6 @@ class TCPSynTest(nettest.NetTestCase): destinations = {} - @log.catcher def setUp(self, *a, **kw): """Configure commandline parameters for TCPSynTest.""" if self.localOptions: @@ -70,26 +69,12 @@ class TCPSynTest(nettest.NetTestCase): setattr(self, key, value) if not self.interface: try: - iface = net.getDefaultIface() + iface = log.catcher(net.getDefaultIface()) except net.IfaceError, ie: - log.msg("Could not find a working network interface!") - except Exception, ex: - log.exception(ex) + log.warn("Could not find a working network interface!") else: log.msg("Using system default interface: %s" % iface) self.interface = iface - if self.cerealize: - if True: - raise NotImplemented("need handler for type(dictproxy)...") - else: - from Cerealize import cerealizer - self.cheerios = Cerealize.cerealizer() - mind = ['scapy.layers.inet.IP', - 'scapy.base_classes.Packet_metaclass', - 'scapy.plist.SndRcvList'] - for spoon in mind: - __import__(spoon) - self.cheerios.register(spoon) def addToDestinations(self, addr, port): dst, dport = net.checkIPandPort(addr, port) @@ -161,9 +146,6 @@ class TCPSynTest(nettest.NetTestCase): if self.hexdump: request_data.update('hexdump', q.hexdump()) response_data.update('hexdump', r.hexdump()) - if self.cerealize: - pass - for dest, data in self.destinations.items(): if data['dst'] == response_data['src']: if not 'reachable' in data:

1 0

[ooni-probe/master] Still working (amend me).
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit eaecafea34c0acc1eb52bc0ade09796e45a335bf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Nov 23 05:49:20 2012 +0000 Still working (amend me). --- nettests/bridge_reachability/tcpsyn.py | 191 +++++++++++++++----------------- 1 files changed, 89 insertions(+), 102 deletions(-) diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py index e261a83..ed11c9d 100644 --- a/nettests/bridge_reachability/tcpsyn.py +++ b/nettests/bridge_reachability/tcpsyn.py @@ -62,11 +62,11 @@ class TCPSynTest(nettest.NetTestCase): destinations = {} + @log.catcher def setUp(self, *a, **kw): """Configure commandline parameters for TCPSynTest.""" if self.localOptions: for key, value in self.localOptions.items(): - log.debug("setting self.%s = %s" % (key, value)) setattr(self, key, value) if not self.interface: try: @@ -78,7 +78,6 @@ class TCPSynTest(nettest.NetTestCase): else: log.msg("Using system default interface: %s" % iface) self.interface = iface - if self.cerealize: if True: raise NotImplemented("need handler for type(dictproxy)...") @@ -97,111 +96,99 @@ class TCPSynTest(nettest.NetTestCase): if not dst in self.destinations.keys(): self.destinations[dst] = {'dst': dst, 'dport': dport} else: - ## XXX implement multiple port or portrange options - log.msg("Multiple port scanning not yet implemented.") + log.debug("XXX Multiple port scanning not yet implemented.") return (dst, dport) def inputProcessor(self, input_file=None): """ - Pull the IPs and PORTs from the input file, and place them in a dict - for storing test results as they arrive. + Pull the IPs and PORTs from the commandline options first, and then + from the input file, and place them in a dict for storing test results + as they arrive. """ - try: - ## get the commandline input, if there is one: - if self.localOptions['dst'] is not None \ - and self.localOptions['port'] is not None: - log.debug("processing commandline destination input") - yield self.addToDestinations(self.localOptions['dst'], - self.localOptions['port']) - ## get the inputs from inputFile: - if input_file and os.path.isfile(input_file): - log.debug("processing input file %s" % input_file) - with open(input_file) as f: - for line in f.readlines(): - if line.startswith('#'): - continue - one = line.strip() - raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! - yield self.addToDestinations(raw_ip, raw_port) - except Exception, ex: - log.exception(ex) - + if self.localOptions['dst'] is not None \ + and self.localOptions['port'] is not None: + log.debug("processing commandline destination input") + yield self.addToDestinations(self.localOptions['dst'], + self.localOptions['port']) + if input_file and os.path.isfile(input_file): + log.debug("processing input file %s" % input_file) + with open(input_file) as f: + for line in f.readlines(): + if line.startswith('#'): + continue + one = line.strip() + raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! + yield self.addToDestinations(raw_ip, raw_port) + + @staticmethod + def build_packets(addr, port, flags=None, count=3): + """Construct a list of packets to send out.""" + packets = [] + for x in xrange(count): + packets.append( IP(dst=addr)/TCP(dport=port, flags=flags) ) + return packets + + @log.catcher def test_tcp_syn(self): """Send the list of SYN packets.""" - try: - def build_packets(addr, port): - """Construct a list of packets to send out.""" - packets = [] - for x in xrange(self.count): - pkt = IP(dst=addr)/TCP(dport=port, flags="S") - packets.append(pkt) - return packets - - def process_packets(packet_list): - """xxx""" - results, unanswered = packet_list - - if self.pdf: - pdf_name = self.name +'_'+ timestamp() - try: - results.pdfdump(pdf_name) - except Exception, ex: - log.exception(ex) - else: - log.msg("Visual packet conversation saved to %s.pdf" - % pdf_name) - - for (q, r) in results: - request_data = {'summary': q.summary(), - 'command': q.command(), - 'hash': q.hashret(), - 'display': q.display(), - 'sent_time': q.time} - response_data = {'summary': r.summary(), - 'command': r.command(), - 'hash': r.hashret(), - 'src': r['IP'].src, - 'flags': r['IP'].flags, - 'display': r.display(), - 'recv_time': r.time, - 'delay': r.time - q.time} - if self.hexdump: - request_data.update('hexdump', q.hexdump()) - response_data.update('hexdump', r.hexdump()) - if self.cerealize: - pass - result_data = (request_data, response_data) - - for dest, data in self.destinations.items(): - if data['dst'] == response_data['src']: - if not 'received_response' in data: - if self.hexdump: - log.msg("%s" % request.hexdump()) - log.msg("%s" % response.hexdump()) - else: - log.msg("\n %s\n ==> %s" % (q.summary(), - r.summary())) - data['result'] = [result_data, ] - data['received_response'] = True - data['reachable'] = True - else: - data['result'].append(result_data) - - def process_unanswered(unanswer): - """Callback function to process unanswered packets.""" - #log.debug("%s" % str(unanswer)) - return unanswer - (addr, port) = self.input - packets = build_packets(addr, port) - - results = [] - - d = txscapy.sr(packets, iface=self.interface) - d.addCallbacks(process_packets, log.exception) - d.addCallbacks(process_unanswered, log.exception) - self.report['destinations'] = self.destinations - return d - - except Exception, e: - log.exception(e) + def process_packets(packet_list): + """xxx""" + results, unanswered = packet_list + + if self.pdf: + pdf_name = self.name +'_'+ timestamp() + try: + results.pdfdump(pdf_name) + except Exception, ex: + log.exception(ex) + else: + log.msg("Visual packet conversation saved to %s.pdf" + % pdf_name) + + for (q, r) in results: + request_data = {'dst': q.dst, + 'dport': q.dport, + 'summary': q.summary(), + 'command': q.command(), + 'sent_time': q.time} + response_data = {'summary': r.summary(), + 'command': r.command(), + 'src': r['IP'].src, + 'flags': r['IP'].flags, + 'recv_time': r.time, + 'delay': r.time - q.time} + if self.hexdump: + request_data.update('hexdump', q.hexdump()) + response_data.update('hexdump', r.hexdump()) + if self.cerealize: + pass + + for dest, data in self.destinations.items(): + if data['dst'] == response_data['src']: + if not 'reachable' in data: + if self.hexdump: + log.msg("%s\n%s" % (q.hexdump(), r.hexdump())) + else: + log.msg(" Received response:\n%s ==> %s" + % (q.mysummary(), r.mysummary())) + data.update( {'reachable': True, + 'request': request_data, + 'response': response_data} ) + return unanswered + + def process_unanswered(unanswered): + """Callback function to process unanswered packets.""" + if unanswered is not None and len(unanswered) > 0: + log.msg("Waiting on responses from\n%s" % + '\n'.join([unans.summary() for unans in unanswered])) + log.msg("Writing response packet information to report...") + self.report = (self.destinations) + return self.destinations + + (addr, port) = self.input + packets = self.build_packets(addr, port, "S", self.count) + d = txscapy.sr(packets, iface=self.interface) + d.addCallbacks(process_packets, log.exception) + d.addCallbacks(process_unanswered, log.exception) + return d

1 0

[ooni-probe/master] Trying out cerealizer for passing objects.
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit f6f8aae1a78d2086103718eaf41dd80f663aaef1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Nov 23 05:49:20 2012 +0000 Trying out cerealizer for passing objects. --- nettests/bridge_reachability/tcpsyn.py | 191 +++++++++++++++----------------- 1 files changed, 89 insertions(+), 102 deletions(-) diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py index e261a83..ed11c9d 100644 --- a/nettests/bridge_reachability/tcpsyn.py +++ b/nettests/bridge_reachability/tcpsyn.py @@ -62,11 +62,11 @@ class TCPSynTest(nettest.NetTestCase): destinations = {} + @log.catcher def setUp(self, *a, **kw): """Configure commandline parameters for TCPSynTest.""" if self.localOptions: for key, value in self.localOptions.items(): - log.debug("setting self.%s = %s" % (key, value)) setattr(self, key, value) if not self.interface: try: @@ -78,7 +78,6 @@ class TCPSynTest(nettest.NetTestCase): else: log.msg("Using system default interface: %s" % iface) self.interface = iface - if self.cerealize: if True: raise NotImplemented("need handler for type(dictproxy)...") @@ -97,111 +96,99 @@ class TCPSynTest(nettest.NetTestCase): if not dst in self.destinations.keys(): self.destinations[dst] = {'dst': dst, 'dport': dport} else: - ## XXX implement multiple port or portrange options - log.msg("Multiple port scanning not yet implemented.") + log.debug("XXX Multiple port scanning not yet implemented.") return (dst, dport) def inputProcessor(self, input_file=None): """ - Pull the IPs and PORTs from the input file, and place them in a dict - for storing test results as they arrive. + Pull the IPs and PORTs from the commandline options first, and then + from the input file, and place them in a dict for storing test results + as they arrive. """ - try: - ## get the commandline input, if there is one: - if self.localOptions['dst'] is not None \ - and self.localOptions['port'] is not None: - log.debug("processing commandline destination input") - yield self.addToDestinations(self.localOptions['dst'], - self.localOptions['port']) - ## get the inputs from inputFile: - if input_file and os.path.isfile(input_file): - log.debug("processing input file %s" % input_file) - with open(input_file) as f: - for line in f.readlines(): - if line.startswith('#'): - continue - one = line.strip() - raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! - yield self.addToDestinations(raw_ip, raw_port) - except Exception, ex: - log.exception(ex) - + if self.localOptions['dst'] is not None \ + and self.localOptions['port'] is not None: + log.debug("processing commandline destination input") + yield self.addToDestinations(self.localOptions['dst'], + self.localOptions['port']) + if input_file and os.path.isfile(input_file): + log.debug("processing input file %s" % input_file) + with open(input_file) as f: + for line in f.readlines(): + if line.startswith('#'): + continue + one = line.strip() + raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! + yield self.addToDestinations(raw_ip, raw_port) + + @staticmethod + def build_packets(addr, port, flags=None, count=3): + """Construct a list of packets to send out.""" + packets = [] + for x in xrange(count): + packets.append( IP(dst=addr)/TCP(dport=port, flags=flags) ) + return packets + + @log.catcher def test_tcp_syn(self): """Send the list of SYN packets.""" - try: - def build_packets(addr, port): - """Construct a list of packets to send out.""" - packets = [] - for x in xrange(self.count): - pkt = IP(dst=addr)/TCP(dport=port, flags="S") - packets.append(pkt) - return packets - - def process_packets(packet_list): - """xxx""" - results, unanswered = packet_list - - if self.pdf: - pdf_name = self.name +'_'+ timestamp() - try: - results.pdfdump(pdf_name) - except Exception, ex: - log.exception(ex) - else: - log.msg("Visual packet conversation saved to %s.pdf" - % pdf_name) - - for (q, r) in results: - request_data = {'summary': q.summary(), - 'command': q.command(), - 'hash': q.hashret(), - 'display': q.display(), - 'sent_time': q.time} - response_data = {'summary': r.summary(), - 'command': r.command(), - 'hash': r.hashret(), - 'src': r['IP'].src, - 'flags': r['IP'].flags, - 'display': r.display(), - 'recv_time': r.time, - 'delay': r.time - q.time} - if self.hexdump: - request_data.update('hexdump', q.hexdump()) - response_data.update('hexdump', r.hexdump()) - if self.cerealize: - pass - result_data = (request_data, response_data) - - for dest, data in self.destinations.items(): - if data['dst'] == response_data['src']: - if not 'received_response' in data: - if self.hexdump: - log.msg("%s" % request.hexdump()) - log.msg("%s" % response.hexdump()) - else: - log.msg("\n %s\n ==> %s" % (q.summary(), - r.summary())) - data['result'] = [result_data, ] - data['received_response'] = True - data['reachable'] = True - else: - data['result'].append(result_data) - - def process_unanswered(unanswer): - """Callback function to process unanswered packets.""" - #log.debug("%s" % str(unanswer)) - return unanswer - (addr, port) = self.input - packets = build_packets(addr, port) - - results = [] - - d = txscapy.sr(packets, iface=self.interface) - d.addCallbacks(process_packets, log.exception) - d.addCallbacks(process_unanswered, log.exception) - self.report['destinations'] = self.destinations - return d - - except Exception, e: - log.exception(e) + def process_packets(packet_list): + """xxx""" + results, unanswered = packet_list + + if self.pdf: + pdf_name = self.name +'_'+ timestamp() + try: + results.pdfdump(pdf_name) + except Exception, ex: + log.exception(ex) + else: + log.msg("Visual packet conversation saved to %s.pdf" + % pdf_name) + + for (q, r) in results: + request_data = {'dst': q.dst, + 'dport': q.dport, + 'summary': q.summary(), + 'command': q.command(), + 'sent_time': q.time} + response_data = {'summary': r.summary(), + 'command': r.command(), + 'src': r['IP'].src, + 'flags': r['IP'].flags, + 'recv_time': r.time, + 'delay': r.time - q.time} + if self.hexdump: + request_data.update('hexdump', q.hexdump()) + response_data.update('hexdump', r.hexdump()) + if self.cerealize: + pass + + for dest, data in self.destinations.items(): + if data['dst'] == response_data['src']: + if not 'reachable' in data: + if self.hexdump: + log.msg("%s\n%s" % (q.hexdump(), r.hexdump())) + else: + log.msg(" Received response:\n%s ==> %s" + % (q.mysummary(), r.mysummary())) + data.update( {'reachable': True, + 'request': request_data, + 'response': response_data} ) + return unanswered + + def process_unanswered(unanswered): + """Callback function to process unanswered packets.""" + if unanswered is not None and len(unanswered) > 0: + log.msg("Waiting on responses from\n%s" % + '\n'.join([unans.summary() for unans in unanswered])) + log.msg("Writing response packet information to report...") + self.report = (self.destinations) + return self.destinations + + (addr, port) = self.input + packets = self.build_packets(addr, port, "S", self.count) + d = txscapy.sr(packets, iface=self.interface) + d.addCallbacks(process_packets, log.exception) + d.addCallbacks(process_unanswered, log.exception) + return d

1 0

[ooni-probe/master] Added better reporting of statistics and safe packet information to TCPflags
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit 1fa46bcb6d65a11b3209c07d8e14507d43303f1a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 27 14:07:52 2012 +0000 Added better reporting of statistics and safe packet information to TCPflags test, which is a combined and condensed version of TCPsyn and TCPfin tests. * Tested pcap support. * Updated documentation. --- nettests/bridge_reachability/tcpsyn.py | 199 ++++++++++++++++++++------------ 1 files changed, 124 insertions(+), 75 deletions(-) diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py index 54271bf..555fdef 100644 --- a/nettests/bridge_reachability/tcpsyn.py +++ b/nettests/bridge_reachability/tcpsyn.py @@ -16,12 +16,13 @@ import os import sys -from ipaddr import IPAddress -from twisted.python import usage -from twisted.internet import reactor, defer, address -from ooni import nettest -from ooni.utils import net, log -from ooni.utils.otime import timestamp +from ipaddr import IPAddress +from twisted.python import usage +from twisted.python.failure import Failure +from twisted.internet import reactor, defer, address +from ooni import nettest, config +from ooni.utils import net, log +from ooni.utils.otime import timestamp try: from scapy.all import TCP, IP @@ -30,8 +31,8 @@ except: log.msg("This test requires scapy, see www.secdev.org/projects/scapy") -class UsageOptions(usage.Options): - """Options for TCPSynTest.""" +class TCPFlagOptions(usage.Options): + """Options for TCPTest.""" optParameters = [ ['dst', 'd', None, 'Host IP to ping'], ['port', 'p', None, 'Host port'], @@ -43,7 +44,7 @@ class UsageOptions(usage.Options): ['cerealize', 'z', False, 'Cerealize scapy objects for further scripting']] -class TCPSynTest(nettest.NetTestCase): +class TCPFlagTest(nettest.NetTestCase): """ Sends only a TCP SYN packet to a host IP:PORT, and waits for either a SYN/ACK, a RST, or an ICMP error. @@ -51,37 +52,55 @@ class TCPSynTest(nettest.NetTestCase): TCPSynTest can take an input file containing one IP:Port pair per line, or the commandline switches --dst <IP> and --port <PORT> can be used. """ - name = 'TCP SYN' + name = 'TCP Flag' author = 'Isis Lovecruft <isis(a)torproject.org>' - description = 'A TCP SYN test to see if a host is reachable.' + description = 'A TCP SYN/ACK/FIN test to see if a host is reachable.' version = '0.0.1' requiresRoot = True - usageOptions = UsageOptions + usageOptions = TCPFlagOptions inputFile = ['file', 'f', None, 'File of list of IP:PORTs to ping'] - destinations = {} + #destinations = {} def setUp(self, *a, **kw): """Configure commandline parameters for TCPSynTest.""" + self.report = {} + if self.localOptions: for key, value in self.localOptions.items(): setattr(self, key, value) if not self.interface: try: - iface = log.catcher(net.getDefaultIface()) + iface = log.catch(net.getDefaultIface()) except net.IfaceError, ie: log.warn("Could not find a working network interface!") + log.fail(ie) else: log.msg("Using system default interface: %s" % iface) self.interface = iface + if config.debug: + defer.setDebugging(on) + + def addToDestinations(self, addr='0.0.0.0', port='443'): + """ + Validate and add an IP address and port to the dictionary of + destinations to send to. If the host's IP is already in the + destinations, then only add the port. - def addToDestinations(self, addr, port): + @param addr: A string representing an IPv4 or IPv6 address. + @param port: A string representing a port number. + @returns: A 2-tuple containing the address and port. + """ dst, dport = net.checkIPandPort(addr, port) - if not dst in self.destinations.keys(): - self.destinations[dst] = {'dst': dst, 'dport': dport} + #if not dst in self.destinations.keys(): + if not dst in self.report.keys(): + #self.destinations[dst] = {'dst': dst, 'dport': [dport]} + self.report[dst] = {'dst': dst, 'dport': [dport]} else: - log.debug("XXX Multiple port scanning not yet implemented.") + log.debug("Got additional port for destination.") + #self.destinations[dst]['dport'].append(dport) + self.report[dst]['dport'].append(dport) return (dst, dport) def inputProcessor(self, input_file=None): @@ -105,6 +124,12 @@ class TCPSynTest(nettest.NetTestCase): raw_ip, raw_port = one.rsplit(':', 1) ## XXX not ipv6 safe! yield self.addToDestinations(raw_ip, raw_port) + @log.catch + def createPDF(self, results): + pdfname = self.name + '_' + timestamp() + results.pdfdump(pdfname) + log.msg("Visual packet conversation saved to %s.pdf" % pdfname) + @staticmethod def build_packets(addr, port, flags=None, count=3): """Construct a list of packets to send out.""" @@ -113,64 +138,88 @@ class TCPSynTest(nettest.NetTestCase): packets.append( IP(dst=addr)/TCP(dport=port, flags=flags) ) return packets - @log.catcher - def test_tcp_syn(self): - """Send the list of SYN packets.""" - - def process_packets(packet_list): - """xxx""" - results, unanswered = packet_list - - if self.pdf: - pdf_name = self.name +'_'+ timestamp() - try: - results.pdfdump(pdf_name) - except Exception, ex: - log.exception(ex) - else: - log.msg("Visual packet conversation saved to %s.pdf" - % pdf_name) - - for (q, r) in results: - request_data = {'dst': q.dst, - 'dport': q.dport, - 'summary': q.summary(), - 'command': q.command(), - 'sent_time': q.time} - response_data = {'summary': r.summary(), - 'command': r.command(), - 'src': r['IP'].src, - 'flags': r['IP'].flags, - 'recv_time': r.time, - 'delay': r.time - q.time} - if self.hexdump: - request_data.update('hexdump', q.hexdump()) - response_data.update('hexdump', r.hexdump()) - for dest, data in self.destinations.items(): - if data['dst'] == response_data['src']: - if not 'reachable' in data: - if self.hexdump: - log.msg("%s\n%s" % (q.hexdump(), r.hexdump())) - else: - log.msg(" Received response:\n%s ==> %s" - % (q.mysummary(), r.mysummary())) - data.update( {'reachable': True, - 'request': request_data, - 'response': response_data} ) - return unanswered - - def process_unanswered(unanswered): - """Callback function to process unanswered packets.""" - if unanswered is not None and len(unanswered) > 0: - log.msg("Waiting on responses from\n%s" % - '\n'.join([unans.summary() for unans in unanswered])) - log.msg("Writing response packet information to report...") - self.report = (self.destinations) - return self.destinations + @staticmethod + def process_packets(packet_list): + """ + If the source address of packet in :param:packet_list matches one of our input + destinations, then extract some of the information from it to the test report. + + @param packet_list: + A :class:scapy.plist.PacketList + """ + results, unanswered = packet_list + + if self.pdf: + self.createPDF(results) + + for (q, r) in results: + request_data = {'dst': q.dst, + 'dport': q.dport, + 'summary': q.summary(), + 'command': q.command(), + 'sent_time': q.time} + response_data = {'src': r['IP'].src, + 'flags': r['IP'].flags, + 'summary': r.summary(), + 'command': r.command(), + 'recv_time': r.time, + 'delay': r.time - q.time} + if self.hexdump: + request_data.update('hexdump', q.hexdump()) + response_data.update('hexdump', r.hexdump()) + for dest, data in self.destinations.items(): + if data['dst'] == response_data['src']: + if not 'reachable' in data: + if self.hexdump: + log.msg("%s\n%s" % (q.hexdump(), r.hexdump())) + else: + log.msg(" Received response:\n%s ==> %s" + % (q.mysummary(), r.mysummary())) + data.update( {'reachable': True, + 'request': request_data, + 'response': response_data} ) + return unanswered + @staticmethod + def process_unanswered(unanswered): + """Callback function to process unanswered packets.""" + if unanswered is not None and len(unanswered) > 0: + log.msg("Waiting on responses from\n%s" % + '\n'.join( [unans.summary() for unans in unanswered] )) + log.msg("Writing response packet information to report...") + self.report = (self.destinations) + return self.destinations + + @log.catch + def tcp_flags(self, flags="S"): + """ + Generate, send, and listen for responses to, a list of TCP/IP packets + to an address and port pair taken from the current input, and a string + specifying the TCP flags to set. + + @param flags: + A string representing the TCP flags to be set, i.e. "SA" or "F". + Defaults to "S". + """ (addr, port) = self.input - packets = self.build_packets(addr, port, "S", self.count) + packets = self.build_packets(addr, port, str(flags), self.count) d = txscapy.sr(packets, iface=self.interface) - d.addCallbacks(process_packets, log.exception) - d.addCallbacks(process_unanswered, log.exception) + d.addCallbacks(self.process_packets, log.exception) + d.addCallbacks(self.process_unanswered, log.exception) return d + + def test_tcp_fin(self): + """Send a list of FIN packets to an address and port pair from inputs.""" + return self.tcp_flags("F") + + def test_tcp_syn(self): + """Send a list of SYN packets to an address and port pair from inputs.""" + return self.tcp_flags("S") + + def test_tcp_synack(self): + """Send a list of SYN/ACK packets to an address and port pair from inputs.""" + return self.tcp_flags("SA") + + def test_tcp_ack(self): + """Send a list of SYN packets to an address and port pair from inputs.""" + return self.tcp_flags("A")

1 0

[ooni-probe/master] Added warning suppression for scapy's logger to the beginning of oonicli.py.
by isis＠torproject.org 18 Dec '12

18 Dec '12

commit a382177448f004a29a26b970be9e01bd799f1f0b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 27 14:12:33 2012 +0000 Added warning suppression for scapy's logger to the beginning of oonicli.py. --- ooni/oonicli.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 263494b..9c2b4e6 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -19,13 +19,17 @@ from twisted.application import app from twisted.python import usage, failure from twisted.python.util import spewer -from ooni import nettest, runner, reporter, config - -from ooni.inputunit import InputUnitFactory +## Get rid of the annoying "No route found for +## IPv6 destination warnings": +import logging as pylogging +pylogging.getLogger("scapy.runtime").setLevel(pylogging.ERROR) +from ooni import nettest, runner, reporter, config from ooni.utils import net from ooni.utils import checkForRoot, PermissionsError from ooni.utils import log +from ooni.inputunit import InputUnitFactory + class Options(usage.Options, app.ReactorSelectionMixin): synopsis = """%s [options] [path to test].py

1 0