- tor-commits - lists.torproject.org

[tor/master] Don't expect unix sockets to be accepted on Windows
by nickm＠torproject.org 01 Feb '16

01 Feb '16

commit 49442b5e67710b7ed3c365c342aec3c18beb41d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 09:57:54 2016 -0500 Don't expect unix sockets to be accepted on Windows Fixes failures in test_config.c; bug not in any released tor. --- src/test/test_config.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 58487d7..c00e8e1 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3958,12 +3958,16 @@ test_config_parse_port_config__ports__ports_given(void *data) smartlist_clear(slout); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_AP_LISTENER, NULL, 0, 0); +#ifdef _WIN32 + tt_int_op(ret, OP_EQ, -1); +#else tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->port, OP_EQ, 0); tt_int_op(port_cfg->is_unix_addr, OP_EQ, 1); tt_str_op(port_cfg->unix_addr, OP_EQ, "/tmp/foo/bar"); +#endif // Test failure if we have no ipv4 and no ipv6 (for unix domain sockets, // this makes no sense - it should be fixed) @@ -3984,11 +3988,15 @@ test_config_parse_port_config__ports__ports_given(void *data) ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_AP_LISTENER, NULL, 0, CL_PORT_TAKES_HOSTNAMES); +#ifdef _WIN32 + tt_int_op(ret, OP_EQ, -1); +#else tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1); +#endif // Test success with both ipv4 and ipv6 (for unix domain sockets, // this makes no sense - it should be fixed) @@ -3999,11 +4007,15 @@ test_config_parse_port_config__ports__ports_given(void *data) ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_AP_LISTENER, NULL, 0, CL_PORT_TAKES_HOSTNAMES); +#ifdef _WIN32 + tt_int_op(ret, OP_EQ, -1); +#else tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1); +#endif // Test failure if we specify world writable for an IP Port tor_free(config_port_invalid);

1 0

[tor/master] Try to fix address tests on FreeBSD
by nickm＠torproject.org 01 Feb '16

01 Feb '16

commit 7d1fe7c9e7e6113bbbaec8c340da3ad7aa60429b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 09:38:31 2016 -0500 Try to fix address tests on FreeBSD In jails, there is not always a localhost. Bugfix not on any released Tor. --- src/test/test_address.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 3e73c3e..4cf3a5a 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -269,8 +269,10 @@ test_address_get_if_addrs_ifaddrs(void *arg) results = get_interface_addresses_ifaddrs(LOG_ERR); tt_int_op(smartlist_len(results),>=,1); +#ifndef __FreeBSD__ + /* FreeBSD doesn't have a localhost in jails sometimes. */ tt_assert(smartlist_contains_localhost_tor_addr(results)); - +#endif done: SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); smartlist_free(results); @@ -484,8 +486,10 @@ test_address_get_if_addrs_ioctl(void *arg) tt_assert(result); tt_int_op(smartlist_len(result),>=,1); +#ifndef __FreeBSD__ + /* FreeBSD doesn't have a localhost in jails sometimes. */ tt_assert(smartlist_contains_localhost_tor_addr(result)); - +#endif done: if (result) { SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t));

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 01 Feb '16

01 Feb '16

