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

[bridgedb/master] Add docstrings for HTTPServer.render() and getBridgeRequestAnswer().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 2bb82e704d2fada7339154586aa95d23add3437f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 5 17:41:09 2014 +0000 Add docstrings for HTTPServer.render() and getBridgeRequestAnswer(). --- lib/bridgedb/HTTPServer.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 3384beb..8083bf1 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -148,10 +148,19 @@ class WebResource(twisted.web.resource.Resource): self.domains = domains def render(self, request): + """Render a response for a client HTTP request. + + Presently, this method merely returns :meth:`getBridgeRequestAnswer`. + """ return self.getBridgeRequestAnswer(request) def getBridgeRequestAnswer(self, request): - """ returns a response to a bridge request """ + """Respond to a client HTTP request for bridges. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object containing the HTTP method, full + URI, and any URL/POST arguments and headers present. + """ interval = self.schedule.getInterval(time.time()) bridges = ( ) ip = None

1 0

[bridgedb/master] Sphinxify and improve Dist.IPBasedDistributor.getBridgesForIP docstring.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 0e50c9920518c13eed361bd956f505fb26eb5bf9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 15:20:54 2014 +0000 Sphinxify and improve Dist.IPBasedDistributor.getBridgesForIP docstring. --- lib/bridgedb/Dist.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 5fc8094..57d95bb 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -166,10 +166,16 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): def getBridgesForIP(self, ip, epoch, N=1, countryCode=None, bridgeFilterRules=None): """Return a list of bridges to give to a user. - ip -- the user's IP address, as a dotted quad. - epoch -- the time period when we got this request. This can - be any string, so long as it changes with every period. - N -- the number of bridges to try to give back. + + :param str ip: The user's IP address, as a dotted quad. + :param str epoch: The time period when we got this request. This can + be any string, so long as it changes with every + period. + :param int N: The number of bridges to try to give back. (default: 1) + :param str countryCode: DOCDOC (default: None) + :param list bridgeFilterRules: A list of callables used filter the + bridges returned in the response to the + client. See :mod:`~bridgedb.Filters`. """ if not bridgeFilterRules: bridgeFilterRules=[] logging.debug("getBridgesForIP(%s, %s, %s, %s",

1 0

[bridgedb/master] Several PEP8 fixes in Dist.IPBasedDistributor.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 159bafa63e6a81575b955ea882bce15f8a383b09 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:10:04 2014 +0000 Several PEP8 fixes in Dist.IPBasedDistributor. * FIXES several PEP8 problems due to lines being too long. * FIXES one cute PEP8 problem; a semicolon which was placed after a `break` in a `for` loop, probably by someone whose fingers are used to coding in C. * FIXES one PEP8 problem due to continuation of an `if` clause on the same line. --- lib/bridgedb/Dist.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 130a1b2..195ceb5 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -141,7 +141,9 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): % n) n += 1 ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) - self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), + self.splitter.addRing(ring, + ruleset, + filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) @@ -159,7 +161,9 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): "Order-Bridges-In-Ring-%d" % clusterNum) ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) - self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), + self.splitter.addRing(ring, + ruleset, + filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) def clear(self): @@ -183,9 +187,11 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): bridges returned in the response to the client. See :mod:`~bridgedb.Filters`. """ - if not bridgeFilterRules: bridgeFilterRules=[] + if not bridgeFilterRules: + bridgeFilterRules=[] logging.debug("getBridgesForIP(%s, %s, %s, %s", Util.logSafely(ip), epoch, N, bridgeFilterRules) + if not len(self.splitter): logging.debug("bailing without splitter") return [] @@ -213,7 +219,7 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): key1 = bridgedb.Bridges.get_hmac(self.splitter.key, "Order-Bridges-In-Ring-%d" % n) - break; + break n += 1 # if no category matches, use area clustering @@ -248,11 +254,16 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): else: logging.debug("Cache miss %s" % ruleset) ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) - self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), + self.splitter.addRing(ring, + ruleset, + filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) # get an appropriate number of bridges - return ring.getBridges(pos, getNumBridgesPerAnswer(ring, max_bridges_per_answer=N)) + numBridgesToReturn = getNumBridgesPerAnswer(ring, + max_bridges_per_answer=N) + answer = ring.getBridges(pos, numBridgesToReturn) + return answer def __len__(self): return len(self.splitter)

1 0

[bridgedb/master] Numerous whitespace fixes in bridgedb.Dist module.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c04af4ea57f53f022f82b68e1358698b33763081 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 15:31:23 2014 +0000 Numerous whitespace fixes in bridgedb.Dist module. These are all whitespace changes ― nothing else is touched. --- lib/bridgedb/Dist.py | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 57d95bb..840881d 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -33,7 +33,7 @@ def uniformMap(ip): if type(IPAddress(ip)) is IPv6Address: return ":".join(IPv6Address(ip).exploded.split(':')[:4]) else: - return ".".join( ip.split(".")[:3] ) + return ".".join(ip.split(".")[:3]) def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3): if len(ring) < 20: n_bridges_per_answer = 1 @@ -125,15 +125,16 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): n = self.nClusters for category in self.categories: g = filterAssignBridgesToRing(self.splitter.hmac, - self.nClusters + - len(self.categories), - n) + self.nClusters + + len(self.categories), + n) bridgeFilterRules = [g] if filterFn: bridgeFilterRules.append(filterFn) ruleset = frozenset(bridgeFilterRules) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, - "Order-Bridges-In-Ring-%d"%n) + "Order-Bridges-In-Ring-%d" + % n) n += 1 ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), @@ -145,13 +146,14 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): g = filterAssignBridgesToRing(self.splitter.hmac, self.nClusters + len(self.categories), - clusterNum) + clusterNum) bridgeFilterRules = [g] if filterFn: bridgeFilterRules.append(filterFn) ruleset = frozenset(bridgeFilterRules) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, - "Order-Bridges-In-Ring-%d"%clusterNum) + "Order-Bridges-In-Ring-%d" + % clusterNum) ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) @@ -198,14 +200,15 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): # IP Categories if category.contains(ip): g = filterAssignBridgesToRing(self.splitter.hmac, - self.nClusters + - len(self.categories), - n) + self.nClusters + + len(self.categories), + n) bridgeFilterRules.append(g) logging.info("category<%s>%s", epoch, Util.logSafely(area)) pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, - "Order-Bridges-In-Ring-%d"%n) + "Order-Bridges-In-Ring-%d" + % n) break; n += 1 @@ -215,15 +218,16 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): h = int( self.areaClusterHmac(area)[:8], 16) # length of numClusters clusterNum = h % self.nClusters - + g = filterAssignBridgesToRing(self.splitter.hmac, self.nClusters + len(self.categories), - clusterNum) + clusterNum) bridgeFilterRules.append(g) pos = self.areaOrderHmac("<%s>%s" % (epoch, area)) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, - "Order-Bridges-In-Ring-%d"%clusterNum) + "Order-Bridges-In-Ring-%d" + % clusterNum) logging.debug("bridgeFilterRules: %s" % bridgeFilterRules) @@ -260,9 +264,9 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): ASPECIAL = '-_+/=_~' ACHAR = r'[\w%s]' % "".join("\\%s"%c for c in ASPECIAL) -DOTATOM = r'%s+(?:\.%s+)*'%(ACHAR,ACHAR) +DOTATOM = r'%s+(?:\.%s+)*' % (ACHAR,ACHAR) DOMAIN = r'\w+(?:\.\w+)*' -ADDRSPEC = r'(%s)\@(%s)'%(DOTATOM, DOMAIN) +ADDRSPEC = r'(%s)\@(%s)' % (DOTATOM, DOMAIN) SPACE_PAT = re.compile(r'\s+') ADDRSPEC_PAT = re.compile(ADDRSPEC) @@ -286,7 +290,7 @@ class TooSoonEmail(BadEmail): class IgnoreEmail(BadEmail): """Raised when we get requests from this address after rate warning.""" - pass + pass def extractAddrSpec(addr): """Given an email From line, try to extract and parse the addrspec @@ -416,7 +420,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): raise IgnoreEmail("Client was warned", Util.logSafely(emailaddress)) else: db.setWarnedEmail(emailaddress, True, now) - db.commit() + db.commit() logging.info("Got a request for bridges from %r; we already " "answered one within the last %d seconds. Warning.", @@ -425,7 +429,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): # warning period is over elif wasWarned: - db.setWarnedEmail(emailaddress, False) + db.setWarnedEmail(emailaddress, False) pos = self.emailHmac("<%s>%s" % (epoch, emailaddress)) @@ -438,11 +442,11 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): # cache miss, add new ring logging.debug("Cache miss %s" % ruleset) - # add new ring + # add new ring key1 = bridgedb.Bridges.get_hmac(self.splitter.key, - "Order-Bridges-In-Ring") + "Order-Bridges-In-Ring") ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) - # debug log: cache miss + # debug log: cache miss self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) @@ -475,7 +479,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): for filterFn in [filterBridgesByIP4, filterBridgesByIP6]: ruleset = frozenset([filterFn]) key1 = bridgedb.Bridges.get_hmac(self.splitter.key, - "Order-Bridges-In-Ring") + "Order-Bridges-In-Ring") ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) self.splitter.addRing(ring, ruleset, filterBridgesByRules([filterFn]),

