October 2015 - tor-commits - lists.torproject.org

[tor/master] Add tests for procmon. These currently fail. Investigation should happen before submitting
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit b4950c9334d476049b8b273ad1d8cb15a86f6074 Author: Ola Bini <ola(a)olabini.se> Date: Tue Sep 15 17:56:56 2015 +0200 Add tests for procmon. These currently fail. Investigation should happen before submitting --- src/test/include.am | 2 + src/test/log_test_helpers.c | 95 +++++++++++++++++++++++++++++++++++++++++++ src/test/log_test_helpers.h | 27 ++++++++++++ src/test/test.c | 3 +- src/test/test_procmon.c | 51 +++++++++++++++++++++++ 5 files changed, 177 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index f7c0204..b99adb9 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -51,6 +51,7 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # matters a lot there, and is quite hard to debug if you forget to do it. src_test_test_SOURCES = \ + src/test/log_test_helpers.c \ src/test/test.c \ src/test/test_accounting.c \ src/test/test_addr.c \ @@ -84,6 +85,7 @@ src_test_test_SOURCES = \ src/test/test_oom.c \ src/test/test_options.c \ src/test/test_policy.c \ + src/test/test_procmon.c \ src/test/test_pt.c \ src/test/test_relay.c \ src/test/test_relaycell.c \ diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c new file mode 100644 index 0000000..42778d4 --- /dev/null +++ b/src/test/log_test_helpers.c @@ -0,0 +1,95 @@ +#define LOG_PRIVATE +#include "torlog.h" +#include "log_test_helpers.h" + +static smartlist_t *saved_logs = NULL; + +int +setup_capture_of_logs(int new_level) +{ + int previous_log = log_global_min_severity_; + log_global_min_severity_ = new_level; + mock_clean_saved_logs(); + MOCK(logv, mock_saving_logv); + return previous_log; +} + +void +teardown_capture_of_logs(int prev) +{ + UNMOCK(logv); + log_global_min_severity_ = prev; + mock_clean_saved_logs(); +} + +void +mock_clean_saved_logs(void) +{ + if (!saved_logs) + return; + SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m, + { tor_free(m->generated_msg); tor_free(m); }); + smartlist_free(saved_logs); + saved_logs = NULL; +} + +char * +mock_saved_log_at(int ix) +{ + int saved_log_count = mock_saved_log_number(); + if(ix < 0) { + ix = saved_log_count + ix; + } + + if (saved_log_count <= ix) + return ""; + return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg; +} + +int +mock_saved_severity_at(int ix) +{ + int saved_log_count = mock_saved_log_number(); + if(ix < 0) { + ix = saved_log_count + ix; + } + + if (saved_log_count <= ix) + return -1; + return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->severity; +} + +int +mock_saved_log_number(void) +{ + if (!saved_logs) + return 0; + return smartlist_len(saved_logs); +} + +const smartlist_t * +mock_saved_logs(void) +{ + return saved_logs; +} + +void +mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) +{ + char *buf = tor_malloc_zero(10240); + int n; + n = tor_vsnprintf(buf,10240,format,ap); + buf[n]='\n'; + buf[n+1]='\0'; + + mock_saved_log_entry_t *e = tor_malloc_zero(sizeof(mock_saved_log_entry_t)); + e->severity = severity; + e->funcname = funcname; + e->suffix = suffix; + e->format = format; + e->generated_msg = buf; + + if (!saved_logs) + saved_logs = smartlist_new(); + smartlist_add(saved_logs, e); +} diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h new file mode 100644 index 0000000..789bfe4 --- /dev/null +++ b/src/test/log_test_helpers.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2014-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "or.h" + +#ifndef TOR_LOG_TEST_HELPERS_H +#define TOR_LOG_TEST_HELPERS_H + +typedef struct mock_saved_log_entry_t { + int severity; + const char *funcname; + const char *suffix; + const char *format; + char *generated_msg; + struct mock_saved_log_entry_t *next; +} mock_saved_log_entry_t; + +void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap); +void mock_clean_saved_logs(void); +const smartlist_t *mock_saved_logs(void); +int setup_capture_of_logs(int new_level); +void teardown_capture_of_logs(int prev); +char *mock_saved_log_at(int ix); +int mock_saved_severity_at(int ix); +int mock_saved_log_number(void); + +#endif diff --git a/src/test/test.c b/src/test/test.c index e10e260..23e41b7 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1145,6 +1145,7 @@ extern struct testcase_t nodelist_tests[]; extern struct testcase_t oom_tests[]; extern struct testcase_t options_tests[]; extern struct testcase_t policy_tests[]; +extern struct testcase_t procmon_tests[]; extern struct testcase_t pt_tests[]; extern struct testcase_t relay_tests[]; extern struct testcase_t relaycell_tests[]; @@ -1192,6 +1193,7 @@ struct testgroup_t testgroups[] = { { "oom/", oom_tests }, { "options/", options_tests }, { "policy/" , policy_tests }, + { "procmon/", procmon_tests }, { "pt/", pt_tests }, { "relay/" , relay_tests }, { "relaycell/", relaycell_tests }, @@ -1208,4 +1210,3 @@ struct testgroup_t testgroups[] = { { "dns/", dns_tests }, END_OF_GROUPS }; - diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c new file mode 100644 index 0000000..ac70a0f --- /dev/null +++ b/src/test/test_procmon.c @@ -0,0 +1,51 @@ +/* Copyright (c) 2010-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define PROCMON_PRIVATE +#include "orconfig.h" +#include "or.h" +#include "test.h" + +#include "procmon.h" + +#include "log_test_helpers.h" + +#define NS_MODULE procmon + +struct event_base; + +static void +test_procmon_tor_process_monitor_new(void *ignored) +{ + (void)ignored; + tor_process_monitor_t *res; + const char *msg; + + res = tor_process_monitor_new(NULL, "probably invalid", 0, NULL, NULL, &msg); + tt_assert(!res); + tt_str_op(msg, OP_EQ, "invalid PID"); + + res = tor_process_monitor_new(NULL, "243443535345454", 0, NULL, NULL, &msg); + tt_assert(!res); + tt_str_op(msg, OP_EQ, "invalid PID"); + + res = tor_process_monitor_new(tor_libevent_get_base(), "43", 0, NULL, NULL, &msg); + tt_assert(res); + tt_assert(!msg); + + res = tor_process_monitor_new(tor_libevent_get_base(), "44 hello", 0, NULL, NULL, &msg); + tt_assert(res); + tt_assert(!msg); + + res = tor_process_monitor_new(tor_libevent_get_base(), "45:hello", 0, NULL, NULL, &msg); + tt_assert(res); + tt_assert(!msg); + + done: + (void)0; +} + +struct testcase_t procmon_tests[] = { + { "tor_process_monitor_new", test_procmon_tor_process_monitor_new, TT_FORK, NULL, NULL }, + END_OF_TESTCASES +};

