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

[bridgedb/master] Log a message if there is a duplicate bridge from a sub-hashring.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit df660bb6369eedcd3ea0e0949beee66148fcb460 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:29:54 2014 +0000 Log a message if there is a duplicate bridge from a sub-hashring. --- lib/bridgedb/Bridges.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 73f7d4e..f9bbd56 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -871,6 +871,10 @@ class BridgeRing(BridgeHolder): for k in forced + self._getBridgeKeysAt(pos, N): if k not in keys: keys.append(k) + else: + logging.debug( + "Got duplicate bridge %r in main hashring for position %r." + % (Util.logSafely(k.encode('hex')), pos.encode('hex'))) keys = keys[:N] keys.sort()

1 0

[bridgedb/master] Name subrings after their parent hashring's distributor.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 0b5e8f422d2abcc4dc206c8520f87b3555efd058 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:42:58 2014 +0000 Name subrings after their parent hashring's distributor. * MOVE logic for parsing filternames from the "unique string" in method FilteredBridgeSplitter.addRing() to new method FilteredBridgeSplitter.extractFilterNames(). * ADD a FilteredBridgeSplitter.distributorName attribute which is set when Dist.Distributor.setDistributorName() is called. * REFACTOR FilteredBridgeSplitter.addRing() to use the new subring names. --- lib/bridgedb/Bridges.py | 52 +++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 8c7d95b..82222ef 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1108,6 +1108,7 @@ class FilteredBridgeSplitter(BridgeHolder): self.filterRings = {} self.hmac = get_hmac_fn(key, hex=True) self.bridges = [] + self.distributorName = '' #XXX: unused self.max_cached_rings = max_cached_rings @@ -1141,6 +1142,26 @@ class FilteredBridgeSplitter(BridgeHolder): logging.debug("Inserted bridge '%s' into '%s' sub hashring" % (bridge.getID(), ringname)) + def extractFilterNames(self, ringname): + """Get the names of the filters applied to a particular sub hashring. + + :param str ringname: A unique name identifying a sub hashring. + :rtype: list + :returns: A sorted list of strings, all the function names of the + filters applied to the sub hashring named **ringname**. + """ + filterNames = [] + + for filterName in [x.func_name for x in list(ringname)]: + # Using `filterAssignBridgesToRing.func_name` gives us a messy + # string which includes all parameters and memory addresses. Get + # rid of this by partitioning at the first `(`: + realFilterName = filterName.partition('(')[0] + filterNames.append(realFilterName) + + filterNames.sort() + return filterNames + def addRing(self, subring, ringname, filterFn, populate_from=None): """Add a subring to this hashring. @@ -1171,30 +1192,25 @@ class FilteredBridgeSplitter(BridgeHolder): # I suppose since it contains memory addresses, it *is* technically # likely to be a unique string, but it is messy. - hashringName = self.__class__.__name__ - subringName = subring.__class__ - filterNames = [] - if not isinstance(subring, BridgeHolder): - logging.fatal("Can't add %r to %s because %r isn't a hashring." - % (ringname, hashringName, ringname)) + logging.fatal("%s hashring can't add invalid subring: %r" + % (self.distributorName, subring)) return False if ringname in self.filterRings.keys(): - logging.fatal("Hashring %s already has a subring named '%s'!" - % (self.__class__, ringname)) + logging.fatal("%s hashring already has a subring named '%s'!" + % (self.distributorName, ringname)) return False - for filterName in [x.func_name for x in list(ringname)]: - # Using `filterAssignBridgesToRing.func_name` gives us a messy - # string which includes all parameters and memory addresses. Get - # rid of this by partitioning at the first `(`: - realFilterName = filterName.partition('(')[0] - filterNames.append(realFilterName) - filterNames = ' '.join(filterNames) + filterNames = self.extractFilterNames(ringname) + subringName = [self.distributorName] + for filterName in filterNames: + if filterName != 'filterAssignBridgesToRing': + subringName.append(filterName.strip('filterBridgesBy')) + subringName = '-'.join([x for x in subringName]) + subring.setName(subringName) - logging.debug("Adding subring to %s hashring:" % hashringName) - logging.debug(" Subring class: %r" % subringName) - logging.debug(" Subring filters: %s" % filterNames) + logging.info("Adding subring to %s hashring..." % subring.name) + logging.info(" Subring filters: %s" % filterNames) #TODO: drop LRU ring if len(self.filterRings) > self.max_cached_rings self.filterRings[ringname] = (filterFn, subring)

1 0

[bridgedb/master] Log when we dump assignments to a file.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 0c0e8ee5686db25c4333dd62ea590150964839dd Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:47:22 2014 +0000 Log when we dump assignments to a file. --- lib/bridgedb/Bridges.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 82222ef..93360ed 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -908,6 +908,7 @@ class BridgeRing(BridgeHolder): return self.bridgesByID.get(fp) def dumpAssignments(self, f, description=""): + logging.info("Dumping bridge assignments for %s..." % self.name) for b in self.bridges.itervalues(): desc = [ description ] ident = b.getID()

1 0

