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

[bridgedb/develop] Fix a typo in doc/DESCRIPTORS.md.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 1b5b984791be2690ea40e07f1580c83cefc6d093 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 20:27:06 2014 +0000 Fix a typo in doc/DESCRIPTORS.md. --- doc/DESCRIPTORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTORS.md b/doc/DESCRIPTORS.md index 226f368..eea8ba8 100644 --- a/doc/DESCRIPTORS.md +++ b/doc/DESCRIPTORS.md @@ -38,7 +38,7 @@ fields. They look like this: VXAN4HoclQiNWdgZF3kAdCXW+8YR/rqyYtSOaLFOxgs= -----END SIGNATURE----- -As of tor-0.2.4.15, bridge router descriptors may be missig the 'opt ' prefix, +As of tor-0.2.4.15, bridge router descriptors may be missing the 'opt ' prefix, and thus appear like this: @purpose bridge @@ -182,7 +182,7 @@ obproxy pluggable transport types: D9FLbPlXw4NWy9B32IT/luOHsENaAJNvOv7ociMPnsM= -----END SIGNATURE----- -## Bridge router microdescriptors +## Bridge router microdescriptors / bridge networkstatus documents r Unnamed /wywABJee98ZPOiCGYM1dpgQc70 NpK1tsi97A+SH8s0evowXkRcyr8 2013-10-22 01:49:45 88.200.197.4 9001 0 a [6212:b13d:252e:479d:32b8:d713:3718:2fac]:9001

1 0

[bridgedb/develop] Fix error when desc digest parsed from networkstatus is None.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit a2192c4d0fb0101526d96c3ad9267fcc653659ca Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 20:50:01 2014 +0000 Fix error when desc digest parsed from networkstatus is None. * FIXES a bug where, if the nickname was not to spec (longer than 19 characters), then the nickname and descriptor digest are both set to ``None`` and ``bridgedb.Bridges.parseStatusFile()`` attempts to format the null descriptor digest into hexadecimal. --- lib/bridgedb/Bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 4aaf86f..e5d5921 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -641,12 +641,12 @@ def parseStatusFile(networkstatusFile): logging.debug(" Nickname: %s" % nickname) logging.debug(" Identity: %s" % hexID) if descDigest: - logging.debug(" Descriptor: {0}".format(toHex(descDigest))) + descDigest = toHex(descDigest) + logging.debug(" Descriptor: {0}".format(descDigest)) logging.debug(" Timestamp: {0}".format(timestamp)) logging.debug(" ORAddress: {0}".format(ORaddr)) logging.debug(" ORport: {0}".format(ORport)) logging.debug(" dirport: {0}".format(dirport)) - descDigest = toHex(descDigest) elif ID and line.startswith("a "): try:

1 0

