- tor-commits - lists.torproject.org

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 18 Aug '12

18 Aug '12

commit a979d19d2b843fc8e723f44bb5597b57215f963b Merge: 3af48cc 1d8240c Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 17 21:32:53 2012 -0700 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe Conflicts: ooni/ooniprobe.py ooni/ooniprobe.py | 2 +- ooni/plugins/daphn3.py | 2 + oonib/INSTALL | 4 ++ oonib/report/api.py | 98 +++++++++++++++++++++++++++++++++++++++++++ oonib/report/db/__init__.py | 33 ++++++++++++++ oonib/report/db/models.py | 41 ++++++++++++++++++ 6 files changed, 179 insertions(+), 1 deletions(-) diff --cc ooni/plugins/daphn3.py index a6d51b0,bdba5d9..6911623 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@@ -134,8 -133,11 +134,10 @@@ class daphn3Test(OONITest) d = endpoint.connect(self.factory) d.addErrback(self._failure) return d - #return endpoint.connect(Daphn3ClientFactory) def load_assets(self): + if not self.local_options: + return {} if not self.steps: print "Error: No assets!" self.end()

1 0

[ooni-probe/master] Minor refactoring of various parts
by art＠torproject.org 18 Aug '12

18 Aug '12

commit 3af48ccd706dd1f56faf6d4e46d8db8216d20822 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 17 21:31:52 2012 -0700 Minor refactoring of various parts --- ooni/plugins/captiveportal.py | 17 +++++++++++++---- ooni/plugins/daphn3.py | 1 + ooni/protocols/daphn3.py | 4 +++- oonib/testhelpers/daphn3.py | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ooni/plugins/captiveportal.py b/ooni/plugins/captiveportal.py index b48f70b..4bf99b3 100644 --- a/ooni/plugins/captiveportal.py +++ b/ooni/plugins/captiveportal.py @@ -31,6 +31,7 @@ try: from dns import resolver except ImportError: print "The dnspython module was not found. https://crate.io/packages/dnspython/" + resolver = None __plugoo__ = "captiveportal" __desc__ = "Captive portal detection test" @@ -132,7 +133,10 @@ class CaptivePortal(OONITest): or a list of strings. If nameserver is not given, use local DNS resolver, and if that fails try using 8.8.8.8. """ - + if not resolver: + log.msg("dnspython is not installed.\ + Cannot perform DNS Resolve test") + return [] if isinstance(hostname, str): hostname = [hostname] @@ -192,6 +196,11 @@ class CaptivePortal(OONITest): The equivalent of: $ dig +short NS ooni.nu """ + if not resolver: + log.msg("dnspython not installed.") + log.msg("Cannot perform test.") + return [] + res = resolver.Resolver() answer = res.query(hostname, 'NS') auth_nameservers = [] @@ -211,9 +220,9 @@ class CaptivePortal(OONITest): for char in hostname: l33t = random.choice(['caps', 'nocaps']) if l33t == 'caps': - hostname_0x20 = hostname_0x20 + char.capitalize() + hostname_0x20 += char.capitalize() else: - hostname_0x20 = hostname_0x20 + char.lower() + hostname_0x20 += char.lower() return hostname_0x20 def check_0x20_to_auth_ns(self, hostname, sample_size=None): @@ -394,7 +403,7 @@ class CaptivePortal(OONITest): log.debug("just magically resolved to a bunch of random addresses.") log.debug("That is definitely highly improbable. In fact, my napkin") log.debug("tells me that the probability of just one of those") - log.degug("hostnames resolving to an address is 1.68e-59, making") + log.debug("hostnames resolving to an address is 1.68e-59, making") log.debug("it nearly twice as unlikely as an MD5 hash collision.") log.debug("Either someone is seriously messing with your network,") log.debug("or else you are witnessing the impossible. %s" % r) diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py index 091fe8a..a6d51b0 100644 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@ -40,6 +40,7 @@ class Daphn3ClientFactory(protocol.ClientFactory): self.mutator.next() p.mutator = self.mutator + p.current_state = self.mutator.state() return p def clientConnectionFailed(self, reason): diff --git a/ooni/protocols/daphn3.py b/ooni/protocols/daphn3.py index 7514a40..a4cc32a 100644 --- a/ooni/protocols/daphn3.py +++ b/ooni/protocols/daphn3.py @@ -201,6 +201,8 @@ class Daphn3Protocol(protocol.Protocol): steps = [] mutator = None + current_state = None + role = 'client' state = 0 total_states = len(steps) - 1 @@ -283,7 +285,7 @@ class Daphn3Protocol(protocol.Protocol): print "Terminated because of little interest in life." return report = {'reason': reason, 'proto_state': self.state, - 'trigger': None, 'mutator_state': self.mutator.state()} + 'trigger': None, 'mutator_state': self.current_state} if self.state < self.total_states: report['trigger'] = 'did not finish state walk' diff --git a/oonib/testhelpers/daphn3.py b/oonib/testhelpers/daphn3.py index 2dd2801..facd11f 100644 --- a/oonib/testhelpers/daphn3.py +++ b/oonib/testhelpers/daphn3.py @@ -40,6 +40,7 @@ class Daphn3Server(protocol.ServerFactory): self.mutations.pop(addr.host) try: p.mutator = self.mutations[addr.host] + p.current_state = p.mutator.state() except: pass return p

