tor-commits March 2013

tor-commits@lists.torproject.org

21 participants
1373 discussions

[bridgedb/master] 4772 - read LOGLEVEL on (re)load()
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit e1bf94ffce3bc59ec27a0d37b6fd5690eefd56a3 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jun 24 06:49:13 2012 -0700 4772 - read LOGLEVEL on (re)load() --- lib/bridgedb/Main.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 977f37a..d8a5c3c 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -336,6 +336,18 @@ def startup(cfg): # Make the parse-bridges function get re-called on SIGHUP. def reload(): logging.info("Caught SIGHUP") + + # re open config file + options, arguments = Opt.parseOpts() + configuration = {} + if options.configfile: + execfile(options.configfile, configuration) + cfg = Conf(**configuration) + # update loglevel on (re)load + level = getattr(cfg, 'LOGLEVEL', 'WARNING') + level = getattr(logging, level) + logging.getLogger().setLevel(level) + load(cfg, splitter, clear=True) proxyList.replaceProxyList(loadProxyList(cfg)) logging.info("%d bridges loaded", len(splitter))

1 0

[bridgedb/master] 5027 - update tests
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 8f1045d626582d4a818dc37fb8ec7a6f48c57e7f Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jul 1 03:39:05 2012 -0700 5027 - update tests adds new tests for transports and ipv6 bridges --- lib/bridgedb/Tests.py | 190 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 136 insertions(+), 54 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index e20f306..b4d3ca1 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -23,15 +23,33 @@ from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByOnlyIP4 from bridgedb.Filters import filterBridgesByOnlyIP6 +from bridgedb.Filters import filterBridgesByTransport +from bridgedb.Filters import filterBridgesByNotBlockedIn def suppressWarnings(): warnings.filterwarnings('ignore', '.*tmpnam.*') def randomIP(): - return ".".join([str(random.randrange(1,256)) for _ in xrange(4)]) + if random.choice(xrange(2)): return randomIP4() + return randomIP6() + +def randomIP4(): + return ipaddr.IPAddress(random.getrandbits(32)) + +def randomIP4String(): + return str(ipaddr.IPAddress(random.getrandbits(32))) def randomIP6(): - return "%s" % ipaddr.IPAddress(random.getrandbits(128)) + return ipaddr.IPAddress(random.getrandbits(128)) + +def randomIP6String(): + # as used by Tor, with enclosing [] + return "[%s]" % randomIP6() + +def randomIPString(): + # as used by Tor, with enclosing [] for IPv6 addresses + if random.choice(xrange(2)): return randomIP4String() + return randomIP6String() def random16IP(): upper = "123.123." # same 16 @@ -39,7 +57,7 @@ def random16IP(): return upper+lower def randomPort(): - return str(random.randint(1,65535)) + return random.randint(1,65535) def randomPortSpec(): """ @@ -73,28 +91,34 @@ def randomCountrySpec(): spec += ",".join(choices) return spec -def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False): +def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, + transports=False): nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP()) + ip = ipaddr.IPAddress(randomIP4()) fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) if or_addresses: - for i in xrange(0,8): - if random.choice(xrange(2)): ip = randomIP() - else: ip = "[%s]"%randomIP6() + for i in xrange(8): address,portlist = bridgedb.Bridges.parseORAddressLine( - "%s:%s" % (ip,randomPortSpec())) + "%s:%s" % (randomIPString(),randomPortSpec())) try: portlist.add(b.or_addresses[address]) except KeyError: pass finally: b.or_addresses[address] = portlist + + if transports: + for i in xrange(0,8): + b.transports.append(bridgedb.Bridges.PluggableTransport(b, + random.choice(["obfs", "obfs2", "pt1"]), + randomIP(), randomPort())) return b -def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False): +def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, + transports=False): nn = "bridge-%s"%random.randrange(0,1000000) ip = ipaddr.IPAddress(randomIP6()) fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) @@ -103,16 +127,21 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False): if or_addresses: for i in xrange(0,8): - if random.choice(xrange(2)): ip = randomIP() - else: ip = "[%s]"%randomIP6() address,portlist = bridgedb.Bridges.parseORAddressLine( - "[%s]:%s" % (randomIP6(),randomPortSpec())) + "%s:%s" % (randomIPString(),randomPortSpec())) try: portlist.add(b.or_addresses[address]) except KeyError: pass finally: b.or_addresses[address] = portlist + + if transports: + for i in xrange(0,8): + b.transports.append(bridgedb.Bridges.PluggableTransport(b, + random.choice(["obfs", "obfs2", "pt1"]), + randomIP(), randomPort())) + return b def fake16Bridge(orport=8080, running=True, stable=True): @@ -197,26 +226,26 @@ class IPBridgeDistTests(unittest.TestCase): 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", - answerParameters=param) - for _ in xrange(32): - d.insert(fakeBridge(443)) - for _ in range(256): - d.insert(fakeBridge()) - for _ in xrange(32): - i = randomIP() - n = d.getBridgesForIP(i, "x", 5) - count = 0 - fps = {} - for b in n: - fps[b.getID()] = 1 - if b.orport == 443: - count += 1 - self.assertEquals(len(fps), len(n)) - self.assertEquals(len(fps), 5) - self.assertTrue(count >= 1) + #def testDistWithPortRestrictions(self): + # param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) + # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Baz", + # answerParameters=param) + # for _ in xrange(32): + # d.insert(fakeBridge(443)) + # for _ in range(256): + # d.insert(fakeBridge()) + # for _ in xrange(32): + # i = randomIP() + # n = d.getBridgesForIP(i, "x", 5) + # count = 0 + # fps = {} + # for b in n: + # fps[b.getID()] = 1 + # if b.orport == 443: + # count += 1 + # self.assertEquals(len(fps), len(n)) + # self.assertEquals(len(fps), 5) + # self.assertTrue(count >= 1) #def testDistWithFilter16(self): # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") @@ -238,7 +267,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - b = d.getBridgesForIP(randomIP(), "x", 1, bridgeFilterRules=[filterBridgesByIP6]) + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[filterBridgesByIP6]) address, portlist = bridgedb.Bridges.parseORAddressLine( random.choice(b).getConfigLine(addressClass=ipaddr.IPv6Address)[7:]) assert type(address) is ipaddr.IPv6Address @@ -251,7 +280,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - b = d.getBridgesForIP(randomIP(), "x", 1, bridgeFilterRules=[filterBridgesByIP4]) + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[filterBridgesByIP4]) address, portlist = bridgedb.Bridges.parseORAddressLine( random.choice(b).getConfigLine(addressClass=ipaddr.IPv4Address)[7:]) assert type(address) is ipaddr.IPv4Address @@ -265,7 +294,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(50): - b = d.getBridgesForIP(randomIP(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ filterBridgesByIP4, filterBridgesByIP6]) if b: t = b.pop() @@ -286,10 +315,72 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(5): - b = d.getBridgesForIP(randomIP(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ filterBridgesByOnlyIP4, filterBridgesByOnlyIP6]) assert len(b) == 0 + def testDistWithFilterBlockedCountries(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True)) + d.insert(fakeBridge(or_addresses=True)) + + for b in d.splitter.bridges: + # china blocks all :-( + for pt in b.transports: + key = "%s:%s" % (pt.address, pt.port) + b.blockingCountries[key] = set(['cn']) + for address, portlist in b.or_addresses.items(): + for port in portlist: + key = "%s:%s" % (address, port) + b.blockingCountries[key] = set(['cn']) + key = "%s:%s" % (b.ip, b.orport) + b.blockingCountries[key] = set(['cn']) + + for i in xrange(5): + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + filterBridgesByNotBlockedIn("cn")]) + assert len(b) == 0 + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + filterBridgesByNotBlockedIn("us")]) + assert len(b) > 0 + + def testDistWithFilterBlockedCountriesAdvanced(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True, transports=True)) + d.insert(fakeBridge(or_addresses=True, transports=True)) + + for b in d.splitter.bridges: + # china blocks some transports + for pt in b.transports: + if random.choice(xrange(2)) > 0: + key = "%s:%s" % (pt.address, pt.port) + b.blockingCountries[key] = set(['cn']) + for address, portlist in b.or_addresses.items(): + # china blocks some transports + for port in portlist: + if random.choice(xrange(2)) > 0: + key = "%s:%s" % (address, port) + b.blockingCountries[key] = set(['cn']) + key = "%s:%s" % (b.ip, b.orport) + b.blockingCountries[key] = set(['cn']) + + # we probably will get at least one bridge back! + # it's pretty unlikely to lose a coin flip 250 times in a row + for i in xrange(5): + b = d.getBridgesForIP(randomIPString(), "x", 1, + bridgeFilterRules=[ + filterBridgesByNotBlockedIn("cn", methodname='obfs2'), + filterBridgesByTransport('obfs2'), + ]) + try: assert len(b) > 0 + except AssertionError: + print "epic fail" + b = d.getBridgesForIP(randomIPString(), "x", 1, bridgeFilterRules=[ + filterBridgesByNotBlockedIn("us")]) + assert len(b) > 0 + class DictStorageTests(unittest.TestCase): def setUp(self): self.fd, self.fname = tempfile.mkstemp() @@ -486,11 +577,9 @@ class ParseDescFileTests(unittest.TestCase): test = "" for i in range(100): - test+= simpleDesc % (randomIP(), randomPort()) - for i in xrange(4): - test+= orAddress % (randomIP(),randomPortSpec()) - for i in xrange(4): - test+= orAddress % ("[%s]" % randomIP6(),randomPortSpec()) + test+= simpleDesc % (randomIPString(), randomPort()) + for i in xrange(8): + test+= orAddress % (randomIPString(),randomPortSpec()) test+= "router-signature\n" bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] @@ -507,11 +596,9 @@ class ParseDescFileTests(unittest.TestCase): test = "" for i in range(100): - test+= simpleDesc % (randomIP(), randomPort()) - for i in xrange(4): - test+= orAddress % (randomIP(),randomPortSpec()) - for i in xrange(4): - test+= orAddress % ("[%s]" % randomIP6(),randomPortSpec()) + test+= simpleDesc % (randomIPString(), randomPort()) + for i in xrange(8): + test+= orAddress % (randomIPString(),randomPortSpec()) test+= "router-signature\n" bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] @@ -524,13 +611,8 @@ class ParseDescFileTests(unittest.TestCase): 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(), + for i in range(100): + test += simpleBlock % (randomIPString(), randomPort(), randomCountrySpec()) for a,p,c in bridgedb.Bridges.parseCountryBlockFile(test.split('\n')):

