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

[bridgedb/master] Add NO_DISTRIBUTION_COUNTRIES option to config.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit a92cf111584c296a5e589f7412bf5ea27bae5dcd Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 03:16:47 2014 +0000 Add NO_DISTRIBUTION_COUNTRIES option to config. This option contains a list of CCs for which, if a bridge is detected to be running on an IP address in one of these countries, it will not be distributed to clients. * FIXES part of #12843. --- bridgedb.conf | 11 ++++++++++- lib/bridgedb/configure.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 1fe61ab..f8b126c 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,15 @@ # for details. # :copyright: (c) 2007-2014 The Tor Project, Inc. # (c) 2007-2014, all sentient entities within the AUTHORS file -# :version: 0.0.10 +# :version: 0.0.13 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.13 - 2015-02-20 +# * ADD NO_DISTRIBUTION_COUNRIES option for refusing to distribute bridges +# whose primary ORAddress is geolocated to any of some certain countries. +# # Changes in version 0.0.12 - 2015-02-06 # * ADD a dictionary of TASKS to be run and the intervals at which they # should be repeated. @@ -187,6 +191,11 @@ COLLECT_TIMESTAMPS = False # Filename that contains blocked bridges list. Comment out to disable. #COUNTRY_BLOCK_FILE = "blocked-bridges" +# (list of two-character, uppercased strings for country codes) Don't +# distribute bridges whose main ORPort IP address is geolocated to any of the +# following countries: +NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] + # A list of filenames that contain IP addresses (one per line) of proxies. # All IP-based distributors that see an incoming connection from a proxy # will treat them specially. diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index e67a252..83b53d6 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -111,7 +111,7 @@ def loadConfig(configFile=None, configCls=None): else: setattr(config, attr, os.path.abspath(os.path.expanduser(setting))) - for attr in ["FORCE_PORTS", "FORCE_FLAGS"]: + for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]: setting = getattr(config, attr, []) # Default to empty lists setattr(config, attr, setting)

1 0

[bridgedb/master] Don't insert bridges in NO_DISTRIBUTION_COUNTRIES into the hashrings.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit f80033f8496b8cda8f032932c0200a7c8f7fe825 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 23:05:32 2015 +0000 Don't insert bridges in NO_DISTRIBUTION_COUNTRIES into the hashrings. When two-letter country codes are given in the bridgedb.conf option NO_DISTRIBUTION_COUNTRIES, e.g.: NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] and a Bridge parsed from the descriptor files is found to be geolocated in one of these countries, we skip adding that Bridge to the hashrings entirely. * FIXES #12843 https://bugs.torproject.org/12843 * TODO We could add these blacklisted Bridges to their own hashring of Undistributables which are never to be distributed to real clients. Potentially, we could distribute these Undistributables to adversaries which are definitely not real clients, as a form of supplying adversaries with decoys (see #12537). By doing so, we would be handing an adversary which is probably some intelligence agency's bridge enumeration program (e.g. part of the NSA and GCHQ's HOMING TROLL and XKEYSCORE programmes) bridges which are run by another intelligence agency (presumedly واجا (VAJA) and/or إدارة الأمن العام) in order to gather information about the clients connecting to them (presumedly hoping that someone from their jurisdiction would use the bridge). Thus, in the best case scenario, feeding each agency false (albeit trivially discoverable as false) information on the other and — in the worst case scenario — simply being an annoyance by breaking things for both parties. However, the current organisation of the hashring structures is not really amenable to adding hashrings for Undistributables — at least not in any way that safely guarantees that they wouldn't end up in some bucket or such intended for real clients (which would defeat the whole purpose of this patch). Because of this concern, using Undistributables as decoys is not yet feasible. --- lib/bridgedb/Main.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 9317760..d0698c0 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -198,10 +198,17 @@ def load(state, splitter, clear=False): inserted = 0 logging.info("Inserting %d bridges into splitter..." % len(bridges)) for fingerprint, bridge in bridges.items(): - # We attempt to insert all bridges. If the bridge is not running, then - # it is skipped during the insertion process. - splitter.insert(bridge) - inserted += 1 + # Skip insertion of bridges which are geolocated to be in one of the + # NO_DISTRIBUTION_COUNTRIES, a.k.a. the countries we don't distribute + # bridges from: + if bridge.country in state.NO_DISTRIBUTION_COUNTRIES: + logging.warn("Not distributing Bridge %s %s:%s in country %s!" % + (bridge, bridge.address, bridge.orPort, bridge.country)) + else: + # If the bridge is not running, then it is skipped during the + # insertion process. + splitter.insert(bridge) + inserted += 1 logging.info("Done inserting %d bridges into splitter." % inserted) if state.COLLECT_TIMESTAMPS:

1 0

