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

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 25 Aug '14

25 Aug '14

commit 0451831d99cd97746a636f8fe5e97ecc8837ab33 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 25 00:15:38 2014 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 519f12f..be20097 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -59,6 +59,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> -<!ENTITY torsettings.bridgeHelp3 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“get transport obfs3”）。由于为了防止攻击者获取大量网桥地址，必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 这两个单词（如需获取 obfs3 网桥，请写“get transport obfs3”）。为了防止封锁者大量获取网桥地址，您必须使用下列之一的电子邮件地址来发送这一请求 (按推荐度排序)。"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> <!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Aug '14

25 Aug '14

commit 95d3fe6c1ba8cdc7ef6e048584c517b9664b905f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 25 00:15:33 2014 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 887fe22..be20097 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -59,7 +59,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 这两个单词（如需获取 obfs3 网桥，请写“get transport obfs3”）。为了防止封锁者大量获取网桥地址，您必须使用下列之一的电子邮件地址来发送这一请求 (按推荐度排序)。"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> <!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。">

1 0

[ooni-probe/master] update ooniprobe to 1.1.1
by art＠torproject.org 24 Aug '14

24 Aug '14

commit 94427900c6d9721f8db75c8d2a33d1abf3e8a4ec Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Aug 24 20:02:05 2014 +0200 update ooniprobe to 1.1.1 --- ChangeLog.rst | 8 ++++++++ debian/changelog | 6 ++++++ ooni/__init__.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 578f783..101b63a 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,14 @@ Changelog ========= +v1.1.1 (Sun, 24 Aug 2014) +------------------------- + +* Update MANIFEST.in to include the manpages for ooniprobe and oonireport. + +* Raise a more specific exception when multiple test cases are in a single + nettest file and the usageOptions are incoherent. + v1.1.0 (Tue, 19 Aug 2014) ------------------------- diff --git a/debian/changelog b/debian/changelog index 90ec33a..792faca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ooniprobe (1.1.1-1) stable; urgency=low + + * ooniprobe 1.1.1 + + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Sun, 24 Aug 2014 20:01:46 +0200 + ooniprobe (1.1.0-1) stable; urgency=low * ooniprobe 1.1.0 diff --git a/ooni/__init__.py b/ooni/__init__.py index 821b197..89fa0bf 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.1.0" +__version__ = "1.1.1" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Improved error handling
by art＠torproject.org 24 Aug '14

24 Aug '14

commit f7556f55018278e2228d4e31ed7357edb4769c7d Author: kudrom <kudrom(a)riseup.net> Date: Wed Aug 20 17:25:44 2014 +0200 Improved error handling --- ooni/errors.py | 12 ++++++++++++ ooni/nettest.py | 4 +++- ooni/tests/test_nettest.py | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index bcf8c95..081c4ac 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -264,11 +264,13 @@ class MissingRequiredOption(Exception): def __str__(self): return ','.join(self.message) + class OONIUsageError(usage.UsageError): def __init__(self, net_test_loader): super(OONIUsageError, self).__init__() self.net_test_loader = net_test_loader + class FailureToLoadNetTest(Exception): pass @@ -281,6 +283,15 @@ class InvalidOption(Exception): pass +class IncoherentOptions(Exception): + def __init__(self, first_options, second_options): + super(IncoherentOptions, self).__init__() + self.message = "%s is different to %s" % (first_options, second_options) + + def __str__(self): + return self.message + + class TaskTimedOut(Exception): pass @@ -304,6 +315,7 @@ class ReportLogExists(Exception): class InvalidConfigFile(Exception): pass + class ConfigFileIncoherent(Exception): pass diff --git a/ooni/nettest.py b/ooni/nettest.py index 3852b40..3db82d7 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -250,7 +250,9 @@ class NetTestLoader(object): if not usage_options: usage_options = self._parseNetTestOptions(test_class) else: - assert usage_options == test_class.usageOptions + if usage_options != test_class.usageOptions: + raise e.IncoherentOptions(usage_options.__name__, + test_class.usageOptions.__name__) return usage_options def loadNetTestString(self, net_test_string): diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index f1cc542..4f7b3e4 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -6,7 +6,7 @@ from twisted.internet import defer, reactor from twisted.python.usage import UsageError from ooni.settings import config -from ooni.errors import MissingRequiredOption, OONIUsageError +from ooni.errors import MissingRequiredOption, OONIUsageError, IncoherentOptions from ooni.nettest import NetTest, NetTestLoader from ooni.director import Director @@ -235,7 +235,7 @@ class TestNetTest(unittest.TestCase): self.verifyMethods(ntl.testCases) self.verifyClasses(ntl.testCases, set(('DummyTestCaseA', 'DummyTestCaseB'))) - self.assertRaises(AssertionError, ntl.checkOptions) + self.assertRaises(IncoherentOptions, ntl.checkOptions) def test_load_with_option(self): ntl = NetTestLoader(dummyArgs)