1 0

[bridgedb/master] 5027 - Add 'unblocked' support to distributors
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 111dbe670b4c0ef240fb56083d4cd4e15003cd94 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jul 1 03:39:39 2012 -0700 5027 - Add 'unblocked' support to distributors Adds 'unblocked' support to HTTPS and email distributors. Removes 'might be blocked' from BridgeDB response. --- lib/bridgedb/Server.py | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 2b3ea40..e5131ba 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -38,6 +38,7 @@ from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport +from bridgedb.Filters import filterBridgesByNotBlockedIn import gpgme @@ -156,8 +157,8 @@ class WebResource(twisted.web.resource.Resource): format = request.args.get("format", None) if format and len(format): format = format[0] # choose the first arg - # do want ipv6 support? - transport = ipv6 = False + # do want any options? + transport = ipv6 = unblocked = False ipv6 = request.args.get("ipv6", False) if ipv6: ipv6 = True # if anything after ?ipv6= @@ -169,6 +170,12 @@ class WebResource(twisted.web.resource.Resource): except (TypeError, IndexError): transport = None + try: + unblocked = re.match('[a-zA-Z]{2,4}', + request.args.get("unblocked")[0]).group() + except (TypeError, IndexError): + unblocked = False + rules = [] if ip: @@ -185,20 +192,21 @@ class WebResource(twisted.web.resource.Resource): # Tor to be a transport, and selecting between them. rules = [filterBridgesByTransport(transport, addressClass)] + if unblocked: + rules.append(filterBridgesByNotBlockedIn(unblocked, + addressClass, transport)) + bridges = self.distributor.getBridgesForIP(ip, interval, self.nBridgesToGive, countryCode, bridgeFilterRules=rules) if bridges: - answer = "".join("%s %s\n" % ( - b.getConfigLine( - includeFingerprint=self.includeFingerprints, - addressClass=addressClass, - transport=transport, - request=bridgedb.Dist.uniformMap(ip) - ), - (I18n.BRIDGEDB_TEXT[16] if b.isBlocked(countryCode) else "") + answer = "".join(" %s\n" % b.getConfigLine( + includeFingerprint=self.includeFingerprints, + addressClass=addressClass, + transport=transport, + request=bridgedb.Dist.uniformMap(ip) ) for b in bridges) else: answer = t.gettext(I18n.BRIDGEDB_TEXT[7]) @@ -435,6 +443,8 @@ def getMailResponse(lines, ctx): if "transport" in ln.strip().lower(): transport = re.search("transport ([_a-zA-Z][_a-zA-Z0-9]*)", ln).group(1).strip() logging.debug("Got request for transport: %s" % transport) + if "unblocked" in ln.strip.lower(): + unblocked = re.search("unblocked ([a-zA-Z]{2,4})", ln).group(1).strip() if ipv6: bridgeFilterRules.append(filterBridgesByIP6) @@ -446,6 +456,10 @@ def getMailResponse(lines, ctx): if transport: bridgeFilterRules = [filterBridgesByTransport(transport, addressClass)] + if unblocked: + rules.append(filterBridgesByNotBlockedIn(unblocked, + addressClass, transport)) + try: interval = ctx.schedule.getInterval(time.time()) bridges = ctx.distributor.getBridgesForEmail(clientAddr,

