July 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Add bridgedb.distribute module with IDistribute and Distributor classes.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit fe0efec8b00250756d36c7fb2cd061fd8ef3d3d3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 00:05:02 2015 +0000 Add bridgedb.distribute module with IDistribute and Distributor classes. * ADD distribute.IDistibute interface. * ADD distribute.Distributor class, an implementation of IDistribute. * REMOVE bridgedb.Dist.Distributor. * RENAME HTTPSDistributor.getBridgesForIP() → HTTPSDistributor.getBridges(). * RENAME EmailBasedDistributor.getBridgesForEmail() → EmailBasedDistributor.getBridges(). * FIXES part of #12506: https://bugs.torproject.org/12506 * FIXES part of #12029: https://bugs.torproject.org/12029 --- lib/bridgedb/Dist.py | 104 +++---------- lib/bridgedb/distribute.py | 275 ++++++++++++++++++++++++++++++++++ lib/bridgedb/email/autoresponder.py | 5 +- lib/bridgedb/interfaces.py | 56 ++++++- lib/bridgedb/test/email_helpers.py | 10 +- lib/bridgedb/test/https_helpers.py | 2 +- lib/bridgedb/test/legacy_Tests.py | 64 ++++---- lib/bridgedb/test/test_Dist.py | 11 +- lib/bridgedb/test/test_distribute.py | 44 ++++++ lib/bridgedb/test/test_interfaces.py | 55 +++++++ 10 files changed, 495 insertions(+), 131 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 93c08c1..fe81c04 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -17,20 +17,19 @@ import logging import re import time -import bridgedb.Bridges import bridgedb.Storage from bridgedb import proxy +from bridgedb.Bridges import BridgeRing from bridgedb.Bridges import FilteredBridgeSplitter from bridgedb.crypto import getHMAC from bridgedb.crypto import getHMACFunc +from bridgedb.distribute import Distributor from bridgedb.Filters import filterAssignBridgesToRing from bridgedb.Filters import filterBridgesByRules from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 from bridgedb.parse import addr -from bridgedb.parse.addr import UnsupportedDomain -from bridgedb.safelog import logSafely MAX_EMAIL_RATE = 3*3600 @@ -48,50 +47,6 @@ class EmailRequestedKey(Exception): """Raised when an incoming email requested a copy of our GnuPG keys.""" -class Distributor(object): - """Distributes bridges to clients.""" - - def __init__(self): - super(Distributor, self).__init__() - self.name = None - self.hashring = None - - 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 - >>> dist = Dist.HTTPSDistributor(2, 'masterkey') - >>> dist.setDistributorName('Excellent Distributor') - >>> dist.name - 'Excellent Distributor' - - :param str name: A name for this distributor. - """ - self.name = name - self.hashring.distributorName = name - - def bridgesPerResponse(self, hashring=None, maximum=3): - if hashring is None: - hashring = self.hashring - - if len(hashring) < 20: - n = 1 - if 20 <= len(hashring) < 100: - n = min(2, maximum) - if len(hashring) >= 100: - n = maximum - - logging.debug("Returning %d bridges from ring of len: %d" % - (n, len(hashring))) - return n - - class HTTPSDistributor(Distributor): """A Distributor that hands out bridges based on the IP address of an incoming request and the current time period. @@ -129,9 +84,7 @@ class HTTPSDistributor(Distributor): parameters, i.e. that an answer has "at least two obfsproxy bridges" or "at least one bridge on port 443", etc. """ - super(HTTPSDistributor, self).__init__() - - self.key = key + super(HTTPSDistributor, self).__init__(key) self.totalSubrings = totalSubrings self.answerParameters = answerParameters @@ -154,13 +107,12 @@ class HTTPSDistributor(Distributor): self._clientToPositionHMAC = getHMACFunc(key3, hex=False) self._subnetToSubringHMAC = getHMACFunc(key4, hex=True) self.hashring = FilteredBridgeSplitter(key2, self.ringCacheSize) - logging.debug("Added %s to HTTPS distributor." % - self.hashring.__class__.__name__) + self.name = 'HTTPS' + logging.debug("Added %s to %s distributor." % + (self.hashring.__class__.__name__, self.name)) - self.setDistributorName('HTTPS') - - def bridgesPerResponse(self, hashring=None, maximum=3): - return super(HTTPSDistributor, self).bridgesPerResponse(hashring, maximum) + def bridgesPerResponse(self, hashring=None): + return super(HTTPSDistributor, self).bridgesPerResponse(hashring) @classmethod def getSubnet(cls, ip, usingProxy=False, proxySubnets=4): @@ -311,7 +263,7 @@ class HTTPSDistributor(Distributor): for subring in range(1, self.totalSubrings + 1): filters = self._buildHashringFilters([filterFn,], subring) key1 = getHMAC(self.key, "Order-Bridges-In-Ring-%d" % subring) - ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) + ring = BridgeRing(key1, self.answerParameters) # For consistency with previous implementation of this method, # only set the "name" for "clusters" which are for this # distributor's proxies: @@ -330,7 +282,7 @@ class HTTPSDistributor(Distributor): previousFilters.append(f) return frozenset(previousFilters) - def getBridges(self, bridgeRequest, interval, N=1): + def getBridges(self, bridgeRequest, interval): """Return a list of bridges to give to a user. :type bridgeRequest: :class:`bridgedb.https.request.HTTPSBridgeRequest` @@ -339,15 +291,13 @@ class HTTPSDistributor(Distributor): attribute set to a string containing the client's IP address. :param str interval: 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) :rtype: list :return: A list of :class:`~bridgedb.Bridges.Bridge`s to include in the response. See :meth:`bridgedb.https.server.WebResourceBridges.getBridgeRequestAnswer` for an example of how this is used. """ - logging.info("Attempting to return %d bridges to client %s..." - % (N, bridgeRequest.client)) + logging.info("Attempting to get bridges for %s..." % bridgeRequest.client) if not len(self.hashring): logging.warn("Bailing! Hashring has zero bridges!") @@ -386,12 +336,12 @@ class HTTPSDistributor(Distributor): else: logging.debug("Cache miss %s" % filters) key1 = getHMAC(self.key, "Order-Bridges-In-Ring-%d" % subring) - ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) + ring = BridgeRing(key1, self.answerParameters) self.hashring.addRing(ring, filters, filterBridgesByRules(filters), populate_from=self.hashring.bridges) # Determine the appropriate number of bridges to give to the client: - returnNum = self.bridgesPerResponse(ring, maximum=N) + returnNum = self.bridgesPerResponse(ring) answer = ring.getBridges(position, returnNum) return answer @@ -427,7 +377,7 @@ class EmailBasedDistributor(Distributor): :param whitelist: A dictionary that maps whitelisted email addresses to GnuPG fingerprints. """ - self.key = key + super(EmailBasedDistributor, self).__init__(key) key1 = getHMAC(key, "Map-Addresses-To-Ring") self.emailHmac = getHMACFunc(key1, hex=False) @@ -440,19 +390,17 @@ class EmailBasedDistributor(Distributor): self.answerParameters = answerParameters #XXX cache options not implemented - self.hashring = bridgedb.Bridges.FilteredBridgeSplitter( - key2, max_cached_rings=5) - - self.setDistributorName('Email') + self.hashring = FilteredBridgeSplitter(key2, max_cached_rings=5) + self.name = "Email" - def bridgesPerResponse(self, hashring=None, maximum=3): - return super(EmailBasedDistributor, self).bridgesPerResponse(hashring, maximum) + def bridgesPerResponse(self, hashring=None): + return super(EmailBasedDistributor, self).bridgesPerResponse(hashring) def insert(self, bridge): """Assign a bridge to this distributor.""" self.hashring.insert(bridge) - def getBridges(self, bridgeRequest, interval, N=1): + def getBridges(self, bridgeRequest, interval): """Return a list of bridges to give to a user. :type bridgeRequest: :class:`~bridgedb.email.request.EmailBridgeRequest` @@ -462,7 +410,6 @@ class EmailBasedDistributor(Distributor): email address. :param interval: 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. """ # All checks on the email address, such as checks for whitelisting and # canonicalization of domain name, are done in @@ -473,15 +420,13 @@ class EmailBasedDistributor(Distributor): ("%s distributor can't get bridges for invalid email email " " address: %s") % (self.name, bridgeRequest.client)) + logging.info("Attempting to get bridges for %s..." % bridgeRequest.client) + now = time.time() with bridgedb.Storage.getDB() as db: wasWarned = db.getWarnedEmail(bridgeRequest.client) lastSaw = db.getEmailTime(bridgeRequest.client) - - logging.info("Attempting to return for %d bridges for %s..." - % (N, bridgeRequest.client)) - if lastSaw is not None: if bridgeRequest.client in self.whitelist.keys(): logging.info(("Whitelisted email address %s was last seen " @@ -500,7 +445,6 @@ class EmailBasedDistributor(Distributor): db.commit() raise TooSoonEmail("Must wait %d seconds" % wait, bridgeRequest.client) - # warning period is over elif wasWarned: db.setWarnedEmail(bridgeRequest.client, False) @@ -518,12 +462,12 @@ class EmailBasedDistributor(Distributor): # add new ring key1 = getHMAC(self.key, "Order-Bridges-In-Ring") - ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) + ring = BridgeRing(key1, self.answerParameters) self.hashring.addRing(ring, ruleset, filterBridgesByRules(ruleset), populate_from=self.hashring.bridges) - returnNum = self.bridgesPerResponse(ring, maximum=N) + returnNum = self.bridgesPerResponse(ring) result = ring.getBridges(pos, returnNum) db.setEmailTime(bridgeRequest.client, now) @@ -553,7 +497,7 @@ class EmailBasedDistributor(Distributor): for filterFn in [filterBridgesByIP4, filterBridgesByIP6]: ruleset = frozenset([filterFn]) key1 = getHMAC(self.key, "Order-Bridges-In-Ring") - ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) + ring = BridgeRing(key1, self.answerParameters) self.hashring.addRing(ring, ruleset, filterBridgesByRules([filterFn]), populate_from=self.hashring.bridges) diff --git a/lib/bridgedb/distribute.py b/lib/bridgedb/distribute.py new file mode 100644 index 0000000..c7c9044 --- /dev/null +++ b/lib/bridgedb/distribute.py @@ -0,0 +1,275 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_distribute ; -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + + +"""Classes for creating bridge distribution systems. + +DEFINITELY +---------- + +Distributor { + name property + bridgesPerResponse() property FORMERLY getNumBridgesPerAnswer() + hashring struct FORMERLY KNOWN AS splitter + rotate bool + rotationGroups + rotationSchedule + key str + subrings list + - Subring + clear() + export() FORMERLY KNOWN AS dumpAssignments() + insert() + getBridges() FORMERLY KNOWN AS getBridgesForEmail() and getBridgesForIP() + handleBridgeRequest() + handleIncomingBridges() +} + +DistributionContext { # should go in bridgedb.py + distributors { + name: DistributorContext + } +} + +DistributorContext { # should go in bridgedb.py + name str + allocationPercentage property + publicKey +} + +Hashring { + assignBridgesToRings() FORMERLY filterAssignBridgesToRing() + + filters bridges uniformly into subrings + clear() / __del__() + isEmpty property +} + +MAYBE +----- +mapClientToHashring() FORMERLY KNOWN AS areaMapper AND +mapClientToSubhashring() +authenticateToBridgeDB() +maintainACL() for proxylists + +- need a way for BridgeDB to decide global parameters to be followed + by all distributors. + - BridgeAnswerParameters? + maybe call it DistributionContext? + then have DistributorContexts? + + requiredFlags AnswerParameters? + requireFlag() + requiredPorts + requirePorts() + + THINGS NEEDED FOR COMMUNICATION BETWEEN DISTRIBUTORS AND BRIDGEDB + ----------------------------------------------------------------- + * distributorCredential (for authenticating to the DB) + * metrics? + * total clients seen + * total clients served + - unique clients seen + - unique clients served + * total requests for TRANSPORT + * total times TRANSPORT was served + + THINGS DISTRIBUTORS SHOULD KEEP TRACK OF, BUT NOT REPORT + -------------------------------------------------------- + - approximate bridge bandwidth + - approximate bandwidth per client + - approximate bridge bandwidth already distributed + + NAMES FOR CHOOSING "GET ME WHATEVER TRANSPORTS" + ----------------------------------------------- + chocolate box, russian roulette + + * How much of a bad idea would it be to store bridges allocated to a + distributor as diffs over the last time the Distributor asked? +""" + +import logging +import math + +from zope import interface +from zope.interface import Attribute +from zope.interface import implements + +# from bridgedb.hashring import IHashring +from bridgedb.interfaces import IName +from bridgedb.interfaces import Named + + +class IDistribute(IName): + """An interface specification for a system which distributes bridges.""" + + _bridgesPerResponseMin = Attribute( + ("The minimum number of bridges to distribute (if possible), per " + "client request.")) + _bridgesPerResponseMax = Attribute( + ("The maximum number of bridges to distribute (if possible), per " + "client request.")) + _hashringLevelMin = Attribute( + ("The bare minimum number of bridges which should be in a hashring. " + "If there less bridges than this, then the implementer of " + "IDistribute should only distribute _bridgesPerResponseMin number " + "of bridges, per client request.")) + _hashringLevelMax = Attribute( + ("The number of bridges which should be in a hashring for the " + "implementer of IDistribute to distribute _bridgesPerResponseMax " + "number of bridges, per client request.")) + + hashring = Attribute( + ("An implementer of ``bridgedb.hashring.IHashring`` which stores the " + "entirety of bridges allocated to this ``Distributor`` by the " + "BridgeDB. This ``Distributor`` is only capable of distributing " + "these bridges to its clients, and these bridges are only " + "distributable by this ``Distributor``.")) + + key = Attribute( + ("A master key which is used to HMAC bridge and client data into " + "this Distributor's **hashring** and its subhashrings.")) + + def __str__(): + """Get a string representation of this Distributor's ``name``.""" + + def bridgesPerResponse(hashring): + """Get the current number of bridges to return in a response.""" + + def getBridges(bridgeRequest): + """Get bridges based on a client's **bridgeRequest**.""" + + +class Distributor(Named): + """A :class:`Distributor` distributes bridges to clients. + + Inherit from me to create a new type of ``Distributor``. + """ + implements(IDistribute) + + _bridgesPerResponseMin = 1 + _bridgesPerResponseMax = 3 + _hashringLevelMin = 20 + _hashringLevelMax = 100 + + def __init__(self, key=None): + """Create a new bridge Distributor. + + :param key: A master key for this Distributor. This is used to HMAC + bridge and client data in order to arrange them into hashring + structures. + """ + super(Distributor, self).__init__() + self._hashring = None + self.key = key + + def __str__(self): + """Get a string representation of this ``Distributor``'s ``name``. + + :rtype: str + :returns: This ``Distributor``'s ``name`` attribute. + """ + return self.name + + @property + def hashring(self): + """Get this Distributor's main hashring, which holds all bridges + allocated to this Distributor. + + :rtype: :class:`~bridgedb.hashring.Hashring`. + :returns: An implementer of :interface:`~bridgedb.hashring.IHashring`. + """ + return self._hashring + + @hashring.setter + def hashring(self, ring): + """Set this Distributor's main hashring. + + :type ring: :class:`~bridgedb.hashring.Hashring` + :param ring: An implementer of :interface:`~bridgedb.hashring.IHashring`. + :raises TypeError: if the **ring** does not implement the + :interface:`~bridgedb.hashring.IHashring` interface. + """ + # if not IHashring.providedBy(ring): + # raise TypeError("%r doesn't implement the IHashring interface." % ring) + + self._hashring = ring + + @hashring.deleter + def hashring(self): + """Clear this Distributor's hashring.""" + if self.hashring: + self.hashring.clear() + + @property + def name(self): + """Get the name of this Distributor. + + :rtype: str + :returns: A string which identifies this :class:`Distributor`. + """ + return self._name + + @name.setter + def name(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, and any + subhashrings of each of those hashrings will also carry that name. + + >>> from bridgedb.distribute import Distributor + >>> dist = Distributor() + >>> dist.name = 'Excellent Distributor' + >>> dist.name + 'Excellent Distributor' + + :param str name: A name for this distributor. + """ + self._name = name + + try: + self.hashring.distributor = name + except AttributeError: + logging.debug(("Couldn't set distributor attribute for %s " + "Distributor's hashring." % name)) + + def bridgesPerResponse(self, hashring=None): + """Get the current number of bridge to distribute in response to a + client's request for bridges. + """ + if hashring is None: + hashring = self.hashring + + if len(hashring) < self._hashringLevelMin: + n = self._bridgesPerResponseMin + elif self._hashringLevelMin <= len(hashring) < self._hashringLevelMax: + n = int(math.ceil( + (self._bridgesPerResponseMin + self._bridgesPerResponseMax) / 2.0)) + elif self._hashringLevelMax <= len(hashring): + n = self._bridgesPerResponseMax + + logging.debug("Returning %d bridges from ring of len: %d" % + (n, len(hashring))) + + return n + + def getBridges(self, bridgeRequest): + """Get some bridges in response to a client's **bridgeRequest**. + + :type bridgeRequest: :class:`~bridgedb.bridgerequest.BridgeRequestBase` + :param bridgeRequest: A client's request for bridges, including some + information on the client making the request, whether they asked + for IPv4 or IPv6 bridges, which type of + :class:`~bridgedb.bridges.PluggableTransport` they wanted, etc. + """ + # XXX generalise the getBridges() method diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 0ab04fa..b98717f 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -97,10 +97,7 @@ def createResponseBody(lines, context, client, lang='en'): # Otherwise they must have requested bridges: interval = context.schedule.intervalStart(time.time()) - bridges = context.distributor.getBridges( - bridgeRequest, - interval, - context.nBridges) + bridges = context.distributor.getBridges(bridgeRequest, interval) except EmailRequestedHelp as error: logging.info(error) return templates.buildWelcomeText(translator, client) diff --git a/lib/bridgedb/interfaces.py b/lib/bridgedb/interfaces.py index 38c3541..89ddb12 100644 --- a/lib/bridgedb/interfaces.py +++ b/lib/bridgedb/interfaces.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_interfaces ; -*- #_____________________________________________________________________________ # # This file is part of BridgeDB, a Tor bridge distribution system. @@ -13,7 +13,55 @@ """All available ``zope.interface``s in BridgeDB.""" +from zope.interface import Interface +from zope.interface import Attribute +from zope.interface import implementer -from bridgedb.bridgerequest import IRequestBridges -from bridgedb.captcha import ICaptcha -from bridgedb.schedule import ISchedule + +class IName(Interface): + """An interface specification for a named object.""" + + name = Attribute("A string which identifies this object.") + + +@implementer(IName) +class Named(object): + """A named object""" + + #: The characters used to join child Named object's names with our name. + separator = ' ' + + def __init__(self): + self._name = str() + + @property + def name(self): + """Get the name of this object. + + :rtype: str + :returns: A string which identifies this object. + """ + return self._name + + @name.setter + def name(self, name): + """Set a **name** for identifying this object. + + This is used to identify the object in log messages; the **name** + doesn't necessarily need to be unique. Other :class:`Named` objects + which are properties of a :class:`Named` object may inherit their + parents' **name**s. + + >>> from bridgedb.distribute import Named + >>> named = Named() + >>> named.name = 'Excellent Super-Awesome Thing' + >>> named.name + 'Excellent Super-Awesome Thing' + + :param str name: A name for this object. + """ + self._name = name + + for attr in self.__dict__.values(): + if IName.providedBy(attr): + attr.name = self.separator.join([name, attr.name]) diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index 0eac35e..20aee57 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -124,6 +124,8 @@ class DummyEmailDistributor(object): test :class:`bridgedb.EmailServer`. """ + _bridgesPerResponseMin = 3 + def __init__(self, key=None, domainmap=None, domainrules=None, answerParameters=None): """None of the parameters are really used, ― they are just there to retain an @@ -134,8 +136,8 @@ class DummyEmailDistributor(object): self.domainrules = domainrules self.answerParameters = answerParameters - def getBridges(self, bridgeRequest, epoch, N=1): - return [util.DummyBridge() for _ in xrange(N)] + def getBridges(self, bridgeRequest, epoch): + return [util.DummyBridge() for _ in xrange(self._bridgesPerResponseMin)] def cleanDatabase(self): pass @@ -157,14 +159,14 @@ class DummyEmailDistributorWithState(DummyEmailDistributor): super(DummyEmailDistributorWithState, self).__init__() self.alreadySeen = {} - def getBridges(self, bridgeRequest, epoch, N=1): + def getBridges(self, bridgeRequest, epoch): # Keep track of the number of times we've seen a client. if not bridgeRequest.client in self.alreadySeen.keys(): self.alreadySeen[bridgeRequest.client] = 0 self.alreadySeen[bridgeRequest.client] += 1 if self.alreadySeen[bridgeRequest.client] <= 1: - return [util.DummyBridge() for _ in xrange(N)] + return [util.DummyBridge() for _ in xrange(self._bridgesPerResponseMin)] elif self.alreadySeen[bridgeRequest.client] == 2: raise TooSoonEmail( "Seen client '%s' %d times" diff --git a/lib/bridgedb/test/https_helpers.py b/lib/bridgedb/test/https_helpers.py index 00ccbd6..3d8ec19 100644 --- a/lib/bridgedb/test/https_helpers.py +++ b/lib/bridgedb/test/https_helpers.py @@ -105,7 +105,7 @@ class DummyHTTPSDistributor(object): _bridge_class = util.DummyBridge _bridgesPerResponseMin = 3 - def getBridges(self, bridgeRequest=None, epoch=None, N=1): + def getBridges(self, bridgeRequest=None, epoch=None): """Needed because it's called in :meth:`BridgesResource.getBridgeRequestAnswer`.""" return [self._bridge_class() for _ in range(self._bridgesPerResponseMin)] diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 5621515..4cdcc03 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -169,11 +169,11 @@ class EmailBridgeDistTests(unittest.TestCase): {'example.com': [], 'dkim.example.com': ['dkim']}) for _ in xrange(256): d.insert(fakeBridge()) - d.getBridges('abc(a)example.com', 1, 3) + d.getBridges('abc(a)example.com', 1) self.assertRaises(bridgedb.Dist.TooSoonEmail, - d.getBridges, 'abc(a)example.com', 1, 3) + d.getBridges, 'abc(a)example.com', 1) self.assertRaises(bridgedb.Dist.IgnoreEmail, - d.getBridges, 'abc(a)example.com', 1, 3) + d.getBridges, 'abc(a)example.com', 1) def testUnsupportedDomain(self): db = self.db @@ -184,19 +184,17 @@ class EmailBridgeDistTests(unittest.TestCase): {'example.com':[]}) class IPBridgeDistTests(unittest.TestCase): - def dumbAreaMapper(self, ip): - return ip + def testBasicDist(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(256): d.insert(fakeBridge()) - n = d.getBridges("1.2.3.4", "x", 2) - n2 = d.getBridges("1.2.3.4", "x", 2) + n = d.getBridges("1.2.3.4", "x") + n2 = d.getBridges("1.2.3.4", "x") self.assertEquals(n, n2) def testDistWithProxies(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo", - [RhymesWith255ProxySet()]) + d = bridgedb.Dist.HTTPSDistributor(3, "Foo", [RhymesWith255ProxySet()]) for _ in xrange(256): d.insert(fakeBridge()) @@ -204,8 +202,8 @@ class IPBridgeDistTests(unittest.TestCase): # Make sure that the ProxySets do not overlap f = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(4)]) g = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(3)] + ['255']) - n = d.getBridges(g(), "x", 10) - n2 = d.getBridges(f(), "x", 10) + n = d.getBridges(g(), "x") + n2 = d.getBridges(f(), "x") assert(len(n) > 0) assert(len(n2) > 0) @@ -219,7 +217,7 @@ class IPBridgeDistTests(unittest.TestCase): #XXX: #6175 breaks this test! #def testDistWithPortRestrictions(self): # param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) - # d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Baz", + # d = bridgedb.Dist.HTTPSDistributor(3, "Baz", # answerParameters=param) # for _ in xrange(32): # d.insert(fakeBridge(443)) @@ -227,7 +225,7 @@ class IPBridgeDistTests(unittest.TestCase): # d.insert(fakeBridge()) # for _ in xrange(32): # i = randomIP() - # n = d.getBridges(i, "x", 5) + # n = d.getBridges(i, "x") # count = 0 # fps = {} # for b in n: @@ -239,15 +237,15 @@ class IPBridgeDistTests(unittest.TestCase): # self.assertTrue(count >= 1) def testDistWithFilterIP6(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): d.insert(fakeBridge6(or_addresses=True)) d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): bridges = d.getBridges(randomIPv4String(), - "faketimestamp", - bridgeFilterRules=[filterBridgesByIP6]) + "faketimestamp", + bridgeFilterRules=[filterBridgesByIP6]) bridge = random.choice(bridges) bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv6Address) address, portlist = networkstatus.parseALine(bridge_line) @@ -255,15 +253,15 @@ class IPBridgeDistTests(unittest.TestCase): assert filterBridgesByIP6(random.choice(bridges)) def testDistWithFilterIP4(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): d.insert(fakeBridge6(or_addresses=True)) d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): bridges = d.getBridges(randomIPv4String(), - "faketimestamp", - bridgeFilterRules=[filterBridgesByIP4]) + "faketimestamp", + bridgeFilterRules=[filterBridgesByIP4]) bridge = random.choice(bridges) bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address) address, portlist = networkstatus.parseALine(bridge_line) @@ -271,17 +269,17 @@ class IPBridgeDistTests(unittest.TestCase): assert filterBridgesByIP4(random.choice(bridges)) def testDistWithFilterBoth(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): d.insert(fakeBridge6(or_addresses=True)) d.insert(fakeBridge(or_addresses=True)) for i in xrange(50): bridges = d.getBridges(randomIPv4String(), - "faketimestamp", 1, - bridgeFilterRules=[ - filterBridgesByIP4, - filterBridgesByIP6]) + "faketimestamp", + bridgeFilterRules=[ + filterBridgesByIP4, + filterBridgesByIP6]) if bridges: t = bridges.pop() assert filterBridgesByIP4(t) @@ -295,18 +293,18 @@ class IPBridgeDistTests(unittest.TestCase): def testDistWithFilterAll(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): d.insert(fakeBridge6(or_addresses=True)) d.insert(fakeBridge(or_addresses=True)) for i in xrange(5): - b = d.getBridges(randomIPv4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[ filterBridgesByIP4, filterBridgesByIP6]) assert len(b) == 0 def testDistWithFilterBlockedCountries(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): d.insert(fakeBridge6(or_addresses=True)) d.insert(fakeBridge(or_addresses=True)) @@ -324,15 +322,15 @@ class IPBridgeDistTests(unittest.TestCase): b.blockingCountries[key] = set(['cn']) for i in xrange(5): - b = d.getBridges(randomIPv4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[ filterBridgesByNotBlockedIn("cn")]) assert len(b) == 0 - b = d.getBridges(randomIPv4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[ filterBridgesByNotBlockedIn("us")]) assert len(b) > 0 def testDistWithFilterBlockedCountriesAdvanced(self): - d = bridgedb.Dist.HTTPSDistributor(self.dumbAreaMapper, 3, "Foo") + d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): d.insert(fakeBridge6(or_addresses=True, transports=True)) d.insert(fakeBridge(or_addresses=True, transports=True)) @@ -355,7 +353,7 @@ class IPBridgeDistTests(unittest.TestCase): # 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.getBridges(randomIPString(), "x", 1, + b = d.getBridges(randomIPString(), "x", bridgeFilterRules=[ filterBridgesByNotBlockedIn("cn"), filterBridgesByTransport('obfs2'), @@ -363,7 +361,7 @@ class IPBridgeDistTests(unittest.TestCase): try: assert len(b) > 0 except AssertionError: print("epic fail") - b = d.getBridges(randomIPString(), "x", 1, bridgeFilterRules=[ + b = d.getBridges(randomIPString(), "x", bridgeFilterRules=[ filterBridgesByNotBlockedIn("us")]) assert len(b) > 0 diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index f47449c..3de7945 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -125,8 +125,9 @@ class HTTPSDistributorTests(unittest.TestCase): def test_HTTPSDistributor_bridgesPerResponse_100_max_5(self): dist = Dist.HTTPSDistributor(3, self.key) + dist._bridgesPerResponseMax = 5 [dist.insert(bridge) for bridge in self.bridges[:100]] - self.assertEqual(dist.bridgesPerResponse(maximum=5), 5) + self.assertEqual(dist.bridgesPerResponse(), 5) def test_HTTPSDistributor_getSubnet_usingProxy(self): """HTTPSDistributor.getSubnet(usingProxy=True) should return a proxy @@ -199,11 +200,11 @@ class HTTPSDistributorTests(unittest.TestCase): for _ in range(5): clientRequest1 = self.randomClientRequestForNotBlockedIn('cn') - b = dist.getBridges(clientRequest1, 1, 3) + b = dist.getBridges(clientRequest1, 1) self.assertEqual(len(b), 0) clientRequest2 = self.randomClientRequestForNotBlockedIn('ir') - b = dist.getBridges(clientRequest2, 1, 3) + b = dist.getBridges(clientRequest2, 1) self.assertEqual(len(b), 3) def test_HTTPSDistributor_getBridges_with_some_blocked_bridges(self): @@ -226,14 +227,14 @@ class HTTPSDistributorTests(unittest.TestCase): for _ in range(5): clientRequest1 = self.randomClientRequestForNotBlockedIn('cn') - bridges = dist.getBridges(clientRequest1, 1, 3) + bridges = dist.getBridges(clientRequest1, 1) for b in bridges: self.assertFalse(b.isBlockedIn('cn')) # The client *should* have gotten some bridges still. self.assertGreater(len(bridges), 0) clientRequest2 = self.randomClientRequestForNotBlockedIn('ir') - bridges = dist.getBridges(clientRequest2, 1, 3) + bridges = dist.getBridges(clientRequest2, 1) for b in bridges: self.assertFalse(b.isBlockedIn('ir')) self.assertGreater(len(bridges), 0) diff --git a/lib/bridgedb/test/test_distribute.py b/lib/bridgedb/test/test_distribute.py new file mode 100644 index 0000000..95fda31 --- /dev/null +++ b/lib/bridgedb/test/test_distribute.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Unittests for :mod:`bridgedb.distribute`.""" + +from __future__ import print_function + +from twisted.trial import unittest + +from zope.interface.verify import verifyObject + +from bridgedb.distribute import IDistribute +from bridgedb.distribute import Distributor + + +class DistributorTests(unittest.TestCase): + """Tests for :class:`bridgedb.distribute.Distributor`.""" + + def test_Distributor_implements_IDistribute(self): + IDistribute.namesAndDescriptions() + IDistribute.providedBy(Distributor) + self.assertTrue(verifyObject(IDistribute, Distributor())) + + def test_Distributor_str_no_name(self): + """str(dist) when the distributor doesn't have a name should return a + blank string. + """ + dist = Distributor() + self.assertEqual(str(dist), "") + + def test_Distributor_str_with_name(self): + """str(dist) when the distributor has a name should return the name.""" + dist = Distributor() + dist.name = "foo" + self.assertEqual(str(dist), "foo") diff --git a/lib/bridgedb/test/test_interfaces.py b/lib/bridgedb/test/test_interfaces.py new file mode 100644 index 0000000..8a78291 --- /dev/null +++ b/lib/bridgedb/test/test_interfaces.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# ____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# :license: see LICENSE for licensing information +# ____________________________________________________________________________ + +"""Unittests for :mod:`bridgedb.interfaces`.""" + +from twisted.trial import unittest + +from bridgedb import interfaces + + +class DummyNamedOtherThing(interfaces.Named): + def __init__(self): + self.name = "hipster" + + +class DummyNamedThing(interfaces.Named): + def __init__(self): + self.whatever = DummyNamedOtherThing() + self.name = "original" + + +class NamedTests(unittest.TestCase): + """Tests for :class:`bridgedb.interfaces.Named`.""" + + def test_Named_init(self): + """Initializing a Named() object should set its name to ''.""" + named = interfaces.Named() + self.assertEqual(named.name, '') + + def test_Named_name(self): + """For a Named object A without any other Named objects which have + object A as an attribute, should just have its name set to whatever + it was set to. + """ + named = DummyNamedOtherThing() + self.assertEqual(named.name, "hipster") + + def test_Named_with_named_object_for_attribute(self): + """For a Named object A which has another Named object B as an + attribute, object A should just have its name set to whatever + it was set to, and object B should have its name set to object A's + name plus whatever object B's name was set to. + """ + named = DummyNamedThing() + self.assertEqual(named.name, "original") + self.assertEqual(named.whatever.name, "original hipster")

