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

[bridgedb/master] Fix a docstring typo in bridgedb.Storage.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit fe567ec2243db738c03cf88ab76c6980ad91b046 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 20:21:05 2015 +0000 Fix a docstring typo in bridgedb.Storage. --- lib/bridgedb/Storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index ef76829..d0660cf 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -384,7 +384,7 @@ _OPENED_DB = None _REFCOUNT = 0 def clearGlobalDB(): - """Start from scratch + """Start from scratch. This is currently only used in unit tests. """

1 0

[bridgedb/master] Replace a for loop with a list comprehension
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 4e3aa2db2d00e7b4abded7038a091f1762483302 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:43:22 2015 -0700 Replace a for loop with a list comprehension --- lib/bridgedb/test/legacy_Tests.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index bf4cf39..ddf30f3 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -80,9 +80,7 @@ def randomPortSpec(): """ returns a random list of ports """ - ports = [] - for i in range(0,24): - ports.append(random.randint(1,65535)) + ports = [randomPort() for i in range(0,24)] ports.sort(reverse=True) portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)])

1 0

[bridgedb/master] Correct a comment
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit d84d88462aae54349bf0df6a1a62080893395ed2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 28 16:57:41 2015 -0700 Correct a comment (Malice is an intent; if something is unintentional, then it's not malicious.) --- lib/bridgedb/parse/descriptors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 3f8d48e..9d196b8 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -172,7 +172,7 @@ def deduplicate(descriptors, statistics=False): .. note:: If two descriptors for the same router are discovered, AND both descriptors have the **same** published timestamp, then the router's fingerprint WILL BE LOGGED ON PURPOSE, because we assume that router - to be malicious (deliberately, or unintentionally). + to be broken or malicious. :param list descriptors: A list of :api:`stem.descriptor.server_descriptor.RelayDescriptor`s,

1 0

[bridgedb/master] Fix comment typo
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 14ebe12b221700644a0e492207bfa184305fdc3c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 28 16:56:37 2015 -0700 Fix comment typo --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 93b9fe9..e2b2ff5 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -321,7 +321,7 @@ class PluggableTransport(BridgeAddressBase): """ argDict = {} - # PT argumentss are comma-separated in the extrainfo + # PT arguments are comma-separated in the extrainfo # descriptors. While there *shouldn't* be anything after them that was # separated by a space (and hence would wind up being in a different # item in `arguments`), if there was we'll join it to the rest of the

1 0

