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

[tor/master] Add a changes file for bug 8790
by nickm＠torproject.org 11 May '13

11 May '13

commit 196155657d83be747b32819ad841c041bc2d9dfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 11 23:46:07 2013 -0400 Add a changes file for bug 8790 --- changes/bug8790 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug8790 b/changes/bug8790 new file mode 100644 index 0000000..9f1f0ba --- /dev/null +++ b/changes/bug8790 @@ -0,0 +1,6 @@ + o Minor code improvements: + - Remove instances of strcpy from the unit tests. They weren't + hurting anything, since they were only in the unit tests, but + it's embarassing to have strcpy() in the code at all, and some + analysis tools don't like it. Fixes 8790. Patch from Arlo Breault. +

1 0

[tor/master] Remove strcpy from unit tests.
by nickm＠torproject.org 11 May '13

11 May '13

commit 73b98948a290cfb9fccf6d6ec751b7daade07f31 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat May 11 14:06:22 2013 -0700 Remove strcpy from unit tests. See #8790. --- src/test/test_pt.c | 32 ++++++++++++++++---------------- src/test/test_util.c | 18 +++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 80707f4..d4cc0ae 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -28,58 +28,58 @@ test_pt_parsing(void) mp->transports = smartlist_new(); /* incomplete cmethod */ - strcpy(line,"CMETHOD trebuchet"); + strlcpy(line,"CMETHOD trebuchet",sizeof(line)); test_assert(parse_cmethod_line(line, mp) < 0); reset_mp(mp); /* wrong proxy type */ - strcpy(line,"CMETHOD trebuchet dog 127.0.0.1:1999"); + strlcpy(line,"CMETHOD trebuchet dog 127.0.0.1:1999",sizeof(line)); test_assert(parse_cmethod_line(line, mp) < 0); reset_mp(mp); /* wrong addrport */ - strcpy(line,"CMETHOD trebuchet socks4 abcd"); + strlcpy(line,"CMETHOD trebuchet socks4 abcd",sizeof(line)); test_assert(parse_cmethod_line(line, mp) < 0); reset_mp(mp); /* correct line */ - strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999"); + strlcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999",sizeof(line)); test_assert(parse_cmethod_line(line, mp) == 0); test_assert(smartlist_len(mp->transports)); reset_mp(mp); /* incomplete smethod */ - strcpy(line,"SMETHOD trebuchet"); + strlcpy(line,"SMETHOD trebuchet",sizeof(line)); test_assert(parse_smethod_line(line, mp) < 0); reset_mp(mp); /* wrong addr type */ - strcpy(line,"SMETHOD trebuchet abcd"); + strlcpy(line,"SMETHOD trebuchet abcd",sizeof(line)); test_assert(parse_smethod_line(line, mp) < 0); reset_mp(mp); /* cowwect */ - strcpy(line,"SMETHOD trebuchy 127.0.0.1:1999"); + strlcpy(line,"SMETHOD trebuchy 127.0.0.1:1999",sizeof(line)); test_assert(parse_smethod_line(line, mp) == 0); reset_mp(mp); /* unsupported version */ - strcpy(line,"VERSION 666"); + strlcpy(line,"VERSION 666",sizeof(line)); test_assert(parse_version(line, mp) < 0); /* incomplete VERSION */ - strcpy(line,"VERSION "); + strlcpy(line,"VERSION ",sizeof(line)); test_assert(parse_version(line, mp) < 0); /* correct VERSION */ - strcpy(line,"VERSION 1"); + strlcpy(line,"VERSION 1",sizeof(line)); test_assert(parse_version(line, mp) == 0); done: @@ -99,32 +99,32 @@ test_pt_protocol(void) /* various wrong protocol runs: */ - strcpy(line,"VERSION 1"); + strlcpy(line,"VERSION 1",sizeof(line)); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS); - strcpy(line,"VERSION 1"); + strlcpy(line,"VERSION 1",sizeof(line)); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_BROKEN); reset_mp(mp); - strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999"); + strlcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999",sizeof(line)); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_BROKEN); reset_mp(mp); /* correct protocol run: */ - strcpy(line,"VERSION 1"); + strlcpy(line,"VERSION 1",sizeof(line)); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS); - strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999"); + strlcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999",sizeof(line)); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS); - strcpy(line,"CMETHODS DONE"); + strlcpy(line,"CMETHODS DONE",sizeof(line)); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_CONFIGURED); diff --git a/src/test/test_util.c b/src/test/test_util.c index d463424..53626bb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2874,7 +2874,7 @@ test_util_eat_whitespace(void *ptr) (void)ptr; /* Try one leading ws */ - strcpy(str, "fuubaar"); + strlcpy(str, "fuubaar", sizeof(str)); for (i = 0; i < sizeof(ws); ++i) { str[0] = ws[i]; test_eq_ptr(str + 1, eat_whitespace(str)); @@ -2889,14 +2889,14 @@ test_util_eat_whitespace(void *ptr) test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Empty string */ - strcpy(str, ""); + strlcpy(str, "", sizeof(str)); test_eq_ptr(str, eat_whitespace(str)); test_eq_ptr(str, eat_whitespace_eos(str, str)); test_eq_ptr(str, eat_whitespace_no_nl(str)); test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str)); /* Only ws */ - strcpy(str, " \t\r\n"); + strlcpy(str, " \t\r\n", sizeof(str)); test_eq_ptr(str + strlen(str), eat_whitespace(str)); test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); test_eq_ptr(str + strlen(str) - 1, @@ -2904,7 +2904,7 @@ test_util_eat_whitespace(void *ptr) test_eq_ptr(str + strlen(str) - 1, eat_whitespace_eos_no_nl(str, str + strlen(str))); - strcpy(str, " \t\r "); + strlcpy(str, " \t\r ", sizeof(str)); test_eq_ptr(str + strlen(str), eat_whitespace(str)); test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); @@ -2913,7 +2913,7 @@ test_util_eat_whitespace(void *ptr) eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Multiple ws */ - strcpy(str, "fuubaar"); + strlcpy(str, "fuubaar", sizeof(str)); for (i = 0; i < sizeof(ws); ++i) str[i] = ws[i]; test_eq_ptr(str + sizeof(ws), eat_whitespace(str)); @@ -2923,28 +2923,28 @@ test_util_eat_whitespace(void *ptr) eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Eat comment */ - strcpy(str, "# Comment \n No Comment"); + strlcpy(str, "# Comment \n No Comment", sizeof(str)); test_streq("No Comment", eat_whitespace(str)); test_streq("No Comment", eat_whitespace_eos(str, str + strlen(str))); test_eq_ptr(str, eat_whitespace_no_nl(str)); test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Eat comment & ws mix */ - strcpy(str, " # \t Comment \n\t\nNo Comment"); + strlcpy(str, " # \t Comment \n\t\nNo Comment", sizeof(str)); test_streq("No Comment", eat_whitespace(str)); test_streq("No Comment", eat_whitespace_eos(str, str + strlen(str))); test_eq_ptr(str + 1, eat_whitespace_no_nl(str)); test_eq_ptr(str + 1, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Eat entire comment */ - strcpy(str, "#Comment"); + strlcpy(str, "#Comment", sizeof(str)); test_eq_ptr(str + strlen(str), eat_whitespace(str)); test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); test_eq_ptr(str, eat_whitespace_no_nl(str)); test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Blank line, then comment */ - strcpy(str, " \t\n # Comment"); + strlcpy(str, " \t\n # Comment", sizeof(str)); test_eq_ptr(str + strlen(str), eat_whitespace(str)); test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); test_eq_ptr(str + 2, eat_whitespace_no_nl(str));

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 11 May '13

