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

[bridgedb/develop] Add TODO: bridgedb.Bridges.BridgeBlock should be a zope.interface.Interface.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 55e760cef839755717d3d9891b8f3d195e18d0e6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 25 00:00:41 2014 +0000 Add TODO: bridgedb.Bridges.BridgeBlock should be a zope.interface.Interface. This does not count as a base class. There is absolutely no point to it. I haven't bothered to do a git blame to see whose idea this was; it doesn't matter. This is NOT A BASE CLASS. Especially when it is an old-style class without a proper method resolution ordering algorithm. --- lib/bridgedb/Bridges.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 0cc9e1f..2439130 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1424,7 +1424,10 @@ class FilteredBridgeSplitter(BridgeHolder): class BridgeBlock(object): - """Base class that abstracts bridge blocking""" + """Base class that abstracts bridge blocking. + + .. TODO:: This should be a zope.interface specification. + """ def __init__(self): pass

1 0

[bridgedb/develop] Run `pylint --rcfile=.pylintrc --generate-rcfile > .pylintrc`.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit f4d755483f5b6d2695410d1ae7c855ea13724279 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 3 14:24:00 2014 +0000 Run `pylint --rcfile=.pylintrc --generate-rcfile > .pylintrc`. This refreshes the pylint config file with new settings from upgrading to version 1.1.0. --- .pylintrc | 213 ++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 149 insertions(+), 64 deletions(-) diff --git a/.pylintrc b/.pylintrc index 6ba152c..0952d2e 100644 --- a/.pylintrc +++ b/.pylintrc @@ -5,6 +5,7 @@ # Python code to execute, usually for sys.path manipulation such as # pygtk.require(). +#init-hook='import sys,os; venv = os.environ.get("VIRTUAL_ENV"); v = os.path.join(venv, "lib", "python" + str(sys.version_info.major) + "." + str(sys.version_info.micro), "site-packages") if venv is not None else None; sys.path.insert(0, v);' init-hook="import sys,os;a=os.getcwd();print a;sys.path.insert(0, os.path.join(a, 'lib'));" # Profiled execution. @@ -26,20 +27,26 @@ load-plugins= # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option -# multiple time. +# multiple time. See also the "--disable" option for examples. #enable= # Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). -disable=W1201,W1401 +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once).You can also use "--disable=all" to +# disable everything first and then reenable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use"--disable=all --enable=classes +# --disable=W" +disable=W1201,W1401,F0401 [REPORTS] # Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html +# (visual studio) and html. You can also give a reporter class, eg +# mypackage.mymodule.MyReporterClass. output-format=text # Include message's id in output @@ -64,6 +71,58 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme # evaluation report (RP0004). comment=no +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details +#msg-template= + + +[SIMILARITIES] + +# Minimum lines number of a similarity. +min-similarity-lines=4 + +# Ignore comments when computing similarities. +ignore-comments=yes + +# Ignore docstrings when computing similarities. +ignore-docstrings=yes + +# Ignore imports when computing similarities. +ignore-imports=no + + +[LOGGING] + +# Logging modules to check that the string format arguments are in logging +# function parameter format +logging-modules=logging + + +[FORMAT] + +# Maximum number of characters on a single line. +max-line-length=79 + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )?<?https?://\S+>?$ + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=yes + +# List of optional constructs for which whitespace checking is disabled +no-space-check=trailing-comma,dict-separator + +# Maximum number of lines in a module +max-module-lines=1500 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + [BASIC] @@ -71,70 +130,88 @@ comment=no required-attributes= # List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input +bad-functions=filter,apply,input -# Regular expression which should only match correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ +# Good variable names which should always be accepted, separated by a comma +good-names=i,j,k,ex,Run,_,err,exc,func,fn,fh -# Regular expression which should only match correct module level names -const-rgx=(([a-zA-Z0-9_]*)|(__.*__))$ +# Bad variable names which should always be refused, separated by a comma +bad-names=foo,bar,baz,toto,tutu,tata -# Regular expression which should only match correct class names -class-rgx=[A-Z_][a-zA-Z0-9]+$ +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= -# Regular expression which should only match correct function names +# Include a hint for the correct naming format with invalid-name +include-naming-hint=no + +# Regular expression matching correct function names function-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ -# Regular expression which should only match correct method names -method-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ +# Naming hint for function names +function-name-hint=[a-z_][a-z0-9_]{2,30}$ -# Regular expression which should only match correct instance attribute names -attr-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ +# Regular expression matching correct variable names +variable-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ -# Regular expression which should only match correct argument names -argument-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ +# Naming hint for variable names +variable-name-hint=[a-z_][a-z0-9_]{2,30}$ -# Regular expression which should only match correct variable names -variable-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ +# Regular expression matching correct constant names +const-rgx=(([a-zA-Z0-9_]*)|(__.*__))$ -# Regular expression which should only match correct list comprehension / -# generator expression variable names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ +# Naming hint for constant names +const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ -# Good variable names which should always be accepted, separated by a comma -good-names=i,j,k,ex,Run,_,err,exc,func,fn,fh +# Regular expression matching correct attribute names +attr-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata +# Naming hint for attribute names +attr-name-hint=[a-z_][a-z0-9_]{2,30}$ -# Regular expression which should only match functions or classes name which do -# not require a docstring -no-docstring-rgx=__.*__ +# Regular expression matching correct argument names +argument-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ +# Naming hint for argument names +argument-name-hint=[a-z_][a-z0-9_]{2,30}$ -[FORMAT] +# Regular expression matching correct class attribute names +class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -# Maximum number of characters on a single line. -max-line-length=79 +# Naming hint for class attribute names +class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -# Maximum number of lines in a module -max-module-lines=1500 +# Regular expression matching correct inline iteration names +inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' +# Naming hint for inline iteration names +inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ +# Regular expression matching correct class names +class-rgx=[A-Z_][a-zA-Z0-9]+$ -[SIMILARITIES] +# Naming hint for class names +class-name-hint=[A-Z_][a-zA-Z0-9]+$ -# Minimum lines number of a similarity. -min-similarity-lines=4 +# Regular expression matching correct module names +module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ -# Ignore comments when computing similarities. -ignore-comments=yes +# Naming hint for module names +module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ -# Ignore docstrings when computing similarities. -ignore-docstrings=yes +# Regular expression matching correct method names +method-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ + +# Naming hint for method names +method-name-hint=[a-z_][a-z0-9_]{2,30}$ + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=__.*__ + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 [TYPECHECK] @@ -143,6 +220,11 @@ ignore-docstrings=yes # mixin class is detected if its name ends with "mixin" (case insensitive). ignore-mixin-members=yes +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus extisting member attributes cannot be deduced by static analysis +ignored-modules=twisted.internet.reactor + # List of classes names for which member attributes should not be checked # (useful for classes with attributes dynamically set). ignored-classes=SQLObject @@ -162,8 +244,8 @@ generated-members=REQUEST,acl_users,aq_parent # Tells whether we should check for unused import in __init__ files. init-import=yes -# A regular expression matching the beginning of the name of dummy variables -# (i.e. not used). +# A regular expression matching the name of dummy variables (i.e. expectedly +# not used). dummy-variables-rgx=_|dummy # List of additional names supposed to be defined in builtins. Remember that @@ -177,6 +259,22 @@ additional-builtins= notes=FIXME,XXX,DOC +[CLASSES] + +# List of interface methods to ignore, separated by a comma. This is used for +# instance to not check methods defines in Zope's Interface base class. +ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__,__new__,setUp + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=mcs + + [IMPORTS] # Deprecated modules which should not be used, separated by a comma @@ -184,7 +282,7 @@ deprecated-modules=regsub,string,TERMIOS,Bastion,rexec,sha # Create a graph of every (i.e. internal and external) dependencies in the # given file (report RP0402 must not be disabled) -#import-graph=pylint-import-graph.plain +import-graph= # Create a graph of external dependencies in the given file (report RP0402 must # not be disabled) @@ -195,19 +293,6 @@ ext-import-graph= int-import-graph= -[CLASSES] - -# List of interface methods to ignore, separated by a comma. This is used for -# instance to not check methods defines in Zope's Interface base class. -ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - - [DESIGN] # Maximum number of arguments for function / method @@ -224,7 +309,7 @@ max-locals=15 max-returns=6 # Maximum number of branch for function / method body -max-branchs=12 +max-branches=12 # Maximum number of statements in function / method body max-statements=50