1 0

[bridgedb/master] Remove Bridges.BridgeHolder class.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 346d321fa4f78626c49cd4ff6d82a346267f6c0c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 03:25:11 2015 +0000 Remove Bridges.BridgeHolder class. It wasn't a real metaclass, base class, or interface; its methods were never used; it didn't provide any decent documentation; not everything which inherited from it used its methods; nothing called super() for it, or otherwise called methods on it. Totally useless. * REMOVE bridgedb.Bridges.BridgeHolder class. * CHANGE everything which previously inherited from BridgeHolder to simply inherit from object instead. --- lib/bridgedb/Bridges.py | 63 ++++++++++++++++------------------------ lib/bridgedb/Main.py | 4 +-- lib/bridgedb/persistent.py | 3 +- lib/bridgedb/test/test_Main.py | 6 ++-- 4 files changed, 32 insertions(+), 44 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 5742794..1a06dd8 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -39,18 +39,6 @@ DIGEST_LEN = 20 PORTSPEC_LEN = 16 -class BridgeHolder(object): - """Abstract base class for all classes that hold bridges.""" - def insert(self, bridge): - raise NotImplementedError - - def clear(self): - pass - - def dumpAssignments(self, f, description=""): - pass - - class BridgeRingParameters(object): """Store validated settings on minimum number of Bridges with certain attributes which should be included in any generated subring of a @@ -99,7 +87,8 @@ class BridgeRingParameters(object): self.needPorts = needPorts[:] self.needFlags = [(flag.lower(), count) for flag, count in needFlags[:]] -class BridgeRing(BridgeHolder): + +class BridgeRing(object): """Arranges bridges into a hashring based on an hmac function.""" def __init__(self, key, answerParameters=None): @@ -333,15 +322,13 @@ class BridgeRing(BridgeHolder): f.write("%s %s\n" % (b.fingerprint, " ".join(desc).strip())) -class FixedBridgeSplitter(BridgeHolder): - """A bridgeholder that splits bridges up based on an hmac and assigns - them to several sub-bridgeholders with equal probability. +class FixedBridgeSplitter(object): + """Splits bridges up based on an HMAC and assigns them to one of several + subhashrings with equal probability. """ def __init__(self, key, rings): self.hmac = getHMACFunc(key, hex=True) self.rings = rings[:] - for r in self.rings: - assert(isinstance(r, BridgeHolder)) def insert(self, bridge): # Grab the first 4 bytes @@ -366,7 +353,7 @@ class FixedBridgeSplitter(BridgeHolder): """Write all bridges assigned to this hashring to ``filename``. :param string description: If given, include a description next to the - index number of the ring from :attr:`FilteredBridgeHolder.rings` + index number of the ring from :attr:`FilteredBridgeSplitter.rings` the following bridges were assigned to. For example, if the description is ``"IPv6 obfs2 bridges"`` the line would read: ``"IPv6 obfs2 bridges ring=3"``. @@ -374,7 +361,8 @@ class FixedBridgeSplitter(BridgeHolder): for index, ring in zip(xrange(len(self.rings)), self.rings): ring.dumpAssignments(filename, "%s ring=%s" % (description, index)) -class UnallocatedHolder(BridgeHolder): + +class UnallocatedHolder(object): """A pseudo-bridgeholder that ignores its bridges and leaves them unassigned. """ @@ -407,10 +395,11 @@ class UnallocatedHolder(BridgeHolder): continue f.write("%s %s\n" % (bridge.hex_key, " ".join(desc).strip())) -class BridgeSplitter(BridgeHolder): - """A BridgeHolder that splits incoming bridges up based on an hmac, - and assigns them to sub-bridgeholders with different probabilities. - Bridge-to-bridgeholder associations are recorded in a store. + +class BridgeSplitter(object): + """Splits incoming bridges up based on an HMAC, and assigns them to + sub-bridgeholders with different probabilities. Bridge ←→ BridgeSplitter + associations are recorded in a store. """ def __init__(self, key): self.hmac = getHMACFunc(key, hex=True) @@ -428,12 +417,13 @@ class BridgeSplitter(BridgeHolder): return n def addRing(self, ring, ringname, p=1): - """Add a new bridgeholder. - ring -- the bridgeholder to add. - ringname -- a string representing the bridgeholder. This is used - to record which bridges have been assigned where in the store. - p -- the relative proportion of bridges to assign to this - bridgeholder. + """Add a new subring. + + :param ring: The subring to add. + :param str ringname: This is used to record which bridges have been + assigned where in the store. + :param int p: The relative proportion of bridges to assign to this + bridgeholder. """ self.ringsByName[ringname] = ring self.pValues.append(self.totalP) @@ -493,8 +483,8 @@ class BridgeSplitter(BridgeHolder): ring.dumpAssignments(f, "%s %s" % (description, name)) -class FilteredBridgeSplitter(BridgeHolder): - """A configurable BridgeHolder that filters bridges into subrings. +class FilteredBridgeSplitter(object): + """Places bridges into subrings based upon sets of filters. The set of subrings and conditions used to assign :class:`Bridge`s should be passed to :meth:`~FilteredBridgeSplitter.addRing`. @@ -513,7 +503,9 @@ class FilteredBridgeSplitter(BridgeHolder): - ``ringname`` is a unique string identifying the subring. - ``filterFn`` is a callable which filters Bridges in some manner, i.e. by whether they are IPv4 or IPv6, etc. - - ``subring`` is a :class:`BridgeHolder`. + - ``subring`` is any of the horribly-implemented, + I-guess-it-passes-for-some-sort-of-hashring classes in this + module. :ivar hmac: DOCDOC :ivar bridges: DOCDOC :type distributorName: str @@ -591,7 +583,6 @@ class FilteredBridgeSplitter(BridgeHolder): def addRing(self, subring, ringname, filterFn, populate_from=None): """Add a subring to this hashring. - :type subring: :class:`BridgeHolder` :param subring: The subring to add. :param str ringname: A unique name for identifying the new subring. :param filterFn: A function whose input is a :class:`Bridge`, and @@ -617,10 +608,6 @@ class FilteredBridgeSplitter(BridgeHolder): # I suppose since it contains memory addresses, it *is* technically # likely to be a unique string, but it is messy. - if not isinstance(subring, BridgeHolder): - logging.fatal("%s hashring can't add invalid subring: %r" - % (self.distributorName, subring)) - return False if ringname in self.filterRings.keys(): logging.fatal("%s hashring already has a subring named '%s'!" % (self.distributorName, ringname)) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 0bb319d..f382cc5 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -47,7 +47,7 @@ def load(state, hashring, clear=False): store them into our ``state.hashring`` instance. The ``state`` will be saved again at the end of this function. - :type hashring: :class:`BridgeSplitter <bridgedb.Bridges.BridgeHolder>` + :type hashring: :class:`~bridgedb.Bridges.BridgeSplitter` :param hashring: A class which provides a mechanism for HMACing Bridges in order to assign them to hashrings. :param boolean clear: If True, clear all previous bridges from the @@ -323,7 +323,7 @@ def run(options, reactor=reactor): :ivar cfg: The current configuration, including any in-memory settings (i.e. settings whose values were not obtained from the config file, but were set via a function somewhere) - :type hashring: A :class:`bridgedb.Bridges.BridgeHolder` + :type hashring: A :class:`~bridgedb.Bridges.BridgeSplitter` :ivar hashring: A class which takes an HMAC key and splits bridges into their hashring assignments. :type proxyList: :class:`~bridgedb.proxy.ProxySet` diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index 1b2507c..c996daa 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -88,7 +88,8 @@ class State(jelly.Jellyable): modules which are known to be unjelliable/unpicklable so far are: - bridgedb.Dist - - bridgedb.Bridges.BridgeHolder and all other ``splitter`` classes + - bridgedb.Bridges, and all "splitter" and "ring" classes contained + within :property statefile: The filename to retrieve a pickled, jellied :class:`~bridgedb.persistent.State` instance from. (default: diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py index 26012f7..e53256f 100644 --- a/lib/bridgedb/test/test_Main.py +++ b/lib/bridgedb/test/test_Main.py @@ -58,7 +58,7 @@ def mockUpdateBridgeHistory(bridges, timestamps): (fingerprint, timestamp)) -class MockBridgeHolder(object): +class MockHashring(object): def __init__(self): self._bridges = {} def __len__(self): @@ -170,8 +170,8 @@ class MainTests(unittest.TestCase): self.state = Main.persistent.State(**self.config.__dict__) self.key = base64.b64decode('TvPS1y36BFguBmSOvhChgtXB2Lt+BOw0mGfz9SZe12Y=') - # Create a BridgeSplitter - self.hashring = MockBridgeHolder() + # Create a pseudo hashring + self.hashring = MockHashring() # Functions which some tests mock, which we'll need to re-replace # later in tearDown():

