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

[bridgedb/master] Merge branch 'fix/9874-https' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit b95d400ff0293cf6de9fe9c2fa7a2dd78f1ee809 Merge: 74cdb09 be93cb7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 03:23:36 2014 +0000 Merge branch 'fix/9874-https' into develop .test.requirements.txt | 3 +- .travis.requirements.txt | 24 +++++ .travis.yml | 19 ++-- lib/bridgedb/test/test_bridgedb.py | 167 ++++++++++++++------------------- lib/bridgedb/test/test_https.py | 179 ++++++++++++++++++++++++++++++++++++ lib/bridgedb/test/util.py | 22 +++++ setup.py | 2 +- 7 files changed, 306 insertions(+), 110 deletions(-)

1 0

[bridgedb/master] Remove unused/extra imports `time` and `random` from test_smtp.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit cc2ea6208f1580f973fd0ed0e71cda6c838c763a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 8 11:27:39 2014 +0000 Remove unused/extra imports `time` and `random` from test_smtp.py. --- lib/bridgedb/test/test_smtp.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 4f30030..fb25c46 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -9,8 +9,6 @@ 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

1 0

[bridgedb/master] Sphinxify bridgedb.test.test_https module docstring.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 7ae1282581e3d690c310fa054a7d692f8cd2fe56 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 09:48:22 2014 +0000 Sphinxify bridgedb.test.test_https module docstring. --- lib/bridgedb/test/test_https.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 8e0fc50..a154856 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -7,9 +7,19 @@ # (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 + +"""Integration tests for BridgeDB's HTTPS Distributor. + +These tests use `mechanize`_ and `BeautifulSoup`_, and require a BridgeDB +instance to have been started in a separate process. To see how a BridgeDB is +started for our CI infrastructure from a fresh clone of this repository, see +the "before_script" section of the `.travis.yml` file in the top level of this +repository. + +.. _mechanize: https://pypi.python.org/pypi/mechanize/ + http://wwwsearch.sourceforge.net/mechanize/ +.. _BeautifulSoup: + http://www.crummy.com/software/BeautifulSoup/bs3/documentation.html """ from __future__ import print_function @@ -20,6 +30,7 @@ import mechanize HTTPS_ROOT = 'https://127.0.0.1:6789' CAPTCHA_RESPONSE = 'Tvx74Pmy' + class HTTPTests(unittest.TestCase): def setUp(self): self.br = None

1 0

[bridgedb/master] Merge branch 'fix/9874-https' into fix/9874-email
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit f18ba06ffc7ff8031b3c074b4c4e656fbe0a9773 Merge: 3536724 be93cb7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 8 03:12:59 2014 +0000 Merge branch 'fix/9874-https' into fix/9874-email lib/bridgedb/test/test_https.py | 217 +++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 102 deletions(-)

1 0

[bridgedb/master] Clarify comments in .travis.requirements.txt.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 01562144625fe4d9d6ae3870583cfef456513a39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 23:58:23 2014 +0000 Clarify comments in .travis.requirements.txt. --- .travis.requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index feef181..37b7bfe 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -1,10 +1,10 @@ +# This is a pip requirements.txt file for running BridgeDB and BridgeDB's test +# suites on Travis CI infrastructure. See https://travis-ci.org/ and the +# .travis.yml file for more info. # -# 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. -# +# 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:

1 0

[bridgedb/master] Change EMAIL_SMTP_PORT to 2525 in copied bridgedb.conf for Travis.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 353672434209b0fe58ba4e9ef1ae49942644f0b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 12:17:40 2014 +0000 Change EMAIL_SMTP_PORT to 2525 in copied bridgedb.conf for Travis. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5f0aed2..6992f6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,8 @@ before_script: # 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 + # Change EMAIL_SMTP_PORT to 2525: + - sed -r -i -e "s/(EMAIL_SMTP_PORT = )([1-9]{2,5})/\12525/" run/bridgedb.conf - leekspin -n 100 - cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors - ./scripts/make-ssl-cert

1 0

[bridgedb/master] Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit d67770d8cfe717bfdc0540311178a3fb6e1b7ced Merge: 0156214 12311ff Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 04:15:12 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets' into develop lib/bridgedb/Bucket.py | 47 +++++++++++++++++++++--------- lib/bridgedb/test/test_Bucket.py | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 13 deletions(-)

