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

[bridgedb/master] Fix duplicate sourcing of FontAwesome CSS.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 99494d38197f4b11ca9390e7ac34c3521c516b24 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 20:43:02 2015 +0000 Fix duplicate sourcing of FontAwesome CSS. --- lib/bridgedb/templates/base.html | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 0c80e46..f26837a 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -14,7 +14,6 @@  <link rel="stylesheet" href="/assets/css/main.css"> -<link rel="stylesheet" href="/assets/css/font-awesome.min.css">

1 0

[bridgedb/master] Remove two spaces before start of bridgelines on HTTPS distributor.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 7e79bc05e77aa87a06ea0e1ad5e329a92e7a8dc0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 8 14:02:18 2015 +0000 Remove two spaces before start of bridgelines on HTTPS distributor. * CHANGE bridge lines created by the HTTPS distributor to not begin with two space characters. * FIXES #13123: https://bugs.torproject.org/13123 --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 464ae0d..6aebba1 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -750,7 +750,7 @@ class WebResourceBridges(resource.Resource): self.nBridgesToGive, countryCode, bridgeFilterRules=rules) - bridgeLines = "".join(" %s\n" % b.getConfigLine( + bridgeLines = "".join("%s\n" % b.getConfigLine( includeFingerprint=self.includeFingerprints, addressClass=addressClass, transport=transport,

1 0

[bridgedb/master] Merge branch 'hotfix/0.2.3-html-footer-icons' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit f58f9f82a75cc471d3116116cf93961594b94c85 Merge: b2ef934 0843a7a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jan 19 23:41:29 2015 +0000 Merge branch 'hotfix/0.2.3-html-footer-icons' into develop lib/bridgedb/templates/base.html | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)

1 0

[bridgedb/master] Add icons to links in base.html footer.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 0843a7a0efc0afdab72943bd057473400b9765cd Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jan 19 23:14:45 2015 +0000 Add icons to links in base.html footer. --- lib/bridgedb/templates/base.html | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 05d6285..69a4a80 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -87,19 +87,23 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)} <hr> <div class="footer"> - <p>© The Tor Project</p> <p> - <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…">${_("Report a Bug")}</a> - &middot - <a href="https://gitweb.torproject.org/bridgedb.git">${_("Source Code")}</a> - &middot + <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…"> + <i class="icon icon-large icon-bug"> ${_("Report a Bug")}</i></a> +   ·   + <a href="https://gitweb.torproject.org/bridgedb.git"> + <i class="icon icon-large icon-code"> ${_("Source Code")}</i></a> +   ·   <a href="https://gitweb.torproject.org/bridgedb.git/blob/HEAD:/CHANGELOG"> - ${_("Changelog")}</a> - &middot - <a href="mailto:help@rt.torproject.org">${_("Contact")}</a> - &middot - <a href="../keys">${_("Public Keys")}</a> + <i class="icon icon-large icon-rocket"> ${_("Changelog")}</i></a> +   ·   + <a href="mailto:help@rt.torproject.org"> + <i class="icon icon-large icon-envelope"> ${_("Contact")}</i></a> +   ·   + <a href="../keys"><i class="icon icon-large icon-key"> ${_("Public Keys")}</i></a> </p> + <br /> + <p>© The Tor Project</p> </div> </div>

1 0

