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

[bridgedb/master] Update Twisted==13.1.0 to Twisted==13.2.0 in requirements.txt.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 44497f79362e06222213d7139ef08f1341929c01 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:18:28 2014 +0000 Update Twisted==13.1.0 to Twisted==13.2.0 in requirements.txt. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f07f1a1..c84313d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 -Twisted==13.1.0 +Twisted==13.2.0 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pyOpenSSL==0.13.1

1 0

[bridgedb/master] Add --quiet options to apt-get and pip during TravisCI builds.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 3044c3f266f28ff6f04ab4590ee9d5520040ec17 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:31:19 2014 +0000 Add --quiet options to apt-get and pip during TravisCI builds. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e3db1e..7c0429e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,8 @@ python: - "2.7" install: - - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools - - pip install -r requirements.txt + - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools + - pip install -q -r requirements.txt - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7.1 coveralls==0.4.2 sure==1.2.2 - make install

1 0

[bridgedb/master] Refactor bridgedb.email.server.MailMessage.getRecipient().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 1c8c02eac6449100ebee951d31c21268538e8951 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 03:08:47 2014 +0000 Refactor bridgedb.email.server.MailMessage.getRecipient(). * CHANGE to using only one try/except block for `smtp.AddressError`s. We should probably assume that our EMAIL_SMTP_FROM_ADDR in the config file is correctly formed, and not bother logging the special case if it is not. Instead, just log all `smtp.AddressError`s in the same manner. * CHANGE variable names to make code clearer. --- lib/bridgedb/email/server.py | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 03643dc..09df526 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -570,26 +570,21 @@ class MailMessage(object): :return: Our address from the recipients list. If we can't find it return our default ``SMTP_FROM_ADDRESS`` from the config file. """ - address = self.context.fromAddr - addressList = incoming.getaddrlist("To") + ourAddress = self.context.fromAddr try: - ours = smtp.Address(address) + ourAddress = smtp.Address(ourAddress) + allRecipients = incoming.getaddrlist("To") + for _, addr in allRecipients: + recipient = smtp.Address(addr) + # See if the user looks familiar. We do a 'find' instead of + # compare because we might have a '+' address here. + if recipient.local.find(ourAddress.local) != -1: + return '@'.join([recipient.local, recipient.domain]) except smtp.AddressError as error: - logging.warn("Our address seems invalid: %r" % address) logging.warn(error) - else: - for _, addr in addressList: - try: - maybeOurs = smtp.Address(addr) - except smtp.AddressError: - pass - else: - # See if the user looks familiar. We do a 'find' instead of - # compare because we might have a '+' address here. - if maybeOurs.local.find(ours.local) != -1: - return '@'.join([maybeOurs.local, maybeOurs.domain]) - return address + + return ourAddress def getCanonicalDomain(self, domain): try:

1 0

