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

[bridgedb/master] Change coverage Makefile directive; use rcfile and TRIAL variable.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 3bea4c16d649049ae5ae5ff928d344d252a693b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:44:00 2014 +0000 Change coverage Makefile directive; use rcfile and TRIAL variable. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 036997e..abf392e 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ .PHONY: install test .DEFAULT: install test +TRIAL:=$(shell which trial) + all: python setup.py build @@ -41,4 +43,6 @@ clean: -rm -rf _trial_temp coverage: - -coverage run $(which trial) ./lib/bridgedb/test/test_* && coverage report && coverage html + -coverage run --rcfile=".coveragerc" $(TRIAL) ./lib/bridgedb/test/test_*.py + -coverage report + -coverage html

1 0

[bridgedb/master] Add deprecation note in docstring of Bridges.is_valid_ip().
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit e91da017b0495a83d49c06086935a7efd5f9f7a1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:45:38 2014 +0000 Add deprecation note in docstring of Bridges.is_valid_ip(). --- lib/bridgedb/Bridges.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index e5d5921..b950bc3 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -38,10 +38,14 @@ HEX_DIGEST_LEN = 40 DIGEST_LEN = 20 PORTSPEC_LEN = 16 + def is_valid_ip(ip): """Return True if ip is the string encoding of a valid IPv4 address, and False otherwise. + XXX this should probably be deprecated in favour of + :func:`bridgedb.parse.addr.isValid`. + >>> from bridgedb import Bridges >>> Bridges.is_valid_ip('1.2.3.4') True

1 0

[bridgedb/master] Add a unit test that verifies we don't add duplicate bridges
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 13fc557b8e4bd094457ca954129dceaa4445d744 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Mar 4 13:03:48 2014 +0000 Add a unit test that verifies we don't add duplicate bridges Previously we did not check that a bridge was already in a splitter, this resulted in adding bridges with (almost) identical information and #9264. --- lib/bridgedb/test/test_Bridges.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/bridgedb/test/test_Bridges.py b/lib/bridgedb/test/test_Bridges.py index 4e0b27e..421b308 100644 --- a/lib/bridgedb/test/test_Bridges.py +++ b/lib/bridgedb/test/test_Bridges.py @@ -109,3 +109,33 @@ class BridgeClassTest(unittest.TestCase): digests = Bridges.getExtraInfoDigests(StringIO(test)) self.failUnlessIn(digest, digests) self.failUnlessEqual(content, digests[digest].read()) + + def test_splitterBridgeInsertion(self): + key = "Testing-Bridges-To-Rings" + splitter = Bridges.FilteredBridgeSplitter(key) + + bridge1 = Bridges.Bridge('unamed1', '1.2.3.5', 9100, + 'a1cc8dfef1fa11af9c40af1054df9daf45250550') + bridge1.setStatus(running = True) + bridge2 = Bridges.Bridge('unamed2', '1.2.3.4', 8080, + 'a1cc8dfef1fa11af9c40af1054df9daf45250551') + bridge2.setStatus(running = True) + bridge3 = Bridges.Bridge('unamed3', '5.2.3.4', 8080, + 'b1cc8dfef1fa11af9c40af1054df9daf45250552') + bridge3.setStatus(running = True) + bridge4 = Bridges.Bridge('unamed3', '5.2.3.4', 8080, + 'b1cc8dfef1fa11af9c40af1054df9daf45250552') + bridge4.setStatus(running = True) + + self.failUnlessEqual(len(splitter), 0) + splitter.insert(bridge1) + splitter.insert(bridge2) + splitter.insert(bridge3) + # Check that all were inserted + self.failUnlessEqual(len(splitter), 3) + splitter.insert(bridge1) + # Check that the same bridge is not inserted twice + self.failUnlessEqual(len(splitter), 3) + splitter.insert(bridge4) + # Check that identical bridges are not inserted twice + self.failUnlessEqual(len(splitter), 3)

1 0

[bridgedb/master] Fix old-style class bridgedb.Bridges.Bridge.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit a2701cd5a44b61d86470bcdc210ece662bdf52f8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:46:26 2014 +0000 Fix old-style class bridgedb.Bridges.Bridge. --- lib/bridgedb/Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index b950bc3..79a25ec 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -112,7 +112,7 @@ def chopString(s, size): for pos in xrange(0, len(s), size): yield s[pos:pos+size] -class Bridge: +class Bridge(object): """Holds information for a single bridge :attr str nickname: The bridge's nickname. Not currently used.

1 0