1 0

[bridgedb/master] PEP8 fixes for several lines in Dist.getNumBridgesPerAnswer().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 7c9c93b0e8324104141b2c0bc4a4972e47c76ed4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:03:35 2014 +0000 PEP8 fixes for several lines in Dist.getNumBridgesPerAnswer(). Several `if` clauses are split to the next line, and an unneeded line-continued backslash is removed from the parameters for a call to the logger. --- lib/bridgedb/Dist.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 840881d..130a1b2 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -36,12 +36,16 @@ def uniformMap(ip): 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 + 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))) - 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):

1 0

[bridgedb/master] Clarify log messages in IPBasedDistributor.getBridgesForIP().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit af4b924ac51109b6f162523cf195686e006ac048 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:33:36 2014 +0000 Clarify log messages in IPBasedDistributor.getBridgesForIP(). --- lib/bridgedb/Dist.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 195ceb5..6728035 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -187,19 +187,25 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): bridges returned in the response to the client. See :mod:`~bridgedb.Filters`. """ + logging.info("Attempting to return %d bridges to client %s..." + % (N, Util.logSafely(ip))) + if not bridgeFilterRules: bridgeFilterRules=[] - logging.debug("getBridgesForIP(%s, %s, %s, %s", - Util.logSafely(ip), epoch, N, bridgeFilterRules) if not len(self.splitter): - logging.debug("bailing without splitter") + logging.warn("Bailing! Splitter has zero bridges!") return [] + logging.debug("Bridges in splitter:\t%d" % len(self.splitter)) + logging.debug("Client request epoch:\t%s" % epoch) + logging.debug("Active bridge filters:\t%s" + % ' '.join([x.func_name for x in bridgeFilterRules])) + area = self.areaMapper(ip) + logging.debug("IP mapped to area:\t%s" + % Util.logSafely("{0}.0/24".format(area))) - logging.info("area is %s", Util.logSafely(area)) - key1 = '' pos = 0 n = self.nClusters @@ -239,8 +245,6 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): "Order-Bridges-In-Ring-%d" % clusterNum) - logging.debug("bridgeFilterRules: %s" % bridgeFilterRules) - # try to find a cached copy ruleset = frozenset(bridgeFilterRules)

1 0

[bridgedb/master] PEP8; remove unnecessary `pass` statements in Exception classes.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9a73b94ceb3197db6c83f1aeca44576f82cdf6d2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:34:47 2014 +0000 PEP8; remove unnecessary `pass` statements in Exception classes. --- lib/bridgedb/Dist.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 6728035..47348a1 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -301,15 +301,12 @@ class BadEmail(Exception): class UnsupportedDomain(BadEmail): """Exception raised when we get an email address from a domain we don't know.""" - pass class TooSoonEmail(BadEmail): """Raised when we got a request from this address too recently.""" - pass class IgnoreEmail(BadEmail): """Raised when we get requests from this address after rate warning.""" - pass def extractAddrSpec(addr): """Given an email From line, try to extract and parse the addrspec

