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

[ooni-probe/develop] Add support for closing a report
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 5ead2b8c42daea738d37d87571c5e0cbd37027c7 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jun 7 00:31:23 2013 +0200 Add support for closing a report --- ooni/reporter.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ooni/reporter.py b/ooni/reporter.py index 85df36e..b80a2a3 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -353,6 +353,10 @@ class OONIBReporter(OReporter): self.backendVersion = parsed_response['backend_version'] log.debug("Created report with id %s" % parsed_response['report_id']) + def finish(self): + url = self.collectorAddress + '/report/' + self.reportID + '/close' + response = yield self.agent.request("POST", url) + class ReportClosed(Exception): pass

1 0

[ooni-probe/develop] Add support for closing reports in ooni-probe
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit d98ea4c4fee6699b8be8462e71503e98be2e24d3 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jun 7 22:13:20 2013 +0200 Add support for closing reports in ooni-probe --- ooni/director.py | 9 +++++---- ooni/reporter.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 809eae4..00ec039 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -171,7 +171,7 @@ class Director(object): """ pass - def netTestDone(self, result, net_test): + def netTestDone(self, net_test): self.activeNetTests.remove(net_test) if len(self.activeNetTests) == 0: self.allTestsDone.callback(None) @@ -206,10 +206,11 @@ class Director(object): self.activeNetTests.append(net_test) - net_test.done.addBoth(report.close) - net_test.done.addBoth(self.netTestDone, net_test) - yield net_test.done + yield report.close() + + self.netTestDone(net_test) + def startSniffing(self): """ Start sniffing with Scapy. Exits if required privileges (root) are not diff --git a/ooni/reporter.py b/ooni/reporter.py index b80a2a3..38519f7 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -242,8 +242,7 @@ class OONIBReporter(OReporter): if the oonib reporter is not valid. """ regexp = '^(http|httpo):\/\/[a-zA-Z0-9\-\.]+(:\d+)?$' - if not re.match(regexp, self.collectorAddress) or \ - len(self.collectorAddress) < 30: + if not re.match(regexp, self.collectorAddress): raise errors.InvalidOONIBCollectorAddress @defer.inlineCallbacks @@ -353,9 +352,11 @@ class OONIBReporter(OReporter): self.backendVersion = parsed_response['backend_version'] log.debug("Created report with id %s" % parsed_response['report_id']) + @defer.inlineCallbacks def finish(self): url = self.collectorAddress + '/report/' + self.reportID + '/close' - response = yield self.agent.request("POST", url) + log.debug("Closing the report %s" % url) + response = yield self.agent.request("POST", str(url)) class ReportClosed(Exception): pass @@ -464,7 +465,7 @@ class Report(object): raise errors.NoMoreReporters return - def close(self, _): + def close(self): """ Close the report by calling it's finish method.

1 0

[ooni-probe/develop] Merge pull request #83 from isislovecruft/fix/pyrex-version
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit a4df00f6c1ac7def03a56572bd68bc0385d325b8 Merge: 3f9035f ba9c4f1 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jun 6 07:55:21 2013 -0700 Merge pull request #83 from isislovecruft/fix/pyrex-version Add version number for the Pyrex dependency. requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/develop] Add version number for the Pyrex dependency.
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit ba9c4f12f3684b5e1b8c2bce9af1cba6a119f338 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 6 13:48:21 2013 +0000 Add version number for the Pyrex dependency. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fae3eb6..2dcab52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ pyOpenSSL>=0.13 pygeoip>=0.2.5 txtorcon>=0.7 txsocksx>=0.0.2 -Pyrex +Pyrex>=0.9.8.6 parsley>=1.1 # Taken from the versions required by twisted 13.0.0 (latest)

1 0

[ooni-probe/develop] Use the full fingerprint as the download specifier.
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 7978b6156078a6e259529d0b23cf6a1931ad356b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 6 13:54:58 2013 +0000 Use the full fingerprint as the download specifier. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 52107e8..ed3250c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -125,7 +125,7 @@ echo "Installing Tor..." echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list -gpg --keyserver keys.gnupg.net --recv 886DDD89 +gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - apt-get update

1 0

[ooni-probe/develop] Merge pull request #84 from isislovecruft/fix/fpr
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 7f786a614c3b13afdf07211cfa20d485c4d8a836 Merge: a4df00f 7978b61 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jun 6 07:56:17 2013 -0700 Merge pull request #84 from isislovecruft/fix/fpr Use the full fingerprint as the download specifier. Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/develop] Add bridge and obfsproxy support to director when starting Tor
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 9b25111586a79db47cb880586dbe368ba6327376 Author: aagbsn <aagbsn(a)extc.org> Date: Thu May 23 00:54:50 2013 -0400 Add bridge and obfsproxy support to director when starting Tor --- ooni/director.py | 16 ++++++++++++++++ ooniprobe.conf.sample | 1 + 2 files changed, 17 insertions(+) diff --git a/ooni/director.py b/ooni/director.py index 809eae4..9538fe4 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -298,6 +298,22 @@ class Director(object): os.makedirs(data_dir) tor_config.DataDirectory = data_dir + if config.tor.bridges: + tor_config.UseBridges = 1 + if config.advanced.obfsproxy_binary: + tor_config.ClientTransportPlugin = \ + 'obfs2,obfs3 exec %s managed' % \ + config.advanced.obfsproxy_binary + bridges = [] + with open(config.tor.bridges) as f: + for bridge in f: + if 'obfs' in bridge: + if config.advanced.obfsproxy_binary: + bridges.append(bridge.strip()) + else: + bridges.append(bridge.strip()) + tor_config.Bridge = bridges + tor_config.save() log.debug("Setting control port as %s" % tor_config.ControlPort) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index bed9da6..174bb91 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -26,6 +26,7 @@ advanced: geoip_data_dir: /usr/share/GeoIP/ debug: true # tor_binary: '/usr/sbin/tor' + # obfsproxy_binary: '/usr/bin/obfsproxy' # For auto detection interface: auto # Of specify a specific interface

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 15 Jun '13

15 Jun '13

commit 75b3630f14ccaca7bc09c67564139752c3ecf2d8 Merge: 34fde62 05582c2 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 14 19:29:49 2013 -0700 Merge branch 'maint-2.4' build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+)

1 0

[torbrowser/master] Announce the 3.0-alpha1 release as recommended.
by mikeperry＠torproject.org 15 Jun '13

15 Jun '13

commit 05582c2d903e7d01f8eb5f635ca08cc0f02cbee5 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 14 18:17:23 2013 -0700 Announce the 3.0-alpha1 release as recommended. --- build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 7c58108..a535941 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -6,4 +6,7 @@ "2.4.12-alpha-2-MacOS", "2.4.12-alpha-2-Windows", "2.4.12-alpha-2-Linux" +"3.0-alpha-1-Linux" +"3.0-alpha-1-MacOS" +"3.0-alpha-1-Windows" ]

1 0

[torbrowser/maint-2.4] Announce the 3.0-alpha1 release as recommended.
by mikeperry＠torproject.org 15 Jun '13

15 Jun '13

commit 05582c2d903e7d01f8eb5f635ca08cc0f02cbee5 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 14 18:17:23 2013 -0700 Announce the 3.0-alpha1 release as recommended. --- build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 7c58108..a535941 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -6,4 +6,7 @@ "2.4.12-alpha-2-MacOS", "2.4.12-alpha-2-Windows", "2.4.12-alpha-2-Linux" +"3.0-alpha-1-Linux" +"3.0-alpha-1-MacOS" +"3.0-alpha-1-Windows" ]

1 0