[bridgedb/master] Remove clear abuses of str.strip() and str.rstrip()
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 4e773f346f2b442a1726af94b7b2da231b73c1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:24:33 2015 -0700 Remove clear abuses of str.strip() and str.rstrip() --- lib/bridgedb/Bridges.py | 3 ++- lib/bridgedb/bridges.py | 6 ++++-- lib/bridgedb/test/test_Main.py | 3 ++- lib/bridgedb/test/test_Tests.py | 3 ++- lib/bridgedb/test/test_bridgedb.py | 3 ++- lib/bridgedb/test/test_captcha.py | 7 ++++--- lib/bridgedb/test/test_configure.py | 3 ++- lib/bridgedb/test/test_crypto.py | 3 ++- lib/bridgedb/test/test_email_autoresponder.py | 3 ++- lib/bridgedb/test/test_https.py | 3 ++- lib/bridgedb/test/test_smtp.py | 3 ++- lib/bridgedb/util.py | 9 +++++++++ 12 files changed, 35 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bdb911a..8c05083 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -29,6 +29,7 @@ from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.safelog import logSafely +from bridgedb.util import remove_prefix try: from cStringIO import StringIO @@ -692,7 +693,7 @@ class FilteredBridgeSplitter(BridgeHolder): subringName = [self.distributorName] for filterName in filterNames: if filterName != 'filterAssignBridgesToRing': - subringName.append(filterName.strip('filterBridgesBy')) + subringName.append(remove_prefix(filterName, 'filterBridgesBy')) subringName = '-'.join([x for x in subringName]) subring.setName(subringName) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 96f995e..8759473 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -38,6 +38,8 @@ from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.nickname import isValidRouterNickname +from bridgedb.util import remove_prefix +from bridgedb.util import remove_suffix class PluggableTransportUnavailable(Exception): @@ -1462,8 +1464,8 @@ class Bridge(BridgeBackwardsCompatibility): sequence = asn1.DerSequence() key = self.signingKey - key = key.strip(TOR_SIGNING_KEY_HEADER) - key = key.strip(TOR_SIGNING_KEY_FOOTER) + key = remove_prefix(key, TOR_SIGNING_KEY_HEADER) + key = remove_suffix(key, TOR_SIGNING_KEY_FOOTER) key = key.replace('\n', '') key = base64.b64decode(key) diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py index 0b14319..688c383 100644 --- a/lib/bridgedb/test/test_Main.py +++ b/lib/bridgedb/test/test_Main.py @@ -29,13 +29,14 @@ from twisted.trial import unittest from bridgedb import Main from bridgedb.Bridges import BridgeHolder from bridgedb.parse.options import parseOptions +from bridgedb.util import remove_suffix logging.getLogger().disabled = True HERE = os.getcwd() -TOPDIR = HERE.rstrip('_trial_temp') +TOPDIR = remove_suffix(HERE, '_trial_temp') CI_RUNDIR = os.path.join(TOPDIR, 'run') # A networkstatus descriptor with two invalid ORAddress (127.0.0.1 and ::1) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index e78a4c4..a46c50f 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -29,6 +29,7 @@ from twisted.trial import unittest from bridgedb.test import legacy_Tests as Tests from bridgedb.test import deprecated +from bridgedb.util import remove_suffix warnings.filterwarnings('ignore', module="bridgedb\.test\.legacy_Tests") @@ -191,7 +192,7 @@ class DynamicTestCaseMeta(type): origFunc = origName.split('.')[-2:] origName = '_'.join(origFunc) if origName.endswith('_py'): # this happens with doctests - origName = origName.strip('_py') + origName = remove_suffix(origName, '_py') methName = str(methodPrefix + origName).replace('.', '_') meth = testMethodFactory(test, methName) logging.debug("Set %s.%s=%r" % (cls.__name__, methName, meth)) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 70c71f0..301309a 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -23,6 +23,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix class BridgeDBCliTest(unittest.TestCase): @@ -30,7 +31,7 @@ class BridgeDBCliTest(unittest.TestCase): def setUp(self): here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index a5083d7..ea05749 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -23,6 +23,7 @@ from zope.interface import providedBy from bridgedb import captcha from bridgedb import crypto +from bridgedb.util import remove_suffix class CaptchaTests(unittest.TestCase): @@ -97,7 +98,7 @@ class GimpCaptchaTests(unittest.TestCase): def setUp(self): here = os.getcwd() - self.topDir = here.rstrip('_trial_temp') + self.topDir = remove_suffix(here, '_trial_temp') self.cacheDir = os.path.join(self.topDir, 'captchas') self.badCacheDir = os.path.join(here, 'capt') @@ -131,7 +132,7 @@ class GimpCaptchaTests(unittest.TestCase): """GimpCaptcha with bad cacheDir should raise GimpCaptchaError.""" self.assertRaises(captcha.GimpCaptchaError, captcha.GimpCaptcha, self.publik, self.sekrit, self.hmacKey, - self.cacheDir.rstrip('chas')) + remove_suffix(self.cacheDir, 'chas')) def test_init(self): """Test that __init__ correctly initialised all the values.""" @@ -238,7 +239,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - challengeBadB64 = challenge.rstrip('==') + "\x42\x42\x42" + challengeBadB64 = remove_suffix(challenge, '==') + "\x42\x42\x42" self.assertEquals( c.check(challenge, c.answer, c.secretKey, c.hmacKey), True) diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py index 501ed1f..5246613 100644 --- a/lib/bridgedb/test/test_configure.py +++ b/lib/bridgedb/test/test_configure.py @@ -16,6 +16,7 @@ import os from twisted.trial import unittest from bridgedb import configure +from bridgedb.util import remove_suffix class ConfigureTests(unittest.TestCase): @@ -24,7 +25,7 @@ class ConfigureTests(unittest.TestCase): def setUp(self): """Find the config file in the top directory of this repo.""" here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.configFilename = os.path.join(topdir, 'bridgedb.conf') def test_loadConfig_with_file(self): diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index c2010ca..afd63c8 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -33,6 +33,7 @@ from bridgedb import txrecaptcha from bridgedb.persistent import Conf from bridgedb.test.util import fileCheckDecorator from bridgedb.test.email_helpers import _createConfig +from bridgedb.util import remove_suffix logging.disable(50) @@ -98,7 +99,7 @@ class InitializeGnuPGTests(unittest.TestCase): :returns: The full path to the new gnupg home directory. """ here = os.getcwd() - topDir = here.rstrip('_trial_temp') + topDir = remove_suffix(here, '_trial_temp') gnupghome = os.path.join(topDir, '.gnupg') gnupghomeNew = os.path.join(here, '.gnupg') diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 2895802..4c36be4 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -29,6 +29,7 @@ from bridgedb.Dist import TooSoonEmail from bridgedb.test.email_helpers import _createConfig from bridgedb.test.email_helpers import _createMailServerContext from bridgedb.test.email_helpers import DummyEmailDistributorWithState +from bridgedb.util import remove_suffix class CreateResponseBodyTests(unittest.TestCase): @@ -36,7 +37,7 @@ class CreateResponseBodyTests(unittest.TestCase): def _moveGPGTestKeyfile(self): here = os.getcwd() - topDir = here.rstrip('_trial_temp') + topDir = remove_suffix(here, '_trial_temp') self.gpgFile = os.path.join(topDir, '.gnupg', 'TESTING.subkeys.sec') self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') shutil.copy(self.gpgFile, self.gpgMoved) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 92b07bf..bf229f8 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -36,6 +36,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' @@ -44,7 +45,7 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 1cbafba..b4cf8f9 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -17,6 +17,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange @@ -118,7 +119,7 @@ class SMTPTests(unittest.TestCase): running. ''' here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index ca2a88f..3e1b42f 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -302,3 +302,12 @@ class mixin: expect mixin classes to end in ``'mixin'``. """ __metaclass__ = abc.ABCMeta + +def remove_prefix(s, f): + assert s.startswith(f) + return s[len(f):] + +def remove_suffix(s, f): + assert s.endswith(f) + return s[:-len(f)] +

