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

[bridgedb/master] Ignore networkstatus documents (mostly), if configured to do so.
by isis＠torproject.org 01 May '15

01 May '15

commit ccff2c10464b61d7f4654dd70529de1cc97946dc Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 30 06:16:44 2015 +0000 Ignore networkstatus documents (mostly), if configured to do so. * FIXES #15866: https://bugs.torproject.org/15866 --- lib/bridgedb/Main.py | 17 +++++++++++++---- lib/bridgedb/bridges.py | 32 +++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 44413d2..88b386b 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -110,6 +110,10 @@ def load(state, splitter, clear=False): logging.info("Loading bridges...") + ignoreNetworkstatus = state.IGNORE_NETWORKSTATUS + if ignoreNetworkstatus: + logging.info("Ignoring BridgeAuthority networkstatus documents.") + bridges = {} timestamps = {} @@ -120,8 +124,7 @@ def load(state, splitter, clear=False): logging.info("Processing networkstatus descriptors...") for router in networkstatuses: bridge = Bridge() - bridge.updateFromNetworkStatus(router) - + bridge.updateFromNetworkStatus(router, ignoreNetworkstatus) try: bridge.assertOK() except MalformedBridgeInfo as error: @@ -136,12 +139,18 @@ def load(state, splitter, clear=False): for router in serverdescriptors: try: - bridges[router.fingerprint].updateFromServerDescriptor(router) + bridge = bridges[router.fingerprint] except KeyError: logging.warn( ("Received server descriptor for bridge '%s' which wasn't " "in the networkstatus!") % router.fingerprint) - continue + if ignoreNetworkstatus: + bridge = Bridge() + else: + continue + + try: + bridge.updateFromServerDescriptor(router, ignoreNetworkstatus) except (ServerDescriptorWithoutNetworkstatus, MissingServerDescriptorDigest, ServerDescriptorDigestMismatch) as error: diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 93b9fe9..65a462c 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1379,33 +1379,38 @@ class Bridge(BridgeBackwardsCompatibility): """ return list(set([pt.methodname for pt in self.transports])) - def updateFromNetworkStatus(self, descriptor): + def updateFromNetworkStatus(self, descriptor, ignoreNetworkstatus=False): """Update this bridge's attributes from a parsed networkstatus document. :type descriptor: :api:`stem.descriptors.router_status_entry.RouterStatusEntry` :param descriptor: The networkstatus document for this bridge. + :param bool ignoreNetworkstatus: If ``True``, then ignore most of the + information in the networkstatus document. """ self.descriptors['networkstatus'] = descriptor # These fields are *only* found in the networkstatus document: - self.descriptorDigest = descriptor.digest self.flags.update(descriptor.flags) - self.bandwidth = descriptor.bandwidth + self.descriptorDigest = descriptor.digest + + if not ignoreNetworkstatus: + self.bandwidth = descriptor.bandwidth # These fields are also found in the server-descriptor. We will prefer # to use the information taken later from the server-descriptor # because it is signed by the bridge. However, for now, we harvest all # the info we can: self.fingerprint = descriptor.fingerprint - self.nickname = descriptor.nickname - self.address = descriptor.address - self.orPort = descriptor.or_port - self._updateORAddresses(descriptor.or_addresses) + if not ignoreNetworkstatus: + self.nickname = descriptor.nickname + self.address = descriptor.address + self.orPort = descriptor.or_port + self._updateORAddresses(descriptor.or_addresses) - def updateFromServerDescriptor(self, descriptor): + def updateFromServerDescriptor(self, descriptor, ignoreNetworkstatus=False): """Update this bridge's info from an ``@type bridge-server-descriptor``. .. info:: @@ -1425,7 +1430,16 @@ class Bridge(BridgeBackwardsCompatibility): networkstatus entry, or its **descriptor** digest didn't match the expected digest (from the networkstatus entry). """ - self._checkServerDescriptor(descriptor) + if ignoreNetworkstatus: + try: + self._checkServerDescriptor(descriptor) + except (ServerDescriptorWithoutNetworkstatus, + MissingServerDescriptorDigest, + ServerDescriptorDigestMismatch) as ignored: + logging.warn(ignored) + else: + self._checkServerDescriptor(descriptor) + self.descriptors['server'] = descriptor # Replace the values which we harvested from the networkstatus

1 0

[bridgedb/master] PEP8 some whitespace fixes in bridgedb.Storage module.
by isis＠torproject.org 01 May '15

01 May '15