1 0

[bridgedb/master] 5027 - add filter for blocked bridges
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 492894e498deae739093f81505957ff6d4bf7874 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jul 1 03:37:36 2012 -0700 5027 - add filter for blocked bridges filterBridgesByNotBlockedIn is updated to also work with transports and ipv6 bridges --- lib/bridgedb/Filters.py | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 435845a..79d50f8 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -3,10 +3,13 @@ # See LICENSE for licensing information from ipaddr import IPv6Address, IPv4Address +import logging funcs = {} def filterAssignBridgesToRing(hmac, numRings, assignedRing): + #XXX: ruleset should have a key unique to this function + # ruleset ensures that the same ruleset = frozenset([hmac, numRings, assignedRing]) try: return funcs[ruleset] @@ -76,7 +79,8 @@ def filterBridgesByOnlyIP6(bridge): return True return False -def filterBridgesByTransport(methodname, addressClass): +def filterBridgesByTransport(methodname, addressClass=None): + if addressClass is None: addressClass = IPv4Address assert (addressClass) in (IPv4Address, IPv6Address) ruleset = frozenset([methodname, addressClass]) try: @@ -89,7 +93,33 @@ def filterBridgesByTransport(methodname, addressClass): transport.methodname.lower() == methodname.lower(): return True return False f.__name__ = "filterBridgesByTransport(%s,%s)" % (methodname, - type(addressClass)) + addressClass) setattr(f, "description", "transport=%s"%methodname) funcs[ruleset] = f return f + +def filterBridgesByNotBlockedIn(countryCode, addressClass=None, methodname=None): + """ if at least one address:port of the selected addressClass and + (optional) transport type is not blocked in countryCode, return True + """ + # default to IPv4 if not specified + if addressClass is None: addressClass = IPv4Address + assert (addressClass) in (IPv4Address, IPv6Address) + ruleset = frozenset([countryCode, addressClass, methodname]) + try: + return funcs[ruleset] + except KeyError: + def f(bridge): + if bridge.isBlocked(countryCode, addressClass, methodname): + if addressClass is IPv4Address: ac = "IPv4" + else: ac = "IPv6" + logmsg = "Removing %s from set of results for country" + logmsg += " '%s' with address class %s and transport %s" + logging.debug(logmsg % ( bridge.fingerprint, countryCode, ac, + methodname)) + return False + return True # not blocked + f.__name__ = "filterBridgesNotBlockedIn(%s,%s,%s)" % \ + (countryCode,methodname,addressClass) + funcs[ruleset] = f + return f