1 0

[bridgedb/develop] Merge branch 'release/0.3.3'
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit ac80d7d2e8d81859c4409ab51f5e96c063029074 Merge: 94dd106 abece06 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 19:23:51 2015 +0000 Merge branch 'release/0.3.3' .gitattributes | 2 +- .gitignore | 4 +- .pylintrc | 2 +- .travis.requirements.txt | 2 +- CHANGELOG | 109 +- MANIFEST.in | 2 + Makefile | 10 +- bridgedb.conf | 48 +- bridgedb/Bridges.py | 684 +++++++ bridgedb/Bucket.py | 288 +++ bridgedb/Main.py | 507 +++++ bridgedb/Stability.py | 295 +++ bridgedb/Storage.py | 466 +++++ bridgedb/__init__.py | 17 + bridgedb/_langs.py | 26 + bridgedb/_version.py | 460 +++++ bridgedb/bridgerequest.py | 242 +++ bridgedb/bridges.py | 1797 +++++++++++++++++ bridgedb/captcha.py | 404 ++++ bridgedb/configure.py | 162 ++ bridgedb/crypto.py | 455 +++++ bridgedb/distribute.py | 282 +++ bridgedb/email/__init__.py | 1 + bridgedb/email/autoresponder.py | 717 +++++++ bridgedb/email/distributor.py | 230 +++ bridgedb/email/dkim.py | 74 + bridgedb/email/request.py | 175 ++ bridgedb/email/server.py | 507 +++++ bridgedb/email/templates.py | 200 ++ bridgedb/filters.py | 255 +++ bridgedb/geo.py | 82 + bridgedb/https/__init__.py | 1 + bridgedb/https/distributor.py | 336 ++++ bridgedb/https/request.py | 146 ++ bridgedb/https/server.py | 1079 +++++++++++ .../https/templates/assets/css/bootstrap.min.css | 7 + .../templates/assets/css/font-awesome-ie7.min.css | 384 ++++ .../templates/assets/css/font-awesome.min.css | 403 ++++ bridgedb/https/templates/assets/css/main.css | 441 +++++ bridgedb/https/templates/assets/css/rtl.css | 7 + .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes .../https/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../https/templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../https/templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes bridgedb/https/templates/assets/js/bridges.js | 83 + bridgedb/https/templates/assets/tor-roots-blue.svg | 95 + bridgedb/https/templates/assets/tor.svg | 6 + bridgedb/https/templates/base.html | 100 + bridgedb/https/templates/bridges.html | 139 ++ bridgedb/https/templates/captcha.html | 49 + bridgedb/https/templates/howto.html | 36 + bridgedb/https/templates/index.html | 43 + bridgedb/https/templates/options.html | 154 ++ bridgedb/https/templates/robots.txt | 1079 +++++++++++ bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 396 ++++ bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 386 ++++ bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 393 ++++ bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ++++ bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 +++++ bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 +++++ bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 391 ++++ bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 388 ++++ bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 388 ++++ bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 396 ++++ bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 + bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 392 ++++ bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 386 ++++ bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ++++ bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 + bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 392 ++++ bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 390 ++++ bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 391 ++++ bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 + bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 381 ++++ bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/templates/bridgedb.pot | 391 ++++ bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 392 ++++ bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 386 ++++ bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 382 ++++ bridgedb/interfaces.py | 71 + bridgedb/parse/__init__.py | 79 + bridgedb/parse/addr.py | 589 ++++++ bridgedb/parse/descriptors.py | 299 +++ bridgedb/parse/fingerprint.py | 66 + bridgedb/parse/headers.py | 79 + bridgedb/parse/nickname.py | 58 + bridgedb/parse/options.py | 295 +++ bridgedb/parse/versions.py | 129 ++ bridgedb/persistent.py | 264 +++ bridgedb/proxy.py | 476 +++++ bridgedb/qrcodes.py | 77 + bridgedb/runner.py | 109 ++ bridgedb/safelog.py | 204 ++ bridgedb/schedule.py | 331 ++++ bridgedb/sitecustomize.py | 34 + bridgedb/strings.py | 565 ++++++ bridgedb/translations.py | 122 ++ bridgedb/txrecaptcha.py | 304 +++ bridgedb/util.py | 389 ++++ .../XXX-bridgedb-database-improvements.txt | 4 +- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- doc/sphinx/ext/traclinks.py | 47 + doc/sphinx/source/bridgedb.Dist.rst | 8 - doc/sphinx/source/bridgedb.Filters.rst | 8 - doc/sphinx/source/bridgedb.HTTPServer.rst | 8 - doc/sphinx/source/bridgedb.distribute.rst | 8 + doc/sphinx/source/bridgedb.email.rst | 1 + doc/sphinx/source/bridgedb.filters.rst | 8 + doc/sphinx/source/bridgedb.https.rst | 12 + doc/sphinx/source/bridgedb.rst | 10 +- doc/sphinx/source/conf.py | 63 +- doc/sphinx/source/index.rst | 53 +- lib/bridgedb/Bridges.py | 711 ------- lib/bridgedb/Bucket.py | 288 --- lib/bridgedb/Dist.py | 530 ----- lib/bridgedb/Filters.py | 120 -- lib/bridgedb/HTTPServer.py | 932 --------- lib/bridgedb/Main.py | 573 ------ lib/bridgedb/Stability.py | 237 --- lib/bridgedb/Storage.py | 468 ----- lib/bridgedb/__init__.py | 17 - lib/bridgedb/_langs.py | 26 - lib/bridgedb/_version.py | 197 -- lib/bridgedb/bridgerequest.py | 186 -- lib/bridgedb/bridges.py | 1654 ---------------- lib/bridgedb/captcha.py | 392 ---- lib/bridgedb/configure.py | 157 -- lib/bridgedb/crypto.py | 450 ----- lib/bridgedb/email/__init__.py | 1 - lib/bridgedb/email/autoresponder.py | 711 ------- lib/bridgedb/email/dkim.py | 73 - lib/bridgedb/email/request.py | 186 -- lib/bridgedb/email/server.py | 496 ----- lib/bridgedb/email/templates.py | 212 -- lib/bridgedb/geo.py | 82 - lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 368 ---- lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 386 ---- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 363 ---- lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 389 ---- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ---- lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 ----- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 382 ---- lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 ----- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 388 ---- lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 387 ---- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 386 ---- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 393 ---- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 383 ---- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 - lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 391 ---- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 362 ---- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ---- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 - lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 390 ---- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 388 ---- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 387 ---- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 386 ---- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 360 ---- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 389 ---- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 - lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 361 ---- lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 ---- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 387 ---- lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/templates/bridgedb.pot | 391 ---- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 389 ---- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 388 ---- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ---- lib/bridgedb/interfaces.py | 19 - lib/bridgedb/parse/__init__.py | 79 - lib/bridgedb/parse/addr.py | 592 ------ lib/bridgedb/parse/descriptors.py | 278 --- lib/bridgedb/parse/fingerprint.py | 46 - lib/bridgedb/parse/headers.py | 79 - lib/bridgedb/parse/nickname.py | 58 - lib/bridgedb/parse/options.py | 296 --- lib/bridgedb/parse/versions.py | 129 -- lib/bridgedb/persistent.py | 260 --- lib/bridgedb/proxy.py | 473 ----- lib/bridgedb/qrcodes.py | 77 - lib/bridgedb/runner.py | 109 -- lib/bridgedb/safelog.py | 197 -- lib/bridgedb/schedule.py | 326 ---- lib/bridgedb/sitecustomize.py | 34 - lib/bridgedb/strings.py | 299 --- lib/bridgedb/templates/assets/bridgedb.png | Bin 2946 -> 0 bytes .../templates/assets/css/bootstrap.min.css | 7 - lib/bridgedb/templates/assets/css/custom.css | 158 -- .../templates/assets/css/font-awesome-ie7.min.css | 384 ---- .../templates/assets/css/font-awesome.min.css | 403 ---- lib/bridgedb/templates/assets/css/main.css | 24 - .../templates/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ---- .../templates/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 46160 -> 0 bytes .../templates/assets/font/lato-italic.woff | Bin 47168 -> 0 bytes .../templates/assets/font/lato-regular.woff | Bin 46108 -> 0 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 - lib/bridgedb/templates/assets/tor.svg | 6 - lib/bridgedb/templates/base.html | 108 -- lib/bridgedb/templates/bridgedb.asc | 252 --- lib/bridgedb/templates/bridges.html | 200 -- lib/bridgedb/templates/captcha.html | 63 - lib/bridgedb/templates/howto.html | 39 - lib/bridgedb/templates/index.html | 43 - lib/bridgedb/templates/options.html | 164 -- lib/bridgedb/templates/robots.txt | 1079 ----------- lib/bridgedb/test/deprecated.py | 702 ------- lib/bridgedb/test/deprecated_networkstatus.py | 275 --- lib/bridgedb/test/email_helpers.py | 181 -- lib/bridgedb/test/legacy_Tests.py | 660 ------- lib/bridgedb/test/test_Bucket.py | 63 - lib/bridgedb/test/test_HTTPServer.py | 703 ------- lib/bridgedb/test/test_Main.py | 432 ----- lib/bridgedb/test/test_Storage.py | 56 - lib/bridgedb/test/test_Tests.py | 259 --- lib/bridgedb/test/test_bridgedb.py | 103 - lib/bridgedb/test/test_bridgerequest.py | 44 - lib/bridgedb/test/test_bridges.py | 1647 ---------------- lib/bridgedb/test/test_captcha.py | 337 ---- lib/bridgedb/test/test_configure.py | 67 - lib/bridgedb/test/test_crypto.py | 392 ---- lib/bridgedb/test/test_email_autoresponder.py | 571 ------ lib/bridgedb/test/test_email_dkim.py | 86 - lib/bridgedb/test/test_email_request.py | 276 --- lib/bridgedb/test/test_email_server.py | 544 ------ lib/bridgedb/test/test_email_templates.py | 119 -- lib/bridgedb/test/test_geo.py | 96 - lib/bridgedb/test/test_https.py | 415 ---- lib/bridgedb/test/test_parse_addr.py | 749 ------- lib/bridgedb/test/test_parse_descriptors.py | 731 ------- lib/bridgedb/test/test_parse_headers.py | 52 - lib/bridgedb/test/test_parse_nickname.py | 63 - lib/bridgedb/test/test_parse_options.py | 102 - lib/bridgedb/test/test_parse_versions.py | 42 - lib/bridgedb/test/test_persistent.py | 170 -- lib/bridgedb/test/test_persistentSaveAndLoad.py | 163 -- lib/bridgedb/test/test_proxy.py | 590 ------ lib/bridgedb/test/test_qrcodes.py | 73 - lib/bridgedb/test/test_safelog.py | 336 ---- lib/bridgedb/test/test_schedule.py | 224 --- lib/bridgedb/test/test_smtp.py | 196 -- lib/bridgedb/test/test_translations.py | 78 - lib/bridgedb/test/test_txrecaptcha.py | 270 --- lib/bridgedb/test/test_util.py | 144 -- lib/bridgedb/test/util.py | 179 -- lib/bridgedb/translations.py | 122 -- lib/bridgedb/txrecaptcha.py | 299 --- lib/bridgedb/util.py | 304 --- maint/get-completed-translations | 27 +- requirements.txt | 2 +- scripts/bridgedb | 2 +- scripts/get-tor-exits | 17 +- scripts/setup-tests | 1 + setup.cfg | 35 +- setup.py | 41 +- test/deprecated.py | 448 +++++ test/email_helpers.py | 180 ++ test/https_helpers.py | 161 ++ test/legacy_Tests.py | 334 ++++ test/test_Bucket.py | 63 + test/test_Main.py | 437 +++++ test/test_Storage.py | 56 + test/test_Tests.py | 249 +++ test/test_bridgedb.py | 103 + test/test_bridgerequest.py | 58 + test/test_bridges.py | 1839 ++++++++++++++++++ test/test_captcha.py | 337 ++++ test/test_configure.py | 67 + test/test_crypto.py | 393 ++++ test/test_distribute.py | 44 + test/test_email_autoresponder.py | 572 ++++++ test/test_email_distributor.py | 259 +++ test/test_email_dkim.py | 86 + test/test_email_request.py | 276 +++ test/test_email_server.py | 544 ++++++ test/test_email_templates.py | 119 ++ test/test_filters.py | 333 ++++ test/test_geo.py | 96 + test/test_https.py | 437 +++++ test/test_https_distributor.py | 406 ++++ test/test_https_request.py | 91 + test/test_https_server.py | 963 +++++++++ test/test_interfaces.py | 55 + test/test_parse_addr.py | 749 +++++++ test/test_parse_descriptors.py | 879 +++++++++ test/test_parse_headers.py | 52 + test/test_parse_nickname.py | 63 + test/test_parse_options.py | 102 + test/test_parse_versions.py | 42 + test/test_persistent.py | 170 ++ test/test_persistentSaveAndLoad.py | 163 ++ test/test_proxy.py | 590 ++++++ test/test_qrcodes.py | 73 + test/test_safelog.py | 335 ++++ test/test_schedule.py | 224 +++ test/test_smtp.py | 206 ++ test/test_translations.py | 78 + test/test_txrecaptcha.py | 270 +++ test/test_util.py | 144 ++ test/util.py | 301 +++ versioneer.py | 2045 +++++++++++++++----- 355 files changed, 50901 insertions(+), 45794 deletions(-)

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 2d3685220f4b473fec47480bc859bc1953cb5199 Merge: 2519454 94dd106 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 22 01:25:42 2015 +0000 Merge branch 'master' into develop

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit e059d91887da0e35a78c38d6f093d8c359dba90d Merge: abece06 ac80d7d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 19:24:23 2015 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] HTML-encode bridge lines properly
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit ccb3b8d17ddf228c903a3abaabf80ba179dadb3a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 30 05:21:50 2015 -0700 HTML-encode bridge lines properly --- lib/bridgedb/HTTPServer.py | 4 +++- lib/bridgedb/templates/bridges.html | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 2e0398c..47ea298 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -56,6 +56,7 @@ from bridgedb.qrcodes import generateQR from bridgedb.safelog import logSafely from bridgedb.schedule import Unscheduled from bridgedb.schedule import ScheduledInterval +from bridgedb.util import htmlify_string TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') @@ -786,7 +787,8 @@ class WebResourceBridges(resource.Resource): rtl=rtl, lang=langs[0], answer=bridgeLines, - qrcode=qrcode) + qrcode=qrcode, + htmlify_string=htmlify_string) except Exception as err: rendered = replaceErrorPage(err) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 8048919..0ecf1d4 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -1,7 +1,8 @@ ## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<%page args="strings, rtl=False, lang='en', answer=0, qrcode=0, **kwargs"/> +<%page args="strings, rtl=False, lang='en', answer=0, qrcode=0, + htmlify_string=None, **kwargs"/> </div> </div> @@ -66,7 +67,7 @@ <div class="row" id="bridgesrow1"> <div class="col col-lg-12"> <div class="bridge-lines" id="bridgelines"> -${answer.replace("\n", "<br />")} +${htmlify_string(answer)} </div> </div> </div>

1 0

[bridgedb/master] Add function to HTML-encode strings
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit faf4898324faaedf4ff675230e5275c264ab90b1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 30 05:17:42 2015 -0700 Add function to HTML-encode strings --- lib/bridgedb/util.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index f3d87bd..8034120 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -180,6 +180,26 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, memo[key] = distance return distance +htmlify_string_map = { + '<': '<', + '>': '>', + '&': '&', + '"': '"', + "'": ''', + '\n': '<br/>' + } +def htmlify_string(s): + """Encode HTML special characters, and newlines, in s. + + >>> htmlify_string('<script>alert("badthink");</script>') + '<script>alert("badthink");</script>' + >>> htmlify_string('bridge 1\nbridge 2') + 'bridge 1<br/>bridge 2' + + :param str s: The string to encode. + """ + return ''.join(map((lambda ch: htmlify_string_map.get(ch, ch)), s)) + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0