1 0

[tor/master] Fix procmon_new to correctly use zeroed memory - otherwise it can blow up if the free call by mistake works on something that is allocated
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit 5b43ecf2b3130781b6020615ba7a5b3ddc5509ce Author: Ola Bini <ola(a)olabini.se> Date: Tue Sep 15 18:44:53 2015 +0200 Fix procmon_new to correctly use zeroed memory - otherwise it can blow up if the free call by mistake works on something that is allocated --- src/common/procmon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index 2d0f021..89c9d75 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -192,7 +192,7 @@ tor_process_monitor_new(struct event_base *base, tor_procmon_callback_t cb, void *cb_arg, const char **msg) { - tor_process_monitor_t *procmon = tor_malloc(sizeof(tor_process_monitor_t)); + tor_process_monitor_t *procmon = tor_malloc_zero(sizeof(tor_process_monitor_t)); struct parsed_process_specifier_t ppspec; tor_assert(msg != NULL); @@ -354,4 +354,3 @@ tor_process_monitor_free(tor_process_monitor_t *procmon) tor_free(procmon); } -

1 0

[tor/master] Fix compiling under gcc warnings to errors
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit be7ef94a7dbfa67d03ca175789590efefca7b3d1 Author: Ola Bini <ola(a)olabini.se> Date: Mon Oct 5 13:41:00 2015 -0500 Fix compiling under gcc warnings to errors --- src/test/log_test_helpers.c | 3 ++- src/test/log_test_helpers.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 42778d4..0efa3ce 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -33,7 +33,7 @@ mock_clean_saved_logs(void) saved_logs = NULL; } -char * +const char * mock_saved_log_at(int ix) { int saved_log_count = mock_saved_log_number(); @@ -76,6 +76,7 @@ mock_saved_logs(void) void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) { + (void)domain; char *buf = tor_malloc_zero(10240); int n; n = tor_vsnprintf(buf,10240,format,ap); diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 789bfe4..debc167 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -20,7 +20,7 @@ void mock_clean_saved_logs(void); const smartlist_t *mock_saved_logs(void); int setup_capture_of_logs(int new_level); void teardown_capture_of_logs(int prev); -char *mock_saved_log_at(int ix); +const char *mock_saved_log_at(int ix); int mock_saved_severity_at(int ix); int mock_saved_log_number(void);

1 0

[tor/master] Fix "make check-spaces"
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit 5a5112f7011046033b31dedb3f376c4a488f599c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 09:34:02 2015 -0400 Fix "make check-spaces" --- src/common/procmon.c | 1 + src/test/test.c | 1 + src/test/test_procmon.c | 1 + 3 files changed, 3 insertions(+) diff --git a/src/common/procmon.c b/src/common/procmon.c index 8c59cad..346a0c6 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -355,3 +355,4 @@ tor_process_monitor_free(tor_process_monitor_t *procmon) tor_free(procmon); } + diff --git a/src/test/test.c b/src/test/test.c index 33a1e57..3468f7f 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1224,3 +1224,4 @@ struct testgroup_t testgroups[] = { { "dns/", dns_tests }, END_OF_GROUPS }; + diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c index 6a9c209..4eff52a 100644 --- a/src/test/test_procmon.c +++ b/src/test/test_procmon.c @@ -53,3 +53,4 @@ struct testcase_t procmon_tests[] = { TT_FORK, NULL, NULL }, END_OF_TESTCASES }; +

