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

[bridgedb/develop] Add CHANGELOG entries for #5463, #9385, and #12147.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 17326a5e9b87fb7fd89ff648d54c231426a73e7d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 24 03:14:16 2014 +0000 Add CHANGELOG entries for #5463, #9385, and #12147. --- CHANGELOG | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 453e128..70b8446 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,21 @@ -Changes in version 0.2.2 - 2014-06-XXX +Changes in version 0.2.3 - 2014-07-XXX + + * FIXES #5463 https://bugs.torproject.org/5463 + XXX + + * FIXES #9385 https://bugs.torproject.org/9385 + BridgeDB now has the ability to blacklist email addresses, and + configurable options to fuzzy match and block addresses which are + similar enough to those in the blacklist. + + * FIXES #12147 https://bugs.torproject.org/12147 + An additional issue with BridgeDB's code for scheduling actions + was identified by Robert Ransom, who also provided a unittest to + demonstrate the issue and test for future regressions. The issue + pointed out has also been fixed. + + +Changes in version 0.2.2 - 2014-06-06 * FIXES #9874 https://trac.torproject.org/projects/tor/ticket/9874 BridgeDB's email and HTTPS distributors were written in a manner

1 0

[bridgedb/develop] Add irc.oftc.net#tor-bridgedb channel for travis-ci bot.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 8df3fc1a97cf321a50b23990542a4174110c375f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 24 04:35:12 2014 +0000 Add irc.oftc.net#tor-bridgedb channel for travis-ci bot. The travis-ci bot cannot currently use #tor-bots due to the +m mode. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3654d0f..354bbd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ notifications: irc: channels: - "irc.oftc.net#tor-bots" + - "irc.oftc.net#tor-bridgedb" template: - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" - "Build details : %{build_url}"

1 0

