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

[bridgedb/master] Move several test dependencies from .travis.yml to .travis.requirements.txt.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 3c9b8732a5c9119837212056306deb4353d6e7bd Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 06:06:31 2014 +0000 Move several test dependencies from .travis.yml to .travis.requirements.txt. --- .travis.requirements.txt | 24 ++++++++++++++++++++++++ .travis.yml | 7 ------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index e018631..428438a 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -1,3 +1,27 @@ +# +# This is a pip requirements.txt file for running BridgeDB's tests on Travis +# See https://travis-ci.org/ and the .travis.yml file for more info. Please +# note that there may be additional dependencies not listed here but specified +# with their version numbers in .travis.yml in order to submit test runs which +# use multiple different dependency versions. +# +#------------------------------------------------------------------------------ +# +# To run install these dependencies and run the tests, do: +# +# $ pip install -r .test.requirements.txt +# $ make coverage +# +#------------------------------------------------------------------------------ +coverage==3.7.1 +coveralls==0.4.2 +leekspin==0.1.4 +mechanize==0.2.5 +pep8==1.5.7 +# pylint must be pinned until pylint bug #203 is fixed. See +# https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages… +pylint==1.1.0 +sure==1.2.2 Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 diff --git a/.travis.yml b/.travis.yml index 7374fa7..9066fc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,11 +26,6 @@ addons: - bridges.torproject.org env: - global: - - LEEKSPIN_VERSION=0.1.4 - - 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 @@ -48,8 +43,6 @@ before_install: 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 .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

1 0

[bridgedb/master] Also copy gnupghome/ to run/ in .travis.yml 'before_script'.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 8d47543523f9120f8ea0fd93612782f50fcbe941 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 07:52:08 2014 +0000 Also copy gnupghome/ to run/ in .travis.yml 'before_script'. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d8edafb..a3771b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Start a BridgeDB instance before running the tests: before_script: - mkdir run - - cp -R -t run bridgedb.conf captchas + - cp -R -t run bridgedb.conf captchas gnupghome - leekspin -n 100 - cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors - ./scripts/make-ssl-cert

1 0

[bridgedb/master] Add --no-use-wheel when pip installing Travis CI dependencies.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit e01aedc7ebe9cd767c87e2f0ee1ad4fd1cf4e21f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 06:16:34 2014 +0000 Add --no-use-wheel when pip installing Travis CI dependencies. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9066fc7..e664a26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ before_install: 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 .travis.requirements.txt + - pip install -q --no-use-wheel -r .travis.requirements.txt - pip install -q --no-use-wheel Twisted==$TWISTED_VERSION pyOpenSSL==$PYOPENSSL_VERSION - make install

1 0

[bridgedb/master] Add file header to lib/bridgedb/test/test_https.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit e96ebb1b02f704a30fe63da863d2ea714d1ad1ec Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 09:47:43 2014 +0000 Add file header to lib/bridgedb/test/test_https.py. --- lib/bridgedb/test/test_https.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 46da832..8e0fc50 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -1,3 +1,12 @@ +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: trygve <tor-dev(a)lists.torproject.org> +# :copyright: (c) trygve +# (c) 2014, The Tor Project, Inc. +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ """integration tests for BridgeDB . http://wwwsearch.sourceforge.net/mechanize/ http://www.crummy.com/software/BeautifulSoup/bs3/documentation.html

1 0