1 0

[tor/master] Merge remote-tracking branch 'twstrike/procmon_tests'
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit cec2bc435ed252389d80d77ab17ba4de33ae3153 Merge: 15bfdbe ca927b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 09:32:51 2015 -0400 Merge remote-tracking branch 'twstrike/procmon_tests' Conflicts: src/test/include.am src/test/log_test_helpers.c src/test/log_test_helpers.h src/common/procmon.c | 4 ++-- src/test/include.am | 1 + src/test/test.c | 3 ++- src/test/test_procmon.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix spaces
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit ca927b7f637551746220bea118c036825d440679 Author: Ola Bini <ola(a)olabini.se> Date: Mon Oct 5 13:42:43 2015 -0500 Fix spaces --- src/common/procmon.c | 3 ++- src/test/log_test_helpers.c | 10 ++++++---- src/test/log_test_helpers.h | 4 +++- src/test/test_procmon.c | 12 ++++++++---- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index 89c9d75..8c59cad 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -192,7 +192,8 @@ tor_process_monitor_new(struct event_base *base, tor_procmon_callback_t cb, void *cb_arg, const char **msg) { - tor_process_monitor_t *procmon = tor_malloc_zero(sizeof(tor_process_monitor_t)); + tor_process_monitor_t *procmon = tor_malloc_zero( + sizeof(tor_process_monitor_t)); struct parsed_process_specifier_t ppspec; tor_assert(msg != NULL); diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 0efa3ce..7dae488 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -37,20 +37,21 @@ const char * mock_saved_log_at(int ix) { int saved_log_count = mock_saved_log_number(); - if(ix < 0) { + if (ix < 0) { ix = saved_log_count + ix; } if (saved_log_count <= ix) return ""; - return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg; + return ((mock_saved_log_entry_t *) + smartlist_get(saved_logs, ix))->generated_msg; } int mock_saved_severity_at(int ix) { int saved_log_count = mock_saved_log_number(); - if(ix < 0) { + if (ix < 0) { ix = saved_log_count + ix; } @@ -74,7 +75,8 @@ mock_saved_logs(void) } void -mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) +mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, + const char *suffix, const char *format, va_list ap) { (void)domain; char *buf = tor_malloc_zero(10240); diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index debc167..58d14d9 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -15,7 +15,9 @@ typedef struct mock_saved_log_entry_t { struct mock_saved_log_entry_t *next; } mock_saved_log_entry_t; -void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap); +void mock_saving_logv(int severity, log_domain_mask_t domain, + const char *funcname, const char *suffix, + const char *format, va_list ap); void mock_clean_saved_logs(void); const smartlist_t *mock_saved_logs(void); int setup_capture_of_logs(int new_level); diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c index ac70a0f..6a9c209 100644 --- a/src/test/test_procmon.c +++ b/src/test/test_procmon.c @@ -29,15 +29,18 @@ test_procmon_tor_process_monitor_new(void *ignored) tt_assert(!res); tt_str_op(msg, OP_EQ, "invalid PID"); - res = tor_process_monitor_new(tor_libevent_get_base(), "43", 0, NULL, NULL, &msg); + res = tor_process_monitor_new(tor_libevent_get_base(), "43", 0, + NULL, NULL, &msg); tt_assert(res); tt_assert(!msg); - res = tor_process_monitor_new(tor_libevent_get_base(), "44 hello", 0, NULL, NULL, &msg); + res = tor_process_monitor_new(tor_libevent_get_base(), "44 hello", 0, + NULL, NULL, &msg); tt_assert(res); tt_assert(!msg); - res = tor_process_monitor_new(tor_libevent_get_base(), "45:hello", 0, NULL, NULL, &msg); + res = tor_process_monitor_new(tor_libevent_get_base(), "45:hello", 0, + NULL, NULL, &msg); tt_assert(res); tt_assert(!msg); @@ -46,6 +49,7 @@ test_procmon_tor_process_monitor_new(void *ignored) } struct testcase_t procmon_tests[] = { - { "tor_process_monitor_new", test_procmon_tor_process_monitor_new, TT_FORK, NULL, NULL }, + { "tor_process_monitor_new", test_procmon_tor_process_monitor_new, + TT_FORK, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] changes file for 17078
by nickm＠torproject.org 07 Oct '15

07 Oct '15

commit 4e34ef87a48421e9b90bea30c5b1110ab0df81c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 09:34:49 2015 -0400 changes file for 17078 --- changes/17078 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/17078 b/changes/17078 new file mode 100644 index 0000000..af02877 --- /dev/null +++ b/changes/17078 @@ -0,0 +1,3 @@ + o Testing: + - More unit tests for procmon.c. Closes ticket 17078. + Patch from Ola Bini.

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 07 Oct '15

07 Oct '15

commit e736c3bd660f1906695ab777960c303e8d9c91b7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 02:46:42 2015 +0000 Update translations for tor-messenger-prefsdtd --- ca/prefs.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ca/prefs.dtd b/ca/prefs.dtd index 1a8396b..ab074a4 100644 --- a/ca/prefs.dtd +++ b/ca/prefs.dtd @@ -1,13 +1,13 @@ <!ENTITY prefs.otrPreferences "Preferències OTR"> -<!ENTITY prefs.otrSettings "OTR Settings"> -<!ENTITY prefs.requireEncryption "Require encryption"> -<!ENTITY prefs.otrKeys "My Private Keys"> -<!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> -<!ENTITY prefs.knownFingers "Known fingerprints"> -<!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.otrSettings "Configuració OTR"> +<!ENTITY prefs.requireEncryption "Necessita xifrat"> +<!ENTITY prefs.otrKeys "Les meves claus privades"> +<!ENTITY prefs.keyForAccount "Clau del compte:"> +<!ENTITY prefs.fingerprint "Empremta:"> +<!ENTITY prefs.knownFingers "Empremtes conegudes"> +<!ENTITY prefs.introFingers "Administra la llista d'empremtes que heu vist."> +<!ENTITY prefs.showFingers "Visualitza"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> -<!ENTITY prefs.emptyAccountList "No accounts configured"> -<!ENTITY prefs.generate "Generate"> \ No newline at end of file +<!ENTITY prefs.emptyAccountList "No s'ha configurat cap compte"> +<!ENTITY prefs.generate "Genera"> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 07 Oct '15

07 Oct '15

commit b11c626261cc4b8e470b26e2b787fb452269c326 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 02:46:29 2015 +0000 Update translations for tor-messenger-fingerdtd --- ca/finger.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/finger.dtd b/ca/finger.dtd index 1edd5df..986db08 100644 --- a/ca/finger.dtd +++ b/ca/finger.dtd @@ -1,4 +1,4 @@ -<!ENTITY finger.title "Known fingerprints"> +<!ENTITY finger.title "Empremtes conegudes"> <!ENTITY finger.screenName "Screenname"> <!ENTITY finger.status "Status"> <!ENTITY finger.verified "Verified"> @@ -7,4 +7,4 @@ <!ENTITY finger.protocol "Protocol"> <!ENTITY finger.verify "Verifica"> <!ENTITY finger.remove "Remove"> -<!ENTITY finger.intro "Manage the list of fingerprints you've seen."> \ No newline at end of file +<!ENTITY finger.intro "Administra la llista d'empremtes que heu vist."> \ No newline at end of file

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Oct '15

07 Oct '15

commit 71d01d2d2908c7a03ec36f5d1793ea8607c69bc1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 02:45:41 2015 +0000 Update translations for tails-misc --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index f77b562..9236b43 100644 --- a/ca.po +++ b/ca.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-24 16:10+0000\n" +"PO-Revision-Date: 2015-10-07 02:24+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0