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

[ooni-probe/master] Refactor install documentation.
by art＠torproject.org 09 Nov '12

09 Nov '12

commit e1fbfd71765f815500808d0e28538e3b39feba86 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 17:42:05 2012 +0100 Refactor install documentation. --- docs/source/install.rst | 23 +++-------------------- 1 files changed, 3 insertions(+), 20 deletions(-) diff --git a/docs/source/install.rst b/docs/source/install.rst index 6cab566..4a24d3a 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -2,9 +2,6 @@ Installing OONI =============== -Currently no installation documentation is present, since OONI is not meant to -be installed and should be handled with care. - Dependencies ************ @@ -16,12 +13,12 @@ OONI depends on the following pieces of software. * pypcap: http://code.google.com/p/pypcap/ * libdnet: http://code.google.com/p/libdnet/ * BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ +* Txtorcon: https://github.com/meejah/txtorcon *Optional* * Dnspython [1]: http://www.dnspython.org/ * Paramiko [2]: http://www.lag.net/paramiko/ -* Txtorcon: https://github.com/meejah/txtorcon If you would like to use Scapy to plot graphs of network activity, or be capable of dumping obtained information to a PostScript or PDF @@ -82,25 +79,11 @@ the ones that are not by building them from source. "simple" dependencies via easy_install:: - sudo easy_install pyyaml - sudo easy_install twisted - sudo easy_install beautifulsoup - sudo easy_install pygeoip - sudo easy_install six - sudo easy_install ipaddr - sudo easy_install psutil - sudo easy_install txtorcon + sudo easy_install pyyaml twisted beautifulsoup pygeoip six ipaddr psutil txtorcon "simple" dependencies via pip:: - sudo pip install pyyaml - sudo pip install twisted - sudo pip install beautifulsoup - sudo pip install pygeoip - sudo pip install six - sudo pip install ipaddr - sudo pip install psutil - sudo pip install txtorcon + sudo pip install pyyaml twisted beautifulsoup pygeoip six ipaddr psutil txtorcon Manual installation of scapy ----------------------------

1 0

[ooni-probe/master] Port china trigger to new API
by art＠torproject.org 09 Nov '12

09 Nov '12