1 0

[bridgedb/develop] Change bridgedb.test.util.TestCaseMixin to be a bridgedb.util.mixin.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 207cec93a3fcb3f3f18eb0e817cb43cf0d82bd9d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 3 14:14:44 2014 +0000 Change bridgedb.test.util.TestCaseMixin to be a bridgedb.util.mixin. --- lib/bridgedb/test/util.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index ca68d1d..3bc2e56 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -14,7 +14,6 @@ from __future__ import print_function from __future__ import unicode_literals -import abc import doctest import os @@ -22,6 +21,8 @@ from functools import wraps from twisted.trial import unittest +from bridgedb import util as bdbutil + def fileCheckDecorator(func): """Method decorator for a t.t.unittest.TestCase test_* method. @@ -66,9 +67,11 @@ def fileCheckDecorator(func): return wrapper -class TestCaseMixin: - """Subclasses of me can be used as mix-in classes with ``TestCase``s.""" - __metaclass__ = abc.ABCMeta +#: Mixin class for use with :api:`~twisted.trial.unittest.TestCase`. A +#: ``TestCaseMixin`` can be used to add additional methods, which should be +#: common to multiple ``TestCase`` subclasses, without the ``TestCaseMixin`` +#: being run as a ``TestCase`` by ``twisted.trial``. +TestCaseMixin = bdbutil.mixin TestCaseMixin.register(unittest.TestCase)

1 0

[bridgedb/develop] Add pip requirements.txt file for testsuite dependencies.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit ece0df775f3b83a5c0ce677fb9f5b899d3969201 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 3 14:30:46 2014 +0000 Add pip requirements.txt file for testsuite dependencies. * ADD new file, .test.requirements.txt, for specifying packages and their versions which are required for running BridgeDB's test suite. --- .test.requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.test.requirements.txt b/.test.requirements.txt new file mode 100644 index 0000000..dad35c5 --- /dev/null +++ b/.test.requirements.txt @@ -0,0 +1,15 @@ +# This is a pip requirements.txt file for running bridgedb's tests. +# +# To run install these dependencies and run the tests, do: +# +# $ pip install -r .test.requirements.txt +# $ make coverage +# +coverage==3.7.1 +leekspin==0.1.4 +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 +Twisted==13.2.0

1 0

[bridgedb/develop] Makefile `clean` target now cleans up coverage-html directory.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 024c978f322dfafce01309ba1fdbc26b70651c86 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 7 12:48:46 2014 +0000 Makefile `clean` target now cleans up coverage-html directory. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4bd5f14..6d7acd2 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,10 @@ docs: clean-docs: -rm -rf build/sphinx -clean: +clean-coverage-html: + -rm -rf doc/coverage-html + +clean: clean-docs clean-coverage-html -rm -rf build -rm -rf dist -rm -rf lib/bridgedb.egg-info

1 0

[bridgedb/develop] Don't allow coverage-test or coverage-html to fail in Makefile.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 33cf0d78f54691e084f5ec2275ef753b9d8e3c4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 12:51:10 2014 +0000 Don't allow coverage-test or coverage-html to fail in Makefile. Something lately has been causeing Travis CI to sometimes not report a build failure when a unittest fails. Removing the dashes before these commands in the hopes that this was the problem. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0184291..4bd5f14 100644 --- a/Makefile +++ b/Makefile @@ -53,10 +53,10 @@ clean: -rm -rf _trial_temp coverage-test: - -coverage run --rcfile=".coveragerc" $(TRIAL) ./lib/bridgedb/test/test_*.py - -coverage report --rcfile=".coveragerc" + coverage run --rcfile=".coveragerc" $(TRIAL) ./lib/bridgedb/test/test_*.py + coverage report --rcfile=".coveragerc" coverage-html: - -coverage html --rcfile=".coveragerc" + coverage html --rcfile=".coveragerc" coverage: coverage-test coverage-html

1 0

[bridgedb/develop] Allow SMTP 'RCPT TO: bridges@bridgedb'.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 7b14664ed9b2c7fd031c930495362838fe0f95b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jun 7 02:19:28 2014 +0000 Allow SMTP 'RCPT TO: bridges@bridgedb'. --- lib/bridgedb/email/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index f57b957..7c86395 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -316,7 +316,8 @@ class SMTPIncomingDelivery(smtp.SMTP): recipient = user.dest ourAddress = smtp.Address(self.context.smtpFromAddr) - if not (ourAddress.domain in recipient.domain): + if not ((ourAddress.domain in recipient.domain) or + (recipient.domain == "bridgedb")): logging.debug(("Not our domain (%s) or subdomain, skipping" " SMTP 'RCPT TO' address: %s") % (ourAddress.domain, str(recipient)))

1 0

[bridgedb/develop] Fix a bug where incoming unicode emails caused logging errors.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 891b75afc307b74173aa37095527f531e47bc4a6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jun 7 02:11:33 2014 +0000 Fix a bug where incoming unicode emails caused logging errors. The stupid Python stdlib logging module doesn't handle unicode at all. If debugging is turned on, and SAFELOGGING is disabled, the incoming emails are logged. If they have any unicode characters, processing of the emails stops due to UnicodeDecodeErrors. --- lib/bridgedb/email/server.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 94405ea..f57b957 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -174,7 +174,13 @@ class SMTPMessage(object): else: self.lines.append(line) if not safelog.safe_logging: - logging.debug("> %s", line.rstrip("\r\n")) + try: + logging.debug("> %s", line.rstrip("\r\n")) + except UnicodeError: # pragma: no cover + pass + except Exception as error: # pragma: no cover + logging.error("Error while trying to log incoming email") + logging.exception(error) def eomReceived(self): """Tell the :ivar:`responder` to reply when we receive an EOM."""

1 0

[bridgedb/develop] Add additional unittest assertion to test_SMTPAutoresponder_getMailTo_UnsupportedDomain().
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 5596d18f69da58e7bd772fa63e7674fe0e716efb Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jun 7 03:02:43 2014 +0000 Add additional unittest assertion to test_SMTPAutoresponder_getMailTo_UnsupportedDomain(). If anything in this list ends up in the list of permitted client email addresses, we should know about it, and also fail the test. --- lib/bridgedb/test/test_email_autoresponder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 3cc802b..39cf1bd 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -397,9 +397,11 @@ class SMTPAutoresponderTests(unittest.TestCase): self.assertIsInstance(clients, list, ( "Returned value of SMTPAutoresponder.getMailTo() isn't a list! " "Type: %s" % type(clients))) + self.assertTrue(emailFrom not in clients) # The client was from an unsupported domain; they shouldn't be in the # clients list: - self.assertEqual(len(clients), 0) + self.assertEqual(len(clients), 0, + "clients = %s" % repr(clients)) def test_SMTPAutoresponder_reply_noFrom(self): """A received email without a "From:" or "Sender:" header shouldn't