[bridgedb/master] Add test_smtp.py by trygve.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit c3e6c2168e48dcf51b5c57aa3061a213bd8fb39c Author: trygve <tor-dev(a)lists.torproject.org> Date: Thu Aug 7 09:50:56 2014 +0000 Add test_smtp.py by trygve. See https://trac.torproject.org/projects/tor/attachment/ticket/9874/test_smtp.py * FIXES part of #9874. --- lib/bridgedb/test/test_smtp.py | 140 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py new file mode 100644 index 0000000..5e8b5c9 --- /dev/null +++ b/lib/bridgedb/test/test_smtp.py @@ -0,0 +1,140 @@ +"""integration tests for BridgeDB .""" + +from __future__ import print_function +from twisted.trial import unittest + +import smtplib +from smtpd import SMTPServer +import asyncore +import threading +import Queue +import random +import time +import random + +# ------------- SMTP Client Config +SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange +BRIDGEDB_SMTP_SERVER_ADDRESS = "localhost" +BRIDGEDB_SMTP_SERVER_PORT = 6725 +FROM_ADDRESS_TEMPLATE = "test%d(a)127.0.0.1" # %d is parameterised with a random integer to make the sender unique +MIN_FROM_ADDRESS = 1 # minimum value used to parameterise FROM_ADDRESS_TEMPLATE +MAX_FROM_ADDRESS = 10**8 # max value used to parameterise FROM_ADDRESS_TEMPLATE. Needs to be pretty big to reduce the chance of collisions +TO_ADDRESS = "bridges(a)torproject.org" +MESSAGE_TEMPLATE = """From: %s +To: %s +Subject: testing + +get bridges""" + +# ------------- SMTP Server Setup +# Setup an SMTP server which we use to check for responses +# from bridgedb. This needs to be done before sending the actual mail +LOCAL_SMTP_SERVER_ADDRESS = 'localhost' +LOCAL_SMTP_SERVER_PORT = 2525 # Must be the same as bridgedb's EMAIL_SMTP_PORT + +class EmailServer(SMTPServer): + def process_message(self, peer, mailfrom, rcpttos, data): + ''' Overridden from SMTP server, called whenever a message is received''' + self.message_queue.put(data) + + def thread_proc(self): + ''' This function runs in thread, and will continue looping + until the _stop Event object is set by the stop() function''' + while self._stop.is_set() == False: + asyncore.loop(timeout=0.0, count=1) + # must close, or asyncore will hold on to the socket and subsequent tests will fail with 'Address not in use' + self.close() + + def start(self): + self.message_queue = Queue.Queue() + self._stop = threading.Event() + self._thread = threading.Thread(target=self.thread_proc) + self._thread.setDaemon(True) # ensures that if any tests do fail, then threads will exit when the parent exits + self._thread.start() + + @classmethod + def startServer(cls): + #print("Starting SMTP server on %s:%s" % (LOCAL_SMTP_SERVER_ADDRESS, LOCAL_SMTP_SERVER_PORT)) + server = EmailServer((LOCAL_SMTP_SERVER_ADDRESS, LOCAL_SMTP_SERVER_PORT), None) + server.start() + return server + + def stop(self): + # signal thread_proc to stop + self._stop.set() + # wait for thread_proc to return (shouldn't take long) + self._thread.join() + assert self._thread.is_alive() == False, "Thread is alive and kicking" + + def getAndCheckMessageContains(self, text, timeoutInSecs=2.0): + #print("Checking for reponse") + message = self.message_queue.get(block=True, timeout=timeoutInSecs) + assert message.find(text) != -1, "Message did not contain text \"%s\". Full message is:\n %s" % (text, message) + + def checkNoMessageReceived(self, timeoutInSecs=2.0): + try: + self.message_queue.get(block=True, timeout=timeoutInSecs) + except Queue.Empty: + return True + assert False, "Found a message in the queue, but expected none" + +def sendMail(fromAddress): + #print("Connecting to %s:%d" % (BRIDGEDB_SMTP_SERVER_ADDRESS, BRIDGEDB_SMTP_SERVER_PORT)) + client = smtplib.SMTP(BRIDGEDB_SMTP_SERVER_ADDRESS, BRIDGEDB_SMTP_SERVER_PORT) + client.set_debuglevel(SMTP_DEBUG_LEVEL) + + #print("Sending mail TO:%s, FROM:%s" % (TO_ADDRESS, fromAddress)) + result = client.sendmail(fromAddress, TO_ADDRESS, MESSAGE_TEMPLATE % (fromAddress, TO_ADDRESS)) + assert result == {}, "Failed to send mail" + client.quit() + +class SMTPTests(unittest.TestCase): + def setUp(self): + ''' Called at the start of each test, ensures that the SMTP server is running''' + self.server = EmailServer.startServer() + + def tearDown(self): + ''' Called after each test, ensures that the SMTP server is cleaned up''' + self.server.stop() + + def test_getBridges(self): + # send the mail to bridgedb, choosing a random email address + sendMail(fromAddress=FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) + + # then check that our local SMTP server received a response + # and that response contained some bridges + self.server.getAndCheckMessageContains("Here are your bridges") + + def test_getBridges_rateLimitExceeded(self): + # send the mail to bridgedb, choosing a random email address + FROM_ADDRESS = FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS) + sendMail(FROM_ADDRESS) + + # then check that our local SMTP server received a response + # and that response contained some bridges + self.server.getAndCheckMessageContains("Here are your bridges") + + # send another request from the same email address + sendMail(FROM_ADDRESS) + + # this time, the email response should not contain any bridges + self.server.getAndCheckMessageContains("You have exceeded the rate limit. Please slow down!") + + # then we send another request from the same email address + sendMail(FROM_ADDRESS) + + # now there should be no response at all (wait 1 second to make sure) + self.server.checkNoMessageReceived(timeoutInSecs=1.0) + + def test_getBridges_stressTest(self): + ''' Sends a large number of emails in a short period of time, and checks that + a response is received for each message ''' + NUM_MAILS = 100 + for i in range(NUM_MAILS): + # Note: if by chance two emails with the same FROM_ADDRESS are generated, this test will fail + # Setting 'MAX_FROM_ADDRESS' to be a high value reduces the probability of this occuring, but does not rule it out + sendMail(fromAddress=FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) + + for i in range(NUM_MAILS): + self.server.getAndCheckMessageContains("Here are your bridges") +

