November 2013 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 10 Nov '13

10 Nov '13

commit 1128a19a11620453f0fe8d3732e06032a89d93ac Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 09:45:11 2013 +0000 Update translations for vidalia --- ro/vidalia_ro.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/vidalia_ro.po b/ro/vidalia_ro.po index cc7ce1a..d866647 100644 --- a/ro/vidalia_ro.po +++ b/ro/vidalia_ro.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-10-03 13:01+0000\n" +"PO-Revision-Date: 2013-11-10 09:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 10 Nov '13

10 Nov '13

commit 9076378a7f7bba0f57c05d37587d966d0c1c14b6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 09:15:57 2013 +0000 Update translations for https_everywhere_completed --- ro/https-everywhere.properties | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ro/https-everywhere.properties b/ro/https-everywhere.properties index 0e7c45b..2e70f8e 100644 --- a/ro/https-everywhere.properties +++ b/ro/https-everywhere.properties @@ -1,5 +1,7 @@ -https-everywhere.menu.globalEnable = Activeaza HTTPS Oriunde -https-everywhere.menu.globalDisable = Dezactiveaza HTTPS Oriunde -https-everywhere.menu.enableDisable = Activeaza/Dezactiveaza Reguli -https-everywhere.menu.noRules = (Fara reguli pe aceasta pagina) -https-everywhere.menu.unknownRules = (Regiuli pentru aceasta pagina Necunoscute) +https-everywhere.menu.globalEnable = Activează HTTPS Oriunde +https-everywhere.menu.globalDisable = Dezactivează HTTPS Oriunde +https-everywhere.menu.enableDisable = Activează / dezactivează reguli +https-everywhere.menu.noRules = (Nu există reguli pentru această pagină) +https-everywhere.menu.unknownRules = (Regulile pentru această pagină sunt necunoscute) +https-everywhere.toolbar.hint = HTTPS Oriunde este activată. O poți comuta în funcție de sait dând click pe pictograma din bara de adrese. +https-everywhere.migration.notification0 = Pentru a implementa o remediere esențială această actualizare resetează preferințele tale pentru regulile HTTPS Oriunde la valorile lor implicite.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Nov '13

10 Nov '13

commit 022cd912682d867408b48fb6dc10581b5faabc1a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 09:15:51 2013 +0000 Update translations for https_everywhere --- ro/https-everywhere.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ro/https-everywhere.properties b/ro/https-everywhere.properties index efadd7c..2e70f8e 100644 --- a/ro/https-everywhere.properties +++ b/ro/https-everywhere.properties @@ -1,7 +1,7 @@ -https-everywhere.menu.globalEnable = Activeaza HTTPS Oriunde -https-everywhere.menu.globalDisable = Dezactiveaza HTTPS Oriunde -https-everywhere.menu.enableDisable = Activeaza/Dezactiveaza Reguli -https-everywhere.menu.noRules = (Fara reguli pe aceasta pagina) -https-everywhere.menu.unknownRules = (Regiuli pentru aceasta pagina Necunoscute) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. -# https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. +https-everywhere.menu.globalEnable = Activează HTTPS Oriunde +https-everywhere.menu.globalDisable = Dezactivează HTTPS Oriunde +https-everywhere.menu.enableDisable = Activează / dezactivează reguli +https-everywhere.menu.noRules = (Nu există reguli pentru această pagină) +https-everywhere.menu.unknownRules = (Regulile pentru această pagină sunt necunoscute) +https-everywhere.toolbar.hint = HTTPS Oriunde este activată. O poți comuta în funcție de sait dând click pe pictograma din bara de adrese. +https-everywhere.migration.notification0 = Pentru a implementa o remediere esențială această actualizare resetează preferințele tale pentru regulile HTTPS Oriunde la valorile lor implicite.

1 0