commit 3e860317f561ea7b2af81a1a3b707254ce6941c2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 21 22:47:09 2015 +0000 PEP8 some whitespace fixes in bridgedb.Storage module. --- lib/bridgedb/Storage.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 439634f..732d8ab 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -189,14 +189,12 @@ class Database(object): def cleanEmailedBridges(self, expireBefore): cur = self._cur t = timeToStr(expireBefore) - cur.execute("DELETE FROM EmailedBridges WHERE when_mailed < ?", (t,)) def getEmailTime(self, addr): addr = hashlib.sha1(addr).hexdigest() cur = self._cur - cur.execute("SELECT when_mailed FROM EmailedBridges WHERE " - "email = ?", (addr,)) + cur.execute("SELECT when_mailed FROM EmailedBridges WHERE email = ?", (addr,)) v = cur.fetchone() if v is None: return None @@ -246,8 +244,7 @@ class Database(object): def getWarnedEmail(self, addr): addr = hashlib.sha1(addr).hexdigest() cur = self._cur - cur.execute("SELECT * FROM WarnedEmails WHERE " - " email = ?", (addr,)) + cur.execute("SELECT * FROM WarnedEmails WHERE email = ?", (addr,)) v = cur.fetchone() if v is None: return False @@ -261,8 +258,7 @@ class Database(object): cur.execute("INSERT INTO WarnedEmails" "(email,when_warned) VALUES (?,?)", (addr, t,)) elif warned == False: - cur.execute("DELETE FROM WarnedEmails WHERE " - "email = ?", (addr,)) + cur.execute("DELETE FROM WarnedEmails WHERE email = ?", (addr,)) def cleanWarnedEmails(self, expireBefore): cur = self._cur @@ -302,10 +298,13 @@ class Database(object): def getBridgesLastUpdatedBefore(self, statusPublicationMillis): cur = self._cur - v = cur.execute("SELECT * FROM BridgeHistory WHERE lastUpdatedWeightedTime < ?", (statusPublicationMillis,)) + v = cur.execute("SELECT * FROM BridgeHistory WHERE lastUpdatedWeightedTime < ?", + (statusPublicationMillis,)) if v is None: return for h in v: yield BridgeHistory(h[0],IPAddress(h[1]),h[2],h[3],h[4],h[5],h[6],h[7],h[8],h[9],h[10]) + + def openDatabase(sqlite_file): conn = sqlite3.Connection(sqlite_file) cur = conn.cursor()

1 0

[bridgedb/master] Remove pygpgme from the list of Python modules mocked in Sphinx builds.
by isis＠torproject.org 01 May '15

01 May '15

commit 8bfa27dbf90de970441d82d8a790bfd09aad5283 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 21 22:45:30 2015 +0000 Remove pygpgme from the list of Python modules mocked in Sphinx builds. --- doc/sphinx/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index ac8ce2d..2f01b4c 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -81,7 +81,7 @@ class Mock(object): else: return Mock() -MOCK_MODULES = ['pygpgme', 'ipaddr'] +MOCK_MODULES = ['ipaddr'] for mod_name in MOCK_MODULES: sys.modules[mod_name] = Mock()

1 0

[bridgedb/master] Improve documentation of Dist.uniformMap().
by isis＠torproject.org 01 May '15

01 May '15

commit 772849f87da3a8d9cd256896e70ae46f0f435dc4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 01:08:11 2015 +0000 Improve documentation of Dist.uniformMap(). --- lib/bridgedb/Dist.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index a71d6bb..a454a77 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -49,14 +49,17 @@ class EmailRequestedKey(Exception): def uniformMap(ip): - """Map an IP to an arbitrary 'area' string, such that any two /24 addresses - get the same string. + """Map an IP to an arbitrary 'area' string, such that any two IPv4 + addresses in the same ``/24`` subnet, or any two IPv6 addresses in the + same ``/64`` subnet, get the same string. >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') '1.2.3' :param str ip: A string representing an IPv4 or IPv6 address. + :rtype: str + :returns: The truncated **ip**. """ if type(IPAddress(ip)) is IPv6Address: return ":".join(IPv6Address(ip).exploded.split(':')[:4])

1 0

[bridgedb/master] Fix incorrect docstring for coutryCode parameter in getBridgesForIP().
by isis＠torproject.org 01 May '15

01 May '15

