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

[bridgedb/master] Generalise BridgeRequestBase.isValid().
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 7ebd8914e30fea061ecf6b537bb186660946db18 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 05:00:56 2015 +0000 Generalise BridgeRequestBase.isValid(). It's now suitable for inheritance by email.request and https.request, so we can remove the custom methods from both. --- lib/bridgedb/bridgerequest.py | 17 +++++++++-------- lib/bridgedb/email/request.py | 15 --------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index f653450..f7aa031 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -130,16 +130,17 @@ class BridgeRequestBase(object): return position def isValid(self, valid=None): - """Set or determine if this request was valid. + """Get or set the validity of this bridge request. - :type valid: None or bool - :param valid: If ``None``, get the current request validity. If - ``True`` or ``False``, set the request validity accordingly. - :rtype: bool - :returns: Whether or not this request is valid. + If called without parameters, this method will return the current + state, otherwise (if called with the **valid** parameter), it will set + the current state of validity for this request. + + :param bool valid: If given, set the validity state of this + request. Otherwise, get the current state. """ - if isinstance(valid, bool): - self.valid = valid + if valid is not None: + self.valid = bool(valid) return self.valid def withIPv4(self): diff --git a/lib/bridgedb/email/request.py b/lib/bridgedb/email/request.py index 9c0f0c2..32446ac 100644 --- a/lib/bridgedb/email/request.py +++ b/lib/bridgedb/email/request.py @@ -108,23 +108,8 @@ class EmailBridgeRequest(bridgerequest.BridgeRequestBase): :class:`~bridgedb.Dist.EmailBasedDistributor`. """ super(EmailBridgeRequest, self).__init__() - self._isValid = False self._wantsKey = False - def isValid(self, valid=None): - """Get or set the validity of this bridge request. - - If called without parameters, this method will return the current - state, otherwise (if called with the **valid** parameter), it will set - the current state of validity for this request. - - :param bool valid: If given, set the validity state of this - request. Otherwise, get the current state. - """ - if valid is not None: - self._isValid = bool(valid) - return self._isValid - def wantsKey(self, wantsKey=None): """Get or set whether this bridge request wanted our GnuPG key.

1 0

[bridgedb/master] Merge branch 'fix/16330-eid-sds-2-fields' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 2b31c86209c6c43cda90dec910a0f262f170fa1c Merge: 0b62526 42f19f5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 16 04:52:53 2015 +0000 Merge branch 'fix/16330-eid-sds-2-fields' into develop .travis.requirements.txt | 2 +- lib/bridgedb/test/test_parse_descriptors.py | 121 +++++++++++++++++++++++++++ requirements.txt | 2 +- setup.py | 4 +- 4 files changed, 126 insertions(+), 3 deletions(-)

1 0

