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

[bridgedb/master] 4568 - Update email and https distributor frontend
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit fb5fdad75ce1f5625ff1f303665710588baeb63e Author: aagbsn <aagbsn(a)extc.org> Date: Fri Jun 15 17:01:10 2012 -0700 4568 - Update email and https distributor frontend Add support for ipv6 and pluggable transports --- lib/bridgedb/Server.py | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index e6a63e1..de5e545 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -36,6 +36,7 @@ from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByIP4 +from bridgedb.Filters import filterBridgesByTransport try: import GeoIP @@ -153,8 +154,18 @@ class WebResource(twisted.web.resource.Resource): if format and len(format): format = format[0] # choose the first arg # do want ipv6 support? - ipv6 = False - if "ipv6" in request.postpath: ipv6 = True + transport = ipv6 = False + + ipv6 = request.args.get("ipv6", False) + if ipv6: ipv6 = True # if anything after ?ipv6= + + try: + # validate method name + logging.debug("trans: %s" % request.args.get("transport")[0]) + transport = re.match('[_a-zA-Z][_a-zA-Z0-9]*', + request.args.get("transport")[0]).group() + except (TypeError, IndexError): + transport = None rules = [] @@ -166,6 +177,12 @@ class WebResource(twisted.web.resource.Resource): rules.append(filterBridgesByIP4) addressClass = IPv4Address + if transport: + #XXX: A cleaner solution would differentiate between + # addresses by protocol rather than have separate lists + # Tor to be a transport, and selecting between them. + rules = [filterBridgesByTransport(transport, addressClass)] + bridges = self.distributor.getBridgesForIP(ip, interval, self.nBridgesToGive, countryCode, @@ -176,6 +193,7 @@ class WebResource(twisted.web.resource.Resource): b.getConfigLine( includeFingerprint=self.includeFingerprints, addressClass=addressClass, + transport=transport, request=bridgedb.Dist.uniformMap(ip) ), (I18n.BRIDGEDB_TEXT[16] if b.isBlocked(countryCode) else "") @@ -212,7 +230,8 @@ class WebResource(twisted.web.resource.Resource): + "" + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "" \ + "" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "" \ + email_domain_list \ - + "<hr />Note for experts: if you can use IPv6, try upgrading to Tor 0.2.3.12-alpha and use this IPv6 address in your bridge line: <tt>[2001:948:7:2::164]:6001</tt> Let us know how it goes!" \ + + "<hr /><a href='?ipv6=true'>Looking for IPv6 bridges?</a>" \ + + "<a href='?transport=obfs3'>Looking for obfsproxy bridges?</a>" \ + "</body></html>" return html_msg @@ -403,21 +422,26 @@ def getMailResponse(lines, ctx): # return None,None # Figure out which bridges to send - - # read subject, see if they want ipv6 - ipv6 = False + transport = ipv6 = False bridgeFilterRules = [] addressClass = None for ln in lines: if "ipv6" in ln.strip().lower(): ipv6 = True - bridgeFilterRules.append(filterBridgesByIP6) - addressClass = IPv6Address - break + if "transport" in ln.strip().lower(): + transport = re.search("transport ([_a-zA-Z][_a-zA-Z0-9]*)", ln).group(1).strip() + logging.debug("transport %s" % transport) + + if ipv6: + bridgeFilterRules.append(filterBridgesByIP6) + addressClass = IPv6Address else: bridgeFilterRules.append(filterBridgesByIP4) addressClass = IPv4Address + if transport: + bridgeFilterRules = [filterBridgesByTransport(transport, addressClass)] + try: interval = ctx.schedule.getInterval(time.time()) bridges = ctx.distributor.getBridgesForEmail(clientAddr, @@ -476,6 +500,7 @@ def getMailResponse(lines, ctx): answer = "".join(" %s\n" %b.getConfigLine( includeFingerprint=with_fp, addressClass=addressClass, + transport=transport, request=clientAddr ) for b in bridges) else: @@ -484,6 +509,9 @@ def getMailResponse(lines, ctx): EMAIL_MESSAGE_TEMPLATE = buildMessageTemplate(t) body.write(EMAIL_MESSAGE_TEMPLATE % answer) + #XXX debug + f.seek(0) + logging.debug(f.readlines()) f.seek(0) logging.info("Email looks good; we should send an answer.") return clientAddr, f

1 0

