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

[tor/master] Fix memory management in test_parsecommon_get_next_token_parse_keys
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 38a7033d3378a7b0cdc68258ebcd0e53371e8f24 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 15 17:44:40 2018 +0300 Fix memory management in test_parsecommon_get_next_token_parse_keys --- src/test/test_parsecommon.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c index ffd3902a8..6b5307619 100644 --- a/src/test/test_parsecommon.c +++ b/src/test/test_parsecommon.c @@ -86,25 +86,22 @@ test_parsecommon_get_next_token_parse_keys(void *arg) (void)arg; memarea_t *area = memarea_new(); - const char *base64_key = + const char *str = + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" "MIGJAoGBAMDdIya33BfNlHOkzoTKSTT8EjD64waMfUr372syVHiFjHhObwKwGA5u\n" "sHaMIe9r+Ij/4C1dKyuXkcz3DOl6gWNhTD7dZ89I+Okoh1jWe30jxCiAcywC22p5\n" - "XLhrDkX1A63Z7XCH9ltwU2WMqWsVM98N2GR6MTujP7wtqdLExYN1AgMBAAE=\n"; - char *str; - tor_asprintf(&str, "onion-key\n" - "-----BEGIN RSA PUBLIC KEY-----\n" - "%s" - "-----END RSA PUBLIC KEY-----\n", base64_key); + "XLhrDkX1A63Z7XCH9ltwU2WMqWsVM98N2GR6MTujP7wtqdLExYN1AgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n"; + const char *end = str + strlen(str); const char **s = (const char **)&str; - const char decoded[128]; - - base64_decode((char *)decoded, sizeof(decoded), base64_key, - strlen(base64_key)); + directory_token_t *token = NULL; + directory_token_t *token2 = NULL; token_rule_t rule = T1("onion-key", R_IPO_ONION_KEY, NO_ARGS, NEED_KEY_1024); - directory_token_t *token = get_next_token(area, s, end, &rule); + token = get_next_token(area, s, end, &rule); tt_int_op(token->tp, OP_EQ, R_IPO_ONION_KEY); tt_int_op(token->n_args, OP_EQ, 0); @@ -114,7 +111,9 @@ test_parsecommon_get_next_token_parse_keys(void *arg) tt_assert(token->key); tt_assert(!token->error); - const char *base64_skey = + const char *str2 = + "client-key\n" + "-----BEGIN RSA PRIVATE KEY-----\n" "MIICXAIBAAKBgQCwS810a2auH2PQchOBz9smNgjlDu31aq0IYlUohSYbhcv5AJ+d\n" "DY0nfZWzS+mZPwzL3UiEnTt6PVv7AgoZ5V9ZJWJTKIURjJpkK0mstfJKHKIZhf84\n" "pmFfRej9GQViB6NLtp1obOXJgJixSlMfw9doDI4NoAnEISCyH/tD77Qs2wIDAQAB\n" @@ -127,24 +126,16 @@ test_parsecommon_get_next_token_parse_keys(void *arg) "xfjbKOW3TQSFV+2WTifFvHEeljQwKMoMyoMGvYRwLCGJjs9JtMLVxsdFjQJBAKwD\n" "3BBvBQ39TuPQ1zWX4tb7zjMlY83HTFP3Sriq71tP/1QWoL2SUl56B2lp8E6vB/C3\n" "wsMK4SCNprHRYAd7VZ0CQDKn6Zhd11P94PLs0msybFEh1VXr6CEW/BrxBgbL4ls6\n" - "dbX5XO0z4Ra8gYXgObgimhyMDYO98Idt5+Z3HIdyrSc=\n"; - - const char decoded2[128]; - base64_decode((char *)decoded2, sizeof(decoded2), base64_skey, - strlen(base64_skey)); + "dbX5XO0z4Ra8gYXgObgimhyMDYO98Idt5+Z3HIdyrSc=\n" + "-----END RSA PRIVATE KEY-----\n"; - char *str2; - tor_asprintf(&str2, "client-key\n" - "-----BEGIN RSA PRIVATE KEY-----\n" - "%s" - "-----END RSA PRIVATE KEY-----\n", base64_skey); const char *end2 = str2 + strlen(str2); const char **s2 = (const char **)&str2; token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS, NEED_SKEY_1024); - directory_token_t *token2 = get_next_token(area, s2, end2, &rule2); + token2 = get_next_token(area, s2, end2, &rule2); tt_int_op(token2->tp, OP_EQ, C_CLIENT_KEY); tt_int_op(token2->n_args, OP_EQ, 0); @@ -155,6 +146,8 @@ test_parsecommon_get_next_token_parse_keys(void *arg) tt_assert(!token->error); done: + if (token) token_clear(token); + if (token2) token_clear(token2); memarea_drop_all(area); }