[bridgedb/master] Document IPBasedDistributor.prepopulateRings().
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit d229941c72e48c3d1550d45983c4ddd2c5ef8961 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 22:50:04 2015 +0000 Document IPBasedDistributor.prepopulateRings(). --- lib/bridgedb/Dist.py | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 78741a7..39e70be 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -201,6 +201,61 @@ class IPBasedDistributor(Distributor): self.setDistributorName('HTTPS') def prepopulateRings(self): + """Prepopulate this distributor's hashrings and subhashrings with + bridges. + + The hashring structure for this distributor is influenced by the + ``N_IP_CLUSTERS`` configuration option, as well as the number of + ``PROXY_LIST_FILES``. Essentially, :data:`nClusters` is set to the + specified ``N_IP_CLUSTERS``. The ``PROXY_LIST_FILES`` (plus the + :class:`bridgedb.proxy.ProxySet` for the Tor Exit list downloaded into + memory with :script:`get-tor-exits`) are stored in :data:`categories`. + + The number of subhashrings which this :class:`Distributor` has active + in its hashring is then the :data:`nClusters` plus the number of + :data:`categories`. + + As an example, if BridgeDB was configured with ``N_IP_CLUSTERS=4`` and + ``PROXY_LIST_FILES=["open-socks-proxies.txt"]``, then the total number + of subhashrings is six — four for the "clusters", and two + "categories": one for everything contained within the + ``"open-socks-proxies.txt"`` file and the other for the downloaded + list of Tor Exits. Thus, the resulting hashring-subhashring structure + would look like: + + +------------------+---------------------------------------------------+-------------------------+ + | | Directly connecting users | Tor / known proxy users | + +------------------+------------+------------+------------+------------+------------+------------+ + | Clusters / | Cluster-1 | Cluster-2 | Cluster-3 | Cluster-4 | Cat-1 | Cat-2 | + | Categories | | | | | | | + +==================+============+============+============+============+============+============+ + | Subhashrings | | | | | | | + | (total, assigned)| (6,0) | (6,1) | (6,2) | (6,3) | (6,4) | (6,5) | + +------------------+------------+------------+------------+------------+------------+------------+ + | Filtered | (6,0) | (6,1) | (6,2) | (6,3) | (6,4) | (6,5) | + | Subhashrings +------------+------------+------------+------------+------------+------------+ + | bBy requested | (6,0)-IPv4 | (6,1)-IPv4 | (6,2)-IPv4 | (6,3)-IPv4 | (6,4)-IPv4 | (6,5)-IPv4 | + | bridge type) +------------+------------+------------+------------+------------+------------+ + | | (6,0)-IPv6 | (6,1)-IPv6 | (6,2)-IPv6 | (6,3)-IPv6 | (6,4)-IPv6 | (6,5)-IPv6 | + +------------------+------------+------------+------------+------------+------------+------------+ + + The "filtered subhashrings" are essentially copies of their respective + subhashring, that is, subhashring ``(6,0)`` contains both IPv4 and + IPv6 bridges, meaning that its contents are a superset of the filtered + subhashrings ``(6,0)-IPv4`` and ``(6,0)-IPv6``. (I have no idea of + the relation between ``(6,0)-IPv4`` and ``(6,0)-IPv6``, including + whether or not their contents are disjoint. I didn't design this shit, + I'm just redesigning it.) + + "Why does the ``(6,0)`` superset subhashring exist then?" + + you might ask. That's a very good question. I don't know either. + I'm inclined to think it shouldn't exist, unless we wish to allow + clients to request IPv4 bridges and IPv6 bridges simultaneously + (there's currently no interface to do this, however). + + Thus, in this example, we end up with **18 total subhashrings**. + """ logging.info("Prepopulating %s distributor hashrings..." % self.name) # populate all rings (for dumping assignments and testing) for filterFn in [None, filterBridgesByIP4, filterBridgesByIP6]:

1 0

[bridgedb/master] Bump Stem version to latest git master.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 42f19f52002c16da545e5e27ccb689c47cb7491c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 10 06:07:08 2015 +0000 Bump Stem version to latest git master. --- .travis.requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index e106d8f..ebda8e0 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -28,5 +28,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -stem==1.3.0 +git+https://git.torproject.org/stem.git@ba8cee36a0348c1509ad3562051723b7948e19ce#egg=stem-1.4.1.dev0-py2.7 zope.interface==3.6.1 diff --git a/requirements.txt b/requirements.txt index 40daca6..9e4aac1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -stem==1.3.0 +git+https://git.torproject.org/stem.git@ba8cee36a0348c1509ad3562051723b7948e19ce#egg=stem-1.4.1.dev0-py2.7 zope.interface==3.6.1

1 0