[bridgedb/develop] Merge branch 'hotfix/9264-descdigest-none' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit f6ad2cf9f5571d95dc6e5c4edf3955d3504ecc25 Merge: 1b5b984 a2192c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 20:59:49 2014 +0000 Merge branch 'hotfix/9264-descdigest-none' into develop lib/bridgedb/Bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Add draft of volunteer page text for GSoC 2014 applications.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 90d759d291907e87f2364a59ca1ee57f604f579c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 21:00:02 2014 +0000 Add draft of volunteer page text for GSoC 2014 applications. --- doc/gsoc2014-volunteer.txt | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/doc/gsoc2014-volunteer.txt b/doc/gsoc2014-volunteer.txt new file mode 100644 index 0000000..eb93611 --- /dev/null +++ b/doc/gsoc2014-volunteer.txt @@ -0,0 +1,92 @@ + +Volunteer Posting +----------------- + +Number of Positions Available: 2 + +Project: BridgeDB https://gitweb.torproject.org/bridgedb.git + +Difficulty Level: Moderate - Difficult, dependent on proposal and previous experience + +Myself (isis) and sysrqb are both looking for students who wish to help Tor by +contributing code to BridgeDB (the program which distributes Tor bridges and +pluggable transport bridges to clients connecting to Tor) through +participation in Google Summer of Code 2014. We are each taking a student, so +if we each find someone someone we want to mentor, then we'll take two +students total. If we only find one student we like, then I suppose sysrqb and +I will just have to fight over that person. + +Required Skills and Prerequisite Tasks for Application: +------------------------------------------------------- + * IRC skills. Lurk in irc.oftc.net#tor-dev, and possibly irc.freenode.net#gsoc as well. + + * Fluent in Python (version 2.7). + + * Proven experience and comfort with asynchronous network programming using + Twisted. + + * Be comfortable doing git things. Not saying you have to have mad + git-fu, but we shouldn't have to explain the difference between + merge/rebase or fetch/pull. + + * Familiarity with documentating code in Sphinx ReStructured Text + format. (See recent commits in the BridgeDB repository for syntax + examples, and https://para.noid.cat/bridgedb/ for documentation builds.) + + * Familiarity with writing unittests. (And willingness to do so!) + Preferably, using `twisted.trial.unittest.TestCase`s. See + https://coveralls.io/r/isislovecruft/bridgedb for current test coverage. + + * Submit a brief sample of Python code that you're proud of (written by you, + and for which you've got whatever necessary legal whatever is needed for + you to share it). It helps if it's Twisted Python code, but it doesn't + have to be. + + * Fix a BridgeDB ticket. Contact isis or sysrqb on ircs://irc.oftc.net:6697 + in #tor-dev to ask if a particular ticket is a good idea, or to ask for a + suggestion or help. Eventually, sysrqb and I will tag some tickets with + "bridgedb-gsoc-application" that we think are good ones to try. + + * Submit a proposal for a distributor (an object which distributes Tor + bridges to clients in possibly censored/surveilled regions). Current + distributors include the `bridgedb.Dist.EmailBasedDistributor` at + bridges(a)bridges.torproject.org, and the `bridgedb.Dist.IPBasedDistributor` + which serves pages at https://bridges.torproject.org . Other example ideas + for bridge distributors are: + - A Twitter bot which interacts with Chinese and Farsi speaking + Twitter users through PMs. + - A distributor which uses XMPP+OTR to give bridges to users. + - Basically, all the nifty protocol obfuscation tricks which could + apply to a pluggable transport would likely also apply here. + - Keep in mind that various adversaries (automated and/or human and/or + extraterrestrial and/or unknown) will be trying to trick your + distributor into giving them bridges. Be prepared to come up with + some sort of safety machanism(s) to protect against this. + - You should plan to have your code finished, reviewed (and + revised…), tested, approved, and deployed by the end of GSoC. (I + think this means "at the end of six weeks".) + + * Please send your code sample, a link to your completed BridgeDB ticket + (which should have your patch(es) attached, or have a link to your git + repository), and proposal to both isis(a)torproject.org and + sysrqb(a)torproject.org. Additionally CC'ing tor-dev(a)lists.torproject.org is + probably a good idea. + + * If accepted, you'll need a google-melange account: + https://www.google-melange.com/gsoc/homepage/google/gsoc2014?ModPagespeed=n… + +Additional Ways to Earn Bonus Points: +------------------------------------- + * OTR skills (over IRC/XMPP). + + * Knowledge about the current state and technical mechanisms of real-world, + deployed censorship/surveillance systems is helpful, though not necessary. + We will gladly provide continual feedback on design proposals and + implementation to ensure that the threats posed by various adversaries + have been taken into account. + + * Major bonus points if you're into test-driven development. + + * Propose building more than one distributor. Each of them still needs to be + a good idea, and we'll need to make certain it's something you're capable + of finishing in the allotted timespan.

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit fa67d20ba88a5673c55bc6049f75181ebf119c99 Merge: 26ba67b 564f4b9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 21:55:20 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/develop] Merge branch 'release-0.1.3'
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 564f4b9fdf0c63128c1fd6d1e7f4e36a42848fb4 Merge: 9871642 26ba67b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 21:54:41 2014 +0000 Merge branch 'release-0.1.3' .travis.yml | 3 +- CHANGELOG | 14 ++++ doc/DESCRIPTORS.md | 4 +- doc/gsoc2014-volunteer.txt | 92 +++++++++++++++++++++ lib/bridgedb/Bridges.py | 151 ++++++++++++++++++++++++++++++----- lib/bridgedb/HTTPServer.py | 55 +++++++++++-- lib/bridgedb/Main.py | 72 ++++++++--------- lib/bridgedb/parse/networkstatus.py | 2 +- lib/bridgedb/persistent.py | 11 ++- lib/bridgedb/templates/base.html | 5 ++ lib/bridgedb/templates/index.html | 11 +-- lib/bridgedb/templates/options.html | 39 +++++++++ lib/bridgedb/test/test_Bridges.py | 111 +++++++++++++++++++++++++ 13 files changed, 491 insertions(+), 79 deletions(-)

1 0

[bridgedb/develop] Update CHANGELOG with entries for version 0.1.3.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 26ba67b41cb7340d70164b3238882b730b2df0aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 21:50:51 2014 +0000 Update CHANGELOG with entries for version 0.1.3. --- CHANGELOG | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4ac962b..bd2a28e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,17 @@ +Changes in version 0.1.3 - 2014-02-21 +BridgeDB 0.1.3 includes fixes for the following bugs: + * FIXES #9264 Problem with transport lines in BridgeDB's bridge + pool assignment files + * FIXES a bug caused by attempts to convert descriptor digests + which could not be parsed into hexadecimal. + * FIXES a unicode decoding error within the bridgedb.persistent + module. + * REMOVES continuous integration testing for Python 2.6. + +Including the following general changes: + * ADD volunteer page text for GSoC 2014 applications. + + Changes in version 0.1.2 - 2014-02-05 BridgeDB 0.1.2 includes fixes for the following bugs: * FIXES #10811 BridgeDB's assignments.log files are not being updated

1 0