1 0

[bridgedb/master] PEP8 fixes in Dist.EmailBasedDistributor.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9bfa604e385844922f95c86e7fdb76d7175c6d8c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:36:46 2014 +0000 PEP8 fixes in Dist.EmailBasedDistributor. * FIXES several lines which are too long. * FIXES a couple whitespace problems. --- lib/bridgedb/Dist.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 47348a1..9a503a6 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -395,8 +395,8 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): self.answerParameters = answerParameters #XXX cache options not implemented - self.splitter = bridgedb.Bridges.FilteredBridgeSplitter(key2, - max_cached_rings=5) + self.splitter = bridgedb.Bridges.FilteredBridgeSplitter( + key2, max_cached_rings=5) def clear(self): self.splitter.clear() @@ -427,7 +427,6 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): db = bridgedb.Storage.getDB() wasWarned = db.getWarnedEmail(emailaddress) - lastSaw = db.getEmailTime(emailaddress) if lastSaw is not None and lastSaw + MAX_EMAIL_RATE >= now: if wasWarned: @@ -453,7 +452,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): ruleset = frozenset(bridgeFilterRules) if ruleset in self.splitter.filterRings.keys(): logging.debug("Cache hit %s" % ruleset) - _,ring = self.splitter.filterRings[ruleset] + _, ring = self.splitter.filterRings[ruleset] else: # cache miss, add new ring logging.debug("Cache miss %s" % ruleset) @@ -467,10 +466,13 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): filterBridgesByRules(bridgeFilterRules), populate_from=self.splitter.bridges) - result = ring.getBridges(pos, getNumBridgesPerAnswer(ring, max_bridges_per_answer=N)) + numBridgesToReturn = getNumBridgesPerAnswer(ring, + max_bridges_per_answer=N) + result = ring.getBridges(pos, numBridgesToReturn) db.setEmailTime(emailaddress, now) db.commit() + return result def __len__(self):