1 0

[ooni-probe/master] ImStart implementing OONIBackenD
by art＠torproject.org 18 Aug '12

18 Aug '12

commit 1d8240c746ec79381aafcb3d921568c90b70889b Author: Arturo Filastò <art(a)torproject.org> Date: Fri Aug 17 20:57:32 2012 -0700 ImStart implementing OONIBackenD (saving this commit from my broken laptop) --- oonib/INSTALL | 4 ++ oonib/report/api.py | 98 +++++++++++++++++++++++++++++++++++++++++++ oonib/report/db/__init__.py | 33 ++++++++++++++ oonib/report/db/models.py | 41 ++++++++++++++++++ 4 files changed, 176 insertions(+), 0 deletions(-) diff --git a/oonib/INSTALL b/oonib/INSTALL new file mode 100644 index 0000000..1622707 --- /dev/null +++ b/oonib/INSTALL @@ -0,0 +1,4 @@ +BEWARE: This requires python 2.7.3 +storm (Storm ORM) +transaction (zope transaction) + diff --git a/oonib/report/api.py b/oonib/report/api.py new file mode 100644 index 0000000..04f70e0 --- /dev/null +++ b/oonib/report/api.py @@ -0,0 +1,98 @@ +""" +/report/do + +/report/pcap + +This is the async pcap reporting system. It requires the client to have created a report already, but can work independently from test progress. + +""" +import random +import strings +from twisted.internet import reactor +from cyclone import web +backend_version = '0.0.1' + +def generateReportID(): + size = 100 + id = ''.join(random.choice(strings.ascii_letters) for x in range(size)) + return id + +def newReport(software_name, software_version, test_name, test_version, + progress, content): + print "Software Name: %s" % software_name + print "Software Version: %s" % software_version + print "Test Name: %s" % test_name + print "Test Version: %s" % test_version + print "Progress: %s" % progress + print "Content: %s" % content + reportId = generateReportID() + return {'backend_version': backend_version, 'report_id': reportID} + +def updateReport(report_id, content): + print "Report ID: %s" % report_id + print "Content: %s" % content + return {'backend_version': '0.1', 'report_id': 'FOOBAR'} + +class DoReportHandler(web.RequestHandler): + """ + Responsible for creating and updating reports. + """ + def post(self): + """ + Creates a new report with the input + + * Request + + {'software_name': 'XXX', + 'software_version': 'XXX', + 'test_name': 'XXX', + 'test_version': 'XXX', + 'progress': 'XXX', + 'content': 'XXX' + } + + * Response + + {'backend_version': 'XXX', 'report_id': 'XXX'} + + """ + # This is the list of supported arguments + arguments = ['software_name', 'software_version', + 'test_name','test_version', + 'progress', 'content'] + report = {} + error = None + for arg in arguments: + if len(self.get_arguments(arg)) == 0: + print "No %s specified" % arg + error = arg + break + report[arg] = self.get_argument(arg) + if not error: + self.write(newReport(**report)) + + def put(self): + """ + Update an already existing report. + + {'report_id': 'XXX', + 'content': 'XXX' + } + """ + pass + +class PCAPReportHandler(web.RequestHandler): + def get(self): + pass + + def post(self): + pass + +handlers = [(r"/report/do", DoReportHandler), + (r"/report/pcap", PCAPReportHandler)] + +reporting = web.Application(handlers) +reactor.listenTCP(8888, reporting, interface="127.0.0.1") +print "starting bullshit" +reactor.run() + diff --git a/oonib/report/db/__init__.py b/oonib/report/db/__init__.py new file mode 100644 index 0000000..1248c19 --- /dev/null +++ b/oonib/report/db/__init__.py @@ -0,0 +1,33 @@ +__all__ = ['models'] + +from twisted.python import log +from twisted.python.threadpool import ThreadPool +from twisted.internet.defer import inlineCallbacks +from storm.twisted.transact import Transactor, transact +from storm.locals import * + +dbtype = "sqlite" + +if dbtype == "sqlite": + from storm.uri import URI + from storm.databases.sqlite import SQLite + database = SQLite(URI('sqlite:///test.db')) + +threadpool = ThreadPool(0, 10) +threadpool.start() +transactor = Transactor(threadpool) + +@inlineCallbacks +def create_tables(): + def create(query): + store = Store(database) + store.execute(query) + store.commit() + + for x in models.__all__: + query = getattr(models.__getattribute__(x), 'create_query') + try: + yield transactor.run(create, query) + except: + log.msg("Failing in creating table for %s. Maybe it already exists?" % x) + diff --git a/oonib/report/db/models.py b/oonib/report/db/models.py new file mode 100644 index 0000000..b4e56d0 --- /dev/null +++ b/oonib/report/db/models.py @@ -0,0 +1,41 @@ +from storm.twisted.transact import transact +from storm.locals import * + +class Report(object): + """ + This represents an OONI Report as stored in the database. + + report_id: this is generated by the backend and is used by the client to + reference a previous report and append to it. It should be + treated as a shared secret between the probe and backend. + + software_name: this indicates the name of the software performing the test + (this will default to ooniprobe) + + software_version: this is the version number of the software running the + test. + + test_name: the name of the test on which the report is being created. + + test_version: indicates the version of the test + + progress: what is the current progress of the report. This allows clients + to report event partial reports up to a certain percentage of + progress. Once the report is complete progress will be 100. + + content: what is the content of the report. If the current progress is less + than 100 we should append to the YAML data structure that is + currently stored in such field. + """ + id = Int(primary=True) + + report_id = Unicode() + + software_name = Unicode() + software_version = Unicode() + test_name = Unicode() + test_version = Unicode() + progress = Unicode() + + content = Unicode() +

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 88859b2ff1fdd4e5f4fab8ad818131ea3c2dd1c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 17:10:03 2012 -0400 whitespace fix --- src/or/config.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/config.h b/src/or/config.h index 48f4e86..dd76edc 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -102,6 +102,5 @@ int addressmap_register_auto(const char *from, const char *to, addressmap_entry_source_t addrmap_source, const char **msg); - #endif