1 0

[bridgedb/master] Remove testDistWithFilterBlockedCountries() from legacy_Tests.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit e9713d2a58566b761a68544d552ae5e702008a2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 05:03:40 2015 +0000 Remove testDistWithFilterBlockedCountries() from legacy_Tests. The functionality tested in testDistWithFilterBlockedCountries() is now tested in test_Dist.test_HTTPSDistributor_with_blocked_bridges() and test_Dist.test_HTTPSDistributor_with_some_blocked_bridges(). --- lib/bridgedb/test/legacy_Tests.py | 26 -------------------------- lib/bridgedb/test/test_Dist.py | 2 ++ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 4cdcc03..fc4ca5d 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -303,32 +303,6 @@ class IPBridgeDistTests(unittest.TestCase): filterBridgesByIP4, filterBridgesByIP6]) assert len(b) == 0 - def testDistWithFilterBlockedCountries(self): - d = bridgedb.Dist.HTTPSDistributor(3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for b in d.hashring.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.getBridges(randomIPv4String(), "x", bridgeFilterRules=[ - filterBridgesByNotBlockedIn("cn")]) - assert len(b) == 0 - b = d.getBridges(randomIPv4String(), "x", bridgeFilterRules=[ - filterBridgesByNotBlockedIn("us")]) - assert len(b) > 0 - def testDistWithFilterBlockedCountriesAdvanced(self): d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index 3de7945..2d93a19 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -230,6 +230,7 @@ class HTTPSDistributorTests(unittest.TestCase): bridges = dist.getBridges(clientRequest1, 1) for b in bridges: self.assertFalse(b.isBlockedIn('cn')) + self.assertNotIn(b.fingerprint, blockedCN) # The client *should* have gotten some bridges still. self.assertGreater(len(bridges), 0) @@ -237,4 +238,5 @@ class HTTPSDistributorTests(unittest.TestCase): bridges = dist.getBridges(clientRequest2, 1) for b in bridges: self.assertFalse(b.isBlockedIn('ir')) + self.assertNotIn(b.fingerprint, blockedIR) self.assertGreater(len(bridges), 0)

1 0

[bridgedb/master] Remove the __len__() method from all Distributors.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit e6357735d612074fe32f2273c52d9254427caa37 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 03:51:43 2015 +0000 Remove the __len__() method from all Distributors. --- lib/bridgedb/Dist.py | 6 ------ lib/bridgedb/Main.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index fe81c04..e149d17 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -346,9 +346,6 @@ class HTTPSDistributor(Distributor): return answer - def __len__(self): - return len(self.hashring) - def dumpAssignments(self, f, description=""): self.hashring.dumpAssignments(f, description) @@ -475,9 +472,6 @@ class EmailBasedDistributor(Distributor): return result - def __len__(self): - return len(self.hashring) - def cleanDatabase(self): with bridgedb.Storage.getDB() as db: try: diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index f382cc5..ba74b66 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -215,7 +215,7 @@ def createBridgeRings(cfg, proxyList, key): crypto.getHMAC(key, "HTTPS-IP-Dist-Key"), proxyList, answerParameters=ringParams) - hashring.addRing(ipDistributor, "https", cfg.HTTPS_SHARE) + hashring.addRing(ipDistributor.hashring, "https", cfg.HTTPS_SHARE) # As appropriate, create an email-based distributor. if cfg.EMAIL_DIST and cfg.EMAIL_SHARE: @@ -226,7 +226,7 @@ def createBridgeRings(cfg, proxyList, key): cfg.EMAIL_DOMAIN_RULES.copy(), answerParameters=ringParams, whitelist=cfg.EMAIL_WHITELIST.copy()) - hashring.addRing(emailDistributor, "email", cfg.EMAIL_SHARE) + hashring.addRing(emailDistributor.hashring, "email", cfg.EMAIL_SHARE) # As appropriate, tell the hashring to leave some bridges unallocated. if cfg.RESERVED_SHARE:

1 0

[bridgedb/master] Move Dist.getNumBridgesPerAnswer() → Distributor.bridgesPerResponse().
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit a51f553e281091bc365d4161da2fb8d1b33923d9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 18 22:41:27 2015 +0000 Move Dist.getNumBridgesPerAnswer() → Distributor.bridgesPerResponse(). It was meant to be a method; it operates on the length of the primary hashring of a Distributor. Having it outside of the class that it interacts with is just wacky. * CHANGE getNumBridgesPerAnswer into a method for the Distributor class. * CHANGE the unittests for the function to take this into account. --- lib/bridgedb/Dist.py | 43 +++++++++++++++++------------- lib/bridgedb/test/test_Dist.py | 56 ++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index e66c1e6..93c08c1 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -48,26 +48,13 @@ class EmailRequestedKey(Exception): """Raised when an incoming email requested a copy of our GnuPG keys.""" -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 Distributor(object): """Distributes bridges to clients.""" def __init__(self): super(Distributor, self).__init__() self.name = None + self.hashring = None def setDistributorName(self, name): """Set a **name** for identifying this distributor. @@ -89,6 +76,21 @@ class Distributor(object): self.name = name self.hashring.distributorName = name + def bridgesPerResponse(self, hashring=None, maximum=3): + if hashring is None: + hashring = self.hashring + + if len(hashring) < 20: + n = 1 + if 20 <= len(hashring) < 100: + n = min(2, maximum) + if len(hashring) >= 100: + n = maximum + + logging.debug("Returning %d bridges from ring of len: %d" % + (n, len(hashring))) + return n + class HTTPSDistributor(Distributor): """A Distributor that hands out bridges based on the IP address of an @@ -157,6 +159,9 @@ class HTTPSDistributor(Distributor): self.setDistributorName('HTTPS') + def bridgesPerResponse(self, hashring=None, maximum=3): + return super(HTTPSDistributor, self).bridgesPerResponse(hashring, maximum) + @classmethod def getSubnet(cls, ip, usingProxy=False, proxySubnets=4): """Map all clients whose **ip**s are within the same subnet to the same @@ -386,7 +391,7 @@ class HTTPSDistributor(Distributor): populate_from=self.hashring.bridges) # Determine the appropriate number of bridges to give to the client: - returnNum = getNumBridgesPerAnswer(ring, max_bridges_per_answer=N) + returnNum = self.bridgesPerResponse(ring, maximum=N) answer = ring.getBridges(position, returnNum) return answer @@ -440,6 +445,9 @@ class EmailBasedDistributor(Distributor): self.setDistributorName('Email') + def bridgesPerResponse(self, hashring=None, maximum=3): + return super(EmailBasedDistributor, self).bridgesPerResponse(hashring, maximum) + def insert(self, bridge): """Assign a bridge to this distributor.""" self.hashring.insert(bridge) @@ -515,9 +523,8 @@ class EmailBasedDistributor(Distributor): filterBridgesByRules(ruleset), populate_from=self.hashring.bridges) - numBridgesToReturn = getNumBridgesPerAnswer(ring, - max_bridges_per_answer=N) - result = ring.getBridges(pos, numBridgesToReturn) + returnNum = self.bridgesPerResponse(ring, maximum=N) + result = ring.getBridges(pos, returnNum) db.setEmailTime(bridgeRequest.client, now) db.commit() diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index a3c8308..f47449c 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -63,37 +63,6 @@ def _generateFakeBridges(n=500): BRIDGES = _generateFakeBridges() -class GetNumBridgesPerAnswerTests(unittest.TestCase): - """Unittests for :func:`bridgedb.Dist.getNumBridgesPerAnswer`.""" - - def setUp(self): - self.key = 'aQpeOFIj8q20s98awfoiq23rpOIjFaqpEWFoij1X' - self.ring = BridgeRing(self.key) - self.bridges = _generateFakeBridges() - - def test_Dist_getNumBridgesPerAnswer_120(self): - [self.ring.insert(bridge) for bridge in self.bridges[:120]] - self.assertEqual(Dist.getNumBridgesPerAnswer(self.ring), 3) - - def test_Dist_getNumBridgesPerAnswer_100(self): - [self.ring.insert(bridge) for bridge in self.bridges[:100]] - self.assertEqual(Dist.getNumBridgesPerAnswer(self.ring), 3) - - def test_Dist_getNumBridgesPerAnswer_50(self): - [self.ring.insert(bridge) for bridge in self.bridges[:60]] - self.assertEqual(Dist.getNumBridgesPerAnswer(self.ring), 2) - - def test_Dist_getNumBridgesPerAnswer_15(self): - [self.ring.insert(bridge) for bridge in self.bridges[:15]] - self.assertEqual(Dist.getNumBridgesPerAnswer(self.ring), 1) - - def test_Dist_getNumBridgesPerAnswer_100_max_5(self): - [self.ring.insert(bridge) for bridge in self.bridges[:100]] - self.assertEqual( - Dist.getNumBridgesPerAnswer(self.ring, max_bridges_per_answer=5), - 5) - - class HTTPSDistributorTests(unittest.TestCase): """Tests for :class:`HTTPSDistributor`.""" @@ -134,6 +103,31 @@ class HTTPSDistributorTests(unittest.TestCase): self.assertEqual(dist.proxySubring, 4) self.assertEqual(dist.totalSubrings, 4) + def test_HTTPSDistributor_bridgesPerResponse_120(self): + dist = Dist.HTTPSDistributor(3, self.key) + [dist.insert(bridge) for bridge in self.bridges[:120]] + self.assertEqual(dist.bridgesPerResponse(), 3) + + def test_HTTPSDistributor_bridgesPerResponse_100(self): + dist = Dist.HTTPSDistributor(3, self.key) + [dist.hashring.insert(bridge) for bridge in self.bridges[:100]] + self.assertEqual(dist.bridgesPerResponse(), 3) + + def test_HTTPSDistributor_bridgesPerResponse_50(self): + dist = Dist.HTTPSDistributor(3, self.key) + [dist.insert(bridge) for bridge in self.bridges[:60]] + self.assertEqual(dist.bridgesPerResponse(), 2) + + def test_HTTPSDistributor_bridgesPerResponse_15(self): + dist = Dist.HTTPSDistributor(3, self.key) + [dist.insert(bridge) for bridge in self.bridges[:15]] + self.assertEqual(dist.bridgesPerResponse(), 1) + + def test_HTTPSDistributor_bridgesPerResponse_100_max_5(self): + dist = Dist.HTTPSDistributor(3, self.key) + [dist.insert(bridge) for bridge in self.bridges[:100]] + self.assertEqual(dist.bridgesPerResponse(maximum=5), 5) + def test_HTTPSDistributor_getSubnet_usingProxy(self): """HTTPSDistributor.getSubnet(usingProxy=True) should return a proxy group number.