1 0

[tor/master] Unit-test multiple line parsing with tokenize_string()
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 78c446af7ef9900c31e84496a4547550d4c191e2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 16 14:53:04 2018 +0300 Unit-test multiple line parsing with tokenize_string() --- src/test/test_parsecommon.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c index d8719747e..0c754a8fe 100644 --- a/src/test/test_parsecommon.c +++ b/src/test/test_parsecommon.c @@ -35,6 +35,51 @@ test_parsecommon_tokenize_string_null(void *arg) } static void +test_parsecommon_tokenize_string_multiple_lines(void *arg) +{ + memarea_t *area = memarea_new(); + smartlist_t *tokens = smartlist_new(); + + (void)arg; + + token_rule_t table[] = { + T01("uptime", K_UPTIME, GE(1), NO_OBJ), + T01("hibernating", K_HIBERNATING, GE(1), NO_OBJ), + T1( "published", K_PUBLISHED, CONCAT_ARGS, NO_OBJ), + END_OF_TABLE, + }; + + char *str = tor_strdup( + "hibernating 0\nuptime 1024\n" + "published 2018-10-15 10:00:00\n"); + + int retval = + tokenize_string(area, str, NULL, + tokens, table, 0); + + tt_int_op(smartlist_len(tokens), OP_EQ, 3); + directory_token_t *token = smartlist_get(tokens, 0); + + tt_int_op(token->tp, OP_EQ, K_HIBERNATING); + + token = smartlist_get(tokens, 1); + + tt_int_op(token->tp, OP_EQ, K_UPTIME); + + token = smartlist_get(tokens, 2); + + tt_int_op(token->tp, OP_EQ, K_PUBLISHED); + + tt_int_op(retval, OP_EQ, 0); + + done: + tor_free(str); + memarea_drop_all(area); + smartlist_free(tokens); + return; +} + +static void test_parsecommon_get_next_token_success(void *arg) { memarea_t *area = memarea_new(); @@ -379,6 +424,7 @@ test_parsecommon_get_next_token_err_bad_base64(void *arg) struct testcase_t parsecommon_tests[] = { PARSECOMMON_TEST(tokenize_string_null), + PARSECOMMON_TEST(tokenize_string_multiple_lines), PARSECOMMON_TEST(get_next_token_success), PARSECOMMON_TEST(get_next_token_concat_args), PARSECOMMON_TEST(get_next_token_parse_keys),

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/409'
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit c6d3bebb1e32fa62712a475081a6724ffa5c9d67 Merge: c3e14a323 65864be9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 09:06:29 2018 -0400 Merge remote-tracking branch 'tor-github/pr/409' changes/ticket27625 | 4 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_parsecommon.c | 593 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 600 insertions(+)

1 0

[tor/master] Test AT_END checking in tokenize_string()
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit f10d664fd14b318fba23c7290c800590d0a474b4 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 16 15:54:11 2018 +0300 Test AT_END checking in tokenize_string() --- src/test/test_parsecommon.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c index 182f6fba5..13e4ac8c7 100644 --- a/src/test/test_parsecommon.c +++ b/src/test/test_parsecommon.c @@ -141,6 +141,66 @@ test_parsecommon_tokenize_string_max_cnt(void *arg) } static void +test_parsecommon_tokenize_string_at_start(void *arg) +{ + memarea_t *area = memarea_new(); + smartlist_t *tokens = smartlist_new(); + + (void)arg; + + token_rule_t table[] = { + T1_START("client-name", C_CLIENT_NAME, CONCAT_ARGS, NO_OBJ), + T01("uptime", K_UPTIME, EQ(1), NO_OBJ), + END_OF_TABLE, + }; + + // "client-name" is not the first line. + char *str = tor_strdup( + "uptime 1024\nclient-name Alice\n"); + + int retval = + tokenize_string(area, str, NULL, tokens, table, 0); + + tt_int_op(retval, OP_EQ, -1); + + done: + tor_free(str); + memarea_drop_all(area); + smartlist_free(tokens); + return; +} + +static void +test_parsecommon_tokenize_string_at_end(void *arg) +{ + memarea_t *area = memarea_new(); + smartlist_t *tokens = smartlist_new(); + + (void)arg; + + token_rule_t table[] = { + T1_END("client-name", C_CLIENT_NAME, CONCAT_ARGS, NO_OBJ), + T01("uptime", K_UPTIME, EQ(1), NO_OBJ), + END_OF_TABLE, + }; + + // "client-name" is not the last line. + char *str = tor_strdup( + "client-name Alice\nuptime 1024\n"); + + int retval = + tokenize_string(area, str, NULL, tokens, table, 0); + + tt_int_op(retval, OP_EQ, -1); + + done: + tor_free(str); + memarea_drop_all(area); + smartlist_free(tokens); + return; +} + +static void test_parsecommon_get_next_token_success(void *arg) { memarea_t *area = memarea_new(); @@ -488,6 +548,8 @@ struct testcase_t parsecommon_tests[] = { PARSECOMMON_TEST(tokenize_string_multiple_lines), PARSECOMMON_TEST(tokenize_string_min_cnt), PARSECOMMON_TEST(tokenize_string_max_cnt), + PARSECOMMON_TEST(tokenize_string_at_start), + PARSECOMMON_TEST(tokenize_string_at_end), PARSECOMMON_TEST(get_next_token_success), PARSECOMMON_TEST(get_next_token_concat_args), PARSECOMMON_TEST(get_next_token_parse_keys),

1 0

[tor/master] Add changes file
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 65864be9bc59fb3743d2cebf497d0a4268596f95 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 16 17:53:17 2018 +0300 Add changes file --- changes/ticket27625 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket27625 b/changes/ticket27625 new file mode 100644 index 000000000..33d40adf3 --- /dev/null +++ b/changes/ticket27625 @@ -0,0 +1,4 @@ + o Testing: + - Write some unit tests for tokenize_string() and + get_next_token() functions. Resolves ticket 27625. +

1 0

[tor/maint-0.3.5] rust/tor_log: fix C_RUST_COUPLED documentation
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit bfab7b9d353227104c3f323c964b0e80fdf60d31 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Oct 23 17:12:13 2018 +0000 rust/tor_log: fix C_RUST_COUPLED documentation This file was moved in 97b15a1d7c51764888d2172711e3f3a71fb01916 and moved again in e7f5f48d68553206b95cbb4f610702c887500124. --- src/rust/tor_log/tor_log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs index 5231d0c63..757c74ff4 100644 --- a/src/rust/tor_log/tor_log.rs +++ b/src/rust/tor_log/tor_log.rs @@ -89,15 +89,15 @@ pub mod log { use super::LogSeverity; use libc::{c_char, c_int}; - /// Severity log types. These mirror definitions in /src/common/torlog.h - /// C_RUST_COUPLED: src/common/log.c, log domain types + /// Severity log types. These mirror definitions in src/lib/log/log.h + /// C_RUST_COUPLED: src/lib/log/log.c, log domain types extern "C" { static LOG_WARN_: c_int; static LOG_NOTICE_: c_int; } - /// Domain log types. These mirror definitions in /src/common/torlog.h - /// C_RUST_COUPLED: src/common/log.c, log severity types + /// Domain log types. These mirror definitions in src/lib/log/log.h + /// C_RUST_COUPLED: src/lib/log/log.c, log severity types extern "C" { static LD_NET_: u32; static LD_GENERAL_: u32;

1 0

[tor/release-0.3.5] rust/tor_log: fix C_RUST_COUPLED documentation
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit bfab7b9d353227104c3f323c964b0e80fdf60d31 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Oct 23 17:12:13 2018 +0000 rust/tor_log: fix C_RUST_COUPLED documentation This file was moved in 97b15a1d7c51764888d2172711e3f3a71fb01916 and moved again in e7f5f48d68553206b95cbb4f610702c887500124. --- src/rust/tor_log/tor_log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs index 5231d0c63..757c74ff4 100644 --- a/src/rust/tor_log/tor_log.rs +++ b/src/rust/tor_log/tor_log.rs @@ -89,15 +89,15 @@ pub mod log { use super::LogSeverity; use libc::{c_char, c_int}; - /// Severity log types. These mirror definitions in /src/common/torlog.h - /// C_RUST_COUPLED: src/common/log.c, log domain types + /// Severity log types. These mirror definitions in src/lib/log/log.h + /// C_RUST_COUPLED: src/lib/log/log.c, log domain types extern "C" { static LOG_WARN_: c_int; static LOG_NOTICE_: c_int; } - /// Domain log types. These mirror definitions in /src/common/torlog.h - /// C_RUST_COUPLED: src/common/log.c, log severity types + /// Domain log types. These mirror definitions in src/lib/log/log.h + /// C_RUST_COUPLED: src/lib/log/log.c, log severity types extern "C" { static LD_NET_: u32; static LD_GENERAL_: u32;

1 0

[tor/master] rust/tor_log: fix C_RUST_COUPLED documentation
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit bfab7b9d353227104c3f323c964b0e80fdf60d31 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Oct 23 17:12:13 2018 +0000 rust/tor_log: fix C_RUST_COUPLED documentation This file was moved in 97b15a1d7c51764888d2172711e3f3a71fb01916 and moved again in e7f5f48d68553206b95cbb4f610702c887500124. --- src/rust/tor_log/tor_log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs index 5231d0c63..757c74ff4 100644 --- a/src/rust/tor_log/tor_log.rs +++ b/src/rust/tor_log/tor_log.rs @@ -89,15 +89,15 @@ pub mod log { use super::LogSeverity; use libc::{c_char, c_int}; - /// Severity log types. These mirror definitions in /src/common/torlog.h - /// C_RUST_COUPLED: src/common/log.c, log domain types + /// Severity log types. These mirror definitions in src/lib/log/log.h + /// C_RUST_COUPLED: src/lib/log/log.c, log domain types extern "C" { static LOG_WARN_: c_int; static LOG_NOTICE_: c_int; } - /// Domain log types. These mirror definitions in /src/common/torlog.h - /// C_RUST_COUPLED: src/common/log.c, log severity types + /// Domain log types. These mirror definitions in src/lib/log/log.h + /// C_RUST_COUPLED: src/lib/log/log.c, log severity types extern "C" { static LD_NET_: u32; static LD_GENERAL_: u32;

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit c3e14a3236c2c7577f0b9425418684fc95f44862 Merge: 3dc5cce74 bfab7b9d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 09:02:06 2018 -0400 Merge branch 'maint-0.3.5' src/rust/tor_log/tor_log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] add --enable-nss build to Travis CI
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit fcbbcf92cbd9e59b336a93c4e877eed55344de18 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Sep 25 18:41:19 2018 +0000 add --enable-nss build to Travis CI --- .travis.yml | 5 ++++- changes/ticket27751 | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34b7595eb..1af7d5bbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,8 @@ matrix: ## Check disable module dirauth with and without rust - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" - env: MODULES_OPTIONS="--disable-module-dirauth" + ## Check NSS + - env: NSS_OPTIONS="--enable-nss" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -118,6 +120,7 @@ addons: ## Optional dependencies - libcap-dev - liblzma-dev + - libnss3-dev - libscrypt-dev - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty @@ -186,7 +189,7 @@ install: script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. diff --git a/changes/ticket27751 b/changes/ticket27751 new file mode 100644 index 000000000..593c473b6 --- /dev/null +++ b/changes/ticket27751 @@ -0,0 +1,2 @@ + o Minor features (continuous integration): + - Add a Travis CI build for --enable-nss on Linux gcc. Closes ticket 27751.

1 0