1 0

[bridgedb/develop] Add rudimentary (email_addr, gpg_key_fingerprint) whitelist feature.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 5595c9a5384d2ce1ec2e6420192254221ce7b774 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jun 7 02:41:15 2014 +0000 Add rudimentary (email_addr,gpg_key_fingerprint) whitelist feature. This serves two purposes. It allows arbitrary whitelisting of certain email addresses for testing purposes, and once #9332 is fully implemented, will allow encrypted emails to be sent to these whitelisted addresses. * FIXES part of #9332. --- bridgedb.conf | 8 +++++++- lib/bridgedb/email/autoresponder.py | 28 +++++++++++++++++++++++----- lib/bridgedb/email/server.py | 9 +++++++++ lib/bridgedb/test/email_helpers.py | 3 +++ 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index eac6a34..85c86f1 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,14 @@ # for details. # :copyright: (c) 2007-2013 The Tor Project, Inc. # (c) 2007-2013, all sentient entities within the AUTHORS file -# :version: 0.0.8 +# :version: 0.0.9 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.9 - 2014-06-06 +# * ADD EMAIL_WHITELIST setting. +# # Changes in version 0.0.8 - 2014-05-14 # * CHANGE RECAPTCHA_PRIV_KEY to RECAPTCHA_SEC_KEY. # @@ -305,6 +308,9 @@ EMAIL_DOMAIN_MAP = {"mail.google.com": "gmail.com", EMAIL_DOMAIN_RULES = {'gmail.com': ["ignore_dots", "dkim"], 'yahoo.com': ["dkim"]} +# A mapping of whitelisted email addresses to GnuPG key fingerprints: +EMAIL_WHITELIST = {} + # If there are any IPs in this list, only allow incoming connections from # those IPs. EMAIL_RESTRICT_IPS = [] diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 9be7e7d..2556da9 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -433,15 +433,27 @@ class SMTPAutoresponder(smtp.SMTPClient): if not addrHeader: logging.warn("No Sender header on incoming mail.") else: + client = None try: - client = smtp.Address(addr.normalizeEmail( + normalized = addr.normalizeEmail( addrHeader, self.incoming.context.domainMap, - self.incoming.context.domainRules)) - except (addr.UnsupportedDomain, addr.BadEmail, - smtp.AddressError) as error: + self.incoming.context.domainRules) + client = smtp.Address(normalized) + except (addr.UnsupportedDomain, addr.BadEmail) as error: logging.warn(error) - else: + # Check if it was one of the whitelisted addresses, because + # then it would make sense that it couldn't be canonicalized: + try: client = smtp.Address(addrHeader) + except smtp.AddressError as error: pass + else: + if str(client) in self.incoming.context.whitelist.keys(): + logging.debug("Email address was whitelisted: %s." + % str(client)) + except smtp.AddressError as error: + logging.warn(error) + + if client: clients.append(client) return clients @@ -594,6 +606,9 @@ class SMTPAutoresponder(smtp.SMTPClient): return False logging.debug("Canonicalizing client email domain...") + # Allow whitelisted addresses through the canonicalization check: + if str(client) in self.incoming.context.whitelist.keys(): + canonicalFromEmail = client.domain # The client's address was already checked to see if it came from a # supported domain and is a valid email address in :meth:`getMailTo`, # so we should just be able to re-extract the canonical domain safely @@ -606,6 +621,9 @@ class SMTPAutoresponder(smtp.SMTPClient): # ``From:`` header should match: if self.incoming.canonicalFromSMTP != canonicalFromEmail: logging.error("SMTP/Email canonical domain mismatch!") + logging.debug("Canonical domain mismatch: %s != %s" + % (self.incoming.canonicalFromSMTP, + canonicalFromEmail)) return False domainRules = self.incoming.context.domainRules.get( diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 7c86395..62d3bff 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -91,6 +91,7 @@ class MailServerContext(object): self.domainRules = config.EMAIL_DOMAIN_RULES or {} self.domainMap = config.EMAIL_DOMAIN_MAP or {} self.canon = self.buildCanonicalDomainMap() + self.whitelist = config.EMAIL_WHITELIST or {} self.gpgContext = getGPGContext(config) @@ -276,6 +277,14 @@ class SMTPIncomingDelivery(smtp.SMTP): error. """ try: + if str(origin) in self.context.whitelist.keys(): + logging.warn("Got SMTP 'MAIL FROM:' whitelisted address: %s." + % str(origin)) + # We need to be certain later that when the fromCanonicalSMTP + # domain is checked again the email 'From:' canonical domain, + # that we allow whitelisted addresses through the check. + self.fromCanonicalSMTP = origin.domain + return origin if ((origin.domain == self.context.hostname) or (origin.domain == smtp.DNSNAME)): self.fromCanonicalSMTP = origin.domain diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index 59b3aa8..f171419 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -37,6 +37,7 @@ EMAIL_DOMAIN_RULES = { 'localhost': [], } EMAIL_DOMAINS = ["gmail.com", "example.com", "localhost"] +EMAIL_WHITELIST = {'white(a)list.ed': 'ABCD1234ABCD1234ABCD1234ABCD1234ABCD1234'} EMAIL_USERNAME = "bridges" EMAIL_SMTP_HOST = "127.0.0.1" EMAIL_SMTP_PORT = 25 @@ -54,6 +55,7 @@ EMAIL_GPG_SIGNING_KEY = %s EMAIL_DOMAIN_MAP = %s EMAIL_DOMAIN_RULES = %s EMAIL_DOMAINS = %s +EMAIL_WHITELIST = %s EMAIL_USERNAME = %s EMAIL_SMTP_HOST = %s EMAIL_SMTP_PORT = %s @@ -69,6 +71,7 @@ EMAIL_PORT = %s repr(EMAIL_DOMAIN_MAP), repr(EMAIL_DOMAIN_RULES), repr(EMAIL_DOMAINS), + repr(EMAIL_WHITELIST), repr(EMAIL_USERNAME), repr(EMAIL_SMTP_HOST), repr(EMAIL_SMTP_PORT),

1 0