[bridgedb/develop] Change CHANGELOG entry links to use https://bugs.torproject.org.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 2457a24cdce957f99252cf2e1fda0f63d99c6b7e Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 24 03:16:03 2014 +0000 Change CHANGELOG entry links to use https://bugs.torproject.org. --- CHANGELOG | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 70b8446..7c9e76e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,7 +17,7 @@ Changes in version 0.2.3 - 2014-07-XXX Changes in version 0.2.2 - 2014-06-06 - * FIXES #9874 https://trac.torproject.org/projects/tor/ticket/9874 + * FIXES #9874 https://bugs.torproject.org/9874 BridgeDB's email and HTTPS distributors were written in a manner that makes them largely impossible to write unittests for. Since the recent rewrite of BridgeDB's email distributor server backends @@ -25,7 +25,7 @@ Changes in version 0.2.2 - 2014-06-06 has near 100% code coverage, see https://coveralls.io/r/isislovecruft/bridgedb - * FIXES #12086 https://trac.torproject.org/projects/tor/ticket/12086 + * FIXES #12086 https://bugs.torproject.org/12086 BridgeDB was found to accept incoming emails sent to any email address whose local part included the word bridges, e.g. emails sent to 'givemebridges(a)serious.ly' would be responded to as if @@ -39,7 +39,7 @@ Changes in version 0.2.2 - 2014-06-06 domain name portion of BridgeDB's configured email address, or is a subdomain of that domain. - * FIXES #12089 https://trac.torproject.org/projects/tor/ticket/12089 + * FIXES #12089 https://bugs.torproject.org/12089 There has been a bug for quite some time now where BridgeDB could be used to email arbitrary email addresses (as long as these addresses were ones which BridgeDB allows, i.e. Gmail or Yahoo @@ -52,7 +52,7 @@ Changes in version 0.2.2 - 2014-06-06 addition to the previous checks that the email address' domain is in the set of allowed domains. - * FIXES #12090 https://trac.torproject.org/projects/tor/ticket/12090 + * FIXES #12090 https://bugs.torproject.org/12090 BridgeDB has been replying with an empty email. I don't actually know for sure if this one is fixed. Before deploying version 0.2.1, the continuous integration tests showed email responses @@ -63,14 +63,14 @@ Changes in version 0.2.2 - 2014-06-06 outdated Python version in Debian Wheezy. I have not been able to reproduce this bug on any other machine. - * FIXES #12091 https://trac.torproject.org/projects/tor/ticket/12091 + * FIXES #12091 https://bugs.torproject.org/12091 BridgeDB wasn't properly ignoring emails whose DKIM signature verification header read "X-DKIM-Authentication-Results: dunno". - Bridgedb now marks incoming emails which have a "X-DKIM-Authentication-Results: dunno" header as invalid and ignores them. - * FIXES #12147 https://trac.torproject.org/projects/tor/ticket/12147 + * FIXES #12147 https://bugs.torproject.org/12147 If a user refreshed https://bridges.torproject.org/bridges after successfully solving a CAPTCHA, BridgeDB would reply with a new set of bridges for each page refresh. This was due to the use of @@ -88,7 +88,7 @@ Changes in version 0.2.2 - 2014-06-06 afterwards redirect back to the CAPTCHA page. THANKS TO francisco on IRC and arma for reporting the bug. - * FIXES #12212 https://trac.torproject.org/projects/tor/ticket/12122 + * FIXES #12212 https://bugs.torproject.org/12122 TRANSLATOR comments are now properly extracted into the gettext PO template file. @@ -150,7 +150,7 @@ And include the following general changes: Changes in version 0.2.1 - 2014-05-16 - * FIXES #5463 https://trac.torproject.org/projects/tor/ticket/5463 + * FIXES #5463 https://bugs.torproject.org/5463 Emails sent from BridgeDB's email distributor should now be signed. - BridgeDB's emails will be signed with its online GnuPG keypair. The public key has the following fingerprint: @@ -166,7 +166,7 @@ Changes in version 0.2.1 - 2014-05-16 All of BridgeDB's keys may be found on the public keyservers, as well as at https://bridges.torproject.org/keys - * FIXES #7547 https://trac.torproject.org/projects/tor/ticket/7547 + * FIXES #7547 https://bugs.torproject.org/7547 BridgeDB's email distributor will now send you a message explaining how to use it, including valid commands and the list of Pluggable Transport TYPES currently supported. To receive help @@ -178,16 +178,16 @@ Changes in version 0.2.1 - 2014-05-16 "get help" in the body of your email. - * FIXES #7550 https://trac.torproject.org/projects/tor/ticket/7550 + * FIXES #7550 https://bugs.torproject.org/7550 BridgeDB's email responder is now interactive, as described in the above entry for ticket #7547. - * FIXES #8241 https://trac.torproject.org/projects/tor/ticket/8241 + * FIXES #8241 https://bugs.torproject.org/8241 BridgeDB's HTTP distributor won't tell you how to get obfs3 bridges through email, although a blank email, or an email containing "get help" will. - * CLOSES #9678 https://trac.torproject.org/projects/tor/ticket/9678 + * CLOSES #9678 https://bugs.torproject.org/9678 A "Select Language" button was requested for the HTTP distributor on https://bridges.torproject.org. Instead, translated pages are distributed automatically (via detecting the "Accept-Language" @@ -198,31 +198,31 @@ Changes in version 0.2.1 - 2014-05-16 https://bridges.torproject.org/options?lang=ar will provide the bridge options selection page in Arabic. - * FIXES #11215 https://trac.torproject.org/projects/tor/ticket/11215 + * FIXES #11215 https://bugs.torproject.org/11215 BridgeDB's usage of gimp-captcha, which creates a local cache of CAPTCHA for use on the HTTP distributor, now supports timeouts. If a CAPTCHA is not solved within 30 minutes of being served to a client, the solution is invalid regardless of its correctness. - * FIXES #11475 https://trac.torproject.org/projects/tor/ticket/11475 + * FIXES #11475 https://bugs.torproject.org/11475 BridgeDB's email responder, up until this point, explained how to use bridges with Vidalia. It now uses the same help text as found at https://bridges.torproject.org/howto which explains how to enter bridges into TorLauncher (used by Tor Browser and Tails). - * FIXES #11522 https://trac.torproject.org/projects/tor/ticket/11522 + * FIXES #11522 https://bugs.torproject.org/11522 There were several errors and bugs in BridgeDB's email distributor. The entire system of server supporting BridgeDB's email distribution system was rewritten. - * FIXES #11664 https://trac.torproject.org/projects/tor/ticket/11664 + * FIXES #11664 https://bugs.torproject.org/11664 Due to changes in the Python language builtin `buffer` in Python3, which were backported to Python 2.7.6, but neither backported to Python 2.6.x nor to Python <= 2.7.5, BridgeDB's use of `io.StringIO` and `io.BytesIO` combined with buffers had to be revised to support both the new and old Python `buffer` APIs. - * FIXES #11753 https://trac.torproject.org/projects/tor/ticket/11753 + * FIXES #11753 https://bugs.torproject.org/11753 BridgeDB's emails should now be translated. - The translations system for BridgeDB, as well as the template system for emails, was completely rewritten. By default, email

1 0

