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

[ooni-probe/master] Query onionoo through Tor
by art＠torproject.org 01 Mar '12

01 Mar '12

commit 59e3e0e3ced2ce85f1799ea36ed0bd77abb04401 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Mar 1 10:32:11 2012 +0530 Query onionoo through Tor All requests are done through Tor now. Also, Onionoo URL is now a global variable. --- tests/bridget.py | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/bridget.py b/tests/bridget.py index 13b72ea..772311c 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -37,6 +37,8 @@ try: except: print "Error TorCtl not installed!" +ONIONOO_URL="http://85.214.195.203/summary/search/" + class SocksiPyConnection(httplib.HTTPConnection): def __init__(self, proxytype, proxyaddr, proxyport = None, rdns = True, username = None, password = None, *args, **kwargs): @@ -198,15 +200,12 @@ ControlPort %s print (time_end-time_start) return str(256/(time_end-time_start)) + " KB/s" - def is_public(self, fp): - conn = httplib.HTTPConnection("85.214.195.203") - conn.request("GET", "/summary/search/"+str(fp)) - response = conn.getresponse() - if response.status == 200: - reply = json.loads(response.read()) - conn.close() - if reply['bridges'] or reply['relays']: - return True + def is_public(self, fp, socksport): + opener = urllib2.build_opener(SocksiPyHandler(socks.PROXY_TYPE_SOCKS5,'127.0.0.1',int(socksport))) + response = opener.open(str(ONIONOO_URL)+str(fp)) + reply = json.loads(response.read()) + if reply['bridges'] or reply['relays']: + return True return False def connect(self, bridge, timeout=None): @@ -256,7 +255,7 @@ ControlPort %s except: self.logger.error("Error in connecting to Tor Control port") - public = self.is_public(bridgeinfo['fingerprint']) + public = self.is_public(bridgeinfo['fingerprint'], socksport) self.logger.info("Public: %s" % public) bandwidth = self.download_file(socksport) self.logger.info("Bandwidth: %s" % bandwidth)

1 0

[ooni-probe/master] Check if bridge is public or not
by art＠torproject.org 01 Mar '12

01 Mar '12

commit f26af2d6d67f94c09586dd8b9360f294a5bdc55d Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Mar 1 01:05:50 2012 +0530 Check if bridge is public or not Queries onionoo to see if the bridge is public. --- tests/bridget.py | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/tests/bridget.py b/tests/bridget.py index 59d7800..13b72ea 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -30,6 +30,7 @@ import fcntl from plugoo import Plugoo, Asset, torify import urllib2 import httplib +import json try: from TorCtl import TorCtl @@ -177,7 +178,12 @@ ControlPort %s for x in output.split("\n"): cfield = x.split(' ') if cfield[0] in fields: - ret[cfield[0]] = ' '.join(cfield[1:]) + #not sure if hellais did this on purpose, but this overwrites + #the previous entries. For ex, 'opt' has multiple entries and + #only the last value is stored + ret[cfield[0]] = ' '.join(cfield[1:]) + if cfield[1] == 'fingerprint': + ret['fingerprint'] = ''.join(cfield[2:]) return ret #Can't use @torify as it doesn't support concurrency right now @@ -192,7 +198,21 @@ ControlPort %s print (time_end-time_start) return str(256/(time_end-time_start)) + " KB/s" + def is_public(self, fp): + conn = httplib.HTTPConnection("85.214.195.203") + conn.request("GET", "/summary/search/"+str(fp)) + response = conn.getresponse() + if response.status == 200: + reply = json.loads(response.read()) + conn.close() + if reply['bridges'] or reply['relays']: + return True + return False + def connect(self, bridge, timeout=None): + bridgeinfo = None + bandwidth = None + public = None if not timeout: if self.config.tests.tor_bridges_timeout: self.timeout = self.config.tests.tor_bridges_timeout @@ -232,12 +252,15 @@ ControlPort %s try: c = TorCtl.connect('127.0.0.1', controlport) bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) - bandwidth = self.download_file(socksport) + c.close() except: self.logger.error("Error in connecting to Tor Control port") + public = self.is_public(bridgeinfo['fingerprint']) + self.logger.info("Public: %s" % public) + bandwidth = self.download_file(socksport) self.logger.info("Bandwidth: %s" % bandwidth) - c.close() + try: p.stdout.close() except: @@ -255,7 +278,8 @@ ControlPort %s 'Bridge': bridge, 'Working': True, 'Descriptor': bridgeinfo, - 'Calculated bandwidth': bandwidth + 'Calculated bandwidth': bandwidth, + 'Public': public } if re.search("%", o):

