March 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Add support for installing cronjob running daily.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 79ae8cd35f406731a1460e865e7a19be465f696e Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 02:23:19 2014 +0100 Add support for installing cronjob running daily. --- scripts/install_on_planetlab.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index afa9022..f4ac6df 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -93,3 +93,8 @@ sudo pip install obfsproxy # Update the Tor running in ooniprobe cat ~/.ooni/ooniprobe.conf | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf.new mv ~/.ooni/ooniprobe.conf.new ~/.ooni/ooniprobe.conf + +mkdir /home/$USER/bridge_reachability/ + +# Add cronjob to run ooniprobe daily +{ crontab -l; echo "0 0 * * * $USER ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab

1 0

[ooni-probe/master] Fix crontab syntax.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit fd50b64f176138939c3da3f2a3434ff08b50d606 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 16:14:34 2014 +0100 Fix crontab syntax. --- scripts/install_on_planetlab.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index 480252a..3be5872 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -140,4 +140,4 @@ cat /usr/share/ooni/ooniprobe.conf.sample | sed s/'start_tor: true'/'start_tor: mkdir /home/$USER/bridge_reachability/ # Add cronjob to run ooniprobe daily -{ crontab -l; echo "0 0 * * * $USER ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab +{ crontab -l; echo "0 0 * * * ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab

1 0

[ooni-probe/master] Add init script for tor.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit a570fc8d563948aee4e4a49e2dffbc6674c6c71b Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 14:29:53 2014 +0100 Add init script for tor. --- scripts/install_on_planetlab.sh | 45 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index 4b85896..480252a 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -67,7 +67,50 @@ sudo mv /usr/bin/tor /usr/bin/tor.old sudo ln -s /usr/local/bin/tor /usr/bin/tor echo "SocksPort 9050" > /usr/local/etc/tor/torrc cat torrc >> /usr/local/etc/tor/torrc -/etc/init.d/tor restart +cat <<EOF > tor.init +RETVAL=0 +prog="tor" + +# Source function library. +. /etc/init.d/functions + + +start() { + echo -n $"Starting $prog: " + daemon $prog --runasdaemon 1 && success || failure + RETVAL=$? + echo + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killall $prog + RETVAL=$? + echo + return $RETVAL +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + RETVAL=3 +esac +exit $RETVAL +EOF +sudo mv tor.init /etc/init.d/tor +sudo chmod +x /etc/init.d/tor +sudo /etc/init.d/tor restart # Install libGeoIP wget -O master.zip https://github.com/maxmind/geoip-api-c/archive/master.zip

1 0

[ooni-probe/master] Fix planet lab install script.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 5d0d9702cf78d20d3846b7b3c4843dcad1269759 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 14:00:15 2014 +0100 Fix planet lab install script. --- scripts/install_on_planetlab.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index 88f0ae2..4b85896 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -3,7 +3,7 @@ ## called torrc with inside the details of the torrc to use. sudo yum -y groupinstall "Development tools" -sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel libffi-devel screen libeven-devel unzip +sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel libffi-devel screen libeven-devel unzip tor cd `mktemp -d` # Install Python 2.7.6 @@ -92,8 +92,7 @@ sudo pip install obfsproxy ooniprobe # Update the Tor running in ooniprobe -cat ~/.ooni/ooniprobe.conf | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf.new -mv ~/.ooni/ooniprobe.conf.new ~/.ooni/ooniprobe.conf +cat /usr/share/ooni/ooniprobe.conf.sample | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf mkdir /home/$USER/bridge_reachability/

1 0

[ooni-probe/master] Use scapy-real. scapy is broken on linux...
by art＠torproject.org 24 Mar '14

24 Mar '14

commit ead020f16c561426451333b1b933bd52dcb71f84 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 13:44:47 2014 +0100 Use scapy-real. scapy is broken on linux... --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8cda752..53709ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ txtorcon>=0.7 txsocksx>=0.0.2 parsley>=1.1 dnspython>=1.10.0 -scapy>=2.2.0-dev +scapy-real>=2.2.0-dev pypcap>=1.1

1 0

[ooni-probe/master] Add percentages to the summary output
by art＠torproject.org 24 Mar '14

24 Mar '14