[bridgedb/master] 4568 - Add extra-info parser to load()
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 9632155b7c2cbf202a0604227ae977949b07574f Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jun 20 04:44:36 2012 -0700 4568 - Add extra-info parser to load() BridgeDB will now also parse extra-info descriptors if the configuration option 'EXTRA_INFO_FILE' is specified --- lib/bridgedb/Main.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index befb4ed..69a4761 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -172,15 +172,18 @@ def load(cfg, splitter, clear=False): for ID, running, stable, or_addresses in Bridges.parseStatusFile(f): status[ID] = running, stable addresses[ID] = or_addresses + #transports[ID] = transports f.close() if hasattr(cfg, "COUNTRY_BLOCK_FILE"): f = open(cfg.COUNTRY_BLOCK_FILE, 'r') for fingerprint, countryCode in Bridges.parseCountryBlockFile(f): countryblock.insert(fingerprint, countryCode) f.close() + bridges = {} for fname in cfg.BRIDGE_FILES: f = open(fname, 'r') for bridge in Bridges.parseDescFile(f, cfg.BRIDGE_PURPOSE): + bridges[bridge.getID()] = bridge s = status.get(bridge.getID()) if s is not None: running, stable = s @@ -190,6 +193,17 @@ def load(cfg, splitter, clear=False): countryblock.getBlockingCountries(bridge.fingerprint)) splitter.insert(bridge) f.close() + # read pluggable transports from extra-info document + # XXX: should read from networkstatus after bridge-authority + # does a reachability test + if hasattr(cfg, "EXTRA_INFO_FILE"): + f = open(cfg.EXTRA_INFO_FILE, 'r') + for transport in Bridges.parseExtraInfoFile(f): + ID, method_name, address, port, argdict = transport + if bridges[ID].running: + bridges[ID].transports.append(Bridges.PluggableTransport(bridges[ID], + method_name, address, port, argdict)) + bridges = None def loadProxyList(cfg): ipset = {}

1 0

[bridgedb/master] 4568 - Clean up email response formatting
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 6e07a0dfdea5ccf4f22532ef77a3db83ea3adeab Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 24 06:20:51 2012 -0700 4568 - Clean up email response formatting Fixes indentation in email response and adds debug logging of email body. --- lib/bridgedb/Server.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 5c4641c..2b3ea40 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -233,9 +233,9 @@ class WebResource(twisted.web.resource.Resource): + "" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "" \ + email_domain_list \ + "<hr /><a href='?ipv6=true'>" \ - + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a>" \ + + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a>" \ + "<a href='?transport=obfs2'>" \ - + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a>" \ + + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a>" \ + "</body></html>" return html_msg @@ -497,9 +497,11 @@ def buildMessageTemplate(t): + t.gettext(I18n.BRIDGEDB_TEXT[1]) + "\n\n" \ + t.gettext(I18n.BRIDGEDB_TEXT[2]) + "\n\n" \ + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[17])+ "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[18])+ "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[19])+ "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[17])+ "\n\n" + # list supported commands, e.g. ipv6, transport + msg_template = msg_template \ + + " " + t.gettext(I18n.BRIDGEDB_TEXT[18])+ "\n" \ + + " " + t.gettext(I18n.BRIDGEDB_TEXT[19])+ "\n\n" \ + t.gettext(I18n.BRIDGEDB_TEXT[6]) + "\n\n" return msg_template @@ -726,7 +728,8 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, mailbody.write(body) f.seek(0) - logging.info("Email looks good; we should send an answer.") + logging.debug("Email body:\n%s" % f.read()) + f.seek(0) return clientAddr, f def getGPGContext(cfg):

1 0

[bridgedb/master] 6175 - Make range continuous
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 614cedb7777fc83b819db6fd0b04858b8eccdf26 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Jun 22 07:13:34 2012 -0700 6175 - Make range continuous fix getNumBridgesPerAnswer so that lengths of 20 and 100 don't break the response --- lib/bridgedb/Dist.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 0241c32..4d7ee8e 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -33,8 +33,8 @@ def uniformMap(ip): def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3): if len(ring) < 20: n_bridges_per_answer = 1 - if 20 < len(ring) < 100: n_bridges_per_answer = min(2, max_bridges_per_answer) - if len(ring) > 100: n_bridges_per_answer = max_bridges_per_answer + if 20 <= len(ring) < 100: n_bridges_per_answer = min(2, max_bridges_per_answer) + if len(ring) >= 100: n_bridges_per_answer = max_bridges_per_answer logging.debug("Returning %d bridges from ring of len: %d" % \ (n_bridges_per_answer, len(ring)))

1 0