commit c9362bfabbb2cdf0cf1af98d5e9d7c22827734a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 30 05:42:18 2015 +0000 Fix incorrect docstring for coutryCode parameter in getBridgesForIP(). --- lib/bridgedb/Dist.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 9f730c0..a71d6bb 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -244,10 +244,9 @@ class IPBasedDistributor(Distributor): period. :param int N: The number of bridges to try to give back. (default: 1) :param str countryCode: The two-letter geoip country code of the - client's IP address. If given, the client will be placed in that - "area". Clients within the same area receive the same bridges per - period. If not given, the **ip** is truncated to it's CIDR /24 - representation and used as the "area". (default: None) + client's IP address. If given, it is assumed that any bridges + distributed to that client should not be blocked in that + country. (default: None) :param list bridgeFilterRules: A list of callables used filter the bridges returned in the response to the client. See :mod:`~bridgedb.Filters`.

1 0

[bridgedb/master] Change Dist.uniformMap() to return IPv4 /16s, not /24s.
by isis＠torproject.org 01 May '15

01 May '15

commit a1d5c24322402d13de02b4e6f9943352b79bfba2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 01:51:10 2015 +0000 Change Dist.uniformMap() to return IPv4 /16s, not /24s. See https://trac.torproject.org/projects/tor/ticket/4771#comment:23 * FIXES part of #4771. --- lib/bridgedb/Dist.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index cd91d62..466db84 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -48,14 +48,14 @@ class EmailRequestedKey(Exception): def uniformMap(ip): """Map an IP to an arbitrary 'area' string, such that any two IPv4 - addresses in the same ``/24`` subnet, or any two IPv6 addresses in the + addresses in the same ``/16`` subnet, or any two IPv6 addresses in the same ``/64`` subnet, get the same string. >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') - '1.2.3.0/24' - >>> Dist.uniformMap('1.2.3.154') - '1.2.3.0/24' + '1.2.0.0/16' + >>> Dist.uniformMap('1.2.211.154') + '1.2.0.0/16' >>> Dist.uniformMap('2001:f::bc1:b13:2808') '2001:f::/64' >>> Dist.uniformMap('2a00:c98:2030:a020:2::42') @@ -75,8 +75,8 @@ def uniformMap(ip): subnet = str(ipaddr.IPv6Network(truncated + "::/64")) return subnet else: - truncated = '.'.join(address.exploded.split('.')[:3]) - subnet = str(ipaddr.IPv4Network(truncated + '.0/24')) + truncated = '.'.join(address.exploded.split('.')[:2]) + subnet = str(ipaddr.IPv4Network(truncated + '.0.0/16')) return subnet def getNumBridgesPerAnswer(ring, max_bridges_per_answer=3):

1 0

[bridgedb/master] Log when we treat a client differently because they are using Tor.
by isis＠torproject.org 01 May '15

01 May '15

commit eaedec23b264fe515ed116d690da1c5396f30198 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 30 01:13:11 2015 +0000 Log when we treat a client differently because they are using Tor. * FIXES #4771: https://bugs.torproject.org/4771 --- lib/bridgedb/Dist.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index db71db3..961d2ca 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -289,13 +289,19 @@ class IPBasedDistributor(Distributor): # try to match the request to an ip category for category in self.categories: # IP Categories - if category.contains(ip): + if ip in category: + # The tag is a tag applied to a proxy IP address when it is + # added to the bridgedb.proxy.ProxySet. For Tor Exit relays, + # the default is 'exit_relay'. For other proxies loaded from + # the PROXY_LIST_FILES config option, the default tag is the + # full filename that the IP address originally came from. + tag = category.getTag(ip) + logging.info("Client was from known proxy (tag: %s): %s" % (tag, ip)) g = filterAssignBridgesToRing(self.splitter.hmac, self.nClusters + len(self.categories), n) bridgeFilterRules.append(g) - logging.info("category<%s>%s", epoch, logSafely(area)) pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring-%d" % n)

1 0

[bridgedb/master] Add HTTPS_ROTATION_PERIOD and EMAIL_ROTATION_PERIOD config options.
by isis＠torproject.org 01 May '15

01 May '15