11 May '13

commit 044ec73aaf2ceb194a0edeee151dc5a0344dfd38 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 03:45:10 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 0c12c8e..5c8f4da 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 03:15+0000\n" +"PO-Revision-Date: 2013-05-12 03:44+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -356,7 +356,7 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "windows：\n用于 Windows 系统的 Tor Browser Bundle 软件包。如果你正在使用某个\n版本的 Windows，比如 Windows XP、Windows Vista 或 Windows 7，应请求or \n获取该软件包。" +msgstr "windows：\n用于 Windows 系统的 Tor Browser Bundle 软件包。如果你正在使用某个\n版本的 Windows，比如 Windows XP、Windows Vista 或 Windows 7，应请求 \n获取该软件包。" #: lib/gettor/i18n.py:227 msgid "" @@ -370,7 +370,7 @@ msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." -msgstr "macos-ppc：\n这是一个较旧的安装程序（Vidalia bundle），用于使用 PowerPC \nCPU 并运行 OS X 系统的旧苹果计算机。请注意，该软件包将很快弃用。" +msgstr "macos-ppc：\n这是一个较旧的安装程序 (Vidalia bundle)，用于使用 PowerPC \nCPU 并运行 OS X 系统的旧苹果计算机。请注意，不久之后该软件包将不再使用。" #: lib/gettor/i18n.py:235 msgid "" @@ -382,7 +382,7 @@ msgstr "linux-i386：\n用于 32 位 Linux 系统的 Tor Browser Bundle 软件 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "请注意，该软件包容量较大，需电子邮件可接收约 30MB 的附件。" +msgstr "请注意，该软件包容量较大，接收文件的电子邮件需支持 30MB 的附件。" #: lib/gettor/i18n.py:241 msgid "" @@ -431,7 +431,7 @@ msgstr "obfs-linux-x86_64：\n用于 64bit Intel CPU 架构的 Linux 系统的 T msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." -msgstr "源代码：\n供专业人士使用的 Tor 源代码。大多数用户无需使用该软件包。" +msgstr "source：\n供专业人士使用的 Tor 源代码。大多数用户无需使用该软件包。" #: lib/gettor/i18n.py:269 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 May '13