[bridgedb/master] 5463 - Adds GPG clearsign to email distributor.
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit ca5398470108b8f9444b5c0f823411eb735dcfd0 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jun 20 05:55:49 2012 -0700 5463 - Adds GPG clearsign to email distributor. Two new configuration options are added to bridgedb.conf: EMAIL_GPG_SIGNING_ENABLED EMAIL_GPG_SIGNING_KEY The former may be either True or False, and the latter must point to the ascii-armored key file. The keyfile must not be passphrase protected. The gpgme library will add the secret key to the secret key ring of user who runs BridgeDB. --- README | 16 ++++++++-- bridgedb.conf | 4 ++ lib/bridgedb/Main.py | 2 + lib/bridgedb/Server.py | 79 +++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 91 insertions(+), 10 deletions(-) diff --git a/README b/README index 6ab1545..baca007 100644 --- a/README +++ b/README @@ -20,10 +20,11 @@ To set up: - A recaptcha.net account is required. - Install these required packages: - Debian: apt-get install python-recaptcha python-beautifulsoup - - Python: pip install recaptcha-client BeautifulSoup + python-gpgme + - Python: pip install recaptcha-client BeautifulSoup pygpgme - Others: http://pypi.python.org/pypi/recaptcha-client - : http://pypi.python.org/pypi/BeautifulSoup - + http://pypi.python.org/pypi/BeautifulSoup + http://pypi.python.org/pypi/pygpgme To re-generate and update the i18n files (in case translated strings have changed in BridgeDB): @@ -67,6 +68,15 @@ To indicate which bridges are blocked: - If this file is present, bridgedb will filter blocked bridges from responses - For GeoIP support make sure to install Maxmind GeoIP +To sign emails with gpg: + - Add these two options to your bridgedb.conf: + + EMAIL_GPG_SIGNING_ENABLED, EMAIL_GPG_SIGNING_KEY + + The former may be either True or False, and the latter must + point to the ascii-armored key file. The keyfile must not be + passphrase protected. + To update the SQL schema: - Install sqlite3: - Debian: apt-get install sqlite3 diff --git a/bridgedb.conf b/bridgedb.conf index f044ee6..2b97d78 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -146,6 +146,10 @@ EMAIL_N_BRIDGES_PER_ANSWER=3 # once we have the vidalia/tor interaction fixed for everbody. EMAIL_INCLUDE_FINGERPRINTS=False +# Configuration options for GPG signed messages +EMAIL_GPG_SIGNING_ENABLED = False +EMAIL_GPG_SIGNING_KEY = '' + #========== # Options related to unallocated bridges. diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 69a4761..977f37a 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -97,6 +97,8 @@ CONFIG = Conf( EMAIL_INCLUDE_FINGERPRINTS = False, EMAIL_SMTP_HOST="127.0.0.1", EMAIL_SMTP_PORT=25, + EMAIL_GPG_SIGNING_ENABLED = False, + EMAIL_GPG_SIGNING_KEY = "bridgedb-gpg.sec", RESERVED_SHARE=2, diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 8ce9ce2..5c4641c 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -6,7 +6,7 @@ This module implements the web and email interfaces to the bridge database. """ -from cStringIO import StringIO +from StringIO import StringIO import MimeWriter import rfc822 import time @@ -31,12 +31,15 @@ from random import randint from bridgedb.Raptcha import Raptcha import base64 import textwrap + from ipaddr import IPv4Address, IPv6Address from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport + +import gpgme try: import GeoIP @@ -458,7 +461,8 @@ def getMailResponse(lines, ctx): # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours body = buildSpamWarningTemplate(t) % (bridgedb.Dist.MAX_EMAIL_RATE / 3600) - return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID) + return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID, + gpgContext=ctx.gpgContext) except IgnoreEmail, e: logging.info("Got a mail too frequently; ignoring %r: %s.", @@ -483,7 +487,8 @@ def getMailResponse(lines, ctx): body = buildMessageTemplate(t) % answer # Generate the message. - return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID) + return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID, + gpgContext=ctx.gpgContext) def buildMessageTemplate(t): msg_template = t.gettext(I18n.BRIDGEDB_TEXT[5]) + "\n\n" \ @@ -575,6 +580,9 @@ class MailContext: # The number of bridges to send for each email. self.N = cfg.EMAIL_N_BRIDGES_PER_ANSWER + # Initialize a gpg context or set to None for backward compatibliity. + self.gpgContext = getGPGContext(cfg) + self.cfg = cfg class MailMessage: @@ -690,7 +698,9 @@ def getCCFromRequest(request): return path.lower() return None -def composeEmail(fromAddr, clientAddr, subject, body, msgID=False): +def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, + gpgContext=None): + f = StringIO() w = MimeWriter.MimeWriter(f) w.addheader("From", fromAddr) @@ -702,10 +712,65 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False): w.addheader("In-Reply-To", msgID) w.addheader("Date", twisted.mail.smtp.rfc822date()) mailbody = w.startbody("text/plain") - mailbody.write(body) - f.seek(0) - logging.debug(f.readlines()) + # gpg-clearsign messages + if gpgContext: + signature = StringIO() + plaintext = StringIO(body) + sigs = gpgContext.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR) + if (len(sigs) != 1): + logging.warn('Failed to sign message!') + signature.seek(0) + [mailbody.write(l) for l in signature] + else: + mailbody.write(body) + f.seek(0) logging.info("Email looks good; we should send an answer.") return clientAddr, f + +def getGPGContext(cfg): + """ Returns a gpgme Context() with the signers initialized by the keyfile + specified by the option EMAIL_GPG_SIGNING_KEY in bridgedb.conf, or None + if the option was not enabled or unable to initialize. + + The key should not be protected by a passphrase. + """ + try: + # must have enabled signing and specified a key file + if not cfg.EMAIL_GPG_SIGNING_ENABLED or not cfg.EMAIL_GPG_SIGNING_KEY: + return None + except AttributeError: + return None + + try: + # import the key + keyfile = open(cfg.EMAIL_GPG_SIGNING_KEY) + logging.debug("Opened GPG Keyfile %s" % cfg.EMAIL_GPG_SIGNING_KEY) + ctx = gpgme.Context() + result = ctx.import_(keyfile) + + assert len(result.imports) == 1 + fingerprint = result.imports[0][0] + keyfile.close() + logging.debug("GPG Key with fingerprint %s imported" % fingerprint) + + ctx.armor = True + ctx.signers = [ctx.get_key(fingerprint)] + assert len(ctx.signers) == 1 + + # make sure we can sign + message = StringIO('Test') + signature = StringIO() + new_sigs = ctx.sign(message, signature, gpgme.SIG_MODE_CLEAR) + assert len(new_sigs) == 1 + + # return the ctx + return ctx + + except IOError, e: + # exit noisily if keyfile not found + exit(e) + except AssertionError: + # exit noisily if key does not pass tests + exit('Invalid GPG Signing Key')