commit 9bf7fc8d86901bca4061dd82f6ca6af311cabee4 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 18:13:12 2012 +0100 Port china trigger to new API --- nettests/core/chinatrigger.py | 107 ++++++++++++++++++++++++++ ooni/templates/scapyt.py | 12 ++-- to-be-ported/old-api/chinatrigger.py | 140 ---------------------------------- 3 files changed, 113 insertions(+), 146 deletions(-) diff --git a/nettests/core/chinatrigger.py b/nettests/core/chinatrigger.py new file mode 100644 index 0000000..53fadb9 --- /dev/null +++ b/nettests/core/chinatrigger.py @@ -0,0 +1,107 @@ +import random +import string +import struct +import time + +from twisted.python import usage +from ooni.templates.scapyt import BaseScapyTest + +class UsageOptions(usage.Options): + optParameters = [['dst', 'd', None, 'Specify the target address'], + ['port', 'p', None, 'Specify the target port'] + ] + +class ChinaTriggerTest(BaseScapyTest): + """ + This test is a OONI based implementation of the C tool written + by Philipp Winter to engage chinese probes in active scanning. + + Example of running it: + ./bin/ooniprobe chinatrigger -d 127.0.0.1 -p 8080 + """ + + name = "chinatrigger" + usageOptions = UsageOptions + requiredOptions = ['dst', 'port'] + + def setUp(self): + self.dst = self.localOptions['dst'] + self.port = int(self.localOptions['port']) + + @staticmethod + def set_random_servername(pkt): + ret = pkt[:121] + for i in range(16): + ret += random.choice(string.ascii_lowercase) + ret += pkt[121+16:] + return ret + + @staticmethod + def set_random_time(pkt): + ret = pkt[:11] + ret += struct.pack('!I', int(time.time())) + ret += pkt[11+4:] + return ret + + @staticmethod + def set_random_field(pkt): + ret = pkt[:15] + for i in range(28): + ret += chr(random.randint(0, 256)) + ret += pkt[15+28:] + return ret + + @staticmethod + def mutate(pkt, idx): + """ + Slightly changed mutate function. + """ + ret = pkt[:idx-1] + mutation = chr(random.randint(0, 256)) + while mutation == pkt[idx]: + mutation = chr(random.randint(0, 256)) + ret += mutation + ret += pkt[idx:] + return ret + + @staticmethod + def set_all_random_fields(pkt): + pkt = ChinaTriggerTest.set_random_servername(pkt) + pkt = ChinaTriggerTest.set_random_time(pkt) + pkt = ChinaTriggerTest.set_random_field(pkt) + return pkt + + def test_send_mutations(self): + from scapy.all import IP, TCP + pkt = "\x16\x03\x01\x00\xcc\x01\x00\x00\xc8"\ + "\x03\x01\x4f\x12\xe5\x63\x3f\xef\x7d"\ + "\x20\xb9\x94\xaa\x04\xb0\xc1\xd4\x8c"\ + "\x50\xcd\xe2\xf9\x2f\xa9\xfb\x78\xca"\ + "\x02\xa8\x73\xe7\x0e\xa8\xf9\x00\x00"\ + "\x3a\xc0\x0a\xc0\x14\x00\x39\x00\x38"\ + "\xc0\x0f\xc0\x05\x00\x35\xc0\x07\xc0"\ + "\x09\xc0\x11\xc0\x13\x00\x33\x00\x32"\ + "\xc0\x0c\xc0\x0e\xc0\x02\xc0\x04\x00"\ + "\x04\x00\x05\x00\x2f\xc0\x08\xc0\x12"\ + "\x00\x16\x00\x13\xc0\x0d\xc0\x03\xfe"\ + "\xff\x00\x0a\x00\xff\x01\x00\x00\x65"\ + "\x00\x00\x00\x1d\x00\x1b\x00\x00\x18"\ + "\x77\x77\x77\x2e\x67\x6e\x6c\x69\x67"\ + "\x78\x7a\x70\x79\x76\x6f\x35\x66\x76"\ + "\x6b\x64\x2e\x63\x6f\x6d\x00\x0b\x00"\ + "\x04\x03\x00\x01\x02\x00\x0a\x00\x34"\ + "\x00\x32\x00\x01\x00\x02\x00\x03\x00"\ + "\x04\x00\x05\x00\x06\x00\x07\x00\x08"\ + "\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00"\ + "\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11"\ + "\x00\x12\x00\x13\x00\x14\x00\x15\x00"\ + "\x16\x00\x17\x00\x18\x00\x19\x00\x23"\ + "\x00\x00" + + pkt = ChinaTriggerTest.set_all_random_fields(pkt) + pkts = [IP(dst=self.dst)/TCP(dport=self.port)/pkt] + for x in range(len(pkt)): + mutation = IP(dst=self.dst)/TCP(dport=self.port)/ChinaTriggerTest.mutate(pkt, x) + pkts.append(mutation) + self.send(pkts) + diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 8683a8e..a1d2969 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -45,22 +45,22 @@ class BaseScapyTest(NetTestCase): sentPackets = [] answeredPackets = [] - def sr(self, *arg, **kw): + def sr(self, pkts, *arg, **kw): """ Wrapper around scapy.sendrecv.sr for sending and receiving of packets at layer 3. """ - answered_packets, sent_packets = sr(*arg, **kw) + answered_packets, unanswered = sr(pkts, *arg, **kw) self.report['answered_packets'] = createPacketReport(answered_packets) - self.report['sent_packets'] = createPacketReport(sent_packets) + self.report['sent_packets'] = createPacketReport(pkts) return (answered_packets, sent_packets) - def send(self, *arg, **kw): + def send(self, pkts, *arg, **kw): """ Wrapper around scapy.sendrecv.send for sending of packets at layer 3 """ - sent_packets = send(*arg, **kw) - self.report['sent_packets'] = createPacketReport(sent_packets) + sent_packets = send(pkts, *arg, **kw) + self.report['sent_packets'] = createPacketReport(pkts) return sent_packets class TXScapyTest(BaseScapyTest): diff --git a/to-be-ported/old-api/chinatrigger.py b/to-be-ported/old-api/chinatrigger.py deleted file mode 100644 index cf4bcb3..0000000 --- a/to-be-ported/old-api/chinatrigger.py +++ /dev/null @@ -1,140 +0,0 @@ -import random -import string -import struct -import time - -from zope.interface import implements -from twisted.python import usage -from twisted.plugin import IPlugin -from twisted.internet import protocol, defer -from ooni.plugoo.tests import ITest, OONITest -from ooni.plugoo.assets import Asset -from ooni.utils import log -from ooni.protocols.scapyproto import ScapyTest - -from ooni.lib.txscapy import txsr, txsend - -class scapyArgs(usage.Options): - optParameters = [['dst', 'd', None, 'Specify the target address'], - ['port', 'p', None, 'Specify the target port'], - ['pcap', 'f', None, 'The pcap file to write with the sent and received packets'], - ] - -class ChinaTriggerTest(ScapyTest): - """ - This test is a OONI based implementation of the C tool written - by Philipp Winter to engage chinese probes in active scanning. - - Example of running it: - ./ooni/ooniprobe.py chinatrigger -d 127.0.0.1 -p 8080 -f bla.pcap - """ - implements(IPlugin, ITest) - - shortName = "chinatrigger" - description = "Triggers the chinese probes into scanning" - requirements = ['root'] - options = scapyArgs - blocking = False - - receive = True - pcapfile = 'example_scapy.pcap' - timeout = 5 - - def initialize(self, reactor=None): - if not self.reactor: - from twisted.internet import reactor - self.reactor = reactor - - @staticmethod - def set_random_servername(pkt): - ret = pkt[:121] - for i in range(16): - ret += random.choice(string.ascii_lowercase) - ret += pkt[121+16:] - return ret - - @staticmethod - def set_random_time(pkt): - ret = pkt[:11] - ret += struct.pack('!I', int(time.time())) - ret += pkt[11+4:] - return ret - - @staticmethod - def set_random_field(pkt): - ret = pkt[:15] - for i in range(28): - ret += chr(random.randint(0, 256)) - ret += pkt[15+28:] - return ret - - @staticmethod - def mutate(pkt, idx): - """ - Slightly changed mutate function. - """ - ret = pkt[:idx-1] - mutation = chr(random.randint(0, 256)) - while mutation == pkt[idx]: - mutation = chr(random.randint(0, 256)) - ret += mutation - ret += pkt[idx:] - return ret - - @staticmethod - def set_all_random_fields(pkt): - pkt = ChinaTriggerTest.set_random_servername(pkt) - pkt = ChinaTriggerTest.set_random_time(pkt) - pkt = ChinaTriggerTest.set_random_field(pkt) - return pkt - - def build_packets(self, *args, **kw): - """ - Override this method to build scapy packets. - """ - from scapy.all import IP, TCP - pkt = "\x16\x03\x01\x00\xcc\x01\x00\x00\xc8"\ - "\x03\x01\x4f\x12\xe5\x63\x3f\xef\x7d"\ - "\x20\xb9\x94\xaa\x04\xb0\xc1\xd4\x8c"\ - "\x50\xcd\xe2\xf9\x2f\xa9\xfb\x78\xca"\ - "\x02\xa8\x73\xe7\x0e\xa8\xf9\x00\x00"\ - "\x3a\xc0\x0a\xc0\x14\x00\x39\x00\x38"\ - "\xc0\x0f\xc0\x05\x00\x35\xc0\x07\xc0"\ - "\x09\xc0\x11\xc0\x13\x00\x33\x00\x32"\ - "\xc0\x0c\xc0\x0e\xc0\x02\xc0\x04\x00"\ - "\x04\x00\x05\x00\x2f\xc0\x08\xc0\x12"\ - "\x00\x16\x00\x13\xc0\x0d\xc0\x03\xfe"\ - "\xff\x00\x0a\x00\xff\x01\x00\x00\x65"\ - "\x00\x00\x00\x1d\x00\x1b\x00\x00\x18"\ - "\x77\x77\x77\x2e\x67\x6e\x6c\x69\x67"\ - "\x78\x7a\x70\x79\x76\x6f\x35\x66\x76"\ - "\x6b\x64\x2e\x63\x6f\x6d\x00\x0b\x00"\ - "\x04\x03\x00\x01\x02\x00\x0a\x00\x34"\ - "\x00\x32\x00\x01\x00\x02\x00\x03\x00"\ - "\x04\x00\x05\x00\x06\x00\x07\x00\x08"\ - "\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00"\ - "\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11"\ - "\x00\x12\x00\x13\x00\x14\x00\x15\x00"\ - "\x16\x00\x17\x00\x18\x00\x19\x00\x23"\ - "\x00\x00" - - pkt = ChinaTriggerTest.set_all_random_fields(pkt) - pkts = [IP(dst=self.dst)/TCP(dport=self.port)/pkt] - for x in range(len(pkt)): - mutation = IP(dst=self.dst)/TCP(dport=self.port)/ChinaTriggerTest.mutate(pkt, x) - pkts.append(mutation) - return pkts - - def load_assets(self): - if self.local_options: - self.dst = self.local_options['dst'] - self.port = int(self.local_options['port']) - if self.local_options['pcap']: - self.pcapfile = self.local_options['pcap'] - if not self.port or not self.dst: - pass - - return {} - -#chinatrigger = ChinaTriggerTest(None, None, None) -

