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

[bridgedb/master] Add BridgeDB's new rst README to the Sphinx developer doc builds.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 63e280af4f136428277549d611bee0a20f8297c6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 28 11:15:56 2014 +0000 Add BridgeDB's new rst README to the Sphinx developer doc builds. --- doc/sphinx/source/index.rst | 9 +++++++++ doc/sphinx/source/readme.rst | 2 ++ 2 files changed, 11 insertions(+) diff --git a/doc/sphinx/source/index.rst b/doc/sphinx/source/index.rst index 06eeac8..02f50ad 100644 --- a/doc/sphinx/source/index.rst +++ b/doc/sphinx/source/… [View More]

1 0

[bridgedb/master] Update Sphinx refs for params in bridgedb.configure.loadConfig().
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit efdc3ae5ba9414b620e7f5700831a9e302f21e84 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 29 00:13:49 2014 +0000 Update Sphinx refs for params in bridgedb.configure.loadConfig(). --- lib/bridgedb/configure.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 33cc458..731b599 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -49,13 +49,13 @@ def … [View More]

1 0

[bridgedb/master] Fix docstring for bridgedb.email.EmailResponse.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 54d4d831841cee3b10b6d4ec57faf62da8faa9c1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 28 11:16:56 2014 +0000 Fix docstring for bridgedb.email.EmailResponse. --- lib/bridgedb/email/autoresponder.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 44f4079..3f53e6e 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@… [View More]

1 0

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

03 Feb '15

commit fe3967b8dbe9b61ed4bec6dd3662d61da314c607 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Sep 3 06:57:20 2014 +0000 Bump Leekspin version to 1.0.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 f1f85ab..ca2c01c 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,… [View More]

1 0

[bridgedb/master] Change bridge line PT args to be space-separated.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 487c1b6c16e979bc448ddd415364e28bd764d29a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Sep 5 00:54:33 2014 +0000 Change bridge line PT args to be space-separated. * FIXES #12932 https://bugs.torproject.org/12932 --- 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 fa9c246..613e2db 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -… [View More]

1 0

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

03 Feb '15

commit 6bc04ac2f9d05080c960d4de04b566e43146425e Merge: fe3967b 519426c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 6 03:37:48 2014 +0000 Merge branch 'fix/12932-pt-args-spaces' into develop .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- lib/bridgedb/Bridges.py | 26 ++++--- lib/bridgedb/strings.py | 1 + lib/bridgedb/templates/options.html | 1 + lib/bridgedb/test/test_https.py | … [View More]

1 0

[bridgedb/master] Merge branch 'fix/0.2.3-readme-testing-instructions' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit c6d52784445f9f5c0af1d577c5f5f58836856e48 Merge: 3972bfa 43f6d7b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 8 13:17:01 2015 +0000 Merge branch 'fix/0.2.3-readme-testing-instructions' into develop README.rst | 3 +++ doc/HACKING.md | 17 +++++++++++++++++ 2 files changed, 20 insertions(+)

1 0

[bridgedb/master] Add obfs4 to the HTTPS Distributor's PT options dropdown.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 1e2db4e7b4ede66443b3d2dfb6e695a9085119c7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 6 02:55:36 2014 +0000 Add obfs4 to the HTTPS Distributor's PT options dropdown. This is temporary. It is needed in order to make sure that the regression tests for #12932 are functioning correctly. Because #12932 is about the way PT arguments are presented to the user in the bridge lines, to test the fixes for it, we must go through the UI (as the tests … [View More]

1 0

[bridgedb/master] Merge branch 'hotfix/0.2.3-travis-mechanize-http' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 3972bfac81b2e2959e39e3e6ad7acb2f9044d2cb Merge: 6bc04ac 24acf6a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 14:10:04 2014 +0000 Merge branch 'hotfix/0.2.3-travis-mechanize-http' into develop .travis.yml | 5 +++ lib/bridgedb/test/test_https.py | 78 +++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 23 deletions(-)

1 0

[bridgedb/master] Fix an additional four bugs in bridgdb.Bridges.parseExtraInfoFile().
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 514026ceb102a359011016f842cd63fd5e6dd1ea Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 6 03:00:41 2014 +0000 Fix an additional four bugs in bridgdb.Bridges.parseExtraInfoFile(). In addition to the one-character bug for #12932 which was fixed in commit 487c1b6c16e979bc448ddd415364e28bd764d29a, there were an additional four bugs in the legacy parser, `bridgedb.Bridges.parseExtraInfoFile()` (which I am about to deprecate anyway for #9380):… [View More] # get the transport line if ID and line.startswith("transport "): fields = line[10:].split() # [ arglist ] field, optional if len(fields) >= 3: arglist = fields[2:] # BUGS 1 and 2 # parse arglist [k=v,...k=v] as argdict {k:v,...,k:v} argdict = {} for arg in arglist: try: k,v = arg.split('=') # BUG 3 except ValueError: continue # BUG 4 argdict[k] = v logging.debug(" Parsing Argument: %s: %s", k, v) BUG 1: This assumes the PT arguments are space-separated in the extrainfo descriptor. They are not; they are comma-separated. BUG 2: This would result in parsing the entire, comma-separated group of PT arguments into: {"key1": "a,key2=b,key3=c"} BUG 3: This would produce a ValueError, because there's more than one '=' character. (Meaning that the whole set of arguments would be discarded due to Bug #4.) BUG 4: The whole set of arguments gets discarded, without even so much as a log message, if there was more than one argument. These are all bug fixes on a single commit, 4300329a30f3b6aa3e390b140193dd50faa6e03f, from #4568. And I'm still deprecating the entire function anyway (for #9380) because the rest of it is likely just as full of bugs. * FIXES #12932 https://bugs.torproject.org/12932 --- lib/bridgedb/Bridges.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 613e2db..a3f50b4 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -596,16 +596,24 @@ def parseExtraInfoFile(f): # get the transport line if ID and line.startswith("transport "): fields = line[10:].split() - # [ arglist ] field, optional + if len(fields) >= 3: - arglist = fields[2:] - # parse arglist [k=v,...k=v] as argdict {k:v,...,k:v} argdict = {} - for arg in arglist: - try: k,v = arg.split('=') - except ValueError: continue - argdict[k] = v - logging.debug(" Parsing Argument: %s: %s", k, v) + # PT argumentss are comma-separated in the extrainfo + # descriptors. While there *shouldn't* be anything after them + # that was separated by a space (and hence would wind up being + # in a different `field`), if there was we'll join it to the + # rest of the PT arguments with a comma so that they are + # parsed as if they were PT arguments as well: + allargs = ','.join(fields[2:]) + for arg in allargs.split(','): + try: + k, v = arg.split('=') + except ValueError: + logging.warn(" Couldn't parse K=V from PT arg: %r" % arg) + else: + logging.debug(" Parsed PT Argument: %s: %s" % (k, v)) + argdict[k] = v # get the required fields, method name and address if len(fields) >= 2: [View Less]

1 0