[bridgedb/develop] Add EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 41ffd515a47f3254b1cc0ec4a563ed51508899a4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 20:15:34 2014 +0000 Add EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings. * ADD the EMAIL_BLACKLIST setting, which is a list of blacklisted (spammer/harvester) email addresses. * ADD the EMAIL_FUZZY_MATCH setting, which allows for fuzzy matching of the EMAIL_BLACKLIST addresses via the Levenshtein Distance algorithm. --- bridgedb.conf | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 85c86f1..9ea28cb 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -13,13 +13,16 @@ # :authors: The Tor Project, Inc. # :license: This file is freely distributed as part of BridgeDB, see LICENSE # for details. -# :copyright: (c) 2007-2013 The Tor Project, Inc. -# (c) 2007-2013, all sentient entities within the AUTHORS file -# :version: 0.0.9 +# :copyright: (c) 2007-2014 The Tor Project, Inc. +# (c) 2007-2014, all sentient entities within the AUTHORS file +# :version: 0.0.10 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.10 - 2014-07-06 +# * ADD EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings. +# # Changes in version 0.0.9 - 2014-06-06 # * ADD EMAIL_WHITELIST setting. # @@ -311,6 +314,20 @@ EMAIL_DOMAIN_RULES = {'gmail.com': ["ignore_dots", "dkim"], # A mapping of whitelisted email addresses to GnuPG key fingerprints: EMAIL_WHITELIST = {} +# A list of blacklisted email addresses: +EMAIL_BLACKLIST = [] + +# An integer. This number will be used to calculate the Levenshtein String +# Distance between the 'From:' email address on an incoming client request and +# each of the blacklisted email addresses above. If the calculated distance is +# equal or less than the number below, the address is assumed to be related to +# one of the above blacklisted spammers. Basically, this allows for fuzzy +# matching the blacklisted email addresses. Decreasing this number will allow +# more email requests through; increasing will mean that a stricter match to +# one of the blacklisted addresses is required before the address is blocked. +# Set to `0` to disable. +EMAIL_FUZZY_MATCH = 4 + # If there are any IPs in this list, only allow incoming connections from # those IPs. EMAIL_RESTRICT_IPS = []

1 0

[bridgedb/develop] Fuzzy match incoming email addresses.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit feea15673d1690ceb1050c9068eaa85de855b637 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 20:37:05 2014 +0000 Fuzzy match incoming email addresses. * ADD a branch to `bridgedb.email.autoresponder.SMTPAutoresponder.runChecks()` which calculates the Levenshtein Distance of an incoming email address in order to fuzzy match it against those in the EMAIL_BLACKLIST setting. * FIXES #9385: https://trac.torproject.org/projects/tor/ticket/9385 --- lib/bridgedb/email/autoresponder.py | 14 ++++++++++++++ lib/bridgedb/email/server.py | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 3674702..8aa004e 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -38,6 +38,7 @@ from bridgedb.email import request from bridgedb.email import templates from bridgedb.parse import addr from bridgedb.parse.addr import canonicalizeEmailDomain +from bridgedb.util import levenshteinDistance from bridgedb import translations @@ -646,6 +647,19 @@ class SMTPAutoresponder(smtp.SMTPClient): if not dkim.checkDKIM(self.incoming.message, self.incoming.domainRules): return False + # If fuzzy matching is enabled via the EMAIL_FUZZY_MATCH setting, then + # calculate the Levenshtein String Distance (see + # :func:`~bridgedb.util.levenshteinDistance`): + if self.incoming.context.fuzzyMatch != 0: + for blacklistedAddress in self.incoming.context.blacklist: + distance = levenshteinDistance(self.incoming.canonicalFromEmail, + blacklistedAddress) + if distance <= self.incoming.context.fuzzyMatch: + logging.info("Fuzzy-matched %s to blacklisted address %s!" + % (self.incoming.canonicalFromEmail, + blacklistedAddress)) + return False + return True def send(self, response, retries=0, timeout=30, reaktor=reactor): diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 4bcfed9..194e74a 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -57,6 +57,11 @@ class MailServerContext(object): :ivar str fromAddr: Use this address in the email :header:`From:` line for outgoing mail. (default: ``bridges(a)torproject.org``) :ivar int nBridges: The number of bridges to send for each email. + :ivar list blacklist: A list of blacklisted email addresses, taken from + the ``EMAIL_BLACKLIST`` config setting. + :ivar int fuzzyMatch: An integer specifying the maximum Levenshtein + Distance from an incoming email address to a blacklisted email address + for the incoming email to be dropped. :ivar gpgContext: A ``gpgme.GpgmeContext`` (as created by :func:`bridgedb.crypto.getGPGContext`), or None if we couldn't create a proper GPGME context for some reason. @@ -92,6 +97,8 @@ class MailServerContext(object): self.domainMap = config.EMAIL_DOMAIN_MAP or {} self.canon = self.buildCanonicalDomainMap() self.whitelist = config.EMAIL_WHITELIST or {} + self.blacklist = config.EMAIL_BLACKLIST or [] + self.fuzzyMatch = config.EMAIL_FUZZY_MATCH or 0 self.gpgContext = getGPGContext(config)