1 0

[bridgedb/master] 4568 - Update obfs version and I18 text
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 0426a51c9a55ca434581577d855224eafc09ee79 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Jun 22 07:29:26 2012 -0700 4568 - Update obfs version and I18 text obfs2 is the correct version --- lib/bridgedb/I18n.py | 8 ++++++-- lib/bridgedb/Server.py | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py index 1e90348..a1c82c9 100644 --- a/lib/bridgedb/I18n.py +++ b/lib/bridgedb/I18n.py @@ -71,7 +71,11 @@ between emails is: """), _("""The following commands are also supported:"""), # BRIDGEDB_TEXT[18] _(""" ipv6 : request ipv6 bridges """), - # bridgedb_text[19] + # BRIDGEDB_TEXT[19] _(""" transport TRANSPORT_NAME : request bridges with transport -TRANSPORT_NAME, such as obfs3.""") +TRANSPORT_NAME, such as obfs2."""), + # BRIDGEDB_TEXT[20] + _("""Looking for IPv6 bridges?"""), + # BRIDGEDB_TEXT[21] + _("""Looking for obfsproxy bridges?""") ] diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 172a0ba..8ce9ce2 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -229,8 +229,10 @@ class WebResource(twisted.web.resource.Resource): + "" + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "" \ + "" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "" \ + email_domain_list \ - + "<hr /><a href='?ipv6=true'>Looking for IPv6 bridges?</a>" \ - + "<a href='?transport=obfs3'>Looking for obfsproxy bridges?</a>" \ + + "<hr /><a href='?ipv6=true'>" \ + + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a>" \ + + "<a href='?transport=obfs2'>" \ + + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a>" \ + "</body></html>" return html_msg

1 0