[bridgedb/master] Add sysrqb to travis email notifications.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit cbcc9a00a44fcc4a0138a5b0354490e95f682ace Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 8 04:38:28 2014 +0000 Add sysrqb to travis email notifications. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39852b1..b4bc299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,13 @@ notifications: - "irc.oftc.net#tor-bots" on_success: always on_failure: always - #use_notice: true template: - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" - "Build details : %{build_url}" email: recipients: - isis(a)torproject.org + - sysrqb(a)torproject.org on_success: never on_failure: change

1 0

[bridgedb/master] Provide an Advanced Options page for easier bridge selection
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 59e8b4684a99537bf7f4def43ede7d6c4dc33eb3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Feb 3 02:37:48 2014 +0000 Provide an Advanced Options page for easier bridge selection The options page allows the user to select a specific pluggable transport type and if they require IPv6 addresses. All pages inheriting from the base template will provide navigation buttons. --- lib/bridgedb/HTTPServer.py | 35 +++++++++++++++++++++++++++++-- lib/bridgedb/templates/base.html | 5 +++++ lib/bridgedb/templates/index.html | 11 ++++------ lib/bridgedb/templates/options.html | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index ad69e1b..610249a 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -208,7 +208,35 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): return redirectTo(request.uri, request) -class WebResource(twisted.web.resource.Resource): +class WebResourceOptions(twisted.web.resource.Resource): + """This resource is used by Twisted Web to give a web page with + additional options that the user may use to specify the criteria + the returned bridges should meet. + """ + isLeaf = True + + def __init__(self): + """Create a new WebResource for the Options page""" + gettext.install("bridgedb", unicode=True) + twisted.web.resource.Resource.__init__(self) + + def render_GET(self, request): + rtl = False + + try: + rtl = usingRTLLang(request) + except Exception as err: + logging.exception(err) + logging.error("The gettext files were not properly installed.") + logging.info("To install translations, try doing `python " \ + "setup.py compile_catalog`.") + + request.setHeader("Content-Type", "text/html; charset=utf-8") + return lookup.get_template('options.html').render(rtl=rtl) + + render_POST = render_GET + +class WebResourceBridges(twisted.web.resource.Resource): """This resource is used by Twisted Web to give a web page with some bridges in response to a request.""" isLeaf = True @@ -433,11 +461,14 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('assets', static.File(os.path.join(template_root, 'assets/'))) - resource = WebResource(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, + resource = WebResourceBridges(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS, domains=cfg.EMAIL_DOMAINS) + resource_options = WebResourceOptions() + + httpdist.putChild('options', resource_options) if cfg.RECAPTCHA_ENABLED: protected = CaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 9f8a70a..441f3b6 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -71,6 +71,11 @@ ${self.body()} ${_("Get IPv6 bridges")} </button> </a> + <a href="./options"> + <button class="btn btn-default" type="button"> + ${_("Advanced Options")} + </button> + </a> </div> </div> </div> diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 82522c8..a97e21d 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -14,13 +14,10 @@ </div> <div class="step row"> - <div class="bdb_span7 step-text"> - <span class="lead"> - <span class="step-title"> - ${_("Step 2")} </span> - <span style="margin-left: 20px;"> - ${_("Get %s bridges %s") % ("""<a href="/bridges">""", "</a>")}</span> - </span></div> + <div class="span1"> + <p class="lead"><span class="step-title"> ${_("Step 2")} </span></p></div> + <div class="span5 step-text"> + ${_("Get %s bridges %s") % ("""<a href="/options">""", "</a>")}</div> </div> <div class="step row"> diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html new file mode 100644 index 0000000..82d1213 --- /dev/null +++ b/lib/bridgedb/templates/options.html @@ -0,0 +1,39 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.html"/> + +<br /> +<br /> +<p><h2><a href="bridges">${_("""Just Give Me Bridges!""")}</a></h2> +</p> +<br /><br /><br /> +<hr /> +<p> +<h3> ${_("""Advanced Options""")}</h3> +<form action="bridges" method="GET"> +<div style="float: left;"> +<p>${_("""Do you need IPv6 addresses?""")} +</p> +## TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses" +<input type="checkbox" name="ipv6" value="yes">${_("""Yes!""")}</input> +<br /> +<br /> +</div><div style="float: right;"> +<p>${_("""Do you need a specific pluggable transport?""")}</p> +<select name="transport"> +<option name="none" value="0"> +## TRANSLATORS: Please do not translate the pluggable transport names +## (obfs2, obfs3, etc) + ${_("""No""")} +</option> +<option value="obfs2">${_("""Yes, obfs2""")}</option> +<option value="obfs3">${_("""Yes, obfs3""")}</option> + +</select> +</div> +<br /> +<br /> +<br /> +<br /> +<p><button>${_("""Get Bridges""")}</button></p> +</form> +<hr>

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit a2aec599ae199d0ddc8b3f2adf7d4455002cae22 Merge: 88569fb 9871642 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:48:48 2014 +0000 Merge branch 'master' into develop

1 0