1 0

[bridgedb/develop] Add Levenshtein Distance function to bridgedb.util module.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 55d05ac4bf876af85078de491de858ed8550dc29 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 19:43:09 2014 +0000 Add Levenshtein Distance function to bridgedb.util module. * ADD new function, `bridgedb.util.levenshteinDistance()`. --- lib/bridgedb/util.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 6d95129..63fd5e6 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -142,6 +142,46 @@ def configureLogging(cfg): logging.info("Level: %s", logLevel) logging.info("Safe Logging: %sabled" % ("En" if safelogging else "Dis")) +def levenshteinDistance(s1, s2, len1=None, len2=None, + offset1=0, offset2=0, memo=None): + """Compute the Levenstein Distance between two strings. + + The `Levenshtein String Distance Algorithm`_ efficiently computes the + number of characters which must be changed in **s1** to make it + identical to **s2**. + + .. `Levenshtein String Distance Algorithm`: + https://en.wikipedia.org/wiki/Levenshtein_distance + + >>> levenshteinDistance('cat', 'cat') + 0 + >>> levenshteinDistance('cat', 'hat') + 1 + >>> levenshteinDistance('arma', 'armadillo') + 5 + + :param str s1: The string which should be changed. + :param str s2: The string which **stringOne** should be compared to. + """ + len1 = len(s1) if len1 is None else len1 + len2 = len(s2) if len2 is None else len2 + memo = {} if memo is None else memo + + key = ','.join([str(offset1), str(len1), str(offset2), str(len2)]) + if memo.get(key) is not None: return memo[key] + + if len1 == 0: return len2 + elif len2 == 0: return len1 + + cost = 0 if (s1[offset1] == s2[offset2]) else 1 + distance = min( + levenshteinDistance(s1, s2, len1-1, len2, offset1+1, offset2, memo) + 1, + levenshteinDistance(s1, s2, len1, len2-1, offset1, offset2+1, memo) + 1, + levenshteinDistance(s1, s2, len1-1, len2-1, offset1+1, offset2+1, memo) + cost, + ) + memo[key] = distance + return distance + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0

[bridgedb/develop] Add unittests for bridgedb.util.levenshteinDistance().
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 387115d8aa4be39da059deb793916defad6f1d0a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 7 12:16:15 2014 +0000 Add unittests for bridgedb.util.levenshteinDistance(). --- lib/bridgedb/test/test_util.py | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/lib/bridgedb/test/test_util.py b/lib/bridgedb/test/test_util.py index a18e1c6..065c401 100644 --- a/lib/bridgedb/test/test_util.py +++ b/lib/bridgedb/test/test_util.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals import os +from twisted.mail.smtp import Address from twisted.trial import unittest from bridgedb import util @@ -58,3 +59,44 @@ class MiscLoggingUtilTests(unittest.TestCase): from bridgedb.persistent import Conf util.configureLogging(Conf()) util.logging.info("BridgeDB's email address: bridges(a)torproject.org") + + +class LevenshteinDistanceTests(unittest.TestCase): + """Unittests for `bridgedb.util.levenshteinDistance.""" + + def test_levenshteinDistance_blank_blank(self): + """The Levenshtein Distance between '' and '' should be 0.""" + distance = util.levenshteinDistance('', '') + self.assertEqual(distance, 0) + + def test_levenshteinDistance_cat_cat(self): + """The Levenshtein Distance between 'cat' and 'cat' should be 0.""" + distance = util.levenshteinDistance('cat', 'cat') + self.assertEqual(distance, 0) + + def test_levenshteinDistance_bat_cat(self): + """The Levenshtein Distance between 'bat' and 'cat' should be 1.""" + distance = util.levenshteinDistance('bat', 'cat') + self.assertEqual(distance, 1) + + def test_levenshteinDistance_bar_cat(self): + """The Levenshtein Distance between 'bar' and 'cat' should be 2.""" + distance = util.levenshteinDistance('bar', 'cat') + self.assertEqual(distance, 2) + + def test_levenshteinDistance_bridgedb_doge(self): + """The Levenshtein Distance between 'bridgedb' and 'doge' should be 6.""" + distance = util.levenshteinDistance('bridgedb', 'doge') + self.assertEqual(distance, 6) + + def test_levenshteinDistance_feidanchaoren0043_feidanchaoren0011(self): + """The Levenshtein Distance between the usernames in + 'feidanchaoren0043(a)gmail.com' and 'feidanchaoren0011(a)gmail.com' should + be less than an EMAIL_FUZZY_MATCH parameter. + """ + email1 = Address('feidanchaoren0043(a)gmail.com') + email2 = Address('feidanchaoren0011(a)gmail.com') + # Fuzzy match if the Levenshtein Distance is less than or equal to: + fuzzyMatch = 4 + distance = util.levenshteinDistance(email1.local, email2.local) + self.assertLessEqual(distance, fuzzyMatch)