[bridgedb/master] 5027 - update Bridge.isBlocked() for transport
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 26169dca5e2fb6143c8d95c333f514d31b4b0ec9 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 30 14:44:52 2012 -0700 5027 - update Bridge.isBlocked() for transport Considers transport and address class when determining if a bridge is blocked in the specified country. Adds parameters addressClass and methodname to differentiate between IPv4, IPv6, and pluggable transports. --- lib/bridgedb/Bridges.py | 82 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 62 insertions(+), 20 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 3d72d37..8bf1f1b 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -116,7 +116,7 @@ class Bridge: if not transports: transports = [] self.transports = transports self.running = self.stable = None - self.blockingCountries = None + self.blockingCountries = {} if id_digest is not None: assert fingerprint is None @@ -227,15 +227,44 @@ class Bridge: if stable is not None: self.stable = stable - def setBlockingCountries(self, blockingCountries): - if blockingCountries is not None: - self.blockingCountries = blockingCountries - - def isBlocked(self, countryCode): - if self.blockingCountries is not None and countryCode is not None: - if countryCode in self.blockingCountries: - return True - return False + def isBlocked(self, countryCode, addressClass, methodname=None): + """ if at least one address:port of the selected addressClass and + (optional) transport type is not blocked in countryCode, return True + """ + # 1) transport is specified + if methodname is not None: + for transport in self.transports: + key = "%s:%s" % (transport.address, transport.port) + if (isinstance(transport.address, addressClass) + and transport.methodname.lower() == methodname.lower()): + try: + if countryCode not in self.blockingCountries[key]: + return False + except KeyError: + return False # no blocklist + return True + # 2) no transport specified (default) + else: + # 3) check primary ip, port + # XXX: could be more elegant if ip,orport were not special case + if isinstance(self.ip, addressClass): + key = "%s:%s" % (self.ip, self.orport) + try: + if countryCode not in self.blockingCountries[key]: + return False + except KeyError: return False # no blocklist + + # 4) check or addresses + for address,portlist in self.or_addresses.items(): + if isinstance(address, addressClass): + # check each port + for port in portlist: + key = "%s:%s" % (address, port) + try: + if countryCode not in self.blockingCountries[key]: + return False + except KeyError: return False # no blocklist + return True def parseDescFile(f, bridge_purpose='bridge'): """Generator. Parses a cached-descriptors file 'f' and yeilds a Bridge object @@ -282,7 +311,7 @@ def parseDescFile(f, bridge_purpose='bridge'): items = line.split() if len(items) >= 4: nickname = items[1] - ip = items[2] + ip = items[2].strip('[]') orport = int(items[3]) elif line.startswith("fingerprint "): fingerprint = line[12:].replace(" ", "") @@ -508,18 +537,31 @@ def parseStatusFile(f): or_addresses = {} def parseCountryBlockFile(f): - """Generator. Parses a blocked-bridges file 'f', and yields a - fingerprint, countryCode tuple for every entry""" - fingerprint = countryCode = None + """Generator. Parses a blocked-bridges file 'f', and yields + a fingerprint (ID), address, a list of ports, and a list of country + codes where the bridge is blocked for each valid line: + address, port [], countrycode []""" for line in f: + ID = address = fields = portlist = countries = None line = line.strip() - m = re.match(r"fingerprint\s+(?P<fingerprint>\w+?)\s+country-code\s+(?P<countryCode>\w+)$", line) try: - fingerprint = m.group('fingerprint').lower() - countryCode = m.group('countryCode').lower() - yield fingerprint, countryCode - except AttributeError, IndexError: - logging.warn("Unparseable line in blocked-bridges file: %s", line) + ID, addrspec, countries = line.split() + if is_valid_fingerprint(ID): + ID = fromHex(ID) + else: + print "failed to parse ID!" + continue # skip this line + + for regex in [re_ipv4, re_ipv6]: + m = regex.match(addrspec) + if m: + address = ipaddr.IPAddress(m.group(1)) + portlist = PortList(m.group(2)) + countries = countries.split(',') + except (IndexError, ValueError): + continue # skip this line + if ID and address and portlist and countries: + yield ID, address, portlist, countries class BridgeHolder: """Abstract base class for all classes that hold bridges."""

1 0