[bridgedb/master] PEP8 obsessive compulsive whitespace fix in bridgedb.Main.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 9686f057465eb83fb41367a0381266b0bb8cd52a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 22:51:56 2015 +0000 PEP8 obsessive compulsive whitespace fix in bridgedb.Main. --- lib/bridgedb/Main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 4fb6338..9317760 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -249,7 +249,6 @@ def createBridgeRings(cfg, proxyList, key): :returns: A BridgeSplitter splitter, an IPBasedDistributor or None, and an EmailBasedDistributor or None. """ - # Create a BridgeSplitter to assign the bridges to the different # distributors. splitter = Bridges.BridgeSplitter(crypto.getHMAC(key, "Splitter-Key"))

1 0

[bridgedb/master] Merge branch 'fix/12843-cc-spurning_r2' into develop
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 689b50aa4ad41efe1f7f54983239aaee16ed602e Merge: 9686f05 2033d83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 00:59:21 2015 +0000 Merge branch 'fix/12843-cc-spurning_r2' into develop bridgedb.conf | 11 +- lib/bridgedb/Main.py | 15 +- lib/bridgedb/configure.py | 2 +- lib/bridgedb/test/test_Main.py | 429 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 451 insertions(+), 6 deletions(-)

1 0

[bridgedb/master] Add unittests for bridgedb.Main module.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 2033d83393460d92c8315a9fd8b8b24a534456a9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 00:18:08 2015 +0000 Add unittests for bridgedb.Main module. --- lib/bridgedb/test/test_Main.py | 429 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 429 insertions(+) diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py new file mode 100644 index 0000000..7525b72 --- /dev/null +++ b/lib/bridgedb/test/test_Main.py @@ -0,0 +1,429 @@ +# -*- 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. +# (c) 2007-2015, all entities within the AUTHORS file +# :license: see included LICENSE for information + +"""Tests for :mod:`bridgedb.Main`.""" + +from __future__ import print_function + +import base64 +import logging +import os +import random +import shutil +import sys + +from datetime import datetime +from time import sleep + +from twisted.internet.threads import deferToThread +from twisted.trial import unittest + +from bridgedb import Main +from bridgedb.Bridges import BridgeHolder +from bridgedb.parse.options import parseOptions + + +logging.getLogger().disabled = True + + +HERE = os.getcwd() +TOPDIR = HERE.rstrip('_trial_temp') +CI_RUNDIR = os.path.join(TOPDIR, 'run') + +# A networkstatus descriptor with two invalid ORAddress (127.0.0.1 and ::1) +# and an invalid port number (70000). +NETWORKSTATUS_MALFORMED = '''\ +r OracleLunacy LBXW03FIKvo9aXCEYbDdq1BbNtM E0yN8ofiBpg6JHW0iPX5gJ1gKFI 2014-09-05 21:39:24 127.0.0.1 70000 0 +a [::1]:70000 +s Fast Guard Running Stable Valid +w Bandwidth=2094050 +p reject 1-65535 +''' + +def mockAddOrUpdateBridgeHistory(bridge, timestamp): + """A mocked version of :func:`bridgedb.Stability.addOrUpdateBridgeHistory` + which doesn't access the database (so that we can test functions which + call it, like :func:`bridgedb.Main.updateBridgeHistory`). + """ + print("Pretending to update Bridge %s with timestamp %s..." % + (bridge.fingerprint, timestamp)) + + +class MockBridgeHolder(BridgeHolder): + def __init__(self): + self._bridges = {} + def __len__(self): + return len(self._bridges.keys()) + def insert(self, bridge): + self._bridges[bridge.fingerprint] = bridge + + +class MainTests(unittest.TestCase): + """Integration tests for :func:`bridgedb.Main.load`.""" + + def _appendToFile(self, file, data): + """Append **data** to **file**.""" + fh = open(file, 'a') + fh.write(data) + fh.flush() + fh.close() + + def _copyDescFilesHere(self, files): + """Copy all the **files** to the _trial_tmp/ directory. + + :param list files: A list of strings representing the paths to + descriptor files. This should probably be taken from a + ``bridgedb.persistent.Conf`` object which has parsed the + ``bridgedb.conf`` file in the top-level directory of this repo. + :rtype: list + :returns: A list of the new paths (in the ``_trial_tmp`` directory) to + the copied descriptor files. This should be used to update the + ``bridgedb.persistent.Conf`` object. + """ + updatedPaths = [] + + for f in files: + base = os.path.basename(f) + src = os.path.join(CI_RUNDIR, base) + if os.path.isfile(src): + dst = os.path.join(HERE, base) + shutil.copy(src, dst) + updatedPaths.append(dst) + else: + self.skip = True + raise unittest.SkipTest( + "Can't find mock descriptor files in %s directory" % + CI_RUNDIR) + + return updatedPaths + + def _cbAssertFingerprints(self, d): + """Assert that there are some bridges in the splitter.""" + self.assertGreater(len(self.splitter), 0) + return d + + def _cbCallUpdateBridgeHistory(self, d, splitter): + """Fake some timestamps for the bridges in the splitter, and then call + Main.updateBridgeHistory(). + """ + def timestamp(): + return datetime.fromtimestamp(random.randint(1324285117, 1524285117)) + + bridges = splitter._bridges + timestamps = {} + + for fingerprint, _ in bridges.items(): + timestamps[fingerprint] = [timestamp(), timestamp(), timestamp()] + + return Main.updateBridgeHistory(bridges, timestamps) + + def _eb_Failure(self, failure): + """If something produces a twisted.python.failure.Failure, fail the + test with it. + """ + self.fail(failure) + + def _writeConfig(self, config): + """Write a config into the current working directory. + + :param str config: A big long multiline string that looks like the + bridgedb.conf file. + :rtype: str + :returns: The pathname of the file that the **config** was written to. + """ + configFile = os.path.join(os.getcwd(), 'bridgedb.conf') + fh = open(configFile, 'w') + fh.write(config) + fh.flush() + fh.close() + return configFile + + def setUp(self): + """Find the bridgedb.conf file in the top-level directory of this repo, + copy it and the descriptor files it references to the current working + directory, produce a state object from the loaded bridgedb.conf file, + and make an HMAC key. + """ + # Get the bridgedb.conf file in the top-level directory of this repo: + self.configFile = os.path.join(TOPDIR, 'bridgedb.conf') + self.config = Main.loadConfig(self.configFile) + + # Copy the referenced descriptor files from bridgedb/run/ to CWD: + self.config.STATUS_FILE = self._copyDescFilesHere([self.config.STATUS_FILE])[0] + self.config.BRIDGE_FILES = self._copyDescFilesHere(self.config.BRIDGE_FILES) + self.config.EXTRA_INFO_FILES = self._copyDescFilesHere(self.config.EXTRA_INFO_FILES) + + # Initialise the state + self.state = Main.persistent.State(**self.config.__dict__) + self.key = base64.b64decode('TvPS1y36BFguBmSOvhChgtXB2Lt+BOw0mGfz9SZe12Y=') + + # Create a BridgeSplitter + self.splitter = MockBridgeHolder() + + # Functions which some tests mock, which we'll need to re-replace + # later in tearDown(): + self._orig_addOrUpdateBridgeHistory = Main.addOrUpdateBridgeHistory + self._orig_sys_argv = sys.argv + + def tearDown(self): + """Replace the mocked mockAddOrUpdateBridgeHistory() function with the + real function, Stability.addOrUpdateBridgeHistory(). + """ + Main.addOrUpdateBridgeHistory = self._orig_addOrUpdateBridgeHistory + sys.argv = self._orig_sys_argv + + def test_Main_updateBridgeHistory(self): + """Main.updateBridgeHistory should update some timestamps for some + bridges. + """ + # Mock the addOrUpdateBridgeHistory() function so that we don't try to + # access the database: + Main.addOrUpdateBridgeHistory = mockAddOrUpdateBridgeHistory + + # Get the bridges into the mocked splitter + d = deferToThread(Main.load, self.state, self.splitter) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + d.addCallback(self._cbCallUpdateBridgeHistory, self.splitter) + d.addErrback(self._eb_Failure) + return d + + def test_Main_load(self): + """Main.load() should run without error.""" + d = deferToThread(Main.load, self.state, self.splitter) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + return d + + def test_Main_load_no_state(self): + """Main.load() should raise SystemExit without a state object.""" + self.assertRaises(SystemExit, Main.load, None, self.splitter) + + def test_Main_load_clear(self): + """When called with clear=True, load() should run and clear the + hashrings. + """ + d = deferToThread(Main.load, self.state, self.splitter, clear=True) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + return d + + def test_Main_load_collect_timestamps(self): + """When COLLECT_TIMESTAMPS=True, Main.load() should call + Main.updateBridgeHistory(). + """ + # Mock the addOrUpdateBridgeHistory() function so that we don't try to + # access the database: + Main.addOrUpdateBridgeHistory = mockAddOrUpdateBridgeHistory + state = self.state + state.COLLECT_TIMESTAMPS = True + + # The reactor is deferring this to a thread, so the test execution + # here isn't actually covering the Main.updateBridgeHistory() + # function: + Main.load(state, self.splitter) + + def test_Main_load_malformed_networkstatus(self): + """When called with a networkstatus file with an invalid descriptor, + Main.load() should raise a ValueError. + """ + self._appendToFile(self.state.STATUS_FILE, NETWORKSTATUS_MALFORMED) + self.assertRaises(ValueError, Main.load, self.state, self.splitter) + + def test_Main_reloadFn(self): + """Main._reloadFn() should return True.""" + self.assertTrue(Main._reloadFn()) + + def test_Main_handleSIGHUP(self): + """Main._handleSIGHUP() should return True.""" + raise unittest.SkipTest("_handleSIGHUP touches the reactor.") + + self.assertTrue(Main._handleSIGHUP()) + + def test_Main_createBridgeRings(self): + """Main.createBridgeRings() should add three hashrings to the + splitter. + """ + proxyList = None + (splitter, emailDist, httpsDist) = Main.createBridgeRings(self.config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, an EmailDistributor ring, + # and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 3) + + def test_Main_createBridgeRings_with_proxyList(self): + """Main.createBridgeRings() should add three hashrings to the + splitter and add the proxyList to the IPBasedDistibutor. + """ + exitRelays = ['1.1.1.1', '2.2.2.2', '3.3.3.3'] + proxyList = Main.proxy.ProxySet() + proxyList.addExitRelays(exitRelays) + (splitter, emailDist, httpsDist) = Main.createBridgeRings(self.config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, an EmailDistributor ring, + # and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 3) + self.assertGreater(len(httpsDist.categories), 0) + self.assertItemsEqual(exitRelays, httpsDist.categories[-1]) + + def test_Main_createBridgeRings_no_https_dist(self): + """When HTTPS_DIST=False, Main.createBridgeRings() should add only + two hashrings to the splitter. + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.HTTPS_DIST = False + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an EmailDistributor ring, and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 2) + self.assertNotIn('https', splitter.rings) + self.assertNotIn(httpsDist, splitter.ringsByName.values()) + + def test_Main_createBridgeRings_no_email_dist(self): + """When EMAIL_DIST=False, Main.createBridgeRings() should add only + two hashrings to the splitter. + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.EMAIL_DIST = False + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, and an UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 2) + self.assertNotIn('email', splitter.rings) + self.assertNotIn(emailDist, splitter.ringsByName.values()) + + def test_Main_createBridgeRings_no_reserved_share(self): + """When RESERVED_SHARE=0, Main.createBridgeRings() should add only + two hashrings to the splitter. + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.RESERVED_SHARE = 0 + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, and an EmailDistributor ring: + self.assertEqual(len(splitter.ringsByName.keys()), 2) + self.assertNotIn('unallocated', splitter.rings) + + def test_Main_createBridgeRings_two_file_buckets(self): + """When FILE_BUCKETS has two filenames in it, Main.createBridgeRings() + should add three hashrings to the splitter, then add two + "pseudo-rings". + """ + proxyList = Main.proxy.ProxySet() + config = self.config + config.FILE_BUCKETS = { + 'bridges-for-support-desk': 10, + 'bridges-for-ooni-tests': 10, + } + (splitter, emailDist, httpsDist) = Main.createBridgeRings(config, + proxyList, + self.key) + # Should have an IPBasedDistributor ring, an EmailDistributor, and an + # UnallocatedHolder ring: + self.assertEqual(len(splitter.ringsByName.keys()), 3) + + # Should have two pseudoRings: + self.assertEqual(len(splitter.pseudoRings), 2) + self.assertIn('pseudo_bridges-for-support-desk', splitter.pseudoRings) + self.assertIn('pseudo_bridges-for-ooni-tests', splitter.pseudoRings) + + def test_Main_run(self): + """Main.run() should run and then finally raise SystemExit.""" + config = """ +BRIDGE_FILES = ["../run/bridge-descriptors"] +EXTRA_INFO_FILES = ["../run/cached-extrainfo", "../run/cached-extrainfo.new"] +STATUS_FILE = "../run/networkstatus-bridges" +HTTPS_CERT_FILE="cert" +HTTPS_KEY_FILE="privkey.pem" +LOGFILE = "bridgedb.log" +PIDFILE = "bridgedb.pid" +DB_FILE = "bridgedist.db" +DB_LOG_FILE = "bridgedist.log" +MASTER_KEY_FILE = "secret_key" +ASSIGNMENTS_FILE = "assignments.log" +LOGLEVEL = "DEBUG" +SAFELOGGING = True +LOGFILE_COUNT = 5 +LOGFILE_ROTATE_SIZE = 10000000 +LOG_THREADS = False +LOG_TRACE = True +LOG_TIME_FORMAT = "%H:%M:%S" +COLLECT_TIMESTAMPS = False +NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] +PROXY_LIST_FILES = [] +N_IP_CLUSTERS = 3 +FORCE_PORTS = [(443, 1)] +FORCE_FLAGS = [("Stable", 1)] +BRIDGE_PURPOSE = "bridge" +TASKS = {'GET_TOR_EXIT_LIST': 3 * 60 * 60,} +SERVER_PUBLIC_FQDN = 'bridges.torproject.org' +SERVER_PUBLIC_EXTERNAL_IP = '38.229.72.19' +HTTPS_DIST = True +HTTPS_BIND_IP = None +HTTPS_PORT = None +HTTPS_N_BRIDGES_PER_ANSWER = 3 +HTTPS_INCLUDE_FINGERPRINTS = True +HTTPS_USE_IP_FROM_FORWARDED_HEADER = False +HTTP_UNENCRYPTED_BIND_IP = "127.0.0.1" +HTTP_UNENCRYPTED_PORT = 55555 +HTTP_USE_IP_FROM_FORWARDED_HEADER = False +RECAPTCHA_ENABLED = False +RECAPTCHA_PUB_KEY = '' +RECAPTCHA_SEC_KEY = '' +RECAPTCHA_REMOTEIP = '' +GIMP_CAPTCHA_ENABLED = False +GIMP_CAPTCHA_DIR = 'captchas' +GIMP_CAPTCHA_HMAC_KEYFILE = 'captcha_hmac_key' +GIMP_CAPTCHA_RSA_KEYFILE = 'captcha_rsa_key' +EMAIL_DIST = True +EMAIL_FROM_ADDR = "bridges(a)torproject.org" +EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org" +EMAIL_SMTP_HOST = "127.0.0.1" +EMAIL_SMTP_PORT = 55556 +EMAIL_USERNAME = "bridges" +EMAIL_DOMAINS = ["somewhere.com", "somewhereelse.net"] +EMAIL_DOMAIN_MAP = { + "mail.somewhere.com": "somewhere.com", + "mail.somewhereelse.net": "somewhereelse.net", +} +EMAIL_DOMAIN_RULES = { + 'somewhere.com': ["ignore_dots", "dkim"], + 'somewhereelse.net': ["dkim"], +} +EMAIL_WHITELIST = {} +EMAIL_BLACKLIST = [] +EMAIL_FUZZY_MATCH = 4 +EMAIL_RESTRICT_IPS = [] +EMAIL_BIND_IP = "127.0.0.1" +EMAIL_PORT = 55557 +EMAIL_N_BRIDGES_PER_ANSWER = 3 +EMAIL_INCLUDE_FINGERPRINTS = True +EMAIL_GPG_SIGNING_ENABLED = False +EMAIL_GPG_SIGNING_KEY = '../gnupghome/TESTING.subkeys.sec' +HTTPS_SHARE = 10 +EMAIL_SHARE = 5 +RESERVED_SHARE = 2 +FILE_BUCKETS = {}""" + configFile = self._writeConfig(config) + + # Fake some options: + sys.argv = ['bridgedb', '-r', os.getcwd(), '-c', configFile] + options = parseOptions() + + self.assertRaises(SystemExit, Main.run, options, reactor=None)