1 0

[bridgedb/master] Add CHANGELOG entry for #9874.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit f565959785b8a9bffd0014cef74427223ede7fab Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 03:27:13 2014 +0000 Add CHANGELOG entry for #9874. --- CHANGELOG | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9d07e62..c6a5c2c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,10 @@ -Changes in version 0.2.3 - 2014-07-XXX +Changes in version 0.2.4 - 2014-08-XXX + * FIXES #9874 https://bugs.torproject.org/9874 + BridgeDB now has integration tests for all bridge distributors. + Thanks to trygve for the patches. + + +Changes in version 0.2.3 - 2014-07-26 * FIXES #5463 https://bugs.torproject.org/5463 XXX

1 0

[bridgedb/master] Add '127.0.0.1' to copied bridgedb.conf in .travis.yml.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit b15e76b2d9441acf17856b888e27d1b5dd06169e Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 11:02:30 2014 +0000 Add '127.0.0.1' to copied bridgedb.conf in .travis.yml. This is necessary to run the tests in `lib/bridgedb/test/test_smtp.py`, and shouldn't be set on production servers. It's done with a sed command in the `.travis.yml` file to a copied bridgedb.conf so that it doesn't ever end up in a production config file. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a3771b0..5f0aed2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,9 @@ install: before_script: - mkdir run - cp -R -t run bridgedb.conf captchas gnupghome + # Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be + # done on testing servers, never on production servers. + - sed -r -i -e "s/(EMAIL_DOMAINS)(.*)(])/\1\2\, '127.0.0.1']/" run/bridgedb.conf - leekspin -n 100 - cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors - ./scripts/make-ssl-cert

1 0

[bridgedb/master] Change obfs3 ipv6 integration test to vanilla ipv4; add scramblesuit test.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit d798533ff482bd7c1a149d1d38bcc9dfb53da3bc Author: trygve <tor-dev(a)lists.torproject.org> Date: Fri Aug 8 03:06:18 2014 +0000 Change obfs3 ipv6 integration test to vanilla ipv4; add scramblesuit test. The ipv6 bridge has been changed to a vanilla ipv4 bridge. I've also added a new test to check for a scramblesuit bridge. Both of these surprised me because they had a different number of fields in each bridge line, but I've adjusted the tests accordingly. --- lib/bridgedb/test/test_https.py | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index a154856..4ffbe08 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -114,7 +114,7 @@ class HTTPTests(unittest.TestCase): #print soup.prettify() return soup - def getBridgeLinesFromSoup(self, soup): + def getBridgeLinesFromSoup(self, soup, fieldsPerBridge): # Now we're looking for something like this in the response: # <div class="bridge-lines"> # obfs2 175.213.252.207:11125 5c6da7d927460317c6ff5420b75c2d0f431f18dd @@ -126,7 +126,7 @@ class HTTPTests(unittest.TestCase): text = bridge_line.text #print("Found bridge-line: %s" % text) items = text.split(' ') - self.assertEquals(len(items), 3, "Expected Pluggale Transport, Bridge and Fingerprint in %s" % str(items)) + self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) bridges.append(items) return bridges @@ -137,7 +137,7 @@ class HTTPTests(unittest.TestCase): PT = 'obfs2' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: self.assertEquals(PT, pt) @@ -148,19 +148,32 @@ class HTTPTests(unittest.TestCase): PT = 'obfs3' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: self.assertEquals(PT, pt) - def test_get_obfs3_ipv6(self): + def test_get_vanilla_ipv4(self): self.openBrowser() self.goToOptionsPage() - PT = 'obfs3' - soup = self.submitOptions(transport=PT, ipv6=True, captchaResponse=CAPTCHA_RESPONSE) + PT = '0' + soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - # at the time of writing, this test fails due to lack of ipv6 bridges - bridges = self.getBridgeLinesFromSoup(soup) - for pt, bridge, fingerprint in bridges: + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge, fingerprint in bridges: + # TODO: do more interesting checks + self.assertTrue(bridge != None) + + def test_get_scramblesuit_ipv4(self): + self.openBrowser() + self.goToOptionsPage() + + PT = 'scramblesuit' + soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) + for pt, bridge, fingerprint, password in bridges: self.assertEquals(PT, pt) + self.assertTrue(password.find("password=") != -1, "Password field missing expected text") +