11 May '13

commit ac66b3d89e1e6e94f6de5fa2512da95468817725 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 03:45:06 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 2f3e323..5c8f4da 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 03:14+0000\n" +"PO-Revision-Date: 2013-05-12 03:44+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -342,7 +342,7 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "另一种提取 .z 文件的方法是将其重命名未 .zip。例如，收到的文件为 \n \"windows.z\"，将其重命名为 \"windows.zip\"，然后通过已安装的常用\n文件压缩程序即可进行解压。" +msgstr "另一种提取 .z 文件的方法是将其重命名为 .zip。例如，将收到的文件 \n \"windows.z\"重命名为 \"windows.zip\"，然后通过已安装的常用\n文件压缩程序即可进行解压。" #: lib/gettor/i18n.py:219 msgid "" @@ -356,7 +356,7 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "windows：\n用于 Windows 系统的 Tor Browser Bundle 软件包。如果你正在使用某个\n版本的 Windows，比如 Windows XP、Windows Vista 或 Windows 7，应请求or \n获取该软件包。" +msgstr "windows：\n用于 Windows 系统的 Tor Browser Bundle 软件包。如果你正在使用某个\n版本的 Windows，比如 Windows XP、Windows Vista 或 Windows 7，应请求 \n获取该软件包。" #: lib/gettor/i18n.py:227 msgid "" @@ -370,7 +370,7 @@ msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." -msgstr "macos-ppc：\n这是一个较旧的安装程序（Vidalia bundle），用于使用 PowerPC \nCPU 并运行 OS X 系统的旧苹果计算机。请注意，该软件包将很快弃用。" +msgstr "macos-ppc：\n这是一个较旧的安装程序 (Vidalia bundle)，用于使用 PowerPC \nCPU 并运行 OS X 系统的旧苹果计算机。请注意，不久之后该软件包将不再使用。" #: lib/gettor/i18n.py:235 msgid "" @@ -382,7 +382,7 @@ msgstr "linux-i386：\n用于 32 位 Linux 系统的 Tor Browser Bundle 软件 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "请注意，该软件包容量较大，需电子邮件可接收约 30MB 的附件。" +msgstr "请注意，该软件包容量较大，接收文件的电子邮件需支持 30MB 的附件。" #: lib/gettor/i18n.py:241 msgid "" @@ -431,7 +431,7 @@ msgstr "obfs-linux-x86_64：\n用于 64bit Intel CPU 架构的 Linux 系统的 T msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." -msgstr "源代码：\n供专业人士使用的 Tor 源代码。大多数用户无需使用该软件包。" +msgstr "source：\n供专业人士使用的 Tor 源代码。大多数用户无需使用该软件包。" #: lib/gettor/i18n.py:269 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 11 May '13