1 0

[ooni-probe/master] Rename keyword filtering test to HTTP keyword filtering
by art＠torproject.org 09 Nov '12

09 Nov '12

commit 695b12a59650bf7c34d18297a2b3a1f9a074fa84 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 17:42:43 2012 +0100 Rename keyword filtering test to HTTP keyword filtering --- nettests/core/http_keyword_filtering.py | 42 +++++++++++++++++++++++++++++++ nettests/core/keyword_filtering.py | 39 ---------------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/nettests/core/http_keyword_filtering.py b/nettests/core/http_keyword_filtering.py new file mode 100644 index 0000000..fabdba6 --- /dev/null +++ b/nettests/core/http_keyword_filtering.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +from ooni.templates import httpt +class HTTPKeywordFiltering(httpt.HTTPTest): + """ + This test involves performing HTTP requests containing to be tested for + censorship keywords. + + It does not detect censorship on the client, but just logs the response from the + HTTP backend server. + """ + name = "HTTP Keyword Filtering" + author = "Arturo Filastò" + version = 0.1 + + optParameters = [['backend', 'b', None, 'URL of the backend system to use for testing']] + + inputFile = ['file', 'f', None, 'List of keywords to use for censorship testing'] + + def processInputs(self): + if 'backend' in self.localOptions: + self.url = self.localOptions['backend'] + else: + raise Exception("No backend specified") + + def test_get(self): + """ + Perform a HTTP GET request to the backend containing the keyword to be + tested inside of the request body. + """ + return self.doRequest(self.url, method="GET", body=self.input) + + def test_post(self): + """ + Perform a HTTP POST request to the backend containing the keyword to be + tested inside of the request body. + """ + return self.doRequest(self.url, method="POST", body=self.input) + diff --git a/nettests/core/keyword_filtering.py b/nettests/core/keyword_filtering.py deleted file mode 100644 index 26af327..0000000 --- a/nettests/core/keyword_filtering.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- encoding: utf-8 -*- -# -# :authors: Arturo Filastò -# :licence: see LICENSE - -from ooni.templates import httpt -class KeywordFiltering(httpt.HTTPTest): - """ - This test involves performing HTTP requests containing to be tested for - censorship keywords. - """ - name = "Keyword Filtering" - author = "Arturo Filastò" - version = 0.1 - - optParameters = [['backend', 'b', None, 'URL of the backend system to use for testing']] - - inputFile = ['file', 'f', None, 'List of keywords to use for censorship testing'] - - def processInputs(self): - if 'backend' in self.localOptions: - self.url = self.localOptions['backend'] - else: - raise Exception("No backend specified") - - def test_get(self): - """ - Perform a HTTP GET request to the backend containing the keyword to be - tested inside of the request body. - """ - return self.doRequest(self.url, method="GET", body=self.input) - - def test_post(self): - """ - Perform a HTTP POST request to the backend containing the keyword to be - tested inside of the request body. - """ - return self.doRequest(self.url, method="POST", body=self.input) -

1 0

[ooni-probe/master] Completely refactor the logic for running tests
by art＠torproject.org 09 Nov '12

09 Nov '12