[bridgedb/master] Rename unittest methods for bridgedb.email.server.MailResponse.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit c171ba31a87f019c83a3947ebf7dd2d729057047 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 04:11:22 2014 +0000 Rename unittest methods for bridgedb.email.server.MailResponse. --- lib/bridgedb/test/test_email_server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index ebb9b85..01be6a7 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -227,30 +227,30 @@ a ball of timey-wimey, wibbly-warbly... stuff.""" def tearDown(self): server.safelog.safe_logging = True - def test_generateResponse(self): + def test_MailResponse_generateResponse(self): response = server.generateResponse(self.fromAddr, self.clientAddr, self.body) self.assertIsInstance(response, server.MailResponse) - def test_generateResponse_noSafelog(self): + def test_MailResponse_generateResponse_noSafelog(self): server.safelog.safe_logging = False response = server.generateResponse(self.fromAddr, self.clientAddr, self.body) self.assertIsInstance(response, server.MailResponse) - def test_generateResponse_mailfile(self): + def test_MailResponse_generateResponse_mailfile(self): response = server.generateResponse(self.fromAddr, self.clientAddr, self.body) self.assertIsInstance(response.mailfile, (io.BytesIO, io.StringIO)) - def test_generateResponse_withInReplyTo(self): + def test_MailResponse_generateResponse_withInReplyTo(self): response = server.generateResponse(self.fromAddr, self.clientAddr, self.body, messageID="NSA") contents = str(response.readContents()).replace('\x00', '') self.assertIsInstance(response.mailfile, (io.BytesIO, io.StringIO)) self.assertSubstring("In-Reply-To: NSA", contents) - def test_generateResponse_readContents(self): + def test_MailResponse_generateResponse_readContents(self): response = server.generateResponse(self.fromAddr, self.clientAddr, self.body) contents = str(response.readContents()).replace('\x00', '')

1 0

[bridgedb/master] Pin zope.interface==3.6.1 (current Debian stable version) in requirements.txt.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 17defaa16a9a5fb44b21dc1d4c1a488a2200389f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:21:09 2014 +0000 Pin zope.interface==3.6.1 (current Debian stable version) in requirements.txt. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c84313d..de393b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ pyOpenSSL==0.13.1 pygeoip==0.2.7 pygpgme==0.3 recaptcha-client==1.0.6 -zope.interface>=4.0.5 +zope.interface==3.6.1

1 0

[bridgedb/master] Simplify MailResponse by removing extra file I/O methods.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit cc3b60859dd85083053c989ebd3b1704fe867a75 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 04:18:02 2014 +0000 Simplify MailResponse by removing extra file I/O methods. The only one we really need is MailResponse.close(), the utility methods (i.e. MailResponse.rewind()) handle other important functionality for us. * REMOVE bridgedb.email.server.MailResponse.flush() * REMOVE bridgedb.email.server.MailResponse.read() * REMOVE bridgedb.email.server.MailResponse.readline() * REMOVE bridgedb.email.server.MailResponse.readlines() * REMOVE bridgedb.email.server.MailResponse.seek() * REMOVE bridgedb.email.server.MailResponse.tell() * REMOVE bridgedb.email.server.MailResponse.truncate() --- lib/bridgedb/email/server.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 077bc17..079960a 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -315,33 +315,6 @@ class MailResponse(object): self.closed = True close.__doc__ = mailfile.close.__doc__ - def flush(self, *args, **kwargs): self.mailfile.flush(*args, **kwargs) - flush.__doc__ = mailfile.flush.__doc__ - - def read(self, *args, **kwargs): - self.mailfile.read(*args, **kwargs) - read.__doc__ = mailfile.read.__doc__ - - def readline(self, *args, **kwargs): - self.mailfile.readline(*args, **kwargs) - readline.__doc__ = mailfile.readline.__doc__ - - def readlines(self, *args, **kwargs): - self.mailfile.readlines(*args, **kwargs) - readlines.__doc__ = mailfile.readlines.__doc__ - - def seek(self, *args, **kwargs): - self.mailfile.seek(*args, **kwargs) - seek.__doc__ = mailfile.seek.__doc__ - - def tell(self, *args, **kwargs): - self.mailfile.tell(*args, **kwargs) - tell.__doc__ = mailfile.tell.__doc__ - - def truncate(self, *args, **kwargs): - self.mailfile.truncate(*args, **kwargs) - truncate.__doc__ = mailfile.truncate.__doc__ - # The following are custom methods to control reading and writing to the # underlying ``mailfile``. @@ -361,7 +334,7 @@ class MailResponse(object): def rewind(self): """Rewind to the very beginning of the :cvar:`mailfile`.""" - self.seek(0) + self.mailfile.seek(0) def write(self, line): """Any **line** written to me will have ``'\r\n'`` appended to it."""

1 0

[bridgedb/master] Create TravisCI build matrix for testing dependency versions.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 86b02570461415236e7a8dc86335ec0e82ecdb6d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:54:54 2014 +0000 Create TravisCI build matrix for testing dependency versions. --- .travis.requirements.txt | 9 +++++++++ .travis.yml | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt new file mode 100644 index 0000000..e018631 --- /dev/null +++ b/.travis.requirements.txt @@ -0,0 +1,9 @@ +Babel==0.9.6 +BeautifulSoup==3.2.1 +Mako==0.8.1 +https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7 +pycrypto==2.6.1 +pygeoip==0.2.7 +pygpgme==0.3 +recaptcha-client==1.0.6 +zope.interface==3.6.1 diff --git a/.travis.yml b/.travis.yml index 7c0429e..1338608 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ notifications: irc: channels: - "irc.oftc.net#tor-bots" + template: + - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" + - "Build details : %{build_url}" on_success: always on_failure: always - template: - - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" - - "Build details : %{build_url}" email: recipients: - isis(a)torproject.org @@ -16,20 +16,40 @@ notifications: on_success: never on_failure: change +python: + - "2.7" + - "pypy" + addons: hosts: - bridges.torproject.org +env: + global: + - LEEKSPIN_VERSION=0.1.3 + - COVERAGE_VERSION=3.7.1 + - COVERALLS_VERSION=0.4.2 + - SURE_VERSION=1.2.2 + matrix: + - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1 + +matrix: + include: + - python: "2.7" + env: TWISTED_VERSION=14.0.0 PYOPENSSL_VERSION=0.14 + allow_failures: + - python: "pypy" + fast_finish: true + before_install: - sudo apt-get update -python: - - "2.7" - install: - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools - - pip install -q -r requirements.txt - - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7.1 coveralls==0.4.2 sure==1.2.2 + - pip install -q -r .travis.requirements.txt + - pip install -q --no-use-wheel leekspin==$LEEKSPIN_VERSION sure==$SURE_VERSION + - pip install -q --no-use-wheel coverage==$COVERAGE_VERSION coveralls==$COVERALLS_VERSION + - pip install -q --no-use-wheel Twisted==$TWISTED_VERSION pyOpenSSL==$PYOPENSSL_VERSION - make install script:

1 0

[bridgedb/master] Add unittests for MailResponse close(), write(), and writelines() methods.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 7e6a652878ba3e7c29751540579ca12f01424a3a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 04:12:10 2014 +0000 Add unittests for MailResponse close(), write(), and writelines() methods. --- lib/bridgedb/test/test_email_server.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index 01be6a7..7805458 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -266,6 +266,32 @@ a ball of timey-wimey, wibbly-warbly... stuff.""" self.assertSubstring("In-Reply-To: NSA", contents) self.assertSubstring("X-been-there: They were so 2004", contents) + def test_MailResponse_close(self): + """Calling MailResponse.close() should close the ``mailfile`` and set + ``closed=True``. + """ + response = server.MailResponse() + self.assertEqual(response.closed, False) + response.close() + self.assertEqual(response.closed, True) + self.assertRaises(ValueError, response.write, self.body) + + def test_MailResponse_write(self): + """Calling MailResponse.write() should write to the mailfile.""" + response = server.MailResponse() + response.write(self.body) + contents = str(response.readContents()).replace('\x00', '') + self.assertEqual(self.body.replace('\n', '\r\n') + '\r\n', contents) + + def test_MailResponse_writelines(self): + """Calling MailResponse.writelines() with a list should write the + concatenated contents of the list into the mailfile. + """ + response = server.MailResponse() + response.writelines(self.body.split('\n')) + contents = str(response.readContents()).replace('\x00', '') + self.assertEqual(self.body.replace('\n', '\r\n') + '\r\n', contents) + class MailMessageTests(unittest.TestCase): """Unittests for :class:`bridgedb.email.server.MailMessage`."""