[bridgedb/master] Rewrite GSoC 2014 volunteer page text with Damian's suggestions.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit d5f25637e07d3df5a31da817e0fca1120f0e82ba Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 6 21:33:55 2014 +0000 Rewrite GSoC 2014 volunteer page text with Damian's suggestions. --- doc/gsoc2014-volunteer.txt | 117 ++++++++++---------------------------------- 1 file changed, 26 insertions(+), 91 deletions(-) diff --git a/doc/gsoc2014-volunteer.txt b/doc/gsoc2014-volunteer.txt index eb93611..1cedaf9 100644 --- a/doc/gsoc2014-volunteer.txt +++ b/doc/gsoc2014-volunteer.txt @@ -1,92 +1,27 @@ -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. +New BridgeDB Distributor +------------------------ + +Effort Level: Medium +Skill Level: Medium to Medium-High +Likely Mentors: isis, sysrqb + +BridgeDB is a Twisted Python system which runs a number of servers, in order +to distribute Tor bridge relays to users in potentially censored regions. Each +of BridgeDB's Distributors uses some unique channel to communicate bridge +addresses to users, currently there is an [https://bridges.torproject.org +HTTPS Distributor], and an Email Distributor. This project would involve +designing and creating a new Distributor for BridgeDB. Some ideas for new +Distributors: + + - 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. + +It's helpful if you already have some knowledge of Twisted. As part of your +application, please submit a design for a Distributor, as well as supply a +patch for a ticket which demonstrates knowledge of Twisted and Python ― +preferably for BridgeDB, see the +[https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~bridgedb-gsoc-application +'bridgedb-gsoc-application'] Trac tag for some examples of good tickets to +try, or contact isis or sysrqb on IRC to ask for ticket suggestions or advice.

1 0

[bridgedb/master] Fix old-style class bridgedb.Bridges.PluggableTransport.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit a564b84bb95f28b5cc6b91ba781c05b68ee5cf66 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:46:52 2014 +0000 Fix old-style class bridgedb.Bridges.PluggableTransport. --- lib/bridgedb/Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 79a25ec..41925a4 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -486,7 +486,7 @@ re_ipv6 = re.compile("\[([a-fA-F0-9:]+)\]:(.*$)") re_ipv4 = re.compile("((?:\d{1,3}\.?){4}):(.*$)") -class PluggableTransport: +class PluggableTransport(object): """ an object that represents a pluggable-transport method and a reference to the relevant bridge

1 0

[bridgedb/master] Add CHANGELOG entry for BridgeDB-0.1.5.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 4981fda08bb8a7271c0869229962f5e3113b0c2e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:52:11 2014 +0000 Add CHANGELOG entry for BridgeDB-0.1.5. --- CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9f44093..bfe527e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +Changes in version 0.1.5 - 2014-02-27 +BridgeDB 0.1.5 includes fixes for the following bugs: + * FIXES #10809 reCAPTCHA on bridges.torproject.org are impossible + to solve for humans + * FIXES #10834 + +Including the following general changes: + * CHANGES the reCaptcha remote IP address to be either a + configurable value, or random (as it was previously). + + Changes in version 0.1.4 - 2014-02-21 BridgeDB 0.1.4 includes fixes for the following bugs: * FIXES an RTL encoding issue in the "Step 2" text on index.html

1 0

[bridgedb/master] Document `key` parameter for bridgedb.Bridges.BridgeRing.__init__().
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 8fc3dfc8106c157801f526e7ae6eddad6fd3975b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:48:05 2014 +0000 Document `key` parameter for bridgedb.Bridges.BridgeRing.__init__(). --- lib/bridgedb/Bridges.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 41925a4..531a842 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -790,10 +790,11 @@ class BridgeRing(BridgeHolder): def __init__(self, key, answerParameters=None): """Create a new BridgeRing, using key as its hmac key. - :param key: DOCDOC + :type key: bytes + :param key: The HMAC key, generated with + :func:`bridgedb.crypto.getKey`. :type answerParameters: :class:`BridgeRingParameters` :param answerParameters: DOCDOC - :ivar dict bridges: A dictionary which maps HMAC keys to :class:`~bridgedb.Bridges.Bridge`s. :ivar dict bridgesByID: A dictionary which maps raw hash digests of

1 0

[bridgedb/master] Update copyright info in lib/bridgedb/Raptcha.py and add utf-8 header.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 85116508430a83d6e5ee42ce80d0cde80358fe09 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 27 21:44:03 2014 +0000 Update copyright info in lib/bridgedb/Raptcha.py and add utf-8 header. --- lib/bridgedb/Raptcha.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Raptcha.py b/lib/bridgedb/Raptcha.py index 1af8dd6..9a35b08 100644 --- a/lib/bridgedb/Raptcha.py +++ b/lib/bridgedb/Raptcha.py @@ -1,6 +1,17 @@ -# Raptcha -# Copyright (c) 2010, The Tor Project, Inc. -# See LICENSE for licensing information +# -*- encoding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> +# Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ """ This module wraps the recaptcha api and proxies requests to protect privacy.

1 0

[bridgedb/master] Fix old-style class bridgedb.captcha.Raptcha.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit be44ad36b147e54e5b843568dd9fd050c547d98e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 28 01:08:28 2014 +0000 Fix old-style class bridgedb.captcha.Raptcha. --- lib/bridgedb/captcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index e6533d8..0d3bf35 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -38,7 +38,7 @@ from BeautifulSoup import BeautifulSoup from recaptcha.client import captcha as recaptcha -class Raptcha(): +class Raptcha(object): """ A recaptcha captcha and method to request them """ def __init__(self, pubkey=None, privkey=None):

1 0