1 0

[bridgedb/master] Remove pep8 and pylint from .travis.requirements.txt.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 65939a314268a31a4eda00ccb9a2d0a9cf80b420 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 23:07:36 2015 +0000 Remove pep8 and pylint from .travis.requirements.txt. --- .travis.requirements.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 828a09d..01c31b7 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -17,10 +17,6 @@ coverage==3.7.1 coveralls==0.4.2 leekspin==1.1.4 mechanize==0.2.5 -pep8==1.5.7 -# pylint must be pinned until pylint bug #203 is fixed. See -# https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages… -pylint==1.1.0 sure==1.2.2 Babel==0.9.6 BeautifulSoup==3.2.1

1 0

[bridgedb/master] Update public OpenPGP keys served on https://bridges.torproject.org/keys.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 979d52c16a6ef1c84a38f4bce01075438c2ed549 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 20:56:15 2015 +0000 Update public OpenPGP keys served on https://bridges.torproject.org/keys. * UPDATE BridgeDB's current online signing keypair, the first OpenPGP public key within lib/bridgedb/templates/bridgedb.asc. The copy had an old expiration date. The key is the same, but it is resigned with the offline key and the online key's new expiration date is 2015-09-11. --- lib/bridgedb/templates/bridgedb.asc | 226 ++++++++++++++--------------------- 1 file changed, 89 insertions(+), 137 deletions(-) diff --git a/lib/bridgedb/templates/bridgedb.asc b/lib/bridgedb/templates/bridgedb.asc index c10cdeb..c37debe 100644 --- a/lib/bridgedb/templates/bridgedb.asc +++ b/lib/bridgedb/templates/bridgedb.asc @@ -6,12 +6,12 @@ # If you receive an email from BridgeDB, it should be signed with the # 21B554E95938F4D0 subkey from the following keypair: -# pub 4096R/8DC43A2848821E32 2013-09-11 [expires: 2014-09-11] +# pub 4096R/8DC43A2848821E32 2013-09-11 [expires: 2015-09-11] # Key fingerprint = DF81 1109 E17C 8BF1 34B5 EEB6 8DC4 3A28 4882 1E32 -# uid BridgeDB <bridges(a)bridges.torproject.org> -# sub 4096R/21B554E95938F4D0 2013-09-11 [expires: 2014-09-11] +# uid BridgeDB <bridges(a)bridges.torproject.org> +# sub 4096R/21B554E95938F4D0 2013-09-11 [expires: 2015-09-11] # Key fingerprint = 9FE3 9D1A 7438 9223 3B3F 66F2 21B5 54E9 5938 F4D0 -# sub 4096R/E7793047C5B54232 2013-09-11 [expires: 2014-09-11] +# sub 4096R/E7793047C5B54232 2013-09-11 [expires: 2015-09-11] # Key fingerprint = CFFB 8469 9048 37E7 8CAE 322C E779 3047 C5B5 4232 -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -28,139 +28,91 @@ qepwrAE7YeF4YuR206UOFFWDhxWDLbRu0gIWgrevEQu/cvQPrO9uH5fL6Gw/+mNP Q/NIteejhkDyvyTUKyBu7x+Gls71zT2u/X13eOAJ8IxBkSVRKQ8tRD+oqJkWplOf +BpaGU+g6u4kT2AzFDxTOupfrYcPvORTAV/V3suys2YQE4x422GASXDivQARAQAB tClCcmlkZ2VEQiA8YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnPokDJQQT -AQoBDwUCUi/xgEgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODEx -MTA5RTE3QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJp -ZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVF -RUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qu -b3JnL3BvbGljeS50eHQCGwEFCQHhM4ADCw0JBBUKCQgEFgIBAAIeAQIXgCcYaHR0 -cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL2tleS5hc2MACgkQjcQ6KEiCHjIW -qw//WM8jAeuZaNl+2Cdt8Mbe4TCS4jggy4IfRgVqOiKEdIcMXUrDIUXsfg1tc+Jg -Gk6Ztcw4Mt8HYIEn2MyhuSWOlRoPlLNzN8i8bVBsPHUGKoX0Z1xIahBhkcXVJTJe -cxRHhvXOpUe+vd54fGYBz/7ViXwwZOjCA7e1zsdkhkpjAkWdJgPynH93bXMU8PYA -XlMR4rJDTs2LCvMIw3BKfv3Z5zE1a3vQFE1dKsKj6Q3fBYw0gZuobF5Z7fgbN9L+ -f9H9bz0A9K7z6AH+6/C9kHwsjWa2zI7Ei+jexQX+v9udNeR1GphLorgewe+1X+9z -UsWhBnczSQU/lQFiFuMFgbzFsuwqD8lmDPrO7Ek3b2R0Klv8ge0cA2Y6z7cVZ8Px -BIEJ5Z9FEqhNBsaLvbbCGbeXUnvzue3Gqcv2WJ8aNfDnPV7BBrtgRSTMP+ErEqyq -DTPWdOASZmEgqox62zMFP42U7UrgHrGKO801Z6P50ELYAganCOEDFC8YM/R1l+Sq -ZezRjjNYj0qNUEm2bBNzLDhi7VvMpoxr2D5oIIrm2i+WeankO2hQuPGuRc0rvASb -tOazhVWqRSddVxeFGlIye8J93NLgEzlHaU1yBwsq/y09/uvmpW65+424HaYzdWVq -s3H4GCa7VyxH6GoQJeXxqQbJP3gsNkSeEyuXF7LyuFl6hVSJCOYEEwEKANAFAlJZ -D9AFgwG4FTBIFIAAAAAAFwAodmVyaWZpZWRAdG9ycHJvamVjdC5vcmdERjgxMTEw -OUUxN0M4QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyTxSAAAAAAB4AKGJyaWRn -ZXNAYnJpZGdlcy50b3Jwcm9qZWN0Lm9yZzdCNzg0MzcwMTVFNjNERjQ3QkIxMjcw -QUNCRDk3QUEyNEU4RTQ3MkUqGmh0dHBzOi8vYnJpZGdlcy50b3Jwcm9qZWN0Lm9y -Zy9wb2xpY3kudHh0AAoJEMvZeqJOjkcuVyY//3Gqkvf84Mo3cLcpux1L6F1UqyQ7 -ZwgFAVbrtsR/8HbDD0BUIEoKUbqkqdMhhNeE+yNzlZHLMqgUxveb4sgfYNStMTJ/ -VSlNPTf/T25FShmS6BghWF8qubyKi4cpqyt3zD1INvvTWdRVzRpwxYRBKKWdALl2 -7J5PqvDSvevjx6h6Gc4FoO97WbK5qaQFOc2Nnw2CKCiEiyL3RciMR4IkvAPoxv+E -Wi6uhCD72s4apqkPiSnsdDqWI/MMkxP7ZKwyyAy/8qMsI79DqwEr2dmLs6AOIXgb -1ec4zMQLyiDFdYH9de0V2DHsZ1tevt18ijBvyC9vL7golk7vOJjUOYXsl6vLID8J -a5byVIgEjJzYYmkKs+8WGXUsZ5wGw5NSfuTHqlNM6XTHEH1CRtEkydCWEw1KCaDd -2n5R+GHnI+gEfLYLLenjJtIzWRqTeMDXZ2YaIuSxzVaqq+F8YURkAbmB4MkXgf37 -eHwLAxGD8t+/K5P8Zb4kYqChHYMqHS9XSQVrCAETc7rFmsnEldyaO2l4+1XA+8Z9 -0F3nh2cNHgYO36hJliXbmMZLkNTFUf4Yj7jM4U5UbcWhZR7HjqtEikK6V0YrMog3 -6lht97t18TZj9dU/BShivb83YJ0J6KBp8tFBJMSkBCP18NAI9J5uGjoYQH1NsaN5 -/por4/OvZsYX8rXvYeMoSljHK4Rh8do9XUnxIMtoNB1cwxL9rzLY7mSf+KwLrR7B -ikQRG2SKO0+SgUGTkfaS6/8tYUFSBWAw3F8TJNMrtgmpQ9c885WDDDwTowyQfwNq -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 -VKHXMVl8Vq2J7j2uW+Z30dYvhn1dKJ/z7QEPIHPQpCaTIquU0AzhYRT+skHKu+7F -7lJBJeampqbXnc9vBNCOvd7pZ38HLBPNKcZKSBup99w2SUhMqoLVoxNT9qZ7FXzu -SC7N5ii3u2ztb96jF3ApDAhh/5MM77aMKmL2OIGmTA2bUBWPFO5SPRXUVL1XXhwA -duMtvdZ4cwARAQABiQWDBBgBCgDTBQJSL/KBSBSAAAAAABcAKHZlcmlmaWVkQHRv -cnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNBMjg0ODgy -MUUzMk8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmdERjgx -MTEwOUUxN0M4QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyKhpodHRwczovL2Jy -aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAgUJAeEzgAKkCRCNxDoo -SIIeMsHYIAQZAQoAgQUCUi/ygU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9y -cHJvamVjdC5vcmc5RkUzOUQxQTc0Mzg5MjIzM0IzRjY2RjIyMUI1NTRFOTU5MzhG -NEQwKhpodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAAK -CRAhtVTpWTj00Ns/D/kBN79Pz55pOgLe/RNg1Efme95C/MBZ2eyEPeWe9+yAOFuK -XCJ8qlzkscpdTeu9vjYcfZy7RyS6Sx0NO8gJkP1wmNGr8X4zObSk0IAmDSlCcdpp -YVCPD4IdgSiLNqLdL6JjGE0d5J0DpPLvGbj5sc1/QCpuVt3p0rCr0S+PAAjrNmwA -e2yYdFQx2sXAZ0pp7oJJyFRPYlAUE8RYyG/N2kMYAJZVpI+zFgq5iD0uCmzAZyh/ -62mtGMpGXwy1KHS5+NtUGVN5Iqkvlj59xNEPc8jzDs5yvfOOvpelgbhJQ0exbDHK -78NNeDvouTX/4F1ofbmEM4BqwtQ5TvJEvzMP9zszQWQZd2OvkjYMQSrDMn1w8daO -mBvw319kug8U/0k6YoYcg2rE17tN/CJN0Pq4Mqz+79ArVT6jeJgFcFNER2ik9R0F -Mz3BhFSHIZdMQouFQ/cwaldiWB5g+tJ2nvpXI3cHMtNsy/77uvHIrEv1xZhTSmdc -eA8LmfIdfmepeaEyeTEAPcGebyf1cN+CLJMMTGqSwSHZVe3KFV8t7PKUQ/Z/C13z -+YAEEKxOPNlboVF9FECNRlZkYWkWDyejXHklL26KzBE/mDWoeKM0VakbJO0laXlU -13R334u1VRfWNGkNSmyNlzGqzd+y/Dan4f/NDXAW8Ouyhq+Go5Or4ASclztkbznu -D/9mG59d6ZeeT+1u+dYeWNUjAYkIt3B/TMOs0KQjxHgvbogto1jy4MMvSfyygkCq -zDURZslBXw6gZbSHu1XZrfApaX0tphhOmiwztbwOr4aEDKv5MsT9MgkXEEh8BesF -g/3yUnZ34I8laKfWJQqxVI+reKz/aJYCx9gcoY2jJAaMQoSsxjtFU/KAPvkRhgq/ -QobO5BS/DPWn8SqMzLXlrG2UjR/E5mb6aQU5yDEtSrMuIHQk0hnc3OrgoNX8mt/B -uhVirtqmsJmrftcfvAfXFWp0RIzsh9qixYeE4yAUSX5mZ4a0zheq/jVAnL0KJEEn -p2Mw8pkBSmfJS0QpHtMxoaOkZSZO/Ofah751X2Hlr7KVG9ZUdqm8kKtDMJc/JCDz -tJSpzioUBcXcuG31sfUOayYtS3RG385SuxaC1IiY6QVQvVSh90UVtatfv/jiuWmb -ddgM7Eifto5ybTnPFNkQASRiFmz3NyrWbinmjnMfC94JJRJVwgOUree3KahjopLC -r6WiZEknm8SqaipkH7o7xKN7HIe0kvx67YqwTmCH1wK81pQQrbqZPh6xzCys+AXb -5VK8yoVX4duo7cQGYiODGaw0SqNqXFkzsJ0fy00LDfmKF7KVvtF2qSK50kgAe3Fc -tQRxUklWHHz5IEviG8nBETtXERQLhilK4E3BPc9BA+aPm7kCDQRSL/KeARAA0zi0 -eXuTSikT6Ywm+Af/GGJFofqK2+9BKICGeo+b/Hf3Yy8oY6mfQSJIeNf4WCjMJ7Gu -CpA5E2l9HjbtwRQdsxoGdRkne+duREsYqrLlyJQINqXse28rGhX7mtJ1MeuLZmkJ -tlwK3ZI/8CNKW4PonVspt1kEJmS8k0285fK6UxLU7fktpus9xHgIRB7jRR9eoRA1 -MsJXn9xKLV9547hYi6mjb581GA8YVLyndtitXrNYIIrKYD/nm9W5DAKcXnH9q6pk -lBHL7Lk1oqeKBmTwSxg0HjSh5AlFW4+ME8lgyEbbaN8IvuAhTxFc8PobY9XEH07L -T6lHRuzUjpi0IIHnaFHb+wCZuDCSYshGsZfiAH+gH8K65t3jkr9D4KFMTq1G/b4S -KC/IofILYqr0PamGkUH0AP8N2dErtmH6HH0EvFMPfahvqE4InhuhernfPoTGQGFW -Ram1Ps7czMgxOoeB35ZLelTSdB5NFaBd/E07O+6R11wWyw+ks0erWzbkfa/5W5gv -EH9gNWQE4UdIrhoTURbVD6NvBsWpMRnS2fZByMY5exDf4LJmE8LhIa/snzbS8LUh -9KI3qmw5oLn74IfkiEwrcjQwFLKY62WBLRdDR0aUqJtjRVRCzKjEcnVP53KYdaxm -YFaev81Y+sSJYSpqo+T9cv/QdHOE7tQsyaZCecMAEQEAAYkC6QQYAQoA0wUCUi/y -nkgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3QzhC -RjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJpZGdlc0Bicmlk -Z2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNB -Mjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL3BvbGlj -eS50eHQCGwwFCQHhM4AACgkQjcQ6KEiCHjIPZhAAs5l8T2mWL+kG8WbNyjdISe/W -D0zZ5E2vAnCq5DcxZ4rax3GblJWRxo1frRT5xoq21adGs8TC5NG1u/40KYn30aB2 -9YE6ida9yCR2R2EYKgX5sKGTXXOpnbFa9og4gXHrgU0f9vwT0rY7CyaRmjBfBxRX -fCy7i/+dnsuwhMHn0RHJL4yIEdmQk/HFA6Taep6ACl8Wfrebg0TX5zi63v1RbC4e -KBt39p+l46+UzGWGqP7yfLrHpYNMUIGJOgImvOWeHa2QWJWojHjCuXt5oIuER4ib -p0lUO2B56wljoAjYvgPHWLAVIAMaxQMriMalF4Nlmcgj0I4aWcFuKMXZVUuie/Ps -Epj8U2JpIWmGQhzUNN2eUF5WNV/8VPF/WqzcYBBlmGz1lMzRCmQ/Ws1DlJz2i5Pj -L2cOVatJrRH7Iwz4YPHxgtv+T777GfezuqaIq+ZDKlICxFjalg1gHe40hxsUDdH1 -oJrb5Tg6RD7QV//wDxHDi43p4iL57d3V8LLl/dICA03n/c4ilBBfoh0gWTCjw3pb -sgww4Q39lcUmcittWG5/xS1OLD9WVLSQ42rUu3c5hPL35zAOhFZsFJSIPuZ2ip8E -T94oJR/vE4KRRZca7Uy5A0TcPmB4qTMfaCmWjQOyCxPyJKc2ECx+thiHKglL62Ww -qgQ42nQM/debtU+2aTo= -=ieIZ +AQoBD0gUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3 +QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJpZGdlc0Bi +cmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERD +NDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL3Bv +bGljeS50eHQCGwEDCw0JBBUKCQgEFgIBAAIeAQIXgCcYaHR0cHM6Ly9icmlkZ2Vz +LnRvcnByb2plY3Qub3JnL2tleS5hc2MFAlSKBKIFCQPDTiIACgkQjcQ6KEiCHjIs +jg//bJ12eRnBMfIGzOGh+T4wz7/YyKLfARAMnqDnSxhTxuE+M5hWm3QbxP03R6eY +x+PKwQaDJSmm7HhRhltb7QXUe8dqjnocFwwagpoLZ/81mBLxByqg5TKHGGIGy+DX +omIzCq5ijx1IUkHlgh708a5alG7bjRTqedT4Wxxyl6psGzDhGQdS8bqx/f32nQaE +h41l+A/EY1g2HVqky63ZHAP3S2v+mWCrk5DnkElc0229MXqaBuEr4nbYMXRkahMb +E2gnCmdSoeD21AY6bNyz7IcJGpyKCx9+hVgPjpm3J23JEYyPL+s48jn6QcI/Q2gD +yAtgU65y6IrdYn8SwkABI1FIq9WAwG7DaInxvkqkYqyBQLaZJEMyX8NTBvFoT5JS +jnkxG0xu61Vxq0BLYBIOJE0VFHAJ40/jOvSxQJkQhu9G4BK7htnADbtstmMDMM3q +xuuO5pcj2rl7YthNunyZ1yhPHXijUUyKrwR9piENpptztFBVN6+ijqU/TmWMOtbH +X7p9F+3tXCHHqwO5U/JMtsb/9M39MR8BrdcLc7m6dCpeuSUuR2LLroh+MoMJGviI +iesxHF95kFqkJAecW1Z3eKL9vrlbfO3waeuCi18k1TePnZuG5lmf2KjKDW5vHK4O +WFqvvfK2kxkCUjvGdLeTOAVOV+X+PQ23jvBJO2bS7YbOb9C5Ag0EUi/ygQEQALZ/ +p7xRINHY7MMf3/bo/I0WRxWHd1AE9tRToyEg1S2u1YrWWL5M9D8saRsp9cpnpGEu +hW3vu7G4nasY27qOz4bSKu1YMAVIC58v1tEnBqdo1zErNjhs38PrmJKbbs9tDfYY +Oi2x0GlhMbIrNStcZpnCdLa6U6NLMbggDL1GxjMPYBMi4TtLgcIeRDUSjsZscZkg +Kxs5QkSVc3SrYyraayIc8WtIpDLcxPt6/g90rbatZzBfO+93Rz7qUXHmgzuM0hy1 +Fvn619o3I5DsWrfOz9t/QuznoOBw4PfzDPNT7VlzZN4xHAcr5+7B+DH9IsvlCt5N +kQFuYpFZCpXNaD2XOtmIqjTCeLNfcgTEj0qoUIEKyKbBIgfP+7S2tLXy8JKUTy5g +9kxXQeHueLykQ4Mt18JH0nMHbHbQl0K3LGT4ucRDOmjNtlQCltVLkIk3GimyqKs/ +vdZ9c+dm4Akx1qsJcwvveX+imJe2e9RUodcxWXxWrYnuPa5b5nfR1i+GfV0on/Pt +AQ8gc9CkJpMiq5TQDOFhFP6yQcq77sXuUkEl5qamptedz28E0I693ulnfwcsE80p +xkpIG6n33DZJSEyqgtWjE1P2pnsVfO5ILs3mKLe7bO1v3qMXcCkMCGH/kwzvtowq +YvY4gaZMDZtQFY8U7lI9FdRUvVdeHAB24y291nhzABEBAAGJBYMEGAEKANNIFIAA +AAAAFwAodmVyaWZpZWRAdG9ycHJvamVjdC5vcmdERjgxMTEwOUUxN0M4QkYxMzRC +NUVFQjY4REM0M0EyODQ4ODIxRTMyTxSAAAAAAB4AKGJyaWRnZXNAYnJpZGdlcy50 +b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4 +MjFFMzIqGmh0dHBzOi8vYnJpZGdlcy50b3Jwcm9qZWN0Lm9yZy9wb2xpY3kudHh0 +AhsCBQJUigTTBQkDw01SAqTB2CAEGQEKAIEFAlIv8oFPFIAAAAAAHgAoYnJpZGdl +c0BicmlkZ2VzLnRvcnByb2plY3Qub3JnOUZFMzlEMUE3NDM4OTIyMzNCM0Y2NkYy +MjFCNTU0RTk1OTM4RjREMCoaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3Jn +L3BvbGljeS50eHQACgkQIbVU6Vk49NDbPw/5ATe/T8+eaToC3v0TYNRH5nveQvzA +WdnshD3lnvfsgDhbilwifKpc5LHKXU3rvb42HH2cu0ckuksdDTvICZD9cJjRq/F+ +Mzm0pNCAJg0pQnHaaWFQjw+CHYEoizai3S+iYxhNHeSdA6Ty7xm4+bHNf0Aqblbd +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 +=raCx -----END PGP PUBLIC KEY BLOCK----- # The following keypair is BridgeDB's offline certification-only keypair. It