commit fb5c62893b9df011f9d0b2b8a6f5ce23efa028cc Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 19:09:17 2014 +0100 Add percentages to the summary output --- ooni/nettests/blocking/bridge_reachability.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 98d7e9a..d55ba29 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -37,7 +37,7 @@ class BridgeReachability(nettest.NetTestCase): self.report['timeout'] = self.timeout self.report['transport_name'] = 'vanilla' - self.report['tor_progress'] = None + self.report['tor_progress'] = 0 self.report['tor_progress_tag'] = None self.report['tor_progress_summary'] = None self.report['bridge_address'] = None @@ -55,7 +55,8 @@ class BridgeReachability(nettest.NetTestCase): details = { 'address': self.report['bridge_address'], - 'transport_name': self.report['transport_name'] + 'transport_name': self.report['transport_name'], + 'tor_progress': self.report['tor_progress'] } if self.report['success']: self.summary['successes'].append(details) @@ -74,7 +75,7 @@ class BridgeReachability(nettest.NetTestCase): count(summary['failures'], failure_count) working_bridges = ', '.join([x['address'] for x in summary['successes']]) - failing_bridges = ', '.join([x['address'] for x in summary['failures']]) + failing_bridges = ', '.join([x['address'] + " (at %s%%)" % x['tor_progress'] for x in summary['failures']]) print "Total successes: %d" % len(summary['successes']) print "Total failures: %d" % len(summary['failures'])

1 0

[ooni-probe/master] Fix links in Documentation.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit f7ebab54f3873aeecebc08b0dab8893a2ea8bf62 Author: anadahz <kojgelo(a)inbox.com> Date: Fri Mar 14 03:33:50 2014 +0100 Fix links in Documentation. --- docs/source/index.rst | 8 ++++---- docs/source/tests/dnsconsistency.rst | 4 ++-- docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/http_requests.rst | 2 +- docs/source/tests/tcpconnect.rst | 2 +- docs/source/tests/traceroute.rst | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 690cf2f..e425c4a 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -102,16 +102,16 @@ Test Helpers The currently implemented test helpers are the following: * `SSL Test Helpers - <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/s…>`_ + <https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/ssl_he…>`_ * `HTTP Test Helpers - <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…>`_ + <https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/http_h…>`_ * `TCP Test Helpers - <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/t…>`_ + <https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/tcp_he…>`_ * `DNS Test Helpers - <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…>`_ + <https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/dns_he…>`_ More developer documentation **************************** diff --git a/docs/source/tests/dnsconsistency.rst b/docs/source/tests/dnsconsistency.rst index a667067..be88c82 100644 --- a/docs/source/tests/dnsconsistency.rst +++ b/docs/source/tests/dnsconsistency.rst @@ -5,9 +5,9 @@ Details *Current version*: 0.4 -*NetTest*: DNS Consistency Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/d…) +*NetTest*: DNS Consistency Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/block…) -*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…) +*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/dns_he…) *Test Type*: Content Blocking diff --git a/docs/source/tests/dnsspoof.rst b/docs/source/tests/dnsspoof.rst index abb08e4..a3b43d5 100644 --- a/docs/source/tests/dnsspoof.rst +++ b/docs/source/tests/dnsspoof.rst @@ -5,9 +5,9 @@ Details *Current version*: 0.1 -*NetTest*: DNSSpoof (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/manipulati…) +*NetTest*: DNSSpoof (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/manip…) -*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…) +*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/dns_he…) *Test Type*: Traffic Manipulation diff --git a/docs/source/tests/http_header_field_manipulation.rst b/docs/source/tests/http_header_field_manipulation.rst index 328d497..f51b609 100644 --- a/docs/source/tests/http_header_field_manipulation.rst +++ b/docs/source/tests/http_header_field_manipulation.rst @@ -5,9 +5,9 @@ Details *Current version*: 0.1.3 -*NetTest*: HTTPHeaderFieldManipulation (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/manipulati…) +*NetTest*: HTTPHeaderFieldManipulation (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/manip…) -*Test Helper*: HTTP Return JSON Headers (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…) +*Test Helper*: HTTP Return JSON Headers (https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/http_h…) *Test Type*: Traffic Manipulation diff --git a/docs/source/tests/http_host.rst b/docs/source/tests/http_host.rst index ebe10e7..7843344 100644 --- a/docs/source/tests/http_host.rst +++ b/docs/source/tests/http_host.rst @@ -5,9 +5,9 @@ Details *Current version*: 0.2 -*NetTest*: HTTP Host (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/core/http_…) +*NetTest*: HTTP Host (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/core/…) -*Test Helper*: HTTP Return JSON Headers (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…) +*Test Helper*: HTTP Return JSON Headers (https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/http_h…) *Test Type*: Traffic Manipulation, Content Blocking diff --git a/docs/source/tests/http_invalid_request_line.rst b/docs/source/tests/http_invalid_request_line.rst index 4a59df0..f1246c4 100644 --- a/docs/source/tests/http_invalid_request_line.rst +++ b/docs/source/tests/http_invalid_request_line.rst @@ -5,9 +5,9 @@ Details *Current version*: 0.1.3 -*NetTest*: HTTP Invalid Request Line (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/manipulati…) +*NetTest*: HTTP Invalid Request Line (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/manip…) -*Test Helper*: TCPEchoHelper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/t…) +*Test Helper*: TCPEchoHelper (https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/tcp_he…) *Test Type*: Traffic Manipulation diff --git a/docs/source/tests/http_requests.rst b/docs/source/tests/http_requests.rst index 6178072..da70835 100644 --- a/docs/source/tests/http_requests.rst +++ b/docs/source/tests/http_requests.rst @@ -5,7 +5,7 @@ Details *Current version*: 0.1 -*NetTest*: HTTP Requests (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/h…) +*NetTest*: HTTP Requests (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/block…) *Test Helper*: None diff --git a/docs/source/tests/tcpconnect.rst b/docs/source/tests/tcpconnect.rst index e92077d..2eadc11 100644 --- a/docs/source/tests/tcpconnect.rst +++ b/docs/source/tests/tcpconnect.rst @@ -5,7 +5,7 @@ Details *Current version*: 0.1 -*NetTest*: TCP Connect Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/core/tcpco…) +*NetTest*: TCP Connect Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/core/…) *Test Helper*: None diff --git a/docs/source/tests/traceroute.rst b/docs/source/tests/traceroute.rst index 5b18454..8532890 100644 --- a/docs/source/tests/traceroute.rst +++ b/docs/source/tests/traceroute.rst @@ -5,7 +5,7 @@ Details *Current version*: 0.1.1 -*NetTest*: Traceroute (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/core/trace…) +*NetTest*: Traceroute (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/core/…) *Test Helper*: Not yet implemented