[bridgedb/master] Fix newlines in bridge lines distributed by HTTPServer.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit dd018316a01533ef614d8180daa8aec180cf0ac8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 20:48:41 2015 +0000 Fix newlines in bridge lines distributed by HTTPServer. * CHANGES bridge.html template to inline replace '\n' with '<br />' in the bridge lines. * FIXES #12664 https://bugs.torproject.org/12664 --- lib/bridgedb/templates/bridges.html | 39 +++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 7e44513..7ac77dd 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -3,23 +3,36 @@ <%inherit file="base.html"/> <%page args="strings, rtl=False, lang='en', answer=0, **kwargs"/> -<div class="container-fluid" - style="width: 98%; align: center; margin: auto;"> - <div class="container-fluid" - style="padding: 2%"> - <h2>${_(strings.BRIDGES[0])}</h2> </div> </div> +<div class="container-narrow"> + <div class="container-fluid"> + % if answer: -<div class="container-fluid" style="width: 98%; align: center; margin: auto;"> -<div class="container-fluid" style="padding: 1px"> -<div class="bridge-lines"> -${answer} -</div> -</div> -</div> -<br \> + <div class="container-fluid" + style="width: 98%; align: center; margin: auto;"> + <div class="container-fluid" + style="padding: 2%"> + <h2>${_(strings.BRIDGES[0])}</h2> + </div> + </div> + + <div class="container-fluid" + style="width: auto; align: center; margin: auto; + position: relative; left: 0%;" + onclick="selectText('bridgelines')"> + <div class="row" id="bridgesrow1"> + <div class="col col-lg-12"> + <div class="bridge-lines" id="bridgelines"> +${answer.replace("\n", "<br />")} + </div> + </div> + </div> + </div> + + <br /> + <br /> <div class="container-fluid" style="width: 100%; align: center; margin: auto;">

1 0

[bridgedb/master] Change mechanize to use HTTP since it chokes on self-signed certs.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 24acf6a72931c602631c97dbbeb582c22cf446cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 13:45:07 2014 +0000 Change mechanize to use HTTP since it chokes on self-signed certs. --- .travis.yml | 5 +++ lib/bridgedb/test/test_https.py | 78 +++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6992f6e..412622b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,11 @@ before_script: - 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 + # Enable plaintext HTTP distribution, otherwise the mechanize-based tests in + # test_https.py will fail with CERTIFICATE_VERIFY_FAILED because urllib2 + # won't recognize ourt self-signed certificate: + - sed -r -i -e "s/(HTTP_UNENCRYPTED_BIND_IP = )(None)/\1'127.0.0.1'/" run/bridgedb.conf + - sed -r -i -e "s/(HTTP_UNENCRYPTED_PORT = )(None)/\16788/" run/bridgedb.conf - leekspin -n 100 - cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors - ./scripts/make-ssl-cert diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 2262db3..4624f08 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -35,7 +35,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID -HTTPS_ROOT = 'https://127.0.0.1:6789' +HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' @@ -56,18 +56,18 @@ class HTTPTests(unittest.TestCase): self.br = mechanize.Browser() # prevents 'HTTP Error 403: request disallowed by robots.txt' self.br.set_handle_robots(False) - self.br.open(HTTPS_ROOT) + self.br.open(HTTP_ROOT) # -------------- Home/Root page self.assertTrue(self.br.viewing_html()) - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) + self.assertEquals(self.br.response().geturl(), HTTP_ROOT) self.assertEquals(self.br.title(), "BridgeDB") 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) + self.assertEquals(self.br.response().geturl(), HTTP_ROOT) # follow the link with the word 'bridges' in it. # Could also use: text='bridges' @@ -75,12 +75,12 @@ class HTTPTests(unittest.TestCase): self.br.follow_link(text_regex='bridges') # ------------- Options - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") + self.assertEquals(self.br.response().geturl(), HTTP_ROOT + "/options") 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") + self.assertEquals(self.br.response().geturl(), HTTP_ROOT + "/options") # At this point, we'd like to be able to set some values in # the 'advancedOptions' form. Unfortunately the HTML form @@ -97,7 +97,7 @@ class HTTPTests(unittest.TestCase): self.br.submit() # ------------- Captcha - EXPECTED_URL = HTTPS_ROOT + "/bridges?transport=%s" % transport + EXPECTED_URL = HTTP_ROOT + "/bridges?transport=%s" % transport if ipv6: EXPECTED_URL += "&ipv6=yes" self.assertEquals(self.br.response().geturl(), EXPECTED_URL) @@ -148,8 +148,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -166,8 +170,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -184,8 +192,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -202,8 +214,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -229,8 +245,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -260,8 +280,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -293,8 +317,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage() @@ -326,8 +354,12 @@ class HTTPTests(unittest.TestCase): if os.environ.get("CI"): if not self.pid or not processExists(self.pid): raise FailTest("Could not start BridgeDB process on CI server!") - if not self.pid or not processExists(self.pid): - raise SkipTest("Can't run test: no BridgeDB process running.") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) self.openBrowser() self.goToOptionsPage()