1 0

[ooni-probe/master] Merge remote-tracking branch 'remotes/gsathya/check_public' into gsathya
by art＠torproject.org 01 Mar '12

01 Mar '12

commit c916dba2f7d74f889496a3d5292e2126fd5c0898 Merge: 7b7ed0b 59e3e0e Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Feb 29 21:17:31 2012 -0800 Merge remote-tracking branch 'remotes/gsathya/check_public' into gsathya Conflicts: tests/bridget.py tests/bridget.py | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --cc tests/bridget.py index c4515aa,772311c..52bff75 --- a/tests/bridget.py +++ b/tests/bridget.py @@@ -36,8 -37,7 +37,9 @@@ try except: print "Error TorCtl not installed!" +__plugoo__ = "BridgeT" +__desc__ = "BridgeT, for testing Tor Bridge reachability" + ONIONOO_URL="http://85.214.195.203/summary/search/" class SocksiPyConnection(httplib.HTTPConnection): def __init__(self, proxytype, proxyaddr, proxyport = None, rdns = True, @@@ -180,7 -180,12 +182,12 @@@ ControlPort % for x in output.split("\n"): cfield = x.split(' ') if cfield[0] in fields: + #not sure if hellais did this on purpose, but this overwrites + #the previous entries. For ex, 'opt' has multiple entries and + #only the last value is stored - ret[cfield[0]] = ' '.join(cfield[1:]) + ret[cfield[0]] = ' '.join(cfield[1:]) + if cfield[1] == 'fingerprint': + ret['fingerprint'] = ''.join(cfield[2:]) return ret #Can't use @torify as it doesn't support concurrency right now @@@ -195,7 -200,18 +202,18 @@@ print (time_end-time_start) return str(256/(time_end-time_start)) + " KB/s" + def is_public(self, fp, socksport): + opener = urllib2.build_opener(SocksiPyHandler(socks.PROXY_TYPE_SOCKS5,'127.0.0.1',int(socksport))) + response = opener.open(str(ONIONOO_URL)+str(fp)) + reply = json.loads(response.read()) + if reply['bridges'] or reply['relays']: + return True + return False - ++ def connect(self, bridge, timeout=None): + bridgeinfo = None + bandwidth = None + public = None if not timeout: if self.config.tests.tor_bridges_timeout: self.timeout = self.config.tests.tor_bridges_timeout

1 0

[tor/master] Don't leak the env_vars_sorted smartlist in process_environment_make
by nickm＠torproject.org 01 Mar '12

01 Mar '12

commit 77a7a980d0ab0bbfd4d99a062dbb0b5eadaa32ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:25:39 2012 -0800 Don't leak the env_vars_sorted smartlist in process_environment_make Found by Coverity. No changes/ file, because this bug has not been in a release yet. --- src/common/util.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5fd8c2d..ecf49a6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3823,6 +3823,8 @@ process_environment_make(struct smartlist_t *env_vars) tor_assert(cp == env->windows_environment_block + total_env_length - 1); } + smartlist_free(env_vars_sorted); + return env; }

1 0

[obfsproxy/master] Include files from doc/ in the release archive.
by nickm＠torproject.org 01 Mar '12

01 Mar '12

commit 7bf37c0eb0ae632ef42f9725cf6b0a4a0dd79e93 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 27 21:49:03 2012 -0800 Include files from doc/ in the release archive. --- Makefile.am | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index a703a99..189ee08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,19 @@ noinst_HEADERS = \ src/test/tinytest.h \ src/test/tinytest_macros.h -EXTRA_DIST = doc/obfs2/protocol-spec.txt +EXTRA_DIST = \ + doc/HACKING \ + doc/obfsproxy.1 \ + doc/obfsproxy_architecture.txt \ + doc/TODO \ + doc/tor-obfs-howto.txt \ + doc/obfs2/protocol-spec.txt \ + doc/obfs2/threat-model.txt \ + doc/obfs2/howto/README \ + doc/obfs2/howto/client-external-howto.txt \ + doc/obfs2/howto/client-managed-howto.txt \ + doc/obfs2/howto/server-managed-howto.txt \ + doc/obfs2/howto/server-external-howto.txt TESTS = unittests

1 0