[bridgedb/master] Refactor getBridgesForEmail() to use EmailBridgeRequests.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 55557c339c18cd3f190521369d5047bbd7ccf369 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 05:54:53 2015 +0000 Refactor getBridgesForEmail() to use EmailBridgeRequests. * RENAME b.D.EmailBasedDistributor.getBridgesForEmail() → b.D.EmailBasedDistributor.getBridges(). * CHANGE b.D.EmailBasedDistributor.getBridges() to use bridgedb.email.request.EmailBridgeRequest. --- lib/bridgedb/Dist.py | 60 ++++++++++++++++------------------- lib/bridgedb/email/autoresponder.py | 16 ++++------ lib/bridgedb/test/email_helpers.py | 24 +++++++------- lib/bridgedb/test/legacy_Tests.py | 6 ++-- 4 files changed, 48 insertions(+), 58 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 39e70be..26e952e 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -473,65 +473,63 @@ class EmailBasedDistributor(Distributor): """Assign a bridge to this distributor.""" self.splitter.insert(bridge) - def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, - countryCode=None, bridgeFilterRules=None): + def getBridges(self, bridgeRequest, epoch, N=1): """Return a list of bridges to give to a user. - :param str emailaddress: The user's email address, as given in a - :header:`From:` line. + :type bridgeRequest: :class:`~bridgedb.email.request.EmailBridgeRequest` + :param bridgeRequest: A :class:`~bridgedb.bridgerequest.BridgeRequestBase` + with the :data:`~bridgedb.bridgerequest.BridgeRequestBase.client` + attribute set to a string containing the client's full, canonicalized + email address. :param 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. - :param parameters: DOCDOC - :param countryCode: DOCDOC - :param bridgeFilterRules: DOCDOC """ - if not bridgeFilterRules: - bridgeFilterRules=[] - now = time.time() - # All checks on the email address, such as checks for whitelisting and # canonicalization of domain name, are done in # :meth:`bridgedb.email.autoresponder.getMailTo` and # :meth:`bridgedb.email.autoresponder.SMTPAutoresponder.runChecks`. - if not emailaddress: - logging.error(("%s distributor can't get bridges for blank email " - "address!") % (self.name, emailaddress)) - return [] + if (not bridgeRequest.client) or (bridgeRequest.client == 'default'): + raise addr.BadEmail( + ("%s distributor can't get bridges for invalid email email " + " address: %s") % (self.name, bridgeRequest.client)) + + now = time.time() with bridgedb.Storage.getDB() as db: - wasWarned = db.getWarnedEmail(emailaddress) - lastSaw = db.getEmailTime(emailaddress) + wasWarned = db.getWarnedEmail(bridgeRequest.client) + lastSaw = db.getEmailTime(bridgeRequest.client) logging.info("Attempting to return for %d bridges for %s..." - % (N, emailaddress)) + % (N, bridgeRequest.client)) if lastSaw is not None: - if emailaddress in self.whitelist.keys(): + if bridgeRequest.client in self.whitelist.keys(): logging.info(("Whitelisted email address %s was last seen " "%d seconds ago.") - % (emailaddress, now - lastSaw)) + % (bridgeRequest.client, now - lastSaw)) elif (lastSaw + MAX_EMAIL_RATE) >= now: wait = (lastSaw + MAX_EMAIL_RATE) - now logging.info("Client %s must wait another %d seconds." - % (emailaddress, wait)) + % (bridgeRequest.client, wait)) if wasWarned: - raise IgnoreEmail("Client was warned.", emailaddress) + raise IgnoreEmail("Client was warned.", + bridgeRequest.client) else: logging.info("Sending duplicate request warning.") - db.setWarnedEmail(emailaddress, True, now) + db.setWarnedEmail(bridgeRequest.client, True, now) db.commit() raise TooSoonEmail("Must wait %d seconds" % wait, - emailaddress) + bridgeRequest.client) # warning period is over elif wasWarned: - db.setWarnedEmail(emailaddress, False) + db.setWarnedEmail(bridgeRequest.client, False) - pos = self.emailHmac("<%s>%s" % (epoch, emailaddress)) + pos = self.emailHmac("<%s>%s" % (epoch, bridgeRequest.client)) ring = None - ruleset = frozenset(bridgeFilterRules) + ruleset = frozenset(bridgeRequest.filters) if ruleset in self.splitter.filterRings.keys(): logging.debug("Cache hit %s" % ruleset) _, ring = self.splitter.filterRings[ruleset] @@ -540,19 +538,17 @@ class EmailBasedDistributor(Distributor): logging.debug("Cache miss %s" % ruleset) # add new ring - key1 = getHMAC(self.splitter.key, - "Order-Bridges-In-Ring") + key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring") ring = bridgedb.Bridges.BridgeRing(key1, self.answerParameters) - # debug log: cache miss self.splitter.addRing(ring, ruleset, - filterBridgesByRules(bridgeFilterRules), + filterBridgesByRules(ruleset), populate_from=self.splitter.bridges) numBridgesToReturn = getNumBridgesPerAnswer(ring, max_bridges_per_answer=N) result = ring.getBridges(pos, numBridgesToReturn) - db.setEmailTime(emailaddress, now) + db.setEmailTime(bridgeRequest.client, now) db.commit() return result diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 0eeb14a..0ab04fa 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -87,6 +87,7 @@ def createResponseBody(lines, context, client, lang='en'): bridges = None try: bridgeRequest = request.determineBridgeRequestOptions(lines) + bridgeRequest.client = str(client) # The request was invalid, respond with a help email which explains # valid email commands: @@ -96,12 +97,10 @@ def createResponseBody(lines, context, client, lang='en'): # Otherwise they must have requested bridges: interval = context.schedule.intervalStart(time.time()) - bridges = context.distributor.getBridgesForEmail( - str(client), + bridges = context.distributor.getBridges( + bridgeRequest, interval, - context.nBridges, - countryCode=None, - bridgeFilterRules=bridgeRequest.filters) + context.nBridges) except EmailRequestedHelp as error: logging.info(error) return templates.buildWelcomeText(translator, client) @@ -120,11 +119,8 @@ def createResponseBody(lines, context, client, lang='en'): answer = "(no bridges currently available)\r\n" if bridges: transport = bridgeRequest.justOnePTType() - answer = "".join(" %s\r\n" % b.getConfigLine( - includeFingerprint=context.includeFingerprints, - addressClass=bridgeRequest.addressClass, - transport=transport, - request=str(client)) for b in bridges) + answer = "".join(" %s\r\n" % b.getBridgeLine( + bridgeRequest, context.includeFingerprints) for b in bridges) return templates.buildAnswerMessage(translator, client, answer) def generateResponse(fromAddress, client, body, subject=None, diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index c80e2ea..28ece91 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -136,8 +136,7 @@ class DummyEmailDistributor(object): self.domainrules = domainrules self.answerParameters = answerParameters - def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, - countryCode=None, bridgeFilterRules=None): + def getBridges(self, bridgeRequest, epoch, N=1): return [DummyBridge() for _ in xrange(N)] def cleanDatabase(self): @@ -160,22 +159,21 @@ class DummyEmailDistributorWithState(DummyEmailDistributor): super(DummyEmailDistributorWithState, self).__init__() self.alreadySeen = {} - def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, - countryCode=None, bridgeFilterRules=None): + def getBridges(self, bridgeRequest, epoch, N=1): # Keep track of the number of times we've seen a client. - if not emailaddress in self.alreadySeen.keys(): - self.alreadySeen[emailaddress] = 0 - self.alreadySeen[emailaddress] += 1 + if not bridgeRequest.client in self.alreadySeen.keys(): + self.alreadySeen[bridgeRequest.client] = 0 + self.alreadySeen[bridgeRequest.client] += 1 - if self.alreadySeen[emailaddress] <= 1: + if self.alreadySeen[bridgeRequest.client] <= 1: return [DummyBridge() for _ in xrange(N)] - elif self.alreadySeen[emailaddress] == 2: + elif self.alreadySeen[bridgeRequest.client] == 2: raise TooSoonEmail( "Seen client '%s' %d times" - % (emailaddress, self.alreadySeen[emailaddress]), - emailaddress) + % (bridgeRequest.client, self.alreadySeen[bridgeRequest.client]), + bridgeRequest.client) else: raise IgnoreEmail( "Seen client '%s' %d times" - % (emailaddress, self.alreadySeen[emailaddress]), - emailaddress) + % (bridgeRequest.client, self.alreadySeen[bridgeRequest.client]), + bridgeRequest.client) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 0d2512c..2e4d56f 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.getBridgesForEmail('abc(a)example.com', 1, 3) + d.getBridges('abc(a)example.com', 1, 3) self.assertRaises(bridgedb.Dist.TooSoonEmail, - d.getBridgesForEmail, 'abc(a)example.com', 1, 3) + d.getBridges, 'abc(a)example.com', 1, 3) self.assertRaises(bridgedb.Dist.IgnoreEmail, - d.getBridgesForEmail, 'abc(a)example.com', 1, 3) + d.getBridges, 'abc(a)example.com', 1, 3) def testUnsupportedDomain(self): db = self.db