1 0

[bridgedb/master] Fix misnamed methods in MailMessage.reply() docstring.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 3e34dfdc2c841da487d50ffcb9dd17f546c3f8a3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 04:23:42 2014 +0000 Fix misnamed methods in MailMessage.reply() docstring. --- lib/bridgedb/email/server.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 43acd99..2684d00 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -545,12 +545,12 @@ class MailMessage(object): def reply(self): """Reply to an incoming email. Maybe. - If no `response` is returned from :func:`createMailResponse`, then the - incoming email will not be responded to at all. This can happen for - several reasons, for example: if the DKIM signature was invalid or - missing, or if the incoming email came from an unacceptable domain, or - if there have been too many emails from this client in the allotted - time period. + If nothing is returned from either :func:`createResponseBody` or + :func:`generateResponse`, then the incoming email will not be + responded to at all. This can happen for several reasons, for example: + if the DKIM signature was invalid or missing, or if the incoming email + came from an unacceptable domain, or if there have been too many + emails from this client in the allotted time period. :rtype: :api:`twisted.internet.defer.Deferred` :returns: A ``Deferred`` which will callback when the response has

1 0

[bridgedb/master] Fix bug in MailResponse.write() multiline string handling.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 212d6dfe9866a9a2d6c60dd6e43e93e6f14908ac Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 04:20:56 2014 +0000 Fix bug in MailResponse.write() multiline string handling. The bridgedb.email.server.MailResponse.write() method wasn't properly converting '\n' newlines in multiline strings to SMTP-formatted '\r\n' newlines. * FIXES multiline string newline replacement bug in bridgedb.email.server.MailResponse.write() method. --- lib/bridgedb/email/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 079960a..43acd99 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -338,8 +338,13 @@ class MailResponse(object): def write(self, line): """Any **line** written to me will have ``'\r\n'`` appended to it.""" - self.mailfile.write(self._buff(line + '\r\n')) - self.mailfile.flush() + if line.find('\n') != -1: + # If **line** contains newlines, send it to :meth:`writelines` to + # break it up so that we can replace them with '\r\n': + self.writelines(line) + else: + self.mailfile.write(self._buff(line + '\r\n')) + self.mailfile.flush() def writelines(self, lines): """Calls :meth:`write` for each line in **lines**."""

1 0