commit 4cd93a6a59236519dee2a1a7ee824904e923189d Merge: a5bed4d 7d1fe7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 09:41:45 2016 -0500 Merge branch 'maint-0.2.7' (We already had a fix for the address test freebsd issues) src/test/test_address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc src/test/test_address.c index 3ddf247,4cf3a5a..3b17b23 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@@ -511,28 -481,16 +511,28 @@@ test_address_get_if_addrs_ioctl(void *a (void)arg; - result = get_interface_addresses_ioctl(LOG_ERR); + result = get_interface_addresses_ioctl(LOG_ERR, AF_INET); + /* On an IPv6-only system, this will fail and return NULL tt_assert(result); - tt_int_op(smartlist_len(result),>=,1); + */ -#ifndef __FreeBSD__ - /* FreeBSD doesn't have a localhost in jails sometimes. */ - tt_assert(smartlist_contains_localhost_tor_addr(result)); -#endif - done: + /* Some FreeBSD jails don't have localhost IP address. Instead, they only + * have the address assigned to the jail (whatever that may be). + * And a jail without a network connection might not have any addresses at + * all. */ + if (result) { + tt_assert(!smartlist_contains_null_tor_addr(result)); + + /* If there are addresses, they must be IPv4 or IPv6. + * (AIX supports IPv6 from SIOCGIFCONF.) */ + if (smartlist_len(result) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(result) + || smartlist_contains_ipv6_tor_addr(result)); + } + } + - done: ++ done: if (result) { SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t)); smartlist_free(result);

1 0

[tor/maint-0.2.7] Try to fix address tests on FreeBSD
by nickm＠torproject.org 01 Feb '16

01 Feb '16

commit 7d1fe7c9e7e6113bbbaec8c340da3ad7aa60429b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 09:38:31 2016 -0500 Try to fix address tests on FreeBSD In jails, there is not always a localhost. Bugfix not on any released Tor. --- src/test/test_address.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 3e73c3e..4cf3a5a 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -269,8 +269,10 @@ test_address_get_if_addrs_ifaddrs(void *arg) results = get_interface_addresses_ifaddrs(LOG_ERR); tt_int_op(smartlist_len(results),>=,1); +#ifndef __FreeBSD__ + /* FreeBSD doesn't have a localhost in jails sometimes. */ tt_assert(smartlist_contains_localhost_tor_addr(results)); - +#endif done: SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); smartlist_free(results); @@ -484,8 +486,10 @@ test_address_get_if_addrs_ioctl(void *arg) tt_assert(result); tt_int_op(smartlist_len(result),>=,1); +#ifndef __FreeBSD__ + /* FreeBSD doesn't have a localhost in jails sometimes. */ tt_assert(smartlist_contains_localhost_tor_addr(result)); - +#endif done: if (result) { SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t));

1 0

[tor-browser/tor-browser-38.6.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Feb '16

01 Feb '16

commit 0585610798a61273268b99daa490c7630ce09980 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 14:47:03 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. This patch fixes https://bugs.torproject.org/18169 --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bf33260..bd8e58c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[tor-browser/tor-browser-38.6.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Feb '16

01 Feb '16

commit 10db8cb3c45ef7290811eac86b5d21deb1fa58c7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 14:56:24 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. Fix for https://bugs.torproject.org/18172 (missing emoji fonts) (Windows and OS X part) --- browser/app/profile/000-tor-browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bd8e58c..c022719 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -270,7 +270,7 @@ pref("browser.download.panel.shown", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Segoe UI Emoji, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[tor-browser/tor-browser-38.6.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Feb '16

01 Feb '16

commit db6d52d44439430de088dbca46ab9bf70bc5e4e4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 14:56:24 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. Fix for https://bugs.torproject.org/18172 (missing emoji fonts) (Windows and OS X part) --- browser/app/profile/000-tor-browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bd8e58c..c022719 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -270,7 +270,7 @@ pref("browser.download.panel.shown", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Segoe UI Emoji, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[tor-browser/tor-browser-38.6.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Feb '16

01 Feb '16

commit d78f5c707b357bc3fe88c1c46a95aae03f27b491 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 14:47:03 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. This patch fixes https://bugs.torproject.org/18169 --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bf33260..bd8e58c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[snowflake/master] s/MeekChannel/BrokerChannel (close #14) and more informative TODOs
by serene＠torproject.org 01 Feb '16

01 Feb '16

commit 678cf454cd51ab9c749ffd70debaec177e2bed54 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Jan 31 21:42:53 2016 -0800 s/MeekChannel/BrokerChannel (close #14) and more informative TODOs --- client/meek-webrtc.go | 74 -------------------------------------------------- client/rendezvous.go | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ client/snowflake.go | 31 ++++++++++++--------- 3 files changed, 94 insertions(+), 86 deletions(-) diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go deleted file mode 100644 index 34ff185..0000000 --- a/client/meek-webrtc.go +++ /dev/null @@ -1,74 +0,0 @@ -// Exchange WebRTC SessionDescriptions over a domain-fronted HTTP -// signaling channel. -package main - -import ( - "bytes" - "io/ioutil" - "log" - "net/http" - "net/url" - - "github.com/keroserene/go-webrtc" -) - -// Meek Signalling Channel. -type MeekChannel struct { - // The Host header to put in the HTTP request (optional and may be - // different from the host name in URL). - Host string - url *url.URL - transport http.Transport // Used to make all requests. -} - -// Construct a new MeekChannel, where: -// |broker| is the full URL of the facilitating program which assigns proxies -// to clients, and |front| is the option fronting domain. -func NewMeekChannel(broker string, front string) *MeekChannel { - targetURL, err := url.Parse(broker) - if nil != err { - return nil - } - mc := new(MeekChannel) - mc.url = targetURL - if "" != front { // Optional front domain. - mc.Host = mc.url.Host - mc.url.Host = front - } - - // We make a copy of DefaultTransport because we want the default Dial - // and TLSHandshakeTimeout settings. But we want to disable the default - // ProxyFromEnvironment setting. - mc.transport = *http.DefaultTransport.(*http.Transport) - mc.transport.Proxy = nil - return mc -} - -// Roundtrip HTTP POST using WebRTC SessionDescriptions. -// -// Sends an SDP offer to the meek broker, which assigns a proxy and responds -// with an SDP answer from a designated remote WebRTC peer. -func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( - *webrtc.SessionDescription, error) { - data := bytes.NewReader([]byte(offer.Serialize())) - // Suffix with broker's client registration handler. - request, err := http.NewRequest("POST", mc.url.String()+"client", data) - if nil != err { - return nil, err - } - if "" != mc.Host { // Set true host if necessary. - request.Host = mc.Host - } - resp, err := mc.transport.RoundTrip(request) - if nil != err { - return nil, err - } - defer resp.Body.Close() - log.Printf("MeekChannel Response:\n%s\n\n", resp.Status) - body, err := ioutil.ReadAll(resp.Body) - if nil != err { - return nil, err - } - answer := webrtc.DeserializeSessionDescription(string(body)) - return answer, nil -} diff --git a/client/rendezvous.go b/client/rendezvous.go new file mode 100644 index 0000000..ea0b338 --- /dev/null +++ b/client/rendezvous.go @@ -0,0 +1,75 @@ +// WebRTC Rendezvous requires the exchange of SessionDescriptions between +// peers. This file contains the domain-fronted HTTP signaling mechanism +// between the client and a desired Broker. +package main + +import ( + "bytes" + "io/ioutil" + "log" + "net/http" + "net/url" + + "github.com/keroserene/go-webrtc" +) + +// Signalling Channel to the Broker. +type BrokerChannel struct { + // The Host header to put in the HTTP request (optional and may be + // different from the host name in URL). + Host string + url *url.URL + transport http.Transport // Used to make all requests. +} + +// Construct a new BrokerChannel, where: +// |broker| is the full URL of the facilitating program which assigns proxies +// to clients, and |front| is the option fronting domain. +func NewBrokerChannel(broker string, front string) *BrokerChannel { + targetURL, err := url.Parse(broker) + if nil != err { + return nil + } + bc := new(BrokerChannel) + bc.url = targetURL + if "" != front { // Optional front domain. + bc.Host = bc.url.Host + bc.url.Host = front + } + + // We make a copy of DefaultTransport because we want the default Dial + // and TLSHandshakeTimeout settings. But we want to disable the default + // ProxyFromEnvironment setting. + bc.transport = *http.DefaultTransport.(*http.Transport) + bc.transport.Proxy = nil + return bc +} + +// Roundtrip HTTP POST using WebRTC SessionDescriptions. +// +// Send an SDP offer to the broker, which assigns a proxy and responds +// with an SDP answer from a designated remote WebRTC peer. +func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( + *webrtc.SessionDescription, error) { + data := bytes.NewReader([]byte(offer.Serialize())) + // Suffix with broker's client registration handler. + request, err := http.NewRequest("POST", bc.url.String()+"client", data) + if nil != err { + return nil, err + } + if "" != bc.Host { // Set true host if necessary. + request.Host = bc.Host + } + resp, err := bc.transport.RoundTrip(request) + if nil != err { + return nil, err + } + defer resp.Body.Close() + log.Printf("BrokerChannel Response:\n%s\n\n", resp.Status) + body, err := ioutil.ReadAll(resp.Body) + if nil != err { + return nil, err + } + answer := webrtc.DeserializeSessionDescription(string(body)) + return answer, nil +} diff --git a/client/snowflake.go b/client/snowflake.go index 83179a3..486e602 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -1,10 +1,9 @@ -// Client transport plugin for the snowflake pluggable transport. -// -// TODO: Use meek for signalling. +// Client transport plugin for the Snowflake pluggable transport. package main import ( "bufio" + "errors" "flag" "fmt" "io" @@ -16,10 +15,9 @@ import ( "syscall" "time" + "git.torproject.org/pluggable-transports/goptlib.git" "github.com/keroserene/go-webrtc" "github.com/keroserene/go-webrtc/data" - - "git.torproject.org/pluggable-transports/goptlib.git" ) var ptInfo pt.ClientInfo @@ -93,7 +91,7 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { return fmt.Errorf("SetWriteDeadline not implemented") } -func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( +func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( *webRTCConn, error) { offerChan := make(chan *webrtc.SessionDescription) @@ -131,6 +129,8 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( log.Printf("OnIceComplete") offerChan <- pc.LocalDescription() } + // This callback is not expected, as the Client initiates the creation + // of the data channel, not the remote peer. pc.OnDataChannel = func(channel *data.Channel) { log.Println("OnDataChannel") panic("OnDataChannel") @@ -151,6 +151,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( log.Println("OnClose channel") pw.Close() close(openChan) + // TODO: (Issue #12) Should attempt to renegotiate at this point. } dc.OnMessage = func(msg []byte) { log.Printf("OnMessage <--- %d bytes", len(msg)) @@ -173,14 +174,14 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( log.Printf("----------------") go func() { if "" != brokerURL { - log.Println("Sending offer via meek channel...\nTarget URL: ", brokerURL, + log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, "\nFront URL: ", frontDomain) - answer, err := meek.Negotiate(pc.LocalDescription()) + answer, err := broker.Negotiate(pc.LocalDescription()) if nil != err { - log.Printf("MeekChannel signaling error: %s", err) + log.Printf("BrokerChannel signaling error: %s", err) } if nil == answer { - log.Printf("MeekChannel: No answer received.") + log.Printf("BrokerChannel: No answer received.") } else { signalChan <- answer } @@ -236,10 +237,16 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() + // TODO: [#3] Fetch ICE server information from Broker. + // TODO: [#18] Consider TURN servers here too. config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - meek := NewMeekChannel(brokerURL, frontDomain) - remote, err := dialWebRTC(config, meek) + broker := NewBrokerChannel(brokerURL, frontDomain) + if nil == broker { + conn.Reject() + return errors.New("Failed to prepare BrokerChannel") + } + remote, err := dialWebRTC(config, broker) if err != nil { conn.Reject() return err

1 0

[stem/master] Add function pids_by_user()
by atagar＠torproject.org 01 Feb '16

01 Feb '16

commit ae178869ee37a1ec78e6b7ef511b54ca4f74863e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 30 14:35:52 2016 -0800 Add function pids_by_user() Simple utility for the system module to get pids for a user. --- docs/change_log.rst | 1 + stem/util/system.py | 31 +++++++++++++++++++++++++++++++ test/integ/util/system.py | 10 ++++++++++ 3 files changed, 42 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 74159e2..81bf5a2 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -77,6 +77,7 @@ The following are only available within Stem's `git repository * Allow :func:`stem.util.conf.Config.set` to remove values when provided with a **None** value * Additional information when :func:`~stem.util.system.call` fails through a :class:`~stem.util.system.CallError` * Added an **is_ipv6** value to :class:`~stem.util.connection.Connection` instances + * Added :func:`~stem.util.system.pids_by_user` * Added :func:`~stem.util.__init__.datetime_to_unix` * **Interpreter** diff --git a/stem/util/system.py b/stem/util/system.py index 14516b2..b9baa28 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -27,6 +27,7 @@ best-effort, providing **None** if the lookup fails. pid_by_name - gets the pid for a process by the given name pid_by_port - gets the pid for a process listening to a given port pid_by_open_file - gets the pid for the process with an open file + pids_by_user - provides processes owned by a user cwd - provides the current working directory for a given process user - provides the user a process is running under start_time - provides the unix timestamp when the process started @@ -84,6 +85,7 @@ GET_PID_BY_PORT_NETSTAT = 'netstat -npltu' GET_PID_BY_PORT_SOCKSTAT = 'sockstat -4l -P tcp -p %s' GET_PID_BY_PORT_LSOF = 'lsof -wnP -iTCP -sTCP:LISTEN' GET_PID_BY_FILE_LSOF = 'lsof -tw %s' +GET_PIDS_BY_USER = 'ps -o pid -u %s' GET_CWD_PWDX = 'pwdx %s' GET_CWD_LSOF = 'lsof -a -p %s -d cwd -Fn' GET_BSD_JAIL_ID_PS = 'ps -p %s -o jid' @@ -640,6 +642,35 @@ def pid_by_open_file(path): return None # all queries failed +def pids_by_user(user): + """ + Provides processes owned by a given user. + + .. versionadded:: 1.5.0 + + :param str user: user to look up processes for + + :returns: **list** with the process ids, **None** if it can't be determined + """ + + # example output: + # atagar@odin:~$ ps -o pid -u avahi + # PID + # 914 + # 915 + + if is_available('ps'): + results = call(GET_PIDS_BY_USER % user, None) + + if results: + try: + return list(map(int, results[1:])) + except ValueError: + pass + + return None + + def cwd(pid): """ Provides the working directory of the given process. diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 1d36b5f..3207f9d 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -366,6 +366,16 @@ class TestSystem(unittest.TestCase): os.rmdir(tmpdir) self.assertEqual(None, stem.util.system.pid_by_open_file(tmpdir)) + def test_pids_by_user(self): + """ + Checks the stem.util.system.pids_by_user function. + """ + + # our own pid should be among the processes for our user + + pids = stem.util.system.pids_by_user(getpass.getuser()) + self.assertTrue(os.getpid() in pids) + def test_cwd(self): """ Checks general usage of the stem.util.system.cwd function.

1 0