1 0

[bridgedb/master] Fix test_https tests to handle multiple bridge lines.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 9111886f2785da3995b2e1f78737326aedbcb4a7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 04:30:09 2014 +0000 Fix test_https tests to handle multiple bridge lines. See https://travis-ci.org/isislovecruft/bridgedb/jobs/33035309#L1781 for an example of how this test was failing. --- lib/bridgedb/test/test_https.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index cad0715..40ab865 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -120,12 +120,11 @@ class HTTPTests(unittest.TestCase): # obfs2 175.213.252.207:11125 5c6da7d927460317c6ff5420b75c2d0f431f18dd # </div> bridges = [] - bridge_lines = soup.findAll(attrs={'class' : 'bridge-lines'}) + soup = soup.findAll(attrs={'class' : 'bridge-lines'}) + bridge_lines = [line.text.split('\n') for line in soup] self.assertTrue(len(bridge_lines) > 0, "Found no bridge lines") for bridge_line in bridge_lines: - text = bridge_line.text - #print("Found bridge-line: %s" % text) - items = text.split(' ') + items = bridge_line.split(' ') self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) bridges.append(items) return bridges

1 0

[bridgedb/master] Fix missing `io.StringIO` import in test_Bucket.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit db63270c23a45411b20c172103f604e2a3242c2c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 05:17:55 2014 +0000 Fix missing `io.StringIO` import in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_Bucket.py b/lib/bridgedb/test/test_Bucket.py index 531a063..ab89fb4 100644 --- a/lib/bridgedb/test/test_Bucket.py +++ b/lib/bridgedb/test/test_Bucket.py @@ -14,6 +14,8 @@ functioning as expected. from __future__ import print_function +from io import StringIO + import sure from sure import this from sure import the

1 0