[bridgedb/master] 4568 - Update I18 strings
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit c737704e07c6aad83b1a344eea49e91b788d0bc9 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 24 06:20:10 2012 -0700 4568 - Update I18 strings Cleans up the I18 strings so that the command descriptions fit on a single line and provide. --- lib/bridgedb/I18n.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py index a1c82c9..dc704b9 100644 --- a/lib/bridgedb/I18n.py +++ b/lib/bridgedb/I18n.py @@ -70,10 +70,9 @@ between emails is: """), # BRIDGEDB_TEXT[17] _("""The following commands are also supported:"""), # BRIDGEDB_TEXT[18] - _(""" ipv6 : request ipv6 bridges """), + _("""ipv6 : request ipv6 bridges."""), # BRIDGEDB_TEXT[19] - _(""" transport TRANSPORT_NAME : request bridges with transport -TRANSPORT_NAME, such as obfs2."""), + _("""transport NAME : request transport NAME. Example: 'transport obfs2'"""), # BRIDGEDB_TEXT[20] _("""Looking for IPv6 bridges?"""), # BRIDGEDB_TEXT[21]

1 0

[bridgedb/master] 6175 - Return fewer bridges from shorter rings.
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit e35809195e3cbe8aa8fb877e5b246e190120403c Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jun 20 04:26:42 2012 -0700 6175 - Return fewer bridges from shorter rings. --- lib/bridgedb/Dist.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index ec13fb5..0241c32 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -31,6 +31,15 @@ def uniformMap(ip): else: return ".".join( ip.split(".")[:3] ) +def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3): + if len(ring) < 20: n_bridges_per_answer = 1 + if 20 < len(ring) < 100: n_bridges_per_answer = min(2, max_bridges_per_answer) + if len(ring) > 100: n_bridges_per_answer = max_bridges_per_answer + + logging.debug("Returning %d bridges from ring of len: %d" % \ + (n_bridges_per_answer, len(ring))) + return n_bridges_per_answer + class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): """Object that hands out bridges based on the IP address of an incoming request and the current time period. @@ -186,8 +195,8 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) - # get the bridge. - return ring.getBridges(pos, N) + # get an appropriate number of bridges + return ring.getBridges(pos, getNumBridgesPerAnswer(ring, max_bridges_per_answer=N)) def __len__(self): return len(self.splitter) @@ -195,6 +204,7 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): def dumpAssignments(self, f, description=""): self.splitter.dumpAssignments(f, description) + # These characters are the ones that RFC2822 allows. #ASPECIAL = '!#$%&*+-/=?^_`{|}~' #ASPECIAL += "\\\'" @@ -389,7 +399,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) - result = ring.getBridges(pos, N) + result = ring.getBridges(pos, getNumBridgesPerAnswer(ring, max_bridges_per_answer=N)) db.setEmailTime(emailaddress, now) db.commit()

1 0

[bridgedb/master] 5027 - Update Tests for 'unblocked' bridge support
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit f1ca03ef1bdcb8648b1267eeb655d165997de5a6 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 30 14:45:43 2012 -0700 5027 - Update Tests for 'unblocked' bridge support Adds tests for parsers & distributors. --- lib/bridgedb/Tests.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index d14bc23..e20f306 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -56,6 +56,23 @@ def randomPortSpec(): portspec = portspec.rstrip(',') #remove trailing , return portspec +def randomCountry(): + countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] + #XXX: load from geoip + return random.choice(countries) + +def randomCountrySpec(): + countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] + #XXX: load from geoip + spec = "" + choices = [] + for i in xrange(10): + choices.append(random.choice(countries)) + choices = set(choices) #dedupe + choices = list(choices) + spec += ",".join(choices) + return spec + def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False): nn = "bridge-%s"%random.randrange(0,1000000) ip = ipaddr.IPAddress(randomIP()) @@ -179,6 +196,7 @@ class IPBridgeDistTests(unittest.TestCase): for b in n2: assert (b not in n) + #XXX: #6175 breaks this test! def testDistWithPortRestrictions(self): param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Baz", @@ -502,6 +520,30 @@ class ParseDescFileTests(unittest.TestCase): for b in bs: b.assertOK() + def testParseCountryBlockFile(self): + simpleBlock = "%s:%s %s\n" + countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] + test = str() + # test ipv4 + for i in range(50): + test += simpleBlock % (randomIP(), randomPort(), + randomCountrySpec()) + # test ipv6 + for i in range(50): + test += simpleBlock % ("[%s]" % randomIP6(), randomPortSpec(), + randomCountrySpec()) + + for a,p,c in bridgedb.Bridges.parseCountryBlockFile(test.split('\n')): + assert type(a) in (ipaddr.IPv6Address, ipaddr.IPv4Address) + assert isinstance(p, bridgedb.Bridges.PortList) + assert isinstance(c, list) + assert len(c) > 0 + for y in c: + assert y in countries + #print "address: %s" % a + #print "portlist: %s" % p + #print "countries: %s" % c + def testSuite(): suite = unittest.TestSuite() loader = unittest.TestLoader()

1 0