1 0

[bridgedb/master] Bump leekspin version to 0.2.0.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 4d302bd3d391fb0174914a2ce035d1dcfaa707c0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 11:28:36 2014 +0000 Bump leekspin version to 0.2.0. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index df97c1a..12dfb7b 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==3.7.1 -leekspin==0.1.4 +leekspin==0.2.0 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 428438a..feef181 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==3.7.1 coveralls==0.4.2 -leekspin==0.1.4 +leekspin==0.2.0 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/setup.py b/setup.py index 4654415..cc2bd32 100644 --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7.1", - "leekspin==0.1.3"]}, + "leekspin==0.2.0"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/master] PEP8 style fixes for bridgedb.test.test_smtp.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit fc127ad1e59601d0507a2ae802d333c220291a17 Author: trygve <tor-dev(a)lists.torproject.org> Date: Fri Aug 8 03:30:05 2014 +0000 PEP8 style fixes for bridgedb.test.test_smtp. --- lib/bridgedb/test/test_smtp.py | 76 +++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 24 deletions(-) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 4e59002..4f30030 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -16,9 +16,13 @@ import random SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange BRIDGEDB_SMTP_SERVER_ADDRESS = "localhost" BRIDGEDB_SMTP_SERVER_PORT = 6725 -FROM_ADDRESS_TEMPLATE = "test%d(a)127.0.0.1" # %d is parameterised with a random integer to make the sender unique -MIN_FROM_ADDRESS = 1 # minimum value used to parameterise FROM_ADDRESS_TEMPLATE -MAX_FROM_ADDRESS = 10**8 # max value used to parameterise FROM_ADDRESS_TEMPLATE. Needs to be pretty big to reduce the chance of collisions +# %d is parameterised with a random integer to make the sender unique +FROM_ADDRESS_TEMPLATE = "test%d(a)127.0.0.1" +# Minimum value used to parameterise FROM_ADDRESS_TEMPLATE +MIN_FROM_ADDRESS = 1 +# Max value used to parameterise FROM_ADDRESS_TEMPLATE. Needs to be pretty big +# to reduce the chance of collisions +MAX_FROM_ADDRESS = 10**8 TO_ADDRESS = "bridges(a)torproject.org" MESSAGE_TEMPLATE = """From: %s To: %s @@ -32,6 +36,7 @@ get bridges""" LOCAL_SMTP_SERVER_ADDRESS = 'localhost' LOCAL_SMTP_SERVER_PORT = 2525 # Must be the same as bridgedb's EMAIL_SMTP_PORT + class EmailServer(SMTPServer): def process_message(self, peer, mailfrom, rcpttos, data): ''' Overridden from SMTP server, called whenever a message is received''' @@ -42,34 +47,42 @@ class EmailServer(SMTPServer): until the _stop Event object is set by the stop() function''' while self._stop.is_set() == False: asyncore.loop(timeout=0.0, count=1) - # must close, or asyncore will hold on to the socket and subsequent tests will fail with 'Address not in use' + # Must close, or asyncore will hold on to the socket and subsequent + # tests will fail with 'Address not in use'. self.close() def start(self): self.message_queue = Queue.Queue() self._stop = threading.Event() self._thread = threading.Thread(target=self.thread_proc) - self._thread.setDaemon(True) # ensures that if any tests do fail, then threads will exit when the parent exits + # Ensures that if any tests do fail, then threads will exit when the + # parent exits. + self._thread.setDaemon(True) self._thread.start() @classmethod def startServer(cls): - #print("Starting SMTP server on %s:%s" % (LOCAL_SMTP_SERVER_ADDRESS, LOCAL_SMTP_SERVER_PORT)) - server = EmailServer((LOCAL_SMTP_SERVER_ADDRESS, LOCAL_SMTP_SERVER_PORT), None) + #print("Starting SMTP server on %s:%s" + # % (LOCAL_SMTP_SERVER_ADDRESS, LOCAL_SMTP_SERVER_PORT)) + server = EmailServer((LOCAL_SMTP_SERVER_ADDRESS, + LOCAL_SMTP_SERVER_PORT), + None) server.start() return server def stop(self): - # signal thread_proc to stop + # Signal thread_proc to stop: self._stop.set() - # wait for thread_proc to return (shouldn't take long) + # Wait for thread_proc to return (shouldn't take long) self._thread.join() assert self._thread.is_alive() == False, "Thread is alive and kicking" def getAndCheckMessageContains(self, text, timeoutInSecs=2.0): #print("Checking for reponse") message = self.message_queue.get(block=True, timeout=timeoutInSecs) - assert message.find(text) != -1, "Message did not contain text \"%s\". Full message is:\n %s" % (text, message) + assert message.find(text) != -1, ("Message did not contain text '%s'." + "Full message is:\n %s" + % (text, message)) def checkNoMessageReceived(self, timeoutInSecs=2.0): try: @@ -79,27 +92,36 @@ class EmailServer(SMTPServer): assert False, "Found a message in the queue, but expected none" def sendMail(fromAddress): - #print("Connecting to %s:%d" % (BRIDGEDB_SMTP_SERVER_ADDRESS, BRIDGEDB_SMTP_SERVER_PORT)) - client = smtplib.SMTP(BRIDGEDB_SMTP_SERVER_ADDRESS, BRIDGEDB_SMTP_SERVER_PORT) + #print("Connecting to %s:%d" + # % (BRIDGEDB_SMTP_SERVER_ADDRESS, BRIDGEDB_SMTP_SERVER_PORT)) + client = smtplib.SMTP(BRIDGEDB_SMTP_SERVER_ADDRESS, + BRIDGEDB_SMTP_SERVER_PORT) client.set_debuglevel(SMTP_DEBUG_LEVEL) - #print("Sending mail TO:%s, FROM:%s" % (TO_ADDRESS, fromAddress)) - result = client.sendmail(fromAddress, TO_ADDRESS, MESSAGE_TEMPLATE % (fromAddress, TO_ADDRESS)) + #print("Sending mail TO:%s, FROM:%s" + # % (TO_ADDRESS, fromAddress)) + result = client.sendmail(fromAddress, TO_ADDRESS, + MESSAGE_TEMPLATE % (fromAddress, TO_ADDRESS)) assert result == {}, "Failed to send mail" client.quit() + class SMTPTests(unittest.TestCase): def setUp(self): - ''' Called at the start of each test, ensures that the SMTP server is running''' + '''Called at the start of each test, ensures that the SMTP server is + running. + ''' self.server = EmailServer.startServer() def tearDown(self): - ''' Called after each test, ensures that the SMTP server is cleaned up''' + '''Called after each test, ensures that the SMTP server is cleaned up. + ''' self.server.stop() def test_getBridges(self): # send the mail to bridgedb, choosing a random email address - sendMail(fromAddress=FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) + sendMail(fromAddress=FROM_ADDRESS_TEMPLATE + % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) # then check that our local SMTP server received a response # and that response contained some bridges @@ -107,7 +129,8 @@ class SMTPTests(unittest.TestCase): def test_getBridges_rateLimitExceeded(self): # send the mail to bridgedb, choosing a random email address - FROM_ADDRESS = FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS) + FROM_ADDRESS = FROM_ADDRESS_TEMPLATE % random.randint( + MIN_FROM_ADDRESS, MAX_FROM_ADDRESS) sendMail(FROM_ADDRESS) # then check that our local SMTP server received a response @@ -118,7 +141,8 @@ class SMTPTests(unittest.TestCase): sendMail(FROM_ADDRESS) # this time, the email response should not contain any bridges - self.server.getAndCheckMessageContains("You have exceeded the rate limit. Please slow down!") + self.server.getAndCheckMessageContains( + "You have exceeded the rate limit. Please slow down!") # then we send another request from the same email address sendMail(FROM_ADDRESS) @@ -127,13 +151,17 @@ class SMTPTests(unittest.TestCase): self.server.checkNoMessageReceived(timeoutInSecs=1.0) def test_getBridges_stressTest(self): - ''' Sends a large number of emails in a short period of time, and checks that - a response is received for each message ''' + '''Sends a large number of emails in a short period of time, and checks + that a response is received for each message. + ''' NUM_MAILS = 100 for i in range(NUM_MAILS): - # Note: if by chance two emails with the same FROM_ADDRESS are generated, this test will fail - # Setting 'MAX_FROM_ADDRESS' to be a high value reduces the probability of this occuring, but does not rule it out - sendMail(fromAddress=FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) + # Note: if by chance two emails with the same FROM_ADDRESS are + # generated, this test will fail Setting 'MAX_FROM_ADDRESS' to be + # a high value reduces the probability of this occuring, but does + # not rule it out + sendMail(fromAddress=FROM_ADDRESS_TEMPLATE + % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) for i in range(NUM_MAILS): self.server.getAndCheckMessageContains("Here are your bridges")

1 0