1 0

[ooni-probe/master] Add to manifest the new path to ooniprobe and oonireport man pages.
by art＠torproject.org 24 Aug '14

24 Aug '14

commit 05896e884d3420bb91ecb68cc3bd68b2721c5cbc Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Aug 24 19:48:52 2014 +0200 Add to manifest the new path to ooniprobe and oonireport man pages. --- MANIFEST.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index c40e0d5..2abe681 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,4 +5,5 @@ include data/GeoIP.dat include data/GeoIPASNum.dat include data/GeoLiteCity.dat include data/ooniprobe.conf.sample -include data/ooni.1 +include data/ooniprobe.1 +include data/oonireport.1

1 0

[ooni-probe/master] UsageOptions with multiple NetTests in a single file
by art＠torproject.org 24 Aug '14

24 Aug '14

commit 288af1412d6138c252d1d1d553077696a57f8bed Author: kudrom <kudrom(a)riseup.net> Date: Wed Aug 20 16:59:35 2014 +0200 UsageOptions with multiple NetTests in a single file --- ooni/tests/test_nettest.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index ccbe2dd..f1cc542 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -54,6 +54,32 @@ class DummyTestCaseB(NetTestCase): self.report['foo'] = 'foo' """ +double_different_options_net_test_string = """ +from twisted.python import usage +from ooni.nettest import NetTestCase + +class UsageOptionsA(usage.Options): + optParameters = [['spam', 's', None, 'ham']] + +class UsageOptionsB(usage.Options): + optParameters = [['spam', 's', None, 'ham']] + +class DummyTestCaseA(NetTestCase): + + usageOptions = UsageOptionsA + + def test_a(self): + self.report['bar'] = 'bar' + + +class DummyTestCaseB(NetTestCase): + + usageOptions = UsageOptionsB + + def test_b(self): + self.report['foo'] = 'foo' +""" + net_test_root_required = net_test_string + """ requiresRoot = True """ @@ -200,6 +226,17 @@ class TestNetTest(unittest.TestCase): self.verifyMethods(ntl.testCases) self.verifyClasses(ntl.testCases, set(('DummyTestCaseA', 'DummyTestCaseB'))) + ntl.checkOptions() + + def test_load_net_test_multiple_different_options(self): + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(double_different_options_net_test_string) + + self.verifyMethods(ntl.testCases) + self.verifyClasses(ntl.testCases, set(('DummyTestCaseA', 'DummyTestCaseB'))) + + self.assertRaises(AssertionError, ntl.checkOptions) + def test_load_with_option(self): ntl = NetTestLoader(dummyArgs) ntl.loadNetTestString(net_test_string)

1 0

[ooni-probe/master] Merge pull request #344 from kudrom/feature/11979
by art＠torproject.org 24 Aug '14

24 Aug '14

commit e451e6acc6b0de7ec40a934c5ebe89fdd26454ff Merge: 3283a34 f7556f5 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Thu Aug 21 16:58:16 2014 +0200 Merge pull request #344 from kudrom/feature/11979 Add support for having multiple test classes in a single nettest file ooni/errors.py | 12 +++++++ ooni/nettest.py | 4 ++- ooni/tests/test_nettest.py | 78 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 86 insertions(+), 8 deletions(-)

1 0

[ooni-probe/master] Add support for having multiple test classes in a single nettest file
by art＠torproject.org 24 Aug '14

24 Aug '14

commit 7e14b11eb3cbfabfb9bb1b51e91cfd52a257f6c0 Author: kudrom <kudrom(a)riseup.net> Date: Mon Aug 18 20:19:17 2014 +0200 Add support for having multiple test classes in a single nettest file --- ooni/tests/test_nettest.py | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 5015c64..ccbe2dd 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -31,6 +31,29 @@ class DummyTestCase(NetTestCase): self.report['foo'] = 'foo' """ +double_net_test_string = """ +from twisted.python import usage +from ooni.nettest import NetTestCase + +class UsageOptions(usage.Options): + optParameters = [['spam', 's', None, 'ham']] + +class DummyTestCaseA(NetTestCase): + + usageOptions = UsageOptions + + def test_a(self): + self.report['bar'] = 'bar' + + +class DummyTestCaseB(NetTestCase): + + usageOptions = UsageOptions + + def test_b(self): + self.report['foo'] = 'foo' +""" + net_test_root_required = net_test_string + """ requiresRoot = True """ @@ -137,6 +160,13 @@ class TestNetTest(unittest.TestCase): uniq_test_methods.add(test_method) self.assertEqual(set(['test_a', 'test_b']), uniq_test_methods) + def verifyClasses(self, test_cases, control_classes): + actual_classes = set() + for test_class, test_methods in test_cases: + actual_classes.add(test_class.__name__) + + self.assertEqual(actual_classes, control_classes) + def test_load_net_test_from_file(self): """ Given a file verify that the net test cases are properly @@ -163,15 +193,12 @@ class TestNetTest(unittest.TestCase): self.verifyMethods(ntl.testCases) - def test_load_net_test_from_StringIO(self): - """ - Given a file like object verify that the net test cases are properly - generated. - """ + def test_load_net_test_multiple(self): ntl = NetTestLoader(dummyArgs) - ntl.loadNetTestString(net_test_string) + ntl.loadNetTestString(double_net_test_string) self.verifyMethods(ntl.testCases) + self.verifyClasses(ntl.testCases, set(('DummyTestCaseA', 'DummyTestCaseB'))) def test_load_with_option(self): ntl = NetTestLoader(dummyArgs)

1 0

[tor/master] Remove the non-implemented versions of the sandbox _array() functions
by nickm＠torproject.org 24 Aug '14

24 Aug '14

commit 15be51b41d1a0c7b8743800c40cf60110cfe880f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 24 13:35:30 2014 -0400 Remove the non-implemented versions of the sandbox _array() functions --- src/common/sandbox.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index e215fe2..146f4ad 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1684,26 +1684,12 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file) } int -sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, ...) -{ - (void)cfg; - return 0; -} - -int sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file) { (void)cfg; (void)file; return 0; } -int -sandbox_cfg_allow_openat_filename_array(sandbox_cfg_t **cfg, ...) -{ - (void)cfg; - return 0; -} - #if 0 int sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, const char *com) @@ -1711,13 +1697,6 @@ sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, const char *com) (void)cfg; (void)com; return 0; } - -int -sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...) -{ - (void)cfg; - return 0; -} #endif int @@ -1728,13 +1707,6 @@ sandbox_cfg_allow_stat_filename(sandbox_cfg_t **cfg, char *file) } int -sandbox_cfg_allow_stat_filename_array(sandbox_cfg_t **cfg, ...) -{ - (void)cfg; - return 0; -} - -int sandbox_cfg_allow_rename(sandbox_cfg_t **cfg, char *file1, char *file2) { (void)cfg; (void)file1; (void)file2;

1 0

[tor/master] Use the ARRAY_LENGTH macro more consistently.
by nickm＠torproject.org 24 Aug '14

24 Aug '14

commit 9222707e5c55ae7419d998f46aaa903fdeacb68a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 24 13:35:48 2014 -0400 Use the ARRAY_LENGTH macro more consistently. --- src/common/tortls.c | 3 +-- src/test/test.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 5fe8d81..eda10bb 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -782,8 +782,7 @@ static const cipher_info_t CLIENT_CIPHER_INFO_LIST[] = { }; /** The length of CLIENT_CIPHER_INFO_LIST and CLIENT_CIPHER_DUMMIES. */ -static const int N_CLIENT_CIPHERS = - sizeof(CLIENT_CIPHER_INFO_LIST)/sizeof(CLIENT_CIPHER_INFO_LIST[0]); +static const int N_CLIENT_CIPHERS = ARRAY_LENGTH(CLIENT_CIPHER_INFO_LIST); #endif #ifndef V2_HANDSHAKE_CLIENT diff --git a/src/test/test.c b/src/test/test.c index 5786f3c..f1efc3d 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -191,7 +191,7 @@ remove_directory(void) #undef CACHE_GENERATED_KEYS static crypto_pk_t *pregen_keys[5] = {NULL, NULL, NULL, NULL, NULL}; -#define N_PREGEN_KEYS ((int)(sizeof(pregen_keys)/sizeof(pregen_keys[0]))) +#define N_PREGEN_KEYS ARRAY_LENGTH(pregen_keys) /** Generate and return a new keypair for use in unit tests. If we're using * the key cache optimization, we might reuse keys: we only guarantee that

1 0