commit a7b8967b9e67cc367f1789747bb31366f2ad4cde Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Nov 9 00:49:05 2012 +0100 Completely refactor the logic for running tests * We no longer rely on calling trial * The code is now *much* more clean and readable * The purpose of this is to make room for the threadpool to capture packets --- nettests/simpletest.py | 2 - ooni/inputunit.py | 16 ---- ooni/nettest.py | 65 +-------------- ooni/oonicli.py | 20 ++--- ooni/reporter.py | 178 +++++++---------------------------------- ooni/runner.py | 207 ++++++++++++++++++++++++------------------------ ooniprobe.conf | 2 +- 7 files changed, 142 insertions(+), 348 deletions(-) diff --git a/nettests/simpletest.py b/nettests/simpletest.py index b9efc73..d72c00c 100644 --- a/nettests/simpletest.py +++ b/nettests/simpletest.py @@ -19,11 +19,9 @@ class SimpleTest(nettest.NetTestCase): print "Running %s with %s" % ("test_foo", self.input) self.report['test_foo'] = 'Antani' self.report['shared'] = "sblinda" - self.assertEqual(1, 1) def test_f4oo(self): """Test that tests are working.""" print "Running %s with %s" % ("test_f4oo", self.input) self.report['test_f4oo'] = 'Antani' self.report['shared'] = "sblinda2" - self.assertEqual(1, 1) diff --git a/ooni/inputunit.py b/ooni/inputunit.py index e5b6187..3b0c491 100644 --- a/ooni/inputunit.py +++ b/ooni/inputunit.py @@ -1,16 +1,3 @@ -from twisted.trial import unittest - -class PatchedPyUnitResultAdapter(unittest.PyUnitResultAdapter): - def __init__(self, original): - """ - Here we patch PyUnitResultAdapter to support our reporterFactory to - properly write headers to reports. - """ - self.original = original - self.reporterFactory = original.reporterFactory - -unittest.PyUnitResultAdapter = PatchedPyUnitResultAdapter - class InputUnitFactory(object): """ This is a factory that takes the size of input units to be generated a set @@ -48,7 +35,6 @@ class InputUnitFactory(object): return InputUnit(input_unit_elements) - class InputUnit(object): """ This is a python iterable object that contains the input elements to be @@ -76,5 +62,3 @@ class InputUnit(object): def append(self, input): self._inputs.append(input) - - diff --git a/ooni/nettest.py b/ooni/nettest.py index 6ebd06a..14d6ae2 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -24,53 +24,9 @@ from ooni.utils import log pyunit = __import__('unittest') - -class InputTestSuite(pyunit.TestSuite): - """ - This in an extension of a unittest test suite. It adds support for inputs - and the tracking of current index via idx. +class NetTestCase(object): """ - - # This is used to keep track of the tests that are associated with our - # special test suite - _tests = None - def run(self, result, idx=0): - log.debug("Running test suite") - self._idx = idx - while self._tests: - if result.shouldStop: - log.debug("Detected that test should stop") - log.debug("Stopping...") - break - test = self._tests.pop(0) - - try: - log.debug("Setting test attributes with %s %s" % - (self.input, self._idx)) - - test.input = self.input - test._idx = self._idx - except Exception, e: - log.debug("Error in setting test attributes") - log.debug("This is probably because the test case you are "\ - "running is not a nettest") - log.debug(e) - - log.debug("Running test with name %s" % str(test)) - # XXX we may want in a future to put all of these tests inside of a - # thread pool and run them all in parallel - test(result) - # Here we need to set the test name to be that of the test case we are running - result._tests[self._idx]['test'] = str(test) - log.debug("Ran.") - - self._idx += 1 - return result - - -class NetTestCase(unittest.TestCase): - """ - This is the monad of the OONI nettest universe. When you write a nettest + This is the base of the OONI nettest universe. When you write a nettest you will subclass this object. * inputs: can be set to a static set of inputs. All the tests (the methods @@ -147,22 +103,7 @@ class NetTestCase(unittest.TestCase): requiredOptions = [] requiresRoot = False - - def deferSetUp(self, ignored, result): - """ - If we have the reporterFactory set we need to write the header. If such - method is not present we will only run the test skipping header - writing. - """ - if result.reporterFactory.firstrun: - log.debug("Detecting first run. Writing report header.") - d1 = result.reporterFactory.writeHeader() - d2 = unittest.TestCase.deferSetUp(self, ignored, result) - dl = defer.DeferredList([d1, d2]) - return dl - else: - log.debug("Not first run. Running test setup directly") - return unittest.TestCase.deferSetUp(self, ignored, result) + parallelism = 1 def inputProcessor(self, fp): """ diff --git a/ooni/oonicli.py b/ooni/oonicli.py index ae78583..b4d963e 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -18,7 +18,7 @@ import os import random import time -from twisted.internet import defer +from twisted.internet import defer, reactor from twisted.application import app from twisted.python import usage, failure from twisted.python.util import spewer @@ -26,8 +26,6 @@ from twisted.python.util import spewer from ooni import nettest, runner, reporter from ooni.inputunit import InputUnitFactory -from ooni.reporter import ReporterFactory -from ooni.nettest import InputTestSuite from ooni.utils import log @@ -75,13 +73,9 @@ class Options(usage.Options, app.ReactorSelectionMixin): except: raise usage.UsageError("No test filename specified!") - def postOptions(self): - self['reporter'] = reporter.OONIReporter - - def run(): """ - Call me to begin testing a file or module. + Call me to begin testing from a file. """ cmd_line_options = Options() if len(sys.argv) == 1: @@ -95,10 +89,10 @@ def run(): defer.setDebugging(True) classes = runner.findTestClassesFromConfig(cmd_line_options) - casesList, options = runner.loadTestsAndOptions(classes, cmd_line_options) + test_cases, options = runner.loadTestsAndOptions(classes, cmd_line_options) + log.start(cmd_line_options['logfile']) + + runner.runTestCases(test_cases, options, cmd_line_options) + reactor.run() - for idx, cases in enumerate(casesList): - orunner = runner.ORunner(cases, options[idx], cmd_line_options) - log.start(cmd_line_options['logfile']) - orunner.run() diff --git a/ooni/reporter.py b/ooni/reporter.py index c9654e8..52239dd 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -14,7 +14,7 @@ from yaml.resolver import * from datetime import datetime from twisted.python.util import untilConcludes from twisted.trial import reporter -from twisted.internet import defer +from twisted.internet import defer, reactor from ooni.templates.httpt import BodyReceiver, StringProducer from ooni.utils import date, log, geodata @@ -121,27 +121,15 @@ class OONIBReporter(object): return d -class OReporter(pyunit.TestResult): +class YamlReporter(object): """ - This is an extension of the unittest TestResult. It adds support for - reporting to yaml format. + These are useful functions for reporting to YAML format. """ - reporterFactory = None + def __init__(self, stream): + self._stream = stream - def __init__(self, stream=sys.stdout, tbformat='default', realtime=False, - publisher=None, testSuite=None): - super(OReporter, self).__init__() - self.report = {'tests': []} - self._stream = reporter.SafeStream(stream) - self.tbformat = tbformat - self.realtime = realtime - self._startTime = None - self._warningCache = set() - - self._publisher = publisher - - def _getTime(self): - return time.time() + def _writeln(self, line): + self._write("%s\n" % line) def _write(self, format_string, *args): s = str(format_string) @@ -152,34 +140,26 @@ class OReporter(pyunit.TestResult): self._stream.write(s) untilConcludes(self._stream.flush) - def _writeln(self, format_string, *args): - self._write(format_string, *args) - self._write('\n') - def writeReportEntry(self, entry): self._write('---\n') self._write(safe_dump(entry)) self._write('...\n') -class ReporterFactory(OReporter): + def finish(self): + self._stream.close() + +class OReporter(YamlReporter): """ This is a reporter factory. It emits new instances of Reports. It is also responsible for writing the OONI Report headers. """ - firstrun = True - - def __init__(self, stream=sys.stdout, tbformat='default', realtime=False, - publisher=None, testSuite=None): - super(ReporterFactory, self).__init__(stream=stream, - tbformat=tbformat, realtime=realtime, publisher=publisher) - - self._testSuite = testSuite - self._reporters = [] + def writeTestsReport(self, tests): + for test in tests.values(): + self.writeReportEntry(test) @defer.inlineCallbacks - def writeHeader(self): + def writeReportHeader(self, options): self.firstrun = False - options = self.options self._writeln("###########################################") self._writeln("# OONI Probe Report for %s test" % options['name']) self._writeln("# %s" % date.pretty_date()) @@ -223,126 +203,26 @@ class ReporterFactory(OReporter): 'test_name': options['name'], 'test_version': options['version'], } - self.writeReportEntry(test_details) - def create(self): - r = OONIReporter(self._stream, self.tbformat, self.realtime, - self._publisher) - self._reporters.append(OONIReporter) - return r - - -class OONIReporter(OReporter): - """ - This is a special reporter that has knowledge about the fact that there can - exist more test runs of the same kind per run. - These multiple test runs are kept track of through idx. - - An instance of such reporter should be created per InputUnit. Every input - unit will invoke size_of_input_unit * test_cases times startTest(). - """ - def __init__(self, stream=sys.stdout, tbformat='default', realtime=False, - publisher=None): - super(OONIReporter, self).__init__(stream=stream, - tbformat=tbformat, realtime=realtime, publisher=publisher) - - self._tests = {} - - def getTestIndex(self, test): - try: - idx = test._idx - except: - idx = 0 - return idx - - - def startTest(self, test): - super(OONIReporter, self).startTest(test) - - idx = self.getTestIndex(test) - if not self._startTime: - self._startTime = self._getTime() - - log.debug("startTest on %s" % idx) - test.report = {} - - self._tests[idx] = {} - self._tests[idx]['test_started'] = self._getTime() - + def testDone(self, test): + test_report = dict(test.report) + + # XXX the scapy test has an example of how + # to do this properly. if isinstance(test.input, packet.Packet): test_input = repr(test.input) else: test_input = test.input - self._tests[idx]['input'] = test_input - log.debug("Now starting %s" % self._tests[idx]) - - def stopTest(self, test): - log.debug("Stopping test") - super(OONIReporter, self).stopTest(test) - - idx = self.getTestIndex(test) - - self._tests[idx]['runtime'] = self._getTime() - \ - self._tests[idx]['test_started'] - - # XXX I put a dict() here so that the object is re-instantiated and I - # actually end up with the report I want. This could either be a - # python bug or a yaml bug. - report = dict(test.report) - log.debug("Set the report to be a dict") - - log.debug("Adding to report %s" % report) - self._tests[idx]['report'] = report - - - def done(self): - """ - Summarize the result of the test run. - - The summary includes a report of all of the errors, todos, skips and - so forth that occurred during the run. It also includes the number of - tests that were run and how long it took to run them (not including - load time). - - Expects that L{_printErrors}, L{_writeln}, L{_write}, L{_printSummary} - and L{_separator} are all implemented. - """ - log.debug("Test run concluded") - self.writeTestsReport(self._tests) - - def writeTestsReport(self, tests): - for test in tests.values(): - self.writeReportEntry(test) - - def addSuccess(self, test): - OReporter.addSuccess(self, test) - #self.report['result'] = {'value': 'success'} - - def addError(self, test, exception): - OReporter.addError(self, test, exception) - exc_type, exc_value, exc_traceback = exception - log.err(exc_type) - log.err(str(exc_value)) - # XXX properly print out the traceback - for line in '\n'.join(traceback.format_tb(exc_traceback)).split("\n"): - log.err(line) - - def addFailure(self, *args): - OReporter.addFailure(self, *args) - log.warn(args) - - def addSkip(self, *args): - OReporter.addSkip(self, *args) - #self.report['result'] = {'value': 'skip', 'args': args} - - def addExpectedFailure(self, *args): - OReporter.addExpectedFailure(self, *args) - #self.report['result'] = {'value': 'expectedFailure', 'args': args} - - def addUnexpectedSuccess(self, *args): - OReporter.addUnexpectedSuccess(self, *args) - #self.report['result'] = {'args': args, 'value': 'unexpectedSuccess'} + test_started = test._start_time + test_runtime = test_started - time.time() + report = {'input': test_input, + 'test_started': test_started, + 'report': test_report} + self.writeReportEntry(report) + def allDone(self): + log.debug("Finished running everything") + self.finish() diff --git a/ooni/runner.py b/ooni/runner.py index e17e690..46f5a00 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -8,19 +8,21 @@ # :license: see included LICENSE file # :copyright: (c) 2012 Isis Lovecruft, Arturo Filasto, The Tor Project, Inc. # :version: 0.1.0-pre-alpha -# + import os +import sys +import time import inspect +import traceback from twisted.python import reflect, usage - -from twisted.trial.runner import isTestCase +from twisted.internet import defer from twisted.trial.runner import filenameToModule from ooni.inputunit import InputUnitFactory -from ooni.nettest import InputTestSuite +from ooni.nettest import NetTestCase -from ooni.reporter import ReporterFactory +from ooni import reporter from ooni.utils import log, date def processTest(obj, cmd_line_options): @@ -44,6 +46,7 @@ def processTest(obj, cmd_line_options): if obj.optParameters or input_file \ or obj.usageOptions or obj.optFlags: + options = None if not obj.optParameters: obj.optParameters = [] @@ -54,21 +57,12 @@ def processTest(obj, cmd_line_options): if input_file: obj.usageOptions.optParameters.append(input_file) options = obj.usageOptions() - else: - # XXX this as suggested by isis should be removed. - log.debug("Got optParameters") - class Options(usage.Options): - optParameters = obj.optParameters - if obj.optFlags: - log.debug("Got optFlags") - optFlags = obj.optFlags - - options = Options() - options.parseOptions(cmd_line_options['subArgs']) - obj.localOptions = options + if options: + options.parseOptions(cmd_line_options['subArgs']) + obj.localOptions = options - if input_file: + if input_file and options: obj.inputFile = options[input_file[0]] try: @@ -76,12 +70,20 @@ def processTest(obj, cmd_line_options): tmp_test_case_object._processOptions(options) except usage.UsageError, e: - print "There was an error in running %s!" % tmp_test_case_object.name + test_name = tmp_test_case_object.name + print "There was an error in running %s!" % test_name print "%s" % e options.opt_help() + raise usage.UsageError("Error in parsing command line args for %s" % test_name) return obj +def isTestCase(obj): + try: + return issubclass(obj, NetTestCase) + except TypeError: + return False + def findTestClassesFromConfig(cmd_line_options): """ Takes as input the command line config parameters and returns the test @@ -103,7 +105,6 @@ def findTestClassesFromConfig(cmd_line_options): module = filenameToModule(filename) for name, val in inspect.getmembers(module): if isTestCase(val): - log.debug("Detected TestCase %s" % val) classes.append(processTest(val, cmd_line_options)) return classes @@ -112,10 +113,9 @@ def makeTestCases(klass, tests, method_prefix): Takes a class some tests and returns the test cases. method_prefix is how the test case functions should be prefixed with. """ - cases = [] for test in tests: - cases.append(klass(method_prefix+test)) + cases.append((klass, method_prefix+test)) return cases def loadTestsAndOptions(classes, cmd_line_options): @@ -123,96 +123,93 @@ def loadTestsAndOptions(classes, cmd_line_options): Takes a list of test classes and returns their testcases and options. """ method_prefix = 'test' - options = [] + options = None test_cases = [] for klass in classes: tests = reflect.prefixedMethodNames(klass, method_prefix) if tests: - cases = makeTestCases(klass, tests, method_prefix) - test_cases.append(cases) - try: - k = klass() - opts = k._processOptions() - options.append(opts) - except AttributeError, ae: - options.append([]) - log.err(ae) + test_cases = makeTestCases(klass, tests, method_prefix) - return test_cases, options - -class ORunner(object): - """ - This is a specialized runner used by the ooniprobe command line tool. - I am responsible for reading the inputs from the test files and splitting - them in input units. I also create all the report instances required to run - the tests. - """ - def __init__(self, cases, options=None, cmd_line_options=None): - self.baseSuite = InputTestSuite - self.cases = cases - self.options = options + test_klass = klass() + options = test_klass._processOptions(cmd_line_options) - log.debug("ORunner: cases=%s" % type(cases)) - log.debug("ORunner: options=%s" % options) + return test_cases, options +def runTestWithInputUnit(test_class, + test_method, input_unit, + oreporter): + def test_done(result, test_instance): + oreporter.testDone(test_instance) + + def test_error(error, test_instance): + print "Got this error: %s" % error + exc_type, exc_value, exc_traceback = sys.exc_info() + traceback.print_exc() + #oreporter.writeReportEntry(test) + + dl = [] + for i in input_unit: + test_instance = test_class() + test_instance.input = i + test_instance.report = {} + # use this to keep track of the test runtime + test_instance._start_time = time.time() + # call setup on the test + test_instance.setUp() + + test = getattr(test_instance, test_method) + + d = defer.maybeDeferred(test) + d.addCallback(test_done, test_instance) + d.addErrback(test_error, test_instance) + dl.append(d) + + return defer.DeferredList(dl) + +(a)defer.inlineCallbacks +def runTestCases(test_cases, options, cmd_line_options): + try: + assert len(options) != 0, "Length of options is zero!" + except AssertionError, ae: + test_inputs = [] + log.err(ae) + else: try: - assert len(options) != 0, "Length of options is zero!" - except AssertionError, ae: - self.inputs = [] - log.err(ae) - else: - try: - first = options.pop(0) - except: - first = options - - if 'inputs' in first: - self.inputs = options['inputs'] - else: - log.msg("Could not find inputs!") - log.msg("options[0] = %s" % first) - self.inputs = [None] - - if cmd_line_options['reportfile']: - report_filename = cmd_line_options['reportfile'] + first = options.pop(0) + except: + first = options + + if 'inputs' in first: + test_inputs = options['inputs'] else: - report_filename = 'report_'+date.timestamp()+'.yamloo' - - if os.path.exists(report_filename): - print "Report already exists with filename %s" % report_filename - print "Renaming it to %s" % report_filename+'.old' - os.rename(report_filename, report_filename+'.old') - - reportFile = open(report_filename, 'w+') - self.reporterFactory = ReporterFactory(reportFile, - testSuite=self.baseSuite(self.cases)) - - def runWithInputUnit(self, input_unit): - idx = 0 - result = self.reporterFactory.create() - log.debug("Running test with input unit %s" % input_unit) - for inputs in input_unit: - result.reporterFactory = self.reporterFactory - - log.debug("Running with %s" % inputs) - suite = self.baseSuite(self.cases) - suite.input = inputs - suite(result, idx) - - # XXX refactor all of this index bullshit to avoid having to pass - # this index around. Probably what I want to do is go and make - # changes to report to support the concept of having multiple runs - # of the same test. - # We currently need to do this addition in order to get the number - # of times the test cases that have run inside of the test suite. - idx += (suite._idx - idx) - log.debug("I am now at the index %s" % idx) - - log.debug("Finished") - result.done() - - def run(self): - self.reporterFactory.options = self.options - for input_unit in InputUnitFactory(self.inputs): - self.runWithInputUnit(input_unit) + log.msg("Could not find inputs!") + log.msg("options[0] = %s" % first) + test_inputs = [None] + + if cmd_line_options['reportfile']: + report_filename = cmd_line_options['reportfile'] + else: + report_filename = 'report_'+date.timestamp()+'.yamloo' + + if os.path.exists(report_filename): + print "Report already exists with filename %s" % report_filename + print "Renaming it to %s" % report_filename+'.old' + os.rename(report_filename, report_filename+'.old') + + reportFile = open(report_filename, 'w+') + oreporter = reporter.OReporter(reportFile) + input_unit_factory = InputUnitFactory(test_inputs) + + yield oreporter.writeReportHeader(options) + # This deferred list is a deferred list of deferred lists + # it is used to store all the deferreds of the tests that + # are run + for input_unit in input_unit_factory: + for test_case in test_cases: + test_class = test_case[0] + test_method = test_case[1] + yield runTestWithInputUnit(test_class, + test_method, input_unit, oreporter) + oreporter.allDone() + diff --git a/ooniprobe.conf b/ooniprobe.conf index 2781476..2039951 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -21,5 +21,5 @@ advanced: # database file. This should be the directory in which OONI is installed # /path/to/ooni-probe/data/ geoip_data_dir: /home/x/code/networking/ooni-probe/data/ - debug: false + debug: true