1 0

[bridgedb/master] Change base.html template background to use <body style="...">.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit a27070b26e95b1cf5388ff43613751fd0ef3f364 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 20:41:44 2015 +0000 Change base.html template background to use <body style="...">. --- lib/bridgedb/templates/base.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 69a4a80..0c80e46 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -32,7 +32,11 @@ span { % endif </head> -<body> +<body style="background: url(/assets/tor-roots-blue.svg); + background-repeat: no-repeat; + background-attachment: scroll; + background-position: 2% 100px; + background-size: 23%;"> <div class="container-narrow"> <div class="masthead"> <div class="nav nav-tabs"> @@ -45,12 +49,6 @@ span { </li> </ul> </div> - <p style="float: left; text-align: left; - margin-left: -23%; margin-bottom: -30%;"> - <a href="https://www.torproject.org"> - <img src="/assets/tor-roots-blue.svg" - height="23%" width="23%"/></a> - </p> </div>

1 0

[bridgedb/master] Bump Leekspin to 1.1.3; it now supports obfs4 mocking.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 40818e8b1e2e61516ab451306dc6ec489c01f33e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Sep 5 07:15:21 2014 +0000 Bump Leekspin to 1.1.3; it now supports obfs4 mocking. --- .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 ca2c01c..78ad3c0 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==3.7.1 -leekspin==1.0.0 +leekspin==1.1.3 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 b10bae4..fcc4c77 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==3.7.1 coveralls==0.4.2 -leekspin==1.0.0 +leekspin==1.1.3 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 47a2cbf..d6f9a20 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==1.0.0"]}, + "leekspin==1.1.3"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/master] Add obfs4 bridge line unittests and regression tests for #12932.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 6f29393d48612f1a5fee97d889971fefa671b877 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 6 02:59:24 2014 +0000 Add obfs4 bridge line unittests and regression tests for #12932. --- lib/bridgedb/test/test_https.py | 133 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index bb783fb..2262db3 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -218,3 +218,136 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) self.assertTrue(password.find("password=") != -1, "Password field missing expected text") + + def test_get_obfs4_ipv4(self): + """Try asking for obfs4 bridges, and check that the PT arguments in the + returned bridge lines were space-separated. + + This is a regression test for #12932, see + https://bugs.torproject.org/12932. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + pt = bridge[0] + ptArgs = bridge[-3:] + self.assertEquals(PT, pt) + self.assertTrue(len(ptArgs) == 3, + ("Expected obfs4 bridge line to have 3 PT args, " + "found %d instead: %s") % (len(ptArgs), ptArgs)) + + def test_get_obfs4_ipv4_iatmode(self): + """Ask for obfs4 bridges and check that there is an 'iat-mode' PT + argument in the bridge lines. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + ptArgs = bridge[-3:] + hasIATMode = False + for arg in ptArgs: + if 'iat-mode' in arg: + hasIATMode = True + + self.assertTrue(hasIATMode, + "obfs4 bridge line is missing 'iat-mode' PT arg.") + + def test_get_obfs4_ipv4_publickey(self): + """Ask for obfs4 bridges and check that there is an 'public-key' PT + argument in the bridge lines. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + ptArgs = bridge[-3:] + hasPublicKey = False + for arg in ptArgs: + if 'public-key' in arg: + hasPublicKey = True + + self.assertTrue(hasPublicKey, + "obfs4 bridge line is missing 'public-key' PT arg.") + + def test_get_obfs4_ipv4_nodeid(self): + """Ask for obfs4 bridges and check that there is an 'node-id' PT + argument in the bridge lines. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + ptArgs = bridge[-3:] + hasNodeID = False + for arg in ptArgs: + if 'node-id' in arg: + hasNodeID = True + + self.assertTrue(hasNodeID, + "obfs4 bridge line is missing 'node-id' PT arg.")

1 0

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

03 Feb '15

commit b2ef9342e6734d4e3d0a2c8e943c68cf0da419d8 Merge: c6d5278 7e79bc0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 8 14:08:29 2015 +0000 Merge branch 'fix/13123-bridgeline-spaces' into develop lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0