commit ceac2ff7b2c966cfea495850d6905d93e675ec03 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 02:19:27 2015 +0000 Add HTTPS_ROTATION_PERIOD and EMAIL_ROTATION_PERIOD config options. This implements configuration of the hashring rotation periods for BridgeDB's distributors via the configuration file. The behaviour for hashring rotation for the EmailBasedDistributor is such that, when `bridgedb.email.autoresponder.createResponseBody()` calls `EmailBasedDistributor.getBridgesForEmail(EMAIL_ADDRESS, EPOCH)` with the `EPOCH` set to the start of the current EMAIL_ROTATION_PERIOD, the client's position in the hashring is determined by the HMAC of the string `"<EPOCH>EMAIL_ADDRESS"`. Therefore, the EMAIL_ROTATION_PERIOD directly effects where the client is placed in the hashring, resulting in different bridges for the user, depending on whether the period has elapsed. With the default setting of `"1 day"`, and taking into account also that the EmailBasedDistributor only responds to a particular user once per three hours, this results in the client being able to ask for (and receive) vanilla bridges (starting from hashring position A) at 9:00, obfs3 bridges (also from position A) at 12:00, obfs4 bridges (from position A again) at 15:00, and so on, and finally different vanilla bridges (from hashring position B) the next morning at 9:00. For the IPBasedDistributor, the behaviour for hashring rotation is that the client's hashring position is determined by the HMAC of the string `"<EPOCH>AREA"` where `EPOCH` is again the start of the current HTTPS_ROTATION_PERIOD, and the `AREA` is the `/16` subnet which the client's IP address resides within. If the client is using Tor or some other open proxy, then the client's hashring position is determined by `"known-proxy<EPOCH>GROUP"` where `EPOCH` is the same as before, and `GROUP` is a number (currently 1 through 4, inclusive) deterministically derived from the IP address of the Tor Exit relay or open proxy that the client is using. Using `GROUP` causes there to only be 4 sets of bridges available to any and all Tor/proxy users at a given time. Hence additionally using `EPOCH` rotates the set of 4 bridges available. The default setting is `"3 hours"`, causing all Tor/proxy users to have 4 different sets of bridges every three hours, while non-Tor users have a new set of bridges (probably) unique to their IP address available every three hours. These defaults for HTTPS_ROTATION_PERIOD and EMAIL_ROTATION_PERIOD will likely need to be changed and fiddled with to make the behaviour an optimum balance between user-friendly and resilient to enumeration. * FIXES #1839: https://bugs.torproject.org/1839. This implement Roger's suggestion to add the rotation periods as configuration file options. --- bridgedb.conf | 32 ++++++++++++++++++++++++++++++++ lib/bridgedb/HTTPServer.py | 15 ++++++++++----- lib/bridgedb/Main.py | 8 ++------ lib/bridgedb/configure.py | 4 ++++ lib/bridgedb/email/server.py | 12 +++++++++--- lib/bridgedb/test/email_helpers.py | 3 +++ lib/bridgedb/test/test_email_server.py | 2 +- 7 files changed, 61 insertions(+), 15 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index c91cc73..2a1c367 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -20,6 +20,11 @@ # # CHANGELOG: # ~~~~~~~~~~ +# Changed in version 0.3.2 - 2015-03-30 +# * CHANGE to using BridgeDB release versions for bridgedb.conf file versions. +# * ADD support for specifying bridge rotation periods via the +# EMAIL_ROTATION_PERIOD and HTTPS_ROTATION_PERIOD settings. +# # Changed in version 0.0.15 - 2015-03-26 # * ADD new SUPPORTED_TRANSPORTS and DEFAULT_TRANSPORT settings. # @@ -295,6 +300,20 @@ HTTPS_INCLUDE_FINGERPRINTS = True # the *last* entry from its X-Forwarded-For header as the client's IP. HTTPS_USE_IP_FROM_FORWARDED_HEADER = False +# (string or None) The period at which the available bridges rotates to a +# separate set of bridges. This setting can be used in the form +# +# "COUNT PERIOD" where +# COUNT is an integer +# PERIOD is one of "second", "minute", "hour", "day", +# "week", or "month" (or any plural form). +# +# For example, setting HTTPS_ROTATION_PERIOD = "3 days" will result in the set +# of bridges which are available through the web interface (either HTTP or +# HTTPS) getting rotated once every three days. Setting this to None disables +# rotation entirely. +HTTPS_ROTATION_PERIOD = "3 hours" + # (string or None) The IP address to listen on for unencrypted HTTP # connections. Set to ``None`` to disable unencrypted connections to the web # interface. @@ -342,6 +361,19 @@ GIMP_CAPTCHA_RSA_KEYFILE = 'captcha_rsa_key' # True if we are enabling distribution via Email; false otherwise. EMAIL_DIST = True +# (string or None) The period at which the available bridges rotates to a +# separate set of bridges. This setting can be used in the form +# +# "COUNT PERIOD" where +# COUNT is an integer +# PERIOD is one of "second", "minute", "hour", "day", +# "week", or "month" (or any plural form). +# +# For example, setting EMAIL_ROTATION_PERIOD = "3 days" will result in the set +# of bridges which are available through the email interface getting rotated +# once every three days. Setting this to None disables rotation entirely. +EMAIL_ROTATION_PERIOD = "1 day" + # What email addresses do we use for outgoing email? # EMAIL_FROM_ADDR goes in the 'From:' header on outgoing emails: diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index ae86957..2e0398c 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -54,6 +54,8 @@ from bridgedb.parse import headers from bridgedb.parse.addr import isIPAddress from bridgedb.qrcodes import generateQR from bridgedb.safelog import logSafely +from bridgedb.schedule import Unscheduled +from bridgedb.schedule import ScheduledInterval TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') @@ -819,7 +821,7 @@ class WebRoot(resource.Resource): return rendered -def addWebServer(cfg, dist, sched): +def addWebServer(cfg, dist): """Set up a web server for HTTP(S)-based bridge distribution. :type cfg: :class:`bridgedb.persistent.Conf` @@ -835,6 +837,7 @@ def addWebServer(cfg, dist, sched): HTTPS_PORT HTTPS_BIND_IP HTTPS_USE_IP_FROM_FORWARDED_HEADER + HTTPS_ROTATION_PERIOD RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY RECAPTCHA_SEC_KEY @@ -845,10 +848,6 @@ def addWebServer(cfg, dist, sched): GIMP_CAPTCHA_RSA_KEYFILE :type dist: :class:`bridgedb.Dist.IPBasedDistributor` :param dist: A bridge distributor. - :type sched: :class:`bridgedb.schedule.ScheduledInterval` - :param sched: The scheduled interval at which bridge selection, which - are ultimately displayed on the :class:`WebResourceBridges` page, will - be shifted. :raises SystemExit: if the servers cannot be started. :rtype: :api:`twisted.web.server.Site` :returns: A webserver. @@ -887,6 +886,12 @@ def addWebServer(cfg, dist, sched): hmacKey=hmacKey, captchaDir=cfg.GIMP_CAPTCHA_DIR) + if cfg.HTTPS_ROTATION_PERIOD: + count, period = cfg.HTTPS_ROTATION_PERIOD.split() + sched = ScheduledInterval(count, period) + else: + sched = Unscheduled() + bridges = WebResourceBridges(dist, sched, numBridges, fwdHeaders, includeFingerprints=fprInclude) if captcha: diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 31a9c66..3b018f9 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -512,13 +512,9 @@ def run(options, reactor=reactor): # Configure all servers: if config.HTTPS_DIST and config.HTTPS_SHARE: - #webSchedule = schedule.ScheduledInterval("day", 2) - webSchedule = schedule.Unscheduled() - HTTPServer.addWebServer(config, ipDistributor, webSchedule) + HTTPServer.addWebServer(config, ipDistributor) if config.EMAIL_DIST and config.EMAIL_SHARE: - #emailSchedule = schedule.ScheduledInterval("day", 1) - emailSchedule = schedule.Unscheduled() - addSMTPServer(config, emailDistributor, emailSchedule) + addSMTPServer(config, emailDistributor) tasks = {} diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 54dcdff..8a24d35 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -115,6 +115,10 @@ def loadConfig(configFile=None, configCls=None): else: setattr(config, attr, os.path.abspath(os.path.expanduser(setting))) + for attr in ["HTTPS_ROTATION_PERIOD", "EMAIL_ROTATION_PERIOD"]: + setting = getattr(config, attr, None) # Default to None + setattr(config, attr, setting) + for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]: setting = getattr(config, attr, []) # Default to empty lists setattr(config, attr, setting) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index cde4637..8034d35 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -68,6 +68,8 @@ from bridgedb.email import request from bridgedb.parse import addr from bridgedb.parse.addr import UnsupportedDomain from bridgedb.parse.addr import canonicalizeEmailDomain +from bridgedb.schedule import ScheduledInterval +from bridgedb.schedule import Unscheduled class MailServerContext(object): @@ -458,7 +460,7 @@ class SMTPIncomingServerFactory(smtp.SMTPFactory): return p -def addServer(config, distributor, schedule): +def addServer(config, distributor): """Set up a SMTP server which listens on the configured ``EMAIL_PORT`` for incoming connections, and responds as necessary to requests for bridges. @@ -467,9 +469,13 @@ def addServer(config, distributor, schedule): :type distributor: :class:`bridgedb.Dist.EmailBasedDistributor` :param dist: A distributor which will handle database interactions, and will decide which bridges to give to who and when. - :type schedule: :class:`bridgedb.schedule.ScheduledInterval` - :param schedule: The schedule. XXX: Is this even used? """ + if config.EMAIL_ROTATION_PERIOD: + count, period = config.EMAIL_ROTATION_PERIOD.split() + schedule = ScheduledInterval(count, period) + else: + schedule = Unscheduled() + context = MailServerContext(config, distributor, schedule) factory = SMTPIncomingServerFactory() factory.setContext(context) diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index 5e4262d..c80e2ea 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -24,6 +24,7 @@ from bridgedb.test.test_HTTPServer import DummyBridge EMAIL_DIST = True +EMAIL_ROTATION_PERIOD = "1 day" EMAIL_INCLUDE_FINGERPRINTS = True EMAIL_GPG_SIGNING_ENABLED = True EMAIL_GPG_HOMEDIR = '.gnupg' @@ -54,6 +55,7 @@ EMAIL_PORT = 5225 TEST_CONFIG_FILE = io.StringIO(unicode("""\ EMAIL_DIST = %s +EMAIL_ROTATION_PERIOD = %s EMAIL_INCLUDE_FINGERPRINTS = %s EMAIL_GPG_SIGNING_ENABLED = %s EMAIL_GPG_HOMEDIR = %s @@ -75,6 +77,7 @@ EMAIL_FROM_ADDR = %s EMAIL_BIND_IP = %s EMAIL_PORT = %s """ % (repr(EMAIL_DIST), + repr(EMAIL_ROTATION_PERIOD), repr(EMAIL_INCLUDE_FINGERPRINTS), repr(EMAIL_GPG_SIGNING_ENABLED), repr(EMAIL_GPG_HOMEDIR), diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index f79f603..e8c9112 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -524,7 +524,7 @@ class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): def test_addServer(self): """Call :func:`bridgedb.email.server.addServer` to test startup.""" - factory = server.addServer(self.config, self.dist, self.sched) + factory = server.addServer(self.config, self.dist) factory.timeout = None factory.protocol.timeout = None # Or else the reactor gets dirty