1 0

[ooni-probe/master] Finish refactor of the core of OONI.
by art＠torproject.org 09 Nov '12

09 Nov '12

commit c44c5282dd1980fcf979a72ddd234758b05b0745 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Nov 9 02:00:18 2012 +0100 Finish refactor of the core of OONI. * Everything is passing * XXX there is a bug in blocking tests not making the reactor stop --- before_i_commit.sh | 4 ++-- bin/ooniprobe | 1 + nettests/core/url_list.py | 3 ++- ooni/config.py | 2 ++ ooni/nettest.py | 24 ++++++++++++++++-------- ooni/oonicli.py | 6 +++--- ooni/reporter.py | 6 ++++++ ooni/runner.py | 33 ++++++++++++++++++++++++--------- 8 files changed, 56 insertions(+), 23 deletions(-) diff --git a/before_i_commit.sh b/before_i_commit.sh index e27fbd2..f08a5f5 100755 --- a/before_i_commit.sh +++ b/before_i_commit.sh @@ -18,11 +18,11 @@ find . -type f -name "*.py[co]" -delete ./bin/ooniprobe -l before_i_commit.log -o dns_tamper_test.yamloo nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/dns_tamper_file.txt -./bin/ooniprobe -l before_i_commit.log -o captive_portal_test.yamloo nettests/core/captiveportal.py +#./bin/ooniprobe -l before_i_commit.log -o captive_portal_test.yamloo nettests/core/captiveportal.py ./bin/ooniprobe -l before_i_commit.log -o http_host.yamloo nettests/core/http_host.py -b http://ooni.nu/test -f test_inputs/http_host_file.txt -./bin/ooniprobe -l before_i_commit.log -o keyword_filtering.yamloo nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt +./bin/ooniprobe -l before_i_commit.log -o http_keyword_filtering.yamloo nettests/core/http_keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/http_keyword_filtering_file.txt ./bin/ooniprobe -l before_i_commit.log -o url_lists.yamloo nettests/core/url_list.py -f test_inputs/url_lists_file.txt diff --git a/bin/ooniprobe b/bin/ooniprobe index 18dab7d..9b9885f 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -12,6 +12,7 @@ import os, sys import copy_reg +from twisted.internet import reactor # Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. sys.path[:] = map(os.path.abspath, sys.path) diff --git a/nettests/core/url_list.py b/nettests/core/url_list.py index a6ed269..43f819e 100644 --- a/nettests/core/url_list.py +++ b/nettests/core/url_list.py @@ -11,7 +11,8 @@ class URLList(httpt.HTTPTest): version = 0.1 inputFile = ['file', 'f', None, 'List of URLS to perform GET and POST requests to'] - + + requiredOptions = ['file'] def test_get(self): if self.input: self.url = self.input diff --git a/ooni/config.py b/ooni/config.py index 5880d69..d3907af 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -6,6 +6,8 @@ import os import yaml +from twisted.internet import reactor + from ooni.utils import Storage def get_root_path(): diff --git a/ooni/nettest.py b/ooni/nettest.py index 14d6ae2..289cd23 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -85,6 +85,7 @@ class NetTestCase(object): * requiredOptions: a list containing the name of the options that are required for proper running of a test. + * localOptions: contains the parsed command line arguments. """ name = "I Did Not Change The Name" author = "Jane Doe <foo(a)example.com>" @@ -103,7 +104,13 @@ class NetTestCase(object): requiredOptions = [] requiresRoot = False - parallelism = 1 + + localOptions = {} + def setUp(self): + """ + Place here your logic to be executed when the test is being setup. + """ + pass def inputProcessor(self, fp): """ @@ -129,6 +136,12 @@ class NetTestCase(object): for x in fp.xreadlines(): yield x.strip() fp.close() + + def _checkRequiredOptions(self): + for required_option in self.requiredOptions: + log.debug("Checking if %s is present" % required_option) + if not self.localOptions[required_option]: + raise usage.UsageError("%s not specified!" % required_option) def _processOptions(self, options=None): if self.inputFile: @@ -145,13 +158,8 @@ class NetTestCase(object): elif self.inputFile: raise usage.UsageError("No input file specified!") - # XXX this is a bit hackish - if options: - for required_option in self.requiredOptions: - log.debug("Checking if %s is present" % required_option) - if not options[required_option]: - raise usage.UsageError("%s not specified!" % required_option) - + self._checkRequiredOptions() + # XXX perhaps we may want to name and version to be inside of a # different method that is not called options. return {'inputs': self.inputs, diff --git a/ooni/oonicli.py b/ooni/oonicli.py index b4d963e..be29b4c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -23,7 +23,7 @@ from twisted.application import app from twisted.python import usage, failure from twisted.python.util import spewer -from ooni import nettest, runner, reporter +from ooni import nettest, runner, reporter, config from ooni.inputunit import InputUnitFactory from ooni.utils import log @@ -88,10 +88,10 @@ def run(): if cmd_line_options['debug-stacktraces']: defer.setDebugging(True) + log.start(cmd_line_options['logfile']) classes = runner.findTestClassesFromConfig(cmd_line_options) test_cases, options = runner.loadTestsAndOptions(classes, cmd_line_options) - log.start(cmd_line_options['logfile']) - + runner.runTestCases(test_cases, options, cmd_line_options) reactor.run() diff --git a/ooni/reporter.py b/ooni/reporter.py index 52239dd..08a72b2 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -226,3 +226,9 @@ class OReporter(YamlReporter): def allDone(self): log.debug("Finished running everything") self.finish() + try: + reactor.stop() + except: + pass + return None + diff --git a/ooni/runner.py b/ooni/runner.py index 46f5a00..c67f2a7 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -46,7 +46,6 @@ def processTest(obj, cmd_line_options): if obj.optParameters or input_file \ or obj.usageOptions or obj.optFlags: - options = None if not obj.optParameters: obj.optParameters = [] @@ -57,15 +56,25 @@ def processTest(obj, cmd_line_options): if input_file: obj.usageOptions.optParameters.append(input_file) options = obj.usageOptions() - + elif obj.optParameters: + log.debug("Got optParameters") + class Options(usage.Options): + optParameters = obj.optParameters + if obj.optFlags: + log.debug("Got optFlags") + optFlags = obj.optFlags + options = Options() + if options: options.parseOptions(cmd_line_options['subArgs']) obj.localOptions = options if input_file and options: + log.debug("Got input file") obj.inputFile = options[input_file[0]] try: + log.debug("processing options") tmp_test_case_object = obj() tmp_test_case_object._processOptions(options) @@ -139,14 +148,22 @@ def loadTestsAndOptions(classes, cmd_line_options): def runTestWithInputUnit(test_class, test_method, input_unit, oreporter): + """ + test_class: the uninstantiated class of the test to be run + + test_method: a string representing the method name to be called + + input_unit: a generator that contains the inputs to be run on the test + + oreporter: ooni.reporter.OReporter instance + + returns a deferred list containing all the tests to be run at this time + """ def test_done(result, test_instance): oreporter.testDone(test_instance) def test_error(error, test_instance): - print "Got this error: %s" % error - exc_type, exc_value, exc_traceback = sys.exc_info() - traceback.print_exc() - #oreporter.writeReportEntry(test) + log.err("%s\n" % error) dl = [] for i in input_unit: @@ -157,9 +174,7 @@ def runTestWithInputUnit(test_class, test_instance._start_time = time.time() # call setup on the test test_instance.setUp() - test = getattr(test_instance, test_method) - d = defer.maybeDeferred(test) d.addCallback(test_done, test_instance) d.addErrback(test_error, test_instance) @@ -200,7 +215,7 @@ def runTestCases(test_cases, options, cmd_line_options): reportFile = open(report_filename, 'w+') oreporter = reporter.OReporter(reportFile) input_unit_factory = InputUnitFactory(test_inputs) - + yield oreporter.writeReportHeader(options) # This deferred list is a deferred list of deferred lists # it is used to store all the deferreds of the tests that