11 May '13

commit 06a93a3a8543c9a581b41621b76c1d1beb2a3cba Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 03:15:11 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 2233f0f..0c12c8e 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 02:39+0000\n" +"PO-Revision-Date: 2013-05-12 03:15+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -342,7 +342,7 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "另一种提取 .z 文件的方法是将其重命名未 .zip。例如，收到的文件为 \n \"windows.z\"，将其重命名为 \"windows.zip\"，然后通过已安装的常用\n文件压缩程序即可进行解压。" +msgstr "另一种提取 .z 文件的方法是将其重命名为 .zip。例如，将收到的文件 \n \"windows.z\"重命名为 \"windows.zip\"，然后通过已安装的常用\n文件压缩程序即可进行解压。" #: lib/gettor/i18n.py:219 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 May '13

11 May '13

commit 28998819a9c55b9844d99b8a5cb7eb81439cfc85 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 12 03:15:07 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 2233f0f..2f3e323 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-12 02:39+0000\n" +"PO-Revision-Date: 2013-05-12 03:14+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[stem/master] Allowing for instantanious closure in test_status_notifications
by atagar＠torproject.org 11 May '13

11 May '13

commit 76f82d74960df9bccececff6792aa7dab88cd77b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 11 17:30:29 2013 -0700 Allowing for instantanious closure in test_status_notifications Well, that's a little odd. Our jenkins instance reported a failure of test_status_notifications... ====================================================================== FAIL: test_status_notifications ---------------------------------------------------------------------- Traceback: File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/integ/control/base_controller.py", line 224, in test_status_notifications self.assertTrue(state_observer.timestamp < time.time()) AssertionError ---------------------------------------------------------------------- In the past we've seen test failures due to dixie being far, far faster than my netbook. I'm a little dubious that state_observer.timestamp truely equaled time.time() (that would imply that the above statements took zero nanoseconds) but oh well. I've only seen this happen once and there's little reason not to pass when they're equal. --- test/integ/control/base_controller.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index b91dd24..0226022 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -221,14 +221,14 @@ class TestBaseController(unittest.TestCase): controller.close() self.assertEquals(controller, state_observer.controller) self.assertEquals(stem.control.State.CLOSED, state_observer.state) - self.assertTrue(state_observer.timestamp < time.time()) + self.assertTrue(state_observer.timestamp <= time.time()) self.assertTrue(state_observer.timestamp > time.time() - 1.0) state_observer.reset() controller.connect() self.assertEquals(controller, state_observer.controller) self.assertEquals(stem.control.State.INIT, state_observer.state) - self.assertTrue(state_observer.timestamp < time.time()) + self.assertTrue(state_observer.timestamp <= time.time()) self.assertTrue(state_observer.timestamp > time.time() - 1.0) state_observer.reset() @@ -237,7 +237,7 @@ class TestBaseController(unittest.TestCase): self.assertRaises(stem.SocketClosed, controller.msg, "blarg") self.assertEquals(controller, state_observer.controller) self.assertEquals(stem.control.State.CLOSED, state_observer.state) - self.assertTrue(state_observer.timestamp < time.time()) + self.assertTrue(state_observer.timestamp <= time.time()) self.assertTrue(state_observer.timestamp > time.time() - 1.0) state_observer.reset() @@ -257,6 +257,6 @@ class TestBaseController(unittest.TestCase): time.sleep(0.1) # not much work going on so this doesn't need to be much self.assertEquals(controller, state_observer.controller) self.assertEquals(stem.control.State.CLOSED, state_observer.state) - self.assertTrue(state_observer.timestamp < time.time()) + self.assertTrue(state_observer.timestamp <= time.time()) self.assertTrue(state_observer.timestamp > time.time() - 1.0) state_observer.reset()

1 0

[stem/master] Support for pulling multiple pids with get_pid_by_name()
by atagar＠torproject.org 11 May '13

11 May '13