1 0

[bridgedb/master] Add module docstring for bridgedb.parse.fingerprint.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 217f8e2785c02d1e8edf784aac9dd9a1b83978a9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 18 04:51:30 2015 +0000 Add module docstring for bridgedb.parse.fingerprint. --- lib/bridgedb/parse/fingerprint.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/bridgedb/parse/fingerprint.py b/lib/bridgedb/parse/fingerprint.py index f825271..bf12ee5 100644 --- a/lib/bridgedb/parse/fingerprint.py +++ b/lib/bridgedb/parse/fingerprint.py @@ -10,6 +10,24 @@ # :license: see LICENSE for licensing information #_____________________________________________________________________________ +"""Utility functions for converting between various relay fingerprint formats, +and checking their validity. + +.. py:module:: bridgedb.parse.fingerprints + :synopsis: Parsers for Tor Bridge fingerprints. + +.. todo: This module is very small; it could possibly be combined with another + module, e.g. :mod:`bridgedb.parse.descriptors`. + +bridgedb.parse.fingerprints +============================ +:: + + toHex - Convert a fingerprint from its binary representation to hexadecimal. + fromHex - Convert a fingerprint from hexadecimal to binary. + isValidFingerprint - Validate a fingerprint. +.. +""" import binascii import logging

1 0