1 0

[tor/master] Turn a memwipe in tor_process_handle_destroy() back to memset
by nickm＠torproject.org 09 Nov '12

09 Nov '12

commit e567b4482a1473f586a8549d9311d989c2335172 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 8 19:59:54 2012 -0500 Turn a memwipe in tor_process_handle_destroy() back to memset It broke linking on tor-resolve.c, and it's not actually sanitizing anything sensitive. Fix for bug 7420; bug not on ony released Tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 005c2b5..6fb597a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3808,7 +3808,7 @@ tor_process_handle_destroy(process_handle_t *process_handle, fclose(process_handle->stderr_handle); #endif - memwipe(process_handle, 0x0f, sizeof(process_handle_t)); + memset(process_handle, 0x0f, sizeof(process_handle_t)); tor_free(process_handle); }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 09 Nov '12

09 Nov '12

commit 08436b27ffba4094760fd1fe5321bbd255043b53 Merge: e1c7d12 e567b44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 8 20:00:54 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Turn a memwipe in tor_process_handle_destroy() back to memset
by nickm＠torproject.org 09 Nov '12

09 Nov '12

commit e567b4482a1473f586a8549d9311d989c2335172 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 8 19:59:54 2012 -0500 Turn a memwipe in tor_process_handle_destroy() back to memset It broke linking on tor-resolve.c, and it's not actually sanitizing anything sensitive. Fix for bug 7420; bug not on ony released Tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 005c2b5..6fb597a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3808,7 +3808,7 @@ tor_process_handle_destroy(process_handle_t *process_handle, fclose(process_handle->stderr_handle); #endif - memwipe(process_handle, 0x0f, sizeof(process_handle_t)); + memset(process_handle, 0x0f, sizeof(process_handle_t)); tor_free(process_handle); }