1 0

[bridgedb/master] Add a doctest for bridgedb.schedule.Unscheduled.
by isis＠torproject.org 01 May '15

01 May '15

commit 35715f1c09a4d8bce57217835d13080a0323174a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 10:13:30 2015 +0000 Add a doctest for bridgedb.schedule.Unscheduled. --- lib/bridgedb/schedule.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 06914d9..4d0b8fd 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -64,8 +64,28 @@ class ISchedule(interface.Interface): class Unscheduled(object): - """A base ``Schedule`` that has only one period that contains all time.""" + """A base ``Schedule`` that has only one period that contains all time. + + >>> from bridgedb.schedule import fromUnixSeconds + >>> from bridgedb.schedule import Unscheduled + >>> timestamp = 1427769526 + >>> str(fromUnixSeconds(timestamp)) + '2015-03-31 02:38:46' + >>> sched = Unscheduled() + >>> start = sched.intervalStart(timestamp) + >>> start + -62135596800 + >>> str(fromUnixSeconds(start)) + '0001-01-01 00:00:00' + >>> sched.getInterval(timestamp) + '1970-01-01 00:00:00' + >>> next = sched.nextIntervalStarts(timestamp) + >>> next + 253402300799 + >>> str(fromUnixSeconds(next)) + '9999-12-31 23:59:59' + """ implements(ISchedule) def __init__(self, count=None, period=None):

1 0

[bridgedb/master] Add two new doctests to Dist.uniformMap().
by isis＠torproject.org 01 May '15

01 May '15

commit c23cf00a83ebdd38b57f8b44a110c50c8d7153b9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 01:09:49 2015 +0000 Add two new doctests to Dist.uniformMap(). --- lib/bridgedb/Dist.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index a454a77..db71db3 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -56,6 +56,10 @@ def uniformMap(ip): >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') '1.2.3' + >>> Dist.uniformMap('1.2.3.154') + '1.2.3' + >>> Dist.uniformMap('2001:f::bc1:b13:2808') + '2001:000f:0000:0000' :param str ip: A string representing an IPv4 or IPv6 address. :rtype: str

1 0