1 0

[bridgedb/master] Add generic Dist.Distributor class for common functionality.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d8d06359681f3c8e613c4a108defff5ba8552491 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:40:18 2014 +0000 Add generic Dist.Distributor class for common functionality. This class currently serves very little purpose because I am still nervous about making major changes to the IPBasedDistributor and EmailBasedDistributor classes. However, I did add functionality for naming a Distributor's hashrings after the distributor's class, so that which hashring a bridge is being added to is much clearer in the logs. * ADD bridgedb.Dist.Distributor class. * CHANGE IPBasedDistributor and EmailBasedDistributor to inherit from Distributor. * ADD functionality for naming hashrings after their distributor. --- lib/bridgedb/Dist.py | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 163916d..0b9bff2 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -48,7 +48,38 @@ def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3): return n_bridges_per_answer -class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): +class Distributor(bridgedb.Bridges.BridgeHolder): + """Distributes bridges to clients.""" + + def __init__(self): + super(Distributor, self).__init__() + + def setDistributorName(self, name): + """Set a **name** for identifying this distributor. + + This is used to identify the distributor in the logs; the **name** + doesn't necessarily need to be unique. The hashrings created for this + distributor will be named after this distributor's name in + :meth:`propopulateRings`, and any sub hashrings of each of those + hashrings will also carry that name. + + >>> from bridgedb import Dist + >>> ipDist = Dist.IPBasedDistributor(Dist.uniformMap, + ... 5, + ... 'fake-hmac-key') + >>> ipDist.setDistributorName('HTTPS Distributor') + >>> ipDist.prepopulateRings() + >>> hashrings = ipDist.splitter.filterRings + >>> for (ringname, (filterFn, subring)) in hashrings.items(): + ... print subring.name + + :param str name: A name for this distributor. + """ + self.name = name + self.splitter.distributorName = name + + +class IPBasedDistributor(Distributor): """A Distributor that hands out bridges based on the IP address of an incoming request and the current time period. @@ -123,6 +154,8 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): logging.debug("Added splitter %s to IPBasedDistributor." % self.splitter.__class__) + self.setDistributorName(self.__class__.__name__) + def prepopulateRings(self): # populate all rings (for dumping assignments and testing) for filterFn in [None, filterBridgesByIP4, filterBridgesByIP6]: @@ -141,6 +174,7 @@ class IPBasedDistributor(bridgedb.Bridges.BridgeHolder): % n) n += 1 ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) + ring.setName('{0} Ring'.format(self.name)) self.splitter.addRing(ring, ruleset, filterBridgesByRules(bridgeFilterRules), @@ -372,7 +406,7 @@ def normalizeEmail(addr, domainmap, domainrules): return "%s@%s"%(localpart, domain) -class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): +class EmailBasedDistributor(Distributor): """Object that hands out bridges based on the email address of an incoming request and the current time period. """

1 0

[bridgedb/master] Clarify log messages in EmailBasedDistributor.getBridgesForEmail().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e3d7a0c04eaa1cc56e9018cf0113c7be1a88c5f6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 11 16:38:20 2014 +0000 Clarify log messages in EmailBasedDistributor.getBridgesForEmail(). --- lib/bridgedb/Dist.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 9a503a6..163916d 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -428,18 +428,24 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): db = bridgedb.Storage.getDB() wasWarned = db.getWarnedEmail(emailaddress) lastSaw = db.getEmailTime(emailaddress) + + logging.info("Attempting to return for %d bridges for %s..." + % (N, Util.logSafely(emailaddress))) + if lastSaw is not None and lastSaw + MAX_EMAIL_RATE >= now: + logging.info("Client %s sent duplicate request within %d seconds." + % (Util.logSafely(emailaddress), MAX_EMAIL_RATE)) if wasWarned: - logging.info("Got a request for bridges from %r; we already " - "sent a warning. Ignoring.", Util.logSafely(emailaddress)) - raise IgnoreEmail("Client was warned", Util.logSafely(emailaddress)) + logging.info( + "Client was already warned about duplicate requests.") + raise IgnoreEmail("Client was warned", + Util.logSafely(emailaddress)) else: + logging.info("Sending duplicate request warning to %s..." + % Util.logSafely(emailaddress)) db.setWarnedEmail(emailaddress, True, now) db.commit() - logging.info("Got a request for bridges from %r; we already " - "answered one within the last %d seconds. Warning.", - Util.logSafely(emailaddress), MAX_EMAIL_RATE) raise TooSoonEmail("Too many emails; wait till later", emailaddress) # warning period is over

1 0