[bridgedb/master] Merge branch 'fix/10559-keyid-in-pt-lines' into develop
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 022a75777e4ddfcaeb81ee0293926ac6aaf8108d Merge: df660bb 4476867 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:34:27 2014 +0000 Merge branch 'fix/10559-keyid-in-pt-lines' into develop lib/bridgedb/Bridges.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)

1 0

[bridgedb/master] Remove extraneous log statement from FilteredBridgeSplitter.prepopulate().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 01c774e3a7bc9562617cf12426946bb853b5bcf7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:48:38 2014 +0000 Remove extraneous log statement from FilteredBridgeSplitter.prepopulate(). --- lib/bridgedb/Bridges.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 93360ed..e26c405 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1217,7 +1217,6 @@ class FilteredBridgeSplitter(BridgeHolder): self.filterRings[ringname] = (filterFn, subring) if populate_from: - logging.info("Populating hashring %s..." % subringName) inserted = 0 for bridge in populate_from: if isinstance(bridge, Bridge) and filterFn(bridge):

1 0

[bridgedb/master] Update bridgedb.parse.networkstatus module docstring.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 819fdce11592dca5e90dd7a560ecf1ca6f4a5c88 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:52:44 2014 +0000 Update bridgedb.parse.networkstatus module docstring. --- lib/bridgedb/parse/networkstatus.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index 466a7f6..b178dbe 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -18,6 +18,7 @@ .. parse \_networkstatus + |_ isValidRouterNickname - Determine if a nickname is according to spec |_ parseRLine - Parse an 'r'-line from a networkstatus document |_ parseALine - Parse an 'a'-line from a networkstatus document \_ parseSLine - Parse an 's'-line from a networkstatus document

1 0

[bridgedb/master] Fix a potential bug where an OR ID might have been unprocessed base64.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 02e40fa92cd667dae90d2aa02dfe71592eed28a1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:53:33 2014 +0000 Fix a potential bug where an OR ID might have been unprocessed base64. * CHANGE bridgedb.parse.networkstatus.parseRLine() to check the OR nickname validity only after parsing (and readding the base64 padding to) the OR ID digest. * ADD inline comments about why this is done. --- lib/bridgedb/parse/networkstatus.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index b178dbe..0b73569 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -103,18 +103,25 @@ def parseRLine(line): "Wrong number of fields in networkstatus 'r'-line: %r" % line) nickname, ID = fields[:2] - isValidRouterNickname(nickname) try: ID = parseUnpaddedBase64(ID) except InvalidBase64 as error: raise InvalidNetworkstatusRouterIdentity(error) + # Check the nickname validity after parsing the ID, otherwise, if the + # nickname is invalid, we end up with the nickname being ``None`` and + # the ID being unparsed, unpadded (meaning it is technically invalid) + # base64. + isValidRouterNickname(nickname) + except NetworkstatusParsingError as error: logging.error(error) nickname, ID = None, None except InvalidRouterNickname as error: logging.error(error) + # Assume that we mostly care about obtaining the OR's ID, then it + # should be okay to set the nickname to ``None``, if it was invalid. nickname = None except InvalidNetworkstatusRouterIdentity as error: logging.error(error)

1 0

[bridgedb/master] Don't log the hashring filters twice, just log the number of bridges inserted.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit bc84f9c7b89a328161a14ec10514562abd939939 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:49:34 2014 +0000 Don't log the hashring filters twice, just log the number of bridges inserted. --- lib/bridgedb/Bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index e26c405..c61f8ff 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1222,8 +1222,8 @@ class FilteredBridgeSplitter(BridgeHolder): if isinstance(bridge, Bridge) and filterFn(bridge): subring.insert(bridge) inserted += 1 - logging.info("Inserted %d bridges into hashring with filters: %s" - % (inserted, filterNames)) + logging.info("Bridges inserted into %s subring: %d" + % (subring.name, inserted)) return True

1 0

[bridgedb/master] Call Distributor.setDistributorName() in subclass __init__s.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e7018ff65d1952874a834357c06d7fbaa343c33f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:59:20 2014 +0000 Call Distributor.setDistributorName() in subclass __init__s. --- lib/bridgedb/Dist.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 8357ca6..84e9c75 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -154,7 +154,7 @@ class IPBasedDistributor(Distributor): logging.debug("Added splitter %s to IPBasedDistributor." % self.splitter.__class__) - self.setDistributorName(self.__class__.__name__) + self.setDistributorName('HTTPS') def prepopulateRings(self): # populate all rings (for dumping assignments and testing) @@ -432,6 +432,8 @@ class EmailBasedDistributor(Distributor): self.splitter = bridgedb.Bridges.FilteredBridgeSplitter( key2, max_cached_rings=5) + self.setDistributorName('Email') + def clear(self): self.splitter.clear() #self.ring.clear() # should be take care of by above

1 0

[bridgedb/master] Add coding: utf-8 header to lib/bridgedb/Bucket.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e62f0bb2b5c0615f1576d1740cd08d38521a9c9f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:56:20 2014 +0000 Add coding: utf-8 header to lib/bridgedb/Bucket.py. --- lib/bridgedb/Bucket.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 72f8962..05f447e 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + """ This module is responsible for everything concerning file bucket bridge distribution. File bucket bridge distribution means that unallocated bridges

1 0