commit 7c0b3ca25596123b5cfbc9251bdfbe630d23ffed Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 11 17:09:52 2013 -0700 Support for pulling multiple pids with get_pid_by_name() A leading cause of test failures in our jenkins environment is test_get_pid_by_name_lsof. This is because the test assumes that there is only a single tor process, but that's often not the case on the dixie host. This not only fixes the test, but expands get_pid_by_name() to include a 'multiple' flag to pull all pids for a given process name. This includes unit test coverage. --- docs/change_log.rst | 1 + stem/util/system.py | 80 ++++++++++++++++++++++++++++++-------------- test/integ/util/system.py | 8 +++- test/unit/util/system.py | 18 ++++++++++ 4 files changed, 79 insertions(+), 28 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 5ddfcda..6189038 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -43,6 +43,7 @@ The following are only available within stem's `git repository * :class:`~stem.response.events.AddrMapEvent` support for the new CACHED argument (:trac:`8596`, :spec:`25b0d43`) * :func:`~stem.control.Controller.attach_stream` could encounter an undocumented 555 response (:trac:`8701`, :spec:`7286576`) * :class:`~stem.descriptor.server_descriptor.RelayDescriptor` digest validation was broken with python 3 (:trac:`8755`) + * :func:`~stem.util.system.get_pid_by_name` can now pull for all processes with a given name * **Website** diff --git a/stem/util/system.py b/stem/util/system.py index 645fbbe..6b767c7 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -219,7 +219,7 @@ def is_running(command): return None -def get_pid_by_name(process_name): +def get_pid_by_name(process_name, multiple = False): """ Attempts to determine the process id for a running process, using... @@ -231,11 +231,15 @@ def get_pid_by_name(process_name): ps axc | egrep " <name>$" (bsd) 4. lsof -tc <name> - Results with multiple instances of the process are discarded. - :param str process_name: process name for which to fetch the pid + :param bool multiple: provides a list of all pids if **True**, otherwise + results with multiple processes are discarded - :returns: **int** with the process id, **None** if it can't be determined + :returns: + Response depends upon the 'multiple' argument as follows... + + * if **False** then this provides an **int** with the process id or **None** if it can't be determined + * if **True** then this provides a **list** of all **int** process ids, and an empty list if it can't be determined """ # attempts to resolve using pgrep, failing if: @@ -249,11 +253,16 @@ def get_pid_by_name(process_name): if is_available("pgrep"): results = call(GET_PID_BY_NAME_PGREP % process_name) - if results and len(results) == 1: - pid = results[0].strip() + if results: + try: + pids = map(int, results) - if pid.isdigit(): - return int(pid) + if multiple: + return pids + elif len(pids) == 1: + return pids[0] + except ValueError: + pass # attempts to resolve using pidof, failing if: # - we're running on bsd (command unavailable) @@ -265,11 +274,16 @@ def get_pid_by_name(process_name): if is_available("pidof"): results = call(GET_PID_BY_NAME_PIDOF % process_name) - if results and len(results) == 1 and len(results[0].split()) == 1: - pid = results[0].strip() + if results and len(results) == 1: + try: + pids = map(int, results[0].split()) - if pid.isdigit(): - return int(pid) + if multiple: + return pids + elif len(pids) == 1: + return pids[0] + except ValueError: + pass # attempts to resolve using ps, failing if: # - system's ps variant doesn't handle these flags (none known at the moment) @@ -292,11 +306,16 @@ def get_pid_by_name(process_name): # linux variant of ps results = call(GET_PID_BY_NAME_PS_LINUX % process_name) - if results and len(results) == 2: - pid = results[1].strip() + if results: + try: + pids = map(int, results[1:]) - if pid.isdigit(): - return int(pid) + if multiple: + return pids + elif len(pids) == 1: + return pids[0] + except ValueError: + pass if is_bsd(): # bsd variant of ps @@ -304,13 +323,17 @@ def get_pid_by_name(process_name): if results: # filters results to those with our process name - results = [r for r in results if r.endswith(" %s" % process_name)] + results = [r.split()[0] for r in results if r.endswith(" %s" % process_name)] - if len(results) == 1 and len(results[0].split()) > 0: - pid = results[0].split()[0] + try: + pids = map(int, results) - if pid.isdigit(): - return int(pid) + if multiple: + return pids + elif len(pids) == 1: + return pids[0] + except ValueError: + pass # resolves using lsof which works on both Linux and BSD, only failing if: # - lsof is unavailable (not included by default on OpenBSD) @@ -329,14 +352,19 @@ def get_pid_by_name(process_name): if is_available("lsof"): results = call(GET_PID_BY_NAME_LSOF % process_name) - if results and len(results) == 1: - pid = results[0].strip() + if results: + try: + pids = map(int, results) - if pid.isdigit(): - return int(pid) + if multiple: + return pids + elif len(pids) == 1: + return pids[0] + except ValueError: + pass log.debug("failed to resolve a pid for '%s'" % process_name) - return None + return [] if multiple else None def get_pid_by_port(port): diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 2c2bc5d..63486a4 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -201,8 +201,12 @@ class TestSystem(unittest.TestCase): lsof_prefix = stem.util.system.GET_PID_BY_NAME_LSOF % "" mocking.mock(stem.util.system.call, filter_system_call([lsof_prefix])) - tor_pid = test.runner.get_runner().get_pid() - self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) + our_tor_pid = test.runner.get_runner().get_pid() + + all_tor_pids = stem.util.system.get_pid_by_name("tor", multiple = True) + + if len(all_tor_pids) == 1: + self.assertEquals(our_tor_pid, all_tor_pids[0]) def test_get_pid_by_port(self): """ diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 4a3473c..fc961cd 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -37,6 +37,12 @@ GET_PID_BY_NAME_PS_BSD = [ " 11 ?? Ss 5:47.36 DirectoryService", " 12 ?? Ss 3:01.44 notifyd"] +GET_PID_BY_NAME_PS_BSD_MULTIPLE = [ + " PID TT STAT TIME COMMAND", + " 1 ?? Ss 9:00.22 launchd", + " 10 ?? Ss 0:09.97 kextd", + " 41 ?? Ss 9:00.22 launchd"] + GET_PID_BY_PORT_NETSTAT_RESULTS = [ "Active Internet connections (only servers)", "Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name", @@ -141,6 +147,8 @@ class TestSystem(unittest.TestCase): expected_response = 1111 if test_input == "success" else None self.assertEquals(expected_response, system.get_pid_by_name(test_input)) + self.assertEquals([123, 456, 789], system.get_pid_by_name("multiple_results", multiple = True)) + def test_get_pid_by_name_pidof(self): """ Tests the get_pid_by_name function with pidof responses. @@ -155,6 +163,8 @@ class TestSystem(unittest.TestCase): expected_response = 1111 if test_input == "success" else None self.assertEquals(expected_response, system.get_pid_by_name(test_input)) + self.assertEquals([123, 456, 789], system.get_pid_by_name("multiple_results", multiple = True)) + def test_get_pid_by_name_ps_linux(self): """ Tests the get_pid_by_name function with the linux variant of ps. @@ -170,6 +180,8 @@ class TestSystem(unittest.TestCase): expected_response = 1111 if test_input == "success" else None self.assertEquals(expected_response, system.get_pid_by_name(test_input)) + self.assertEquals([123, 456, 789], system.get_pid_by_name("multiple_results", multiple = True)) + def test_get_pid_by_name_ps_bsd(self): """ Tests the get_pid_by_name function with the bsd variant of ps. @@ -181,6 +193,10 @@ class TestSystem(unittest.TestCase): self.assertEquals(11, system.get_pid_by_name("DirectoryService")) self.assertEquals(None, system.get_pid_by_name("blarg")) + mocking.mock(system.call, mock_call(system.GET_PID_BY_NAME_PS_BSD, GET_PID_BY_NAME_PS_BSD_MULTIPLE)) + + self.assertEquals([1, 41], system.get_pid_by_name("launchd", multiple = True)) + def test_get_pid_by_name_lsof(self): """ Tests the get_pid_by_name function with lsof responses. @@ -195,6 +211,8 @@ class TestSystem(unittest.TestCase): expected_response = 1111 if test_input == "success" else None self.assertEquals(expected_response, system.get_pid_by_name(test_input)) + self.assertEquals([123, 456, 789], system.get_pid_by_name("multiple_results", multiple = True)) + def test_get_pid_by_port_netstat(self): """ Tests the get_pid_by_port function with a netstat response.

1 0

[stem/master] Disabling test_event_handling
by atagar＠torproject.org 11 May '13

11 May '13

commit 2f69e4de1e5d9982dfe94a90c62da3c71edf96a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 11 17:21:13 2013 -0700 Disabling test_event_handling Well damn. Even with expanded sleeps test_event_handling is occasionally failing on the jenkins host. No test is better than a flaky test so disabling this for the time being. Ticket for fixing this test... https://trac.torproject.org/8865 --- test/integ/control/controller.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4909399..f0b94a9 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -108,6 +108,14 @@ class TestController(unittest.TestCase): them. Then remove the listeners. """ + # TODO: This test relies on the timing of BW events which has proved to + # be unreliable on our jenkins host (probably related to system load). + # This occures even with sizable sleeps so this test needs to be disabled + # until we can come up with a test that doesn't rely on event timing. + + test.runner.skip(self, "(presently unreliable)") + return + if test.runner.require_control(self): return

1 0

[stem/master] Make controller cache thread safe
by atagar＠torproject.org 11 May '13

11 May '13

commit 2c51c6a10cef7b68d9acc7703014bea2e4bd3101 Author: Akshit Khurana <axitkhurana(a)gmail.com> Date: Thu Apr 4 18:09:06 2013 +0530 Make controller cache thread safe reads and writes take place under cache lock https://trac.torproject.org/8607 --- stem/control.py | 139 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 102 insertions(+), 37 deletions(-) diff --git a/stem/control.py b/stem/control.py index 2e83a64..304a808 100644 --- a/stem/control.py +++ b/stem/control.py @@ -659,6 +659,8 @@ class Controller(BaseController): self._is_caching_enabled = True self._request_cache = {} + self._cache_lock = threading.RLock() + # mapping of event types to their listeners self._event_listeners = {} @@ -753,13 +755,17 @@ class Controller(BaseController): params = set(params) # check for cached results - for param in list(params): - cache_key = "getinfo.%s" % param.lower() + from_cache = [param.lower() for param in params] + cached_results = self._get_cache(from_cache, "getinfo") + + reply = {} + for key in cached_results.keys(): + user_expected_key = _case_insensitive_lookup(params, key, key) + reply[user_expected_key] = cached_results[key] + params.remove(user_expected_key) - if cache_key in self._request_cache: - reply[param] = self._request_cache[cache_key] - params.remove(param) - elif param.startswith('ip-to-country/') and self.is_geoip_unavailable(): + for param in params: + if param.startswith('ip-to-country/') and self.is_geoip_unavailable(): # the geoip database already looks to be unavailable - abort the request if default == UNDEFINED: raise stem.ProtocolError("Tor geoip database is unavailable") @@ -782,16 +788,19 @@ class Controller(BaseController): reply.update(response.entries) if self.is_caching_enabled(): + to_cache = {} for key, value in response.entries.items(): key = key.lower() # make case insensitive if key in CACHEABLE_GETINFO_PARAMS: - self._request_cache["getinfo.%s" % key] = value + to_cache[key] = value elif key.startswith('ip-to-country/'): # both cache-able and means that we should reset the geoip failure count - self._request_cache["getinfo.%s" % key] = value + to_cache[key] = value self._geoip_failure_count = -1 + self._set_cache(to_cache, "getinfo") + log.debug("GETINFO %s (runtime: %0.4f)" % (" ".join(params), time.time() - start_time)) if is_multiple: @@ -839,11 +848,14 @@ class Controller(BaseController): try: if not self.is_caching_enabled(): return stem.version.Version(self.get_info("version")) - elif not "version" in self._request_cache: - version = stem.version.Version(self.get_info("version")) - self._request_cache["version"] = version + else: + version = self._get_cache(["version"]).get("version", None) - return self._request_cache["version"] + if not version: + version = stem.version.Version(self.get_info("version")) + self._set_cache({"version": version}) + + return version except Exception as exc: if default == UNDEFINED: raise exc @@ -866,10 +878,11 @@ class Controller(BaseController): An exception is only raised if we weren't provided a default response. """ - with self._msg_lock: try: - if not "exit_policy" in self._request_cache: + config_policy = self._get_cache(["exit_policy"]).get("exit_policy", + None) + if not config_policy: policy = [] if self.get_conf("ExitPolicyRejectPrivate") == "1": @@ -884,10 +897,10 @@ class Controller(BaseController): policy += policy_line.split(",") policy += self.get_info("exit-policy/default").split(",") + config_policy = stem.exit_policy.get_config_policy(policy) + self._set_cache({"exit_policy": config_policy}) - self._request_cache["exit_policy"] = stem.exit_policy.get_config_policy(policy) - - return self._request_cache["exit_policy"] + return config_policy except Exception as exc: if default == UNDEFINED: raise exc @@ -1316,12 +1329,14 @@ class Controller(BaseController): lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) # check for cached results - for param in list(lookup_params): - cache_key = "getconf.%s" % param.lower() + from_cache = [param.lower() for param in lookup_params] + cached_results = self._get_cache(from_cache, "getconf") - if cache_key in self._request_cache: - reply[param] = self._request_cache[cache_key] - lookup_params.remove(param) + reply = {} + for key in cached_results.keys(): + user_expected_key = _case_insensitive_lookup(lookup_params, key, key) + reply[user_expected_key] = cached_results[key] + lookup_params.remove(user_expected_key) # if everything was cached then short circuit making the query if not lookup_params: @@ -1334,9 +1349,15 @@ class Controller(BaseController): reply.update(response.entries) if self.is_caching_enabled(): - for key, value in response.entries.items(): - self._request_cache["getconf.%s" % key.lower()] = value + to_cache = {} + for param, value in response.entries.items(): + param = param.lower() + if isinstance(value, (bytes, unicode)): + value = [value] + to_cache[param] = value + + self._set_cache(to_cache, "getconf") # Maps the entries back to the parameters that the user requested so the # capitalization matches (ie, if they request "exitpolicy" then that # should be the key rather than "ExitPolicy"). When the same @@ -1481,19 +1502,13 @@ class Controller(BaseController): log.debug("%s (runtime: %0.4f)" % (query, time.time() - start_time)) if self.is_caching_enabled(): + to_cache = {} for param, value in params: - cache_key = "getconf.%s" % param.lower() + if isinstance(value, (bytes, unicode)): + value = [value] + to_cache[param.lower()] = value - if value is None: - if cache_key in self._request_cache: - del self._request_cache[cache_key] - elif isinstance(value, (bytes, unicode)): - self._request_cache[cache_key] = [value] - else: - self._request_cache[cache_key] = value - - if param.lower() == "exitpolicy" and "exit_policy" in self._request_cache: - del self._request_cache["exit_policy"] + self._set_cache(to_cache, "getconf") else: log.debug("%s (failed, code: %s, message: %s)" % (query, response.code, response.message)) @@ -1582,6 +1597,55 @@ class Controller(BaseController): if not response.is_ok(): raise stem.ProtocolError("SETEVENTS received unexpected response\n%s" % response) + def _get_cache(self, params, func=None): + """ + Queries multiple configuration options in cache atomically, returning a + mapping of those options to their values. + + :param list params: keys to be queried in cache + :param str func: function prefix to keys + + :returns: **dict** of 'param => cached value' pairs of keys present in cache + """ + + with self._cache_lock: + cached_values = {} + + for param in params: + if func: + cache_key = "%s.%s" % (func, param) + else: + cache_key = param + + if cache_key in self._request_cache: + cached_values[param] = self._request_cache[cache_key] + + return cached_values + + def _set_cache(self, params, func=None): + """ + Changes the value of tor configuration options in cache atomically. + + :param dict params: **dict** of 'cache_key => value' pairs to be cached + :param str func: function prefix to keys + """ + + with self._cache_lock: + for key, value in params.items(): + if func: + cache_key = "%s.%s" % (func, key) + else: + cache_key = key + + if value is None: + if cache_key in self._request_cache: + del self._request_cache[cache_key] + else: + self._request_cache[cache_key] = value + + if key.lower() == "exitpolicy" and "exit_policy" in self._request_cache: + del self._request_cache["exit_policy"] + def is_caching_enabled(self): """ **True** if caching has been enabled, **False** otherwise. @@ -1608,8 +1672,9 @@ class Controller(BaseController): Drops any cached results. """ - self._request_cache = {} - self._geoip_failure_count = 0 + with self._cache_lock: + self._request_cache = {} + self._geoip_failure_count = 0 def load_conf(self, configtext): """

1 0