1 0

[bridgedb/master] Remove dumpAssignments() for all Distributors.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 69becd92ceb3b55777acddbe4734f7aa912cb425 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 04:49:24 2015 +0000 Remove dumpAssignments() for all Distributors. These methods were never used. Hashrings dump the bridges assigned to them. --- lib/bridgedb/Dist.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index e149d17..fe6b8da 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -346,9 +346,6 @@ class HTTPSDistributor(Distributor): return answer - def dumpAssignments(self, f, description=""): - self.hashring.dumpAssignments(f, description) - class EmailBasedDistributor(Distributor): """Object that hands out bridges based on the email address of an incoming @@ -483,9 +480,6 @@ class EmailBasedDistributor(Distributor): else: db.commit() - def dumpAssignments(self, f, description=""): - self.hashring.dumpAssignments(f, description) - def prepopulateRings(self): # populate all rings (for dumping assignments and testing) for filterFn in [filterBridgesByIP4, filterBridgesByIP6]:

1 0

[bridgedb/master] Rewrite testDistWithFilterIP4() in legacy_Tests.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit d9dcb7f3d143cfb46f2f1e988da96cf5a5b1b449 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 21 23:34:50 2015 +0000 Rewrite testDistWithFilterIP4() in legacy_Tests. --- lib/bridgedb/test/legacy_Tests.py | 16 ---------------- lib/bridgedb/test/test_Dist.py | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 043f09b..9a0c74f 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -252,22 +252,6 @@ class IPBridgeDistTests(unittest.TestCase): assert type(ipaddr.IPAddress(address)) is ipaddr.IPv6Address assert filterBridgesByIP6(random.choice(bridges)) - def testDistWithFilterIP4(self): - d = bridgedb.Dist.HTTPSDistributor(3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for i in xrange(500): - bridges = d.getBridges(randomIPv4String(), - "faketimestamp", - bridgeFilterRules=[filterBridgesByIP4]) - bridge = random.choice(bridges) - bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address) - address, portlist = networkstatus.parseALine(bridge_line) - assert type(ipaddr.IPAddress(address)) is ipaddr.IPv4Address - assert filterBridgesByIP4(random.choice(bridges)) - def testDistWithFilterBlockedCountriesAdvanced(self): d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index 9e47a92..82ef823 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -288,3 +288,23 @@ class HTTPSDistributorTests(unittest.TestCase): address = address.strip('[]') self.assertIsInstance(ipaddr.IPAddress(address), ipaddr.IPv6Address) self.assertIsNotNone(filterBridgesByIP6(random.choice(bridges))) + + def test_HTTPSDistributor_getBridges_ipv4(self): + """A request for IPv4 bridges should return IPv4 bridges.""" + dist = Dist.HTTPSDistributor(1, self.key) + [dist.insert(bridge) for bridge in self.bridges[:250]] + + for i in xrange(500): + bridgeRequest = self.randomClientRequest() + bridgeRequest.generateFilters() + + bridges = dist.getBridges(bridgeRequest, "faketimestamp") + self.assertTrue(type(bridges) is list) + self.assertGreater(len(bridges), 0) + + bridge = random.choice(bridges) + bridgeLine = bridge.getBridgeLine(bridgeRequest) + addrport, fingerprint = bridgeLine.split() + address, port = addrport.rsplit(':', 1) + self.assertIsInstance(ipaddr.IPAddress(address), ipaddr.IPv4Address) + self.assertIsNotNone(filterBridgesByIP4(random.choice(bridges)))

1 0

[bridgedb/master] Rewrite testBasicDist() in legacy_Tests.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit e75d41608d0cec23a4d1240d59f3fb5e2ea593d5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 05:31:13 2015 +0000 Rewrite testBasicDist() in legacy_Tests. --- lib/bridgedb/test/legacy_Tests.py | 8 -------- lib/bridgedb/test/test_Dist.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index c495412..fd6a739 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -185,14 +185,6 @@ class EmailBridgeDistTests(unittest.TestCase): class IPBridgeDistTests(unittest.TestCase): - def testBasicDist(self): - d = bridgedb.Dist.HTTPSDistributor(3, "Foo") - for _ in xrange(256): - d.insert(fakeBridge()) - n = d.getBridges("1.2.3.4", "x") - n2 = d.getBridges("1.2.3.4", "x") - self.assertEquals(n, n2) - def testDistWithProxies(self): d = bridgedb.Dist.HTTPSDistributor(3, "Foo", [RhymesWith255ProxySet()]) for _ in xrange(256): diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index bc437ba..23a6492 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -243,6 +243,21 @@ class HTTPSDistributorTests(unittest.TestCase): self.assertNotIn(b.fingerprint, blockedIR) self.assertGreater(len(bridges), 0) + def test_HTTPSDistributor_getBridges_same_bridges_to_same_client(self): + """The same client asking for bridges from the HTTPSDistributor + multiple times in a row should get the same bridges in response each + time. + """ + dist = Dist.HTTPSDistributor(3, self.key) + [dist.insert(bridge) for bridge in self.bridges[:250]] + + bridgeRequest = self.randomClientRequest() + responses = {} + for i in range(5): + responses[i] = dist.getBridges(bridgeRequest, 1) + for i in range(4): + self.assertItemsEqual(responses[i], responses[i+1]) + def test_HTTPSDistributor_getBridges_ipv4_ipv6(self): """Asking for bridge addresses which are simultaneously IPv4 and IPv6 (in that order) should return IPv4 bridges.