1 0

[bridgedb/develop] Add EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings to test/email_helpers.py.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 43e1c994b72bfe0ed99be9d0632d6ae3f95d5292 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 7 12:10:45 2014 +0000 Add EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings to test/email_helpers.py. --- lib/bridgedb/test/email_helpers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index f171419..db52561 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -38,6 +38,8 @@ EMAIL_DOMAIN_RULES = { } EMAIL_DOMAINS = ["gmail.com", "example.com", "localhost"] EMAIL_WHITELIST = {'white(a)list.ed': 'ABCD1234ABCD1234ABCD1234ABCD1234ABCD1234'} +EMAIL_BLACKLIST = ['feidanchaoren'] +EMAIL_FUZZY_MATCH = 4 EMAIL_USERNAME = "bridges" EMAIL_SMTP_HOST = "127.0.0.1" EMAIL_SMTP_PORT = 25 @@ -56,6 +58,8 @@ EMAIL_DOMAIN_MAP = %s EMAIL_DOMAIN_RULES = %s EMAIL_DOMAINS = %s EMAIL_WHITELIST = %s +EMAIL_BLACKLIST = %s +EMAIL_FUZZY_MATCH = %s EMAIL_USERNAME = %s EMAIL_SMTP_HOST = %s EMAIL_SMTP_PORT = %s @@ -72,6 +76,8 @@ EMAIL_PORT = %s repr(EMAIL_DOMAIN_RULES), repr(EMAIL_DOMAINS), repr(EMAIL_WHITELIST), + repr(EMAIL_BLACKLIST), + repr(EMAIL_FUZZY_MATCH), repr(EMAIL_USERNAME), repr(EMAIL_SMTP_HOST), repr(EMAIL_SMTP_PORT),

1 0

[bridgedb/develop] Add unittest for SMTPAutoresponder.runChecks() with blacklisted email.
by isis＠torproject.org 24 Jul '14

24 Jul '14

commit 6a7d9d6de0a0d4cbbdec87d7a13b14cdeae0b686 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 7 16:16:27 2014 +0000 Add unittest for SMTPAutoresponder.runChecks() with blacklisted email. --- lib/bridgedb/test/email_helpers.py | 2 +- lib/bridgedb/test/test_email_autoresponder.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index db52561..867ff58 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -38,7 +38,7 @@ EMAIL_DOMAIN_RULES = { } EMAIL_DOMAINS = ["gmail.com", "example.com", "localhost"] EMAIL_WHITELIST = {'white(a)list.ed': 'ABCD1234ABCD1234ABCD1234ABCD1234ABCD1234'} -EMAIL_BLACKLIST = ['feidanchaoren'] +EMAIL_BLACKLIST = ['feidanchaoren0001(a)gmail.com'] EMAIL_FUZZY_MATCH = 4 EMAIL_USERNAME = "bridges" EMAIL_SMTP_HOST = "127.0.0.1" diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 39cf1bd..c94c909 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -562,3 +562,10 @@ class SMTPAutoresponderTests(unittest.TestCase): self.message.lines.insert(3, header) self._setUpResponder() self.assertFalse(self.responder.runChecks(emailFrom)) + + def test_SMTPAutoresponder_runChecks_blacklisted(self): + """runChecks() on an blacklisted email address should return False.""" + emailFrom = Address('feidanchaoren0043(a)gmail.com') + self._getIncomingLines(str(emailFrom)) + self._setUpResponder() + self.assertFalse(self.responder.runChecks(emailFrom))

1 0

[tor-browser-bundle/master] Remove FTE IPv6 bridges.
by mikeperry＠torproject.org 24 Jul '14

24 Jul '14

commit 9f8d7fcdcb71471805be68d6f9c76a43f2a60e32 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 23 20:16:50 2014 -0700 Remove FTE IPv6 bridges. They were AWS load balancer IPs and may change. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 5abe0cc..b01ad07 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -24,10 +24,6 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> -// <ipv6> -pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -// </ipv6> pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");

1 0