[bridgedb/master] Add Sphinx extension for referencing Tor Trac tickets.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 8df13d2b5f2bcc4a19c32017bcdf81efe0f6401d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 18 04:38:19 2015 +0000 Add Sphinx extension for referencing Tor Trac tickets. --- doc/sphinx/ext/traclinks.py | 37 +++++++++++++++++++++++++++++++++++++ doc/sphinx/source/conf.py | 3 ++- lib/bridgedb/parse/descriptors.py | 8 ++++---- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/doc/sphinx/ext/traclinks.py b/doc/sphinx/ext/traclinks.py new file mode 100644 index 0000000..fd2d9b3 --- /dev/null +++ b/doc/sphinx/ext/traclinks.py @@ -0,0 +1,37 @@ +"""Sphinx/docutils extension to create links to a Trac site using a +RestructuredText interpreted text role that looks like this:: + + :trac:`trac_link_text` + +for example:: + + :trac:`#2015` + +creates a link to ticket number 2015. + +adapted from recipe here_. + +.. _here: http://stackoverflow.com/a/2111327/13564 +""" + +import urllib +from docutils import nodes, utils + +def make_trac_link(name, rawtext, text, lineno, inliner, + options={}, content=[]): + env = inliner.document.settings.env + trac_url = env.config.traclinks_base_url + ref = trac_url + urllib.quote(text, safe='') + node = nodes.reference(rawtext, + utils.unescape(text), + refuri=ref, + **options) + return [node],[] + + +def setup(app): + """setup function to register the extension""" + app.add_config_value('traclinks_base_url', + 'https://bugs.torproject.org/', + 'env') + app.add_role('trac', make_trac_link) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 5cd485f..e733c42 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -116,7 +116,8 @@ extensions = ['sphinx.ext.autodoc', 'sphinxarg.ext', 'sphinxcontrib.fulltoc', 'repoze.sphinx.autointerface', - 'apilinks_sphinxext'] + 'apilinks_sphinxext', + 'traclinks'] todo_include_todos = True diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 46f959e..81cba7f 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -69,10 +69,10 @@ def parseNetworkStatusFile(filename, validate=True, skipAnnotations=True, descriptorClass=RouterStatusEntryV3): """Parse a file which contains an ``@type bridge-networkstatus`` document. - See `ticket #12254 <https://bugs.torproject.org/12254>`__ for why - networkstatus-bridges documents don't look anything like the networkstatus - v2 documents that they are purported to look like. They are missing all - headers, and the entire footer including authority signatures. + See :trac:`#12254` for why networkstatus-bridges documents don't look + anything like the networkstatus v2 documents that they are purported to + look like. They are missing all headers, and the entire footer including + authority signatures. :param str filename: The location of the file containing bridge networkstatus descriptors.

1 0

[bridgedb/master] Remove annoying and unnecessary log statements with memory addresses.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit dfbc8e0abbfba32324c4c2c9573d0671a150cf34 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 20 22:27:05 2015 +0000 Remove annoying and unnecessary log statements with memory addresses. The information which these log statements were trying to log is captured by other log statements within the same functions, and both of them included non-human-useful data like locations of various objects in memory. Conflicts: lib/bridgedb/Bridges.py --- lib/bridgedb/Bridges.py | 3 --- lib/bridgedb/Filters.py | 1 - 2 files changed, 4 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 58a81cd..d9b28e2 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -634,9 +634,6 @@ class FilteredBridgeSplitter(BridgeHolder): # I suppose since it contains memory addresses, it *is* technically # likely to be a unique string, but it is messy. - logging.debug("Adding '%s' subring to %s..." - % (ringname, self.__class__.__name__)) - if not isinstance(subring, BridgeHolder): logging.fatal("%s hashring can't add invalid subring: %r" % (self.distributorName, subring)) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index eadf012..aade069 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -12,7 +12,6 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): # ruleset ensures that the same logging.debug("Creating a filter for assigning bridges to hashrings...") ruleset = frozenset([hmac, numRings, assignedRing]) - logging.debug("Filter created: %s" % ruleset) try: return funcs[ruleset]

1 0

[bridgedb/master] Add module docstring for bridgedb.parse.descriptors.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 6d7180a895dc205176f34e38a1251f6aae0ef156 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 18 04:39:01 2015 +0000 Add module docstring for bridgedb.parse.descriptors. --- lib/bridgedb/parse/descriptors.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 81cba7f..1b0108e 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -10,6 +10,29 @@ # :license: see LICENSE for licensing information #_____________________________________________________________________________ +"""Parsers for Tor Bridge descriptors, including ``bridge-networkstatus`` +documents, ``bridge-server-descriptor``s, and ``bridge-extrainfo`` +descriptors. + +.. py:module:: bridgedb.parse.descriptors + :synopsis: Parsers for Tor Bridge descriptors. + +bridgedb.parse.descriptors +=========================== +:: + + DescriptorWarning - Raised when we parse a very odd descriptor. + deduplicate - Deduplicate a container of descriptors, keeping only the newest + descriptor for each router. + parseNetworkStatusFile - Parse a bridge-networkstatus document generated and + given to us by the BridgeAuthority. + parseServerDescriptorsFile - Parse a file containing + bridge-server-descriptors. + parseExtraInfoFiles - Parse (multiple) file(s) containing bridge-extrainfo + descriptors. +.. +""" + from __future__ import print_function import datetime

1 0

[bridgedb/master] Deduplicate getClientIP() function in bridgedb.HTTPServer.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 06c22e1b40bec96502331fd7054c2354ef1eea38 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 08:38:53 2015 +0000 Deduplicate getClientIP() function in bridgedb.HTTPServer. --- lib/bridgedb/HTTPServer.py | 53 ++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index beff4bd..8c58380 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -75,6 +75,33 @@ lookup = TemplateLookup(directories=[TEMPLATE_DIR], collection_size=500) logging.debug("Set template root to %s" % TEMPLATE_DIR) + +def getClientIP(request, useForwardedHeader=False): + """Get the client's IP address from the :header:`X-Forwarded-For` + header, or from the :api:`request <twisted.web.server.Request>`. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object for a + :api:`twisted.web.resource.Resource`. + :param bool useForwardedHeader: If ``True``, attempt to get the client's + IP address from the :header:`X-Forwarded-For` header. + :rtype: None or str + :returns: The client's IP address, if it was obtainable. + """ + ip = None + + if useForwardedHeader: + header = request.getHeader("X-Forwarded-For") + if header: + ip = header.split(",")[-1].strip() + if not isIPAddress(ip): + logging.warn("Got weird X-Forwarded-For value %r" % header) + ip = None + else: + ip = request.getClientIP() + + return ip + def replaceErrorPage(error, template_name=None): """Create a general error page for displaying in place of tracebacks. @@ -138,20 +165,13 @@ class CaptchaProtectedResource(resource.Resource): """Get the client's IP address from the :header:`X-Forwarded-For` header, or from the :api:`request <twisted.web.server.Request>`. + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object for a + :api:`twisted.web.resource.Resource`. :rtype: None or str :returns: The client's IP address, if it was obtainable. """ - ip = None - if self.useForwardedHeader: - h = request.getHeader("X-Forwarded-For") - if h: - ip = h.split(",")[-1].strip() - if not isIPAddress(ip): - logging.warn("Got weird X-Forwarded-For value %r" % h) - ip = None - else: - ip = request.getClientIP() - return ip + return getClientIP(request, self.useForwardedHeader) def getCaptchaImage(self, request=None): """Get a CAPTCHA image. @@ -667,16 +687,7 @@ class WebResourceBridges(resource.Resource): ip = None countryCode = None - # XXX this code is duplicated in CaptchaProtectedResource - if self.useForwardedHeader: - h = request.getHeader("X-Forwarded-For") - if h: - ip = h.split(",")[-1].strip() - if not isIPAddress(ip): - logging.warn("Got weird forwarded-for value %r",h) - ip = None - else: - ip = request.getClientIP() + ip = getClientIP(request, self.useForwardedForHeader) # Look up the country code of the input IP if isIPAddress(ip):

1 0