1 0

[bridgedb/master] Rewrite commented out testDistWithPortRestrictions() in legacy_Tests.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 003165e7875412944b91785431ee1b749fda2a0d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 20 03:34:40 2015 +0000 Rewrite commented out testDistWithPortRestrictions() in legacy_Tests. --- lib/bridgedb/test/legacy_Tests.py | 22 ---------------------- lib/bridgedb/test/test_Dist.py | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 85ba722..2f1da67 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -185,28 +185,6 @@ class EmailBridgeDistTests(unittest.TestCase): class IPBridgeDistTests(unittest.TestCase): - #XXX: #6175 breaks this test! - #def testDistWithPortRestrictions(self): - # param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) - # d = bridgedb.Dist.HTTPSDistributor(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.getBridges(i, "x") - # 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 testDistWithFilterBlockedCountriesAdvanced(self): d = bridgedb.Dist.HTTPSDistributor(3, "Foo") for _ in xrange(250): diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index 18b3e79..e8a17e4 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -23,6 +23,7 @@ from bridgedb import Dist from bridgedb.bridges import Bridge from bridgedb.bridges import PluggableTransport from bridgedb.Bridges import BridgeRing +from bridgedb.Bridges import BridgeRingParameters from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 @@ -282,6 +283,30 @@ class HTTPSDistributorTests(unittest.TestCase): for i in range(4): self.assertItemsEqual(responses[i], responses[i+1]) + def test_HTTPSDistributor_getBridges_with_BridgeRingParameters(self): + param = BridgeRingParameters(needPorts=[(443, 1)]) + dist = Dist.HTTPSDistributor(3, self.key, answerParameters=param) + + bridges = self.bridges[:32] + for b in self.bridges: + b.orPort = 443 + + [dist.insert(bridge) for bridge in bridges] + [dist.insert(bridge) for bridge in self.bridges[:250]] + + for _ in xrange(32): + bridgeRequest = self.randomClientRequest() + answer = dist.getBridges(bridgeRequest, 1) + count = 0 + fingerprints = {} + for bridge in answer: + fingerprints[bridge.identity] = 1 + if bridge.orPort == 443: + count += 1 + self.assertEquals(len(fingerprints), len(answer)) + self.assertGreater(len(fingerprints), 0) + self.assertTrue(count >= 1) + def test_HTTPSDistributor_getBridges_ipv4_ipv6(self): """Asking for bridge addresses which are simultaneously IPv4 and IPv6 (in that order) should return IPv4 bridges.

