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

[bridgedb/develop] Fix an additional four bugs in bridgdb.Bridges.parseExtraInfoFile().
by isis＠torproject.org 20 Sep '14

20 Sep '14

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): # 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:

1 0

[bridgedb/develop] Add obfs4 to the HTTPS Distributor's PT options dropdown.
by isis＠torproject.org 20 Sep '14

20 Sep '14

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 in `lib/bridgedb/test/test_https.py` do). --- lib/bridgedb/templates/options.html | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html index 2debbf1..e765ce7 100644 --- a/lib/bridgedb/templates/options.html +++ b/lib/bridgedb/templates/options.html @@ -89,6 +89,7 @@ <option label="none" value="0" >${_("none")}</option> <option label="obfs2" value="obfs2" >obfs2</option> <option label="obfs3" value="obfs3" selected >obfs3</option> +<option label="obfs4" value="obfs4" >obfs4</option> <option label="scramblesuit" value="scramblesuit">scramblesuit</option> <option label="fte" value="fte" >fteproxy</option> </select>

1 0

[bridgedb/develop] Disable obfs4 distribution (for now).
by isis＠torproject.org 20 Sep '14

20 Sep '14

commit 519426c5c545fe96577b38fa6fba29f98286b7cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 6 03:07:34 2014 +0000 Disable obfs4 distribution (for now). Until we have enough bridges supporting obfs4 to actually distribute them, and Tor Browser has obfs4 built in, I'm leaving the HTTPS dropdown item present but disabled, and nothing will be mentioned in emails sent by the Email Distributor until the `"obfs4"` line in `bridgedb.strings.CURRENT_TRANSPORTS is uncommented. --- lib/bridgedb/strings.py | 1 + lib/bridgedb/templates/options.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index bea2f5d..929c610 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -166,6 +166,7 @@ EMAIL_COMMANDS = { CURRENT_TRANSPORTS = [ "obfs2", "obfs3", + #"obfs4", "scramblesuit", "fte", ] diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html index e765ce7..79ac1df 100644 --- a/lib/bridgedb/templates/options.html +++ b/lib/bridgedb/templates/options.html @@ -89,7 +89,7 @@ <option label="none" value="0" >${_("none")}</option> <option label="obfs2" value="obfs2" >obfs2</option> <option label="obfs3" value="obfs3" selected >obfs3</option> -<option label="obfs4" value="obfs4" >obfs4</option> +<option label="obfs4" value="obfs4" disabled >obfs4</option> <option label="scramblesuit" value="scramblesuit">scramblesuit</option> <option label="fte" value="fte" >fteproxy</option> </select>

1 0

[bridgedb/develop] Merge branch 'fix/12932-pt-args-spaces' into develop
by isis＠torproject.org 20 Sep '14

20 Sep '14

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 | 133 +++++++++++++++++++++++++++++++++++ setup.py | 2 +- 7 files changed, 155 insertions(+), 12 deletions(-)

1 0

[tor/release-0.2.5] merge in the next changes entry
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 9fe73959847ab5caa6b723fb5567882604a31765 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 17:11:43 2014 -0400 merge in the next changes entry --- ChangeLog | 8 ++++++++ changes/bug13100 | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e334c85..739e342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ Changes in version 0.2.5.8-rc - 2014-09-2? + Tor 0.2.5.8-rc is the second release candidate for the Tor 0.2.5.x + series. It fixes a bug that affects consistency and speed when + connecting to hidden services, and it updates the location of one of + the directory authorities. + o Major bugfixes: - Clients now send the correct address for their chosen rendezvous point when trying to access a hidden service. They used to send @@ -13,6 +18,9 @@ Changes in version 0.2.5.8-rc - 2014-09-2? some users might have reduced their anonymity. Fixes bug 13151; bugfix on 0.2.1.5-alpha. + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + Changes in version 0.2.5.7-rc - 2014-09-11 Tor 0.2.5.7-rc fixes several regressions from earlier in the 0.2.5.x diff --git a/changes/bug13100 b/changes/bug13100 deleted file mode 100644 index bbe43e6..0000000 --- a/changes/bug13100 +++ /dev/null @@ -1,3 +0,0 @@ - o Directory authority changes: - - Change IP address for gabelmoo (v3 directory authority). -

1 0

[tor/release-0.2.5] gabelmoo's IPv4 address changed
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug13100 b/changes/bug13100 new file mode 100644 index 0000000..bbe43e6 --- /dev/null +++ b/changes/bug13100 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index f6db98e..991c6fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 31a3586,919dd27..39b85aa --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 no-v2 " + "turtles orport=9090 " "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 70762a0e9c396bdba01b8cc1cdc6d1c275f9aa1d Merge: 22a8216 87576e8 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 20 16:51:41 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] gabelmoo's IPv4 address changed
by arma＠torproject.org 20 Sep '14

20 Sep '14

commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug13100 b/changes/bug13100 new file mode 100644 index 0000000..bbe43e6 --- /dev/null +++ b/changes/bug13100 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for gabelmoo (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index f6db98e..991c6fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",

1 0