1 0

[ooni-probe/master] Fix typo in displaySummary method definition
by art＠torproject.org 24 Mar '14

24 Mar '14

commit f35289deaee8ce2a3a8338116dd6465946dd4302 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 19:10:41 2014 +0100 Fix typo in displaySummary method definition --- ooni/nettest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 6a182ca..61b327e 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -698,7 +698,7 @@ class NetTestCase(object): """ raise e.NoPostProcessor - def displaySummary(self): + def displaySummary(self, summary): """ This gets called after the test has run to allow printing out of a summary of the test run.

1 0

[ooni-probe/master] Add support for displaying a summary of the test results to bridge reachability test.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit e7ac9808ac51ac0e06f8ef8091b83c1e30e7c9e5 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 18:47:00 2014 +0100 Add support for displaying a summary of the test results to bridge reachability test. --- ooni/nettest.py | 27 ++++++++++++- ooni/nettests/blocking/bridge_reachability.py | 54 ++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 235ad85..520fcf8 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -388,6 +388,9 @@ class NetTestLoader(object): self.testVersion = test_class.version self.testName = test_class_name_to_name(test_class.name) self.testCases = test_cases + self.testClasses = set([]) + for test_class, test_method in self.testCases: + self.testClasses.add(test_class) def checkOptions(self): """ @@ -397,7 +400,7 @@ class NetTestLoader(object): for test_class, test_method in self.testCases: test_classes.add(test_class) - for klass in test_classes: + for klass in self.testClasses: options = self.usageOptions() options.parseOptions(self.options) @@ -488,13 +491,25 @@ class NetTest(object): """ self.report = report self.testCases = net_test_loader.testCases + self.testClasses = net_test_loader.testClasses + self.testDetails = net_test_loader.testDetails + + self.summary = {} # This will fire when all the measurements have been completed and # all the reports are done. Done means that they have either completed # successfully or all the possible retries have been reached. self.done = defer.Deferred() + self.done.addCallback(self.doneNetTest) self.state = NetTestState(self.done) + + def doneNetTest(self, result): + print "Summary for %s" % self.testDetails['test_name'] + print "------------" + "-"*len(self.testDetails['test_name']) + for test_class in self.testClasses: + test_instance = test_class() + test_instance.displaySummary(self.summary) def doneReport(self, report_results): """ @@ -556,6 +571,7 @@ class NetTest(object): for input in test_class.inputs: measurements = [] test_instance = test_class() + test_instance.summary = self.summary for method in test_methods: log.debug("Running %s %s" % (test_class, method)) measurement = self.makeMeasurement(test_instance, method, input) @@ -674,9 +690,18 @@ class NetTestCase(object): postProcessing works exactly like test methods, in the sense that anything that gets written to the object self.report[] will be added to the final test report. + You should also place in this method any logic that is required for + generating the summary. """ raise e.NoPostProcessor + def displaySummary(self): + """ + This gets called after the test has run to allow printing out of a + summary of the test run. + """ + pass + def inputProcessor(self, filename): """ You may replace this with your own custom input processor. It takes as diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 7c519ec..98d7e9a 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -34,12 +34,59 @@ class BridgeReachability(nettest.NetTestCase): def setUp(self): self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) + self.report['timeout'] = self.timeout + self.report['transport_name'] = 'vanilla' + self.report['tor_progress'] = None + self.report['tor_progress_tag'] = None + self.report['tor_progress_summary'] = None + self.report['bridge_address'] = None + self.bridge = self.input if self.input.startswith('Bridge'): self.bridge = self.input.replace('Bridge ', '') self.pyobfsproxy_bin = find_executable('obfsproxy') + def postProcessor(self, measurements): + if 'successes' not in self.summary: + self.summary['successes'] = [] + if 'failures' not in self.summary: + self.summary['failures'] = [] + + details = { + 'address': self.report['bridge_address'], + 'transport_name': self.report['transport_name'] + } + if self.report['success']: + self.summary['successes'].append(details) + else: + self.summary['failures'].append(details) + + def displaySummary(self, summary): + successful_count = {} + failure_count = {} + def count(results, counter): + for result in results: + if result['transport_name'] not in counter: + counter[result['transport_name']] = 0 + counter[result['transport_name']] += 1 + count(summary['successes'], successful_count) + count(summary['failures'], failure_count) + + working_bridges = ', '.join([x['address'] for x in summary['successes']]) + failing_bridges = ', '.join([x['address'] for x in summary['failures']]) + + print "Total successes: %d" % len(summary['successes']) + print "Total failures: %d" % len(summary['failures']) + + for transport, count in successful_count.items(): + print "%s successes: %d" % (transport.title(), count) + for transport, count in failure_count.items(): + print "%s failures: %d" % (transport.title(), count) + + print "Working bridges: %s" % working_bridges + print "Failing bridges: %s" % failing_bridges + def test_full_tor_connection(self): def getTransport(address): """ @@ -59,22 +106,25 @@ class BridgeReachability(nettest.NetTestCase): config = txtorcon.TorConfig() config.ControlPort = random.randint(2**14, 2**16) config.SocksPort = random.randint(2**14, 2**16) - + transport_name = getTransport(self.bridge) if transport_name and self.pyobfsproxy_bin: config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) self.report['transport_name'] = transport_name + self.report['bridge_address'] = self.bridge.split(' ')[1] elif transport_name and not self.pyobfsproxy_bin: log.err("Unable to test bridge because pyobfsproxy is not installed") self.report['success'] = None return + else: + self.report['bridge_address'] = self.bridge.split(' ')[0] config.Bridge = self.bridge config.UseBridges = 1 config.save() def updates(prog, tag, summary): - log.msg("Tor progress: %s%%" % prog) + log.msg("%s: %s%%" % (self.bridge, prog)) self.report['tor_progress'] = int(prog) self.report['tor_progress_tag'] = tag self.report['tor_progress_summary'] = summary

1 0

[ooni-probe/master] Merge pull request #72 from hellais/feature/bridget
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 191ca90564b3781ced5a396ab5ac92111d8d3ac6 Merge: 8f129d8 f7b67e7 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Fri Mar 14 11:53:35 2014 +0100 Merge pull request #72 from hellais/feature/bridget Feature/bridget ooni/nettest.py | 36 +++++- ooni/nettests/blocking/bridge_reachability.py | 150 +++++++++++++++++++++++++ ooni/reporter.py | 3 +- requirements.txt | 16 +-- scripts/install_on_planetlab.sh | 144 ++++++++++++++++++++++++ 5 files changed, 333 insertions(+), 16 deletions(-)

1 0