1 0

[bridgedb/master] 4568 - Provide links in captcha template
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit b59a1cfa33d8dc81bb60f2cf180e70c5b66b7ca3 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Jul 3 00:05:11 2012 -0700 4568 - Provide links in captcha template --- lib/bridgedb/Server.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index e5131ba..3e23154 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -290,6 +290,10 @@ class WebResource(twisted.web.resource.Resource): + "<p>" + recaptchaTemplate + "</p>" \ + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "</p>" \ + email_domain_list \ + + "<hr /><p><a href='?ipv6=true'>" \ + + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a></p>" \ + + "<p><a href='?transport=obfs2'>" \ + + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a></p>" \ + "</body></html>" return html_msg

1 0

[bridgedb/master] 4568 - Add "Submit" button string
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 491471cb66892f74cb804c2f00ebcb18bd10b525 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 5 12:27:05 2012 +0200 4568 - Add "Submit" button string --- lib/bridgedb/I18n.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py index dc704b9..deb84cd 100644 --- a/lib/bridgedb/I18n.py +++ b/lib/bridgedb/I18n.py @@ -76,5 +76,9 @@ between emails is: """), # BRIDGEDB_TEXT[20] _("""Looking for IPv6 bridges?"""), # BRIDGEDB_TEXT[21] - _("""Looking for obfsproxy bridges?""") + _("""Looking for obfsproxy bridges?"""), + # BRIDGEDB_TEXT[22] + _("""Specify transport by name:"""), + # BRIDGEDB_TEXT[23] + _("""Submit""") ]

1 0

[bridgedb/master] 5027 - Fix typos in email distributor
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 1a3d3202a00c8b467e7723527847d298a4200e1d Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 5 12:25:29 2012 +0200 5027 - Fix typos in email distributor Also adds AttributeError to caught exceptions. --- lib/bridgedb/Server.py | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 3e23154..c0ca3c2 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -146,11 +146,6 @@ class WebResource(twisted.web.resource.Resource): if geoip: countryCode = geoip.country_code_by_addr(ip) - # allow client to specify a country - forcecc = getCCFromRequest(request) - if forcecc != None: - countryCode = forcecc - # get locale t = getLocaleFromRequest(request) @@ -167,13 +162,13 @@ class WebResource(twisted.web.resource.Resource): # validate method name transport = re.match('[_a-zA-Z][_a-zA-Z0-9]*', request.args.get("transport")[0]).group() - except (TypeError, IndexError): + except (TypeError, IndexError, AttributeError): transport = None try: unblocked = re.match('[a-zA-Z]{2,4}', request.args.get("unblocked")[0]).group() - except (TypeError, IndexError): + except (TypeError, IndexError, AttributeError): unblocked = False rules = [] @@ -244,8 +239,13 @@ class WebResource(twisted.web.resource.Resource): + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a></p>" \ + "<p><a href='?transport=obfs2'>" \ + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a></p>" \ + + "<form method='GET'>" \ + + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[22]) + "</p>" \ + + "<input name='transport'>" \ + + "<input type='submit' value='" \ + + t.gettext(I18n.BRIDGEDB_TEXT[23]) +"'>" \ + + "</form>" \ + "</body></html>" - return html_msg def buildHTMLMessageTemplateWithCaptcha(self, t, challenge, img): @@ -294,6 +294,11 @@ class WebResource(twisted.web.resource.Resource): + t.gettext(I18n.BRIDGEDB_TEXT[20]) + "</a></p>" \ + "<p><a href='?transport=obfs2'>" \ + t.gettext(I18n.BRIDGEDB_TEXT[21]) + "</a></p>" \ + + "<form method='GET'>" \ + + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[22]) + "</p>" \ + + "<input name='transport'>" \ + + "<input name='submit' type='submit'>" \ + + "</form>" \ + "</body></html>" return html_msg @@ -438,17 +443,25 @@ def getMailResponse(lines, ctx): # return None,None # Figure out which bridges to send - transport = ipv6 = False + unblocked = transport = ipv6 = False bridgeFilterRules = [] addressClass = None for ln in lines: if "ipv6" in ln.strip().lower(): ipv6 = True if "transport" in ln.strip().lower(): - transport = re.search("transport ([_a-zA-Z][_a-zA-Z0-9]*)", ln).group(1).strip() + try: + transport = re.search("transport ([_a-zA-Z][_a-zA-Z0-9]*)", + ln).group(1).strip() + except (TypeError, AttributeError): + transport = None logging.debug("Got request for transport: %s" % transport) - if "unblocked" in ln.strip.lower(): - unblocked = re.search("unblocked ([a-zA-Z]{2,4})", ln).group(1).strip() + if "unblocked" in ln.strip().lower(): + try: + unblocked = re.search("unblocked ([a-zA-Z]{2,4})", + ln).group(1).strip() + except (TypeError, AttributeError): + transport = None if ipv6: bridgeFilterRules.append(filterBridgesByIP6) @@ -712,12 +725,6 @@ def getLocaleFromRequest(request): lang = lang[0] return I18n.getLang(lang) -def getCCFromRequest(request): - path = re.sub(r'[^a-zA-Z]', '', request.path) - if len(path) == 2: - return path.lower() - return None - def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, gpgContext=None):

1 0

[bridgedb/master] 4297 - Skip lines before Subject: in email
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit dd91eda2702e3fb45cff0a9c4cdca148b36d09a6 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jul 18 19:39:03 2012 +0200 4297 - Skip lines before Subject: in email The email headers may contain the string "IPv6", breaking message parsing. --- lib/bridgedb/Server.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index c0ca3c2..86a402e 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -443,10 +443,15 @@ def getMailResponse(lines, ctx): # return None,None # Figure out which bridges to send - unblocked = transport = ipv6 = False + unblocked = transport = ipv6 = skippedheaders = False bridgeFilterRules = [] addressClass = None for ln in lines: + # ignore all lines before the subject header + if "subject" in ln.strip().lower(): + skippedheaders = True + if not skippedheaders: continue + if "ipv6" in ln.strip().lower(): ipv6 = True if "transport" in ln.strip().lower():

1 0

[bridgedb/master] 4297 - Clear filtered lists of bridges properly
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 28f72d6ca3b19fb19f9cb43d908806a5d3160181 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Aug 19 16:52:33 2012 -0700 4297 - Clear filtered lists of bridges properly The dictionary must be cleared or the filtered sets of bridges will not be repopulated. --- lib/bridgedb/Bridges.py | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 8bf1f1b..3117d34 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -902,10 +902,8 @@ class FilteredBridgeSplitter(BridgeHolder): return len(self.bridges) def clear(self): - #XXX syntax? - [r.clear() for n,(f,r) in self.filterRings.items()] self.bridges = [] - #self.filterRings = {} + self.filterRings = {} def insert(self, bridge): if not bridge.running: @@ -920,11 +918,6 @@ class FilteredBridgeSplitter(BridgeHolder): r.insert(bridge) logging.debug("insert bridge into %s" % n) - #XXX db.insertBridgeAndGetRing ?? - # already 'assigned' by the FixedBridgeSplitter - #XXX persisent mapping? - # the filters rebuild - def addRing(self, ring, ringname, filterFn, populate_from=None): """Add a ring to this splitter. ring -- the ring to add @@ -937,8 +930,7 @@ class FilteredBridgeSplitter(BridgeHolder): assert ringname not in self.filterRings.keys() logging.debug("addRing %s" % ringname) - #XXX: drop LRU ring if len(self.filterRings) > self.max_cached_rings - #XXX: where do rings go after cache eviction? + #TODO: drop LRU ring if len(self.filterRings) > self.max_cached_rings self.filterRings[ringname] = (filterFn,ring) # populate ring from an iterable @@ -987,7 +979,7 @@ class FilteredBridgeSplitter(BridgeHolder): f.write("%s %s\n"%( toHex(b.getID()), desc)) def assignmentsArePersistent(self): - return False #XXX: is this right? + return False class BridgeBlock: """Base class that abstracts bridge blocking"""