[flashproxy/master] Add tests for have_websocket_binary_frames().
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit 4ddd0cc48873438e53ecf2fdd444892550e6427d Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 2 10:35:25 2013 -0700 Add tests for have_websocket_binary_frames(). --- proxy/flashproxy-test.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index e2b5a43..e775f53 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -322,6 +322,26 @@ function test_lang_keys() { } } +function test_have_websocket_binary_frames() { + var TESTS = [ + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36", expected: true }, + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/536.30.1 (KHTML, like Gecko) Version/6.0.5 Safari/536.30.1", expected: true }, + { expected: false }, // no userAgent + ]; + var _navigator = window.navigator; + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + window.navigator = { userAgent: test.ua }; + var actual = have_websocket_binary_frames(); + + if (objects_equal(actual, test.expected)) + pass(test.ua); + else + fail(test.ua, test.expected, actual); + } + window.navigator = _navigator; +} + test_build_url(); test_parse_cookie_string(); test_parse_query_string(); @@ -329,6 +349,7 @@ test_get_param_boolean(); test_parse_addr_spec(); test_get_param_addr(); test_lang_keys(); +test_have_websocket_binary_frames(); if (num_failed == 0) quit(0);

1 0

[flashproxy/master] Add Firefox 11 to have_websocket_binary_frames().
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit 46a148d479c412daca0ac4fc5dfc55a9f1252004 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 2 10:36:16 2013 -0700 Add Firefox 11 to have_websocket_binary_frames(). --- proxy/flashproxy-test.js | 2 ++ proxy/flashproxy.js | 1 + 2 files changed, 3 insertions(+) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index e775f53..976fd44 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -324,6 +324,8 @@ function test_lang_keys() { function test_have_websocket_binary_frames() { var TESTS = [ + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:10.0.2) Gecko/20100101 Firefox/10.0.2", expected: false }, + { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:11.0) Gecko/20100101 Firefox/11.0", expected: true }, { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36", expected: true }, { ua: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/536.30.1 (KHTML, like Gecko) Version/6.0.5 Safari/536.30.1", expected: true }, { expected: false }, // no userAgent diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index fad3b7e..8353fe0 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -435,6 +435,7 @@ function have_websocket_binary_frames() { browsers = [ { idString: "Chrome", verString: "Chrome", version: 16 }, { idString: "Safari", verString: "Version", version: 6 }, + { idString: "Firefox", verString: "Firefox", version: 11 } ]; for (var i = 0; i < browsers.length; i++) {

1 0

[flashproxy/master] Test window.navigator.userAgent for truth instead of against null.
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit 2bc332dc074f17c3794a79a1ceaa0bb0b0d0533a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 9 23:35:38 2013 -0800 Test window.navigator.userAgent for truth instead of against null. We're about to add a patch where it can be undefined rather than null. See https://trac.torproject.org/projects/tor/ticket/9069#comment:8. --- proxy/flashproxy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index b739464..8f73aba 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -429,7 +429,7 @@ function have_websocket_binary_frames() { var ua, matches; ua = window.navigator.userAgent; - if (ua === null) + if (!ua) return false; /* We are cool for Chrome 16 or Safari 6.0. */ @@ -1050,7 +1050,7 @@ function flashproxy_should_disable() { } ua = window.navigator.userAgent; - if (ua !== null) { + if (ua) { var UA_LIST = [ /\bmobile\b/i, /\bandroid\b/i,

1 0

[flashproxy/master] Refactor have_websocket_binary_frames().
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit b30065357f4f99b7faf4c4f384d387e39a21f38c Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 2 10:33:27 2013 -0700 Refactor have_websocket_binary_frames(). --- proxy/flashproxy.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index b739464..fad3b7e 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -426,22 +426,26 @@ function format_addr(addr) { 6455 section 5.6.) If not, we have to use base64-encoded text frames. It is assumed that the client and relay endpoints always support binary frames. */ function have_websocket_binary_frames() { - var ua, matches; + var ua, matches, browsers, reg; ua = window.navigator.userAgent; - if (ua === null) + if (ua == null) return false; - /* We are cool for Chrome 16 or Safari 6.0. */ - - matches = ua.match(/\bchrome\/(\d+)/i); - if (matches !== null && Number(matches[1]) >= 16) - return true; - - matches = ua.match(/\bversion\/(\d+)/i); - if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i) - && Number(matches[1]) >= 6) - return true; + browsers = [ + { idString: "Chrome", verString: "Chrome", version: 16 }, + { idString: "Safari", verString: "Version", version: 6 }, + ]; + + for (var i = 0; i < browsers.length; i++) { + reg = "\\b" + browsers[i].idString + "\\b"; + if (ua.match(new RegExp(reg, "i")) == null) + continue; + reg = "\\b" + browsers[i].verString + "\\/(\\d+)"; + matches = ua.match(new RegExp(reg, "i")); + return (matches != null + && Number(matches[1]) >= browsers[i].version) ? true : false; + } return false; }