1 0

[bridgedb/master] Rewrite testDistWithProxies() in legacy_Tests.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit dcafe58630f9048b7829184675a9a93deda2f0a3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 19 05:43:39 2015 +0000 Rewrite testDistWithProxies() in legacy_Tests. --- lib/bridgedb/test/legacy_Tests.py | 21 --------------------- lib/bridgedb/test/test_Dist.py | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index fd6a739..85ba722 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -185,27 +185,6 @@ class EmailBridgeDistTests(unittest.TestCase): class IPBridgeDistTests(unittest.TestCase): - def testDistWithProxies(self): - d = bridgedb.Dist.HTTPSDistributor(3, "Foo", [RhymesWith255ProxySet()]) - for _ in xrange(256): - d.insert(fakeBridge()) - - for _ in xrange(256): - # Make sure that the ProxySets do not overlap - f = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(4)]) - g = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(3)] + ['255']) - n = d.getBridges(g(), "x") - n2 = d.getBridges(f(), "x") - - assert(len(n) > 0) - assert(len(n2) > 0) - - for b in n: - assert (b not in n2) - - for b in n2: - assert (b not in n) - #XXX: #6175 breaks this test! #def testDistWithPortRestrictions(self): # param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) diff --git a/lib/bridgedb/test/test_Dist.py b/lib/bridgedb/test/test_Dist.py index 23a6492..18b3e79 100644 --- a/lib/bridgedb/test/test_Dist.py +++ b/lib/bridgedb/test/test_Dist.py @@ -243,6 +243,30 @@ class HTTPSDistributorTests(unittest.TestCase): self.assertNotIn(b.fingerprint, blockedIR) self.assertGreater(len(bridges), 0) + def test_HTTPSDistributor_getBridges_with_proxy_and_nonproxy_users(self): + """An HTTPSDistributor should give separate bridges to proxy users.""" + proxies = ProxySet(['.'.join(['1.1.1', str(x)]) for x in range(1, 256)]) + dist = Dist.HTTPSDistributor(3, self.key, proxies) + [dist.insert(bridge) for bridge in self.bridges] + + for _ in range(10): + bridgeRequest1 = self.randomClientRequest() + bridgeRequest1.client = '.'.join(['1.1.1', str(random.randrange(1, 255))]) + + bridgeRequest2 = self.randomClientRequest() + bridgeRequest2.client = '.'.join(['9.9.9', str(random.randrange(1, 255))]) + + n1 = dist.getBridges(bridgeRequest1, 1) + n2 = dist.getBridges(bridgeRequest2, 1) + + self.assertGreater(len(n1), 0) + self.assertGreater(len(n2), 0) + + for b in n1: + self.assertNotIn(b, n2) + for b in n2: + self.assertNotIn(b, n1) + def test_HTTPSDistributor_getBridges_same_bridges_to_same_client(self): """The same client asking for bridges from the HTTPSDistributor multiple times in a row should get the same bridges in response each

1 0