1 0

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

17 Aug '12

commit 661bd3fe714f0c9986eb872eb8eb5d72b2efc195 Merge: 1c64f99 88859b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 17:10:16 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' src/or/config.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] whitespace fix
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 88859b2ff1fdd4e5f4fab8ad818131ea3c2dd1c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 17:10:03 2012 -0400 whitespace fix --- src/or/config.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/config.h b/src/or/config.h index 48f4e86..dd76edc 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -102,6 +102,5 @@ int addressmap_register_auto(const char *from, const char *to, addressmap_entry_source_t addrmap_source, const char **msg); - #endif

1 0

[torbrowser/master] bump recommended-versions to 2.2.38-1 for stable tbbs
by erinn＠torproject.org 17 Aug '12

17 Aug '12

commit e2976698bdabfb5db4ce9212d58edd3803a75830 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:21 2012 +0100 bump recommended-versions to 2.2.38-1 for stable tbbs --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index d26819d..46c8079 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.37-2-MacOS-i386", -"2.2.37-2-MacOS-x86_64", -"2.2.37-2-Windows", -"2.2.37-2-Linux-i686", -"2.2.37-2-Linux-x86_64", +"2.2.38-1-MacOS-i386", +"2.2.38-1-MacOS-x86_64", +"2.2.38-1-Windows", +"2.2.38-1-Linux-i686", +"2.2.38-1-Linux-x86_64", "2.3.20-alpha-1-MacOS-i386", "2.3.20-alpha-1-Windows", "2.3.20-alpha-1-Linux-i386",

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 17 Aug '12

17 Aug '12

commit 5b0211745b145233634f91537ceb41472854f687 Merge: 4d1bbc9 e297669 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:38 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 17 Aug '12

17 Aug '12

commit 5b0211745b145233634f91537ceb41472854f687 Merge: 4d1bbc9 e297669 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:38 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.3] bump recommended-versions to 2.2.38-1 for stable tbbs
by erinn＠torproject.org 17 Aug '12

17 Aug '12

commit e2976698bdabfb5db4ce9212d58edd3803a75830 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:21 2012 +0100 bump recommended-versions to 2.2.38-1 for stable tbbs --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index d26819d..46c8079 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.37-2-MacOS-i386", -"2.2.37-2-MacOS-x86_64", -"2.2.37-2-Windows", -"2.2.37-2-Linux-i686", -"2.2.37-2-Linux-x86_64", +"2.2.38-1-MacOS-i386", +"2.2.38-1-MacOS-x86_64", +"2.2.38-1-Windows", +"2.2.38-1-Linux-i686", +"2.2.38-1-Linux-x86_64", "2.3.20-alpha-1-MacOS-i386", "2.3.20-alpha-1-Windows", "2.3.20-alpha-1-Linux-i386",

1 0