1 0

[bridgedb/master] Fix typo in comment in .travis.yml.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 95ad0a644ba6befe41a2bdaddfe38bb54dc10255 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 23 22:23:59 2015 +0000 Fix typo in comment in .travis.yml. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a0f4814..4bc10ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ before_script: - sed -r -i -e "s/(EMAIL_SMTP_PORT = )([1-9]{2,5})/\12525/" run/bridgedb.conf # Enable plaintext HTTP distribution, otherwise the mechanize-based tests in # test_https.py will fail with CERTIFICATE_VERIFY_FAILED because urllib2 - # won't recognize ourt self-signed certificate: + # won't recognize our self-signed certificate: - sed -r -i -e "s/(HTTP_UNENCRYPTED_BIND_IP = )(None)/\1'127.0.0.1'/" run/bridgedb.conf - sed -r -i -e "s/(HTTP_UNENCRYPTED_PORT = )(None)/\16788/" run/bridgedb.conf - leekspin -n 100

1 0

[bridgedb/master] Add python-gnupg==2.0.0 and remove pygpgme in .travis.requirements.txt.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 1b8916b2be79a3a58faae9f2b68f3648dc0f5941 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 23:08:22 2015 +0000 Add python-gnupg==2.0.0 and remove pygpgme in .travis.requirements.txt. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 01c31b7..d2a94a8 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -24,7 +24,7 @@ Mako==0.8.1 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pygeoip==0.2.7 -pygpgme==0.3 +gnupg==2.0.0 recaptcha-client==1.0.6 stem==1.2.2 zope.interface==3.6.1

1 0

[bridgedb/master] Update installation instructions in README.rst to remove libgpgme11-dev.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 4061bee4d45f9d29628e8f66a526175477c26af0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 23:20:06 2015 +0000 Update installation instructions in README.rst to remove libgpgme11-dev. --- README.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 617dbd1..0007c78 100644 --- a/README.rst +++ b/README.rst @@ -75,8 +75,7 @@ BridgeDB requires the following OS-level dependencies: - python>=2.7 - python-dev - build-essential -- libgpgme11 -- libgpgme11-dev +- gnupg (preferrably, gnupg2) - OpenSSL>=1.0.1g - `SQLite3 <http://www.maxmind.com/app/python>`__ - `MaxMind GeoIP <https://www.maxmind.com/en/geolocation_landing>`__ @@ -101,8 +100,7 @@ BridgeDB should work with or without a Python virtualenv. can do:: sudo apt-get install build-essential openssl python python-dev \ - python-setuptools sqlite3 libgpgme11 libgpgme11-dev libgeoip-dev \ - geoip-database + python-setuptools sqlite3 gnupg2 libgeoip-dev geoip-database - Install Pip 1.3.1 or later. Debian has this version, but if for some

1 0