1 0

[flashproxy/master] Move matches on ua to the block where ua is defined.
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit f8a0809805d938f122d87e91b5b4d7f76d45ba81 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 9 23:37:27 2013 -0800 Move matches on ua to the block where ua is defined. This bug was noticed by Arlo. I based the patch on https://trac.torproject.org/projects/tor/attachment/ticket/9069/0001-Test-i…. --- proxy/flashproxy.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 8f73aba..cc14008 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -1065,14 +1065,14 @@ function flashproxy_should_disable() { return true; } } - } - if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i) - && !ua.match(/\bversion\/[6789]\./i)) { - /* Disable before Safari 6.0 because it doesn't have the hybi/RFC type - of WebSockets. */ - puts("Disable because User-Agent is Safari before 6.0."); - return true; + if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i) + && !ua.match(/\bversion\/[6789]\./i)) { + /* Disable before Safari 6.0 because it doesn't have the hybi/RFC type + of WebSockets. */ + puts("Disable because User-Agent is Safari before 6.0."); + return true; + } } if (!WebSocket) {

1 0

[flashproxy/master] Merge branch 'bug9069'
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit 458fa59cf38be1dd0329deb8f69e54f403e09d30 Merge: f8a0809 46a148d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 9 23:58:43 2013 -0800 Merge branch 'bug9069' Conflicts: proxy/flashproxy.js proxy/flashproxy-test.js | 23 +++++++++++++++++++++++ proxy/flashproxy.js | 27 ++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --cc proxy/flashproxy.js index cc14008,8353fe0..8aca4e5 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@@ -426,22 -426,27 +426,27 @@@ function format_addr(addr) 6455 section 5.6.) If not, we have to use base64-encoded text frames. It is assumed that the client and relay endpoints always support binary frames. */ function have_websocket_binary_frames() { - var ua, matches; + var ua, matches, browsers, reg; ua = window.navigator.userAgent; - if (ua == null) + if (!ua) return false; - /* We are cool for Chrome 16 or Safari 6.0. */ - - matches = ua.match(/\bchrome\/(\d+)/i); - if (matches !== null && Number(matches[1]) >= 16) - return true; - - matches = ua.match(/\bversion\/(\d+)/i); - if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i) - && Number(matches[1]) >= 6) - return true; + browsers = [ + { idString: "Chrome", verString: "Chrome", version: 16 }, + { idString: "Safari", verString: "Version", version: 6 }, + { idString: "Firefox", verString: "Firefox", version: 11 } + ]; + + for (var i = 0; i < browsers.length; i++) { + reg = "\\b" + browsers[i].idString + "\\b"; + if (ua.match(new RegExp(reg, "i")) == null) + continue; + reg = "\\b" + browsers[i].verString + "\\/(\\d+)"; + matches = ua.match(new RegExp(reg, "i")); + return (matches != null + && Number(matches[1]) >= browsers[i].version) ? true : false; + } return false; }

1 0

[flashproxy/master] Post-hoc ChangeLog for the facilitator part of #9349.
by dcf＠torproject.org 10 Nov '13

10 Nov '13

commit 1527cd97c9120e6cc857c13cf73f3f28beef1d1e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 9 23:51:26 2013 -0800 Post-hoc ChangeLog for the facilitator part of #9349. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index f90579e..15c61f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,12 @@ Changes in version 1.4 assign proxies to clients that use matching transports. Patch by George Kadianakis. Part of bug 9349. + o Allowed the facilitator to handle layered transports. For example, a + client that register with the transport "obfs3|websocket" will + receive a connection from a proxy using websocket, and will be + connected to a relay that has an obfs3 server behind a websocket + front end. Patch by Ximin Luo and George Kadianakis. Fixes bug 9349. + o Changed to use the pluggable transport method name "flashproxy" rather than "websocket". Both names are equivalent and "websocket" continues to work. The reason for this change is to reduce confusion

1 0