1 0

[torspec/master] Fix two typos in control-spec.txt.
by arma＠torproject.org 09 Nov '12

09 Nov '12

commit c795510852e7ceda84aa7f2bd5dfe2642541d822 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 8 19:18:26 2012 -0500 Fix two typos in control-spec.txt. --- control-spec.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 678f977..8a239d0 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -643,8 +643,8 @@ Tor's SETEVENTS. "features/names" - A space-separated list of all the events supported by this version of - Tor's USEFEATURE. + A space-separated list of all the features supported by this version + of Tor's USEFEATURE. "ip-to-country/*" Maps IP addresses to 2-letter country codes. For example, @@ -1221,7 +1221,7 @@ recognize, and SHOULD process those events as if any unrecognized arguments and keywords were not present. - Clients SHOULD NOT depend on the order of keywords=value arguments, + Clients SHOULD NOT depend on the order of keyword=value arguments, and SHOULD NOT depend on there being no new keyword=value arguments appearing between existing keyword=value arguments, though as of this writing (Jun 2011) some do. Thus, extensions to this protocol should

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 09 Nov '12

09 Nov '12

commit 8f5583a4b10b772fbc00d75cb60ea6aa06a90f0e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 00:15:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 470120e..973c0b6 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.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-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-08 14:56+0000\n" +"PO-Revision-Date: 2012-11-08 23:48+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgstr "Gráfico de Ancho de Banda " msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando la solicitud de bridge (puente a Tor no propagado) HTTPS... " +msgstr "Iniciando la solicitud de bridge HTTPS (puente a Tor no propagado)... " msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..."

1 0