[bridgedb/master] Whitespace fixes for bridgedb.test.test_https.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit be93cb7c849990bf516c33c1a440ca406b2b3cb9 Author: trygve <tor-dev(a)lists.torproject.org> Date: Fri Aug 8 03:11:31 2014 +0000 Whitespace fixes for bridgedb.test.test_https. --- lib/bridgedb/test/test_https.py | 210 +++++++++++++++++++-------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 4ffbe08..cad0715 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -33,147 +33,147 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): - self.br = None + self.br = None def tearDown(self): - self.br = None + self.br = None def openBrowser(self): - # use mechanize to open the BridgeDB website in its browser - self.br = mechanize.Browser() - self.br.set_handle_robots(False) # prevents 'HTTP Error 403: request disallowed by robots.txt' - self.br.open(HTTPS_ROOT) - - # -------------- Home/Root page - self.assertTrue(self.br.viewing_html()) - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) - self.assertEquals(self.br.title(), "BridgeDB") - #for link in self.br.links(): print(link) - #for form in self.br.forms(): print(form) - return self.br + # use mechanize to open the BridgeDB website in its browser + self.br = mechanize.Browser() + self.br.set_handle_robots(False) # prevents 'HTTP Error 403: request disallowed by robots.txt' + self.br.open(HTTPS_ROOT) + + # -------------- Home/Root page + self.assertTrue(self.br.viewing_html()) + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) + self.assertEquals(self.br.title(), "BridgeDB") + #for link in self.br.links(): print(link) + #for form in self.br.forms(): print(form) + return self.br def goToOptionsPage(self): # check that we are on the root page - self.assertTrue(self.br.viewing_html()) - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) - - # follow the link with the word 'bridges' in it. - # Could also use: text='bridges' - # Could also use: url='/options' - self.br.follow_link(text_regex='bridges') - - # ------------- Options - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") - #print(self.br.response().read()) - #for form in self.br.forms(): print(form) - return self.br - + self.assertTrue(self.br.viewing_html()) + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) + + # follow the link with the word 'bridges' in it. + # Could also use: text='bridges' + # Could also use: url='/options' + self.br.follow_link(text_regex='bridges') + + # ------------- Options + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") + #print(self.br.response().read()) + #for form in self.br.forms(): print(form) + return self.br + def submitOptions(self, transport, ipv6, captchaResponse): - # check that we are on the options page - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") - - # At this point, we'd like to be able to set some values in - # the 'advancedOptions' form. Unfortunately the HTML form - # does not define a 'name' attribute, so the we have to rely on - # the fact that this is the only form on the page and will therefore - # always exist at index 0. - #br.select_form(name="advancedOptions") - self.br.select_form(nr=0) - - # change the pluggable transport to something else - #print(self.br.form) - self.br.form['transport'] = [transport] + # check that we are on the options page + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") + + # At this point, we'd like to be able to set some values in + # the 'advancedOptions' form. Unfortunately the HTML form + # does not define a 'name' attribute, so the we have to rely on + # the fact that this is the only form on the page and will therefore + # always exist at index 0. + #br.select_form(name="advancedOptions") + self.br.select_form(nr=0) + + # change the pluggable transport to something else + #print(self.br.form) + self.br.form['transport'] = [transport] if ipv6: self.br.form['ipv6'] = ['yes'] - self.br.submit() + self.br.submit() - # ------------- Captcha - EXPECTED_URL = HTTPS_ROOT + "/bridges?transport=%s" % transport + # ------------- Captcha + EXPECTED_URL = HTTPS_ROOT + "/bridges?transport=%s" % transport if ipv6: EXPECTED_URL += "&ipv6=yes" - self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - #print(self.br.response().read()) - #for form in self.br.forms(): print(form) - - # As on the previous page, the form does not define a 'name' attribute, forcing - # us to use the index of the form i.e. 0 - #self.br.select_form(name="captchaSubmission") - self.br.select_form(nr=0) - - # input the required captcha response. There is only one captcha defined - # by default, so this should always be accepted. Note this will not be possible - # to automate if used with a real captcha systems (e.g. reCAPTCHA) - #self.br.form['captcha_response_field'] = 'Tvx74PMy' - self.br.form['captcha_response_field'] = captchaResponse - captcha_response = self.br.submit() - - # ------------- Results - # URL should be the same as last time - self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - soup = BeautifulSoup(captcha_response.read()) - #print soup.prettify() - return soup + self.assertEquals(self.br.response().geturl(), EXPECTED_URL) + #print(self.br.response().read()) + #for form in self.br.forms(): print(form) + + # As on the previous page, the form does not define a 'name' attribute, forcing + # us to use the index of the form i.e. 0 + #self.br.select_form(name="captchaSubmission") + self.br.select_form(nr=0) + + # input the required captcha response. There is only one captcha defined + # by default, so this should always be accepted. Note this will not be possible + # to automate if used with a real captcha systems (e.g. reCAPTCHA) + #self.br.form['captcha_response_field'] = 'Tvx74PMy' + self.br.form['captcha_response_field'] = captchaResponse + captcha_response = self.br.submit() + + # ------------- Results + # URL should be the same as last time + self.assertEquals(self.br.response().geturl(), EXPECTED_URL) + soup = BeautifulSoup(captcha_response.read()) + #print soup.prettify() + return 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 - # </div> - bridges = [] - bridge_lines = soup.findAll(attrs={'class' : 'bridge-lines'}) - self.assertTrue(len(bridge_lines) > 0, "Found no bridge lines") - for bridge_line in bridge_lines: - text = bridge_line.text - #print("Found bridge-line: %s" % text) - items = text.split(' ') - self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) - bridges.append(items) - return bridges + # Now we're looking for something like this in the response: + # <div class="bridge-lines"> + # obfs2 175.213.252.207:11125 5c6da7d927460317c6ff5420b75c2d0f431f18dd + # </div> + bridges = [] + bridge_lines = soup.findAll(attrs={'class' : 'bridge-lines'}) + self.assertTrue(len(bridge_lines) > 0, "Found no bridge lines") + for bridge_line in bridge_lines: + text = bridge_line.text + #print("Found bridge-line: %s" % text) + items = text.split(' ') + self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) + bridges.append(items) + return bridges def test_get_obfs2_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = 'obfs2' + PT = 'obfs2' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: - self.assertEquals(PT, pt) + self.assertEquals(PT, pt) def test_get_obfs3_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = 'obfs3' + PT = 'obfs3' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: - self.assertEquals(PT, pt) + self.assertEquals(PT, pt) def test_get_vanilla_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = '0' + PT = '0' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) - for bridge, fingerprint in bridges: + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge, fingerprint in bridges: # TODO: do more interesting checks - self.assertTrue(bridge != None) + self.assertTrue(bridge != None) def test_get_scramblesuit_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = 'scramblesuit' - soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) + 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") + 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