1 0

[bridgedb/master] 4297 - Prepopulate rings before calling dumpAssignments
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 8d3aa5cb83ee0eff0f8453c5a0c56ba06f574204 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Sep 9 17:30:26 2012 -0700 4297 - Prepopulate rings before calling dumpAssignments Default rings are not populated if the FilteredBridgeSplitter is cleared on reload(). --- lib/bridgedb/Main.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 4faec57..31c9917 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -309,7 +309,6 @@ def startup(cfg): Bridges.get_hmac(key, "HTTPS-IP-Dist-Key"), categories, answerParameters=ringParams) - ipDistributor.prepopulateRings() # create default rings splitter.addRing(ipDistributor, "https", cfg.HTTPS_SHARE) #webSchedule = Time.IntervalSchedule("day", 2) webSchedule = Time.NoSchedule() @@ -323,7 +322,6 @@ def startup(cfg): cfg.EMAIL_DOMAIN_MAP.copy(), cfg.EMAIL_DOMAIN_RULES.copy(), answerParameters=ringParams) - emailDistributor.prepopulateRings() # create default rings splitter.addRing(emailDistributor, "email", cfg.EMAIL_SHARE) #emailSchedule = Time.IntervalSchedule("day", 1) emailSchedule = Time.NoSchedule() @@ -357,8 +355,10 @@ def startup(cfg): proxyList.replaceProxyList(loadProxyList(cfg)) logging.info("%d bridges loaded", len(splitter)) if emailDistributor: + emailDistributor.prepopulateRings() # create default rings logging.info("%d for email", len(emailDistributor.splitter)) if ipDistributor: + ipDistributor.prepopulateRings() # create default rings logging.info("%d for web:", len(ipDistributor.splitter)) for (n,(f,r)) in ipDistributor.splitter.filterRings.items(): logging.info(" by filter set %s, %d" % (n, len(r)))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2013