tor-commits June 2016

tor-commits@lists.torproject.org

20 participants
1204 discussions

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 17 Jun '16

17 Jun '16

commit e502215376f43be0d05b875be226ab881bdf8d4e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 17 06:18:45 2016 +0000 Update translations for tails-onioncircuits --- el/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/onioncircuits.pot b/el/onioncircuits.pot index 04252cf..6b6c869 100644 --- a/el/onioncircuits.pot +++ b/el/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-17 05:47+0000\n" +"PO-Revision-Date: 2016-06-17 05:50+0000\n" "Last-Translator: ilias_ <teneatis(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "Δεν είστε ακόμα συνδεδεμένος με το Tor" #: ../onioncircuits:95 msgid "Onion Circuits"

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 17 Jun '16

17 Jun '16

commit c34a83f431d1c8a6aac56bc94e24eb43787b709c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 17 06:17:52 2016 +0000 Update translations for tor-messenger-fingerdtd --- el/finger.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/finger.dtd b/el/finger.dtd index 6eadf2a..aabc595 100644 --- a/el/finger.dtd +++ b/el/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "Επιβεβαιώστε "> <!ENTITY finger.remove "Αφαίρεση"> <!ENTITY finger.intro "Διαχειριστείτε τη λίστα των δακτυλικών αποτυπωμάτων που έχετε δει."> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> +<!ENTITY addFingerDialog.title "Προσθήκη αποτυπώματος"> +<!ENTITY addFingerDialog.finger "Αποτύπωμα"> <!ENTITY addFingerDialog.accept "Οκ"> <!ENTITY addFingerDialog.cancel "Skip"> <!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 17 Jun '16

17 Jun '16

commit 5bc09473e052f4444ca323097c01c26318a9d938 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 17 05:48:45 2016 +0000 Update translations for tails-onioncircuits --- el/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/onioncircuits.pot b/el/onioncircuits.pot index 0d64acf..04252cf 100644 --- a/el/onioncircuits.pot +++ b/el/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-08 07:02+0000\n" +"PO-Revision-Date: 2016-06-17 05:47+0000\n" "Last-Translator: ilias_ <teneatis(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -68,7 +68,7 @@ msgstr "%.2f Mb/s" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "" +msgstr "Άγνωστο" #: ../onioncircuits:607 msgid "Fingerprint:"

1 0

[tor/master] Mark code unreachable in unescape_string()
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 128ab31c649d3e9ecef284fa3f751dbea13682a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 15:36:08 2016 -0400 Mark code unreachable in unescape_string() Also, add tests for it in case someday it does become reachable. --- src/common/util.c | 14 +++++++++++--- src/test/test_util.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 2775dae..a80d96a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2823,7 +2823,7 @@ unescape_string(const char *s, char **result, size_t *size_out) if (size_out) *size_out = out - *result; return cp+1; case '\0': - /* LCOV_EXCL_START */ + /* LCOV_EXCL_START -- we caught this in parse_config_from_line. */ tor_fragile_assert(); tor_free(*result); return NULL; @@ -2841,8 +2841,12 @@ unescape_string(const char *s, char **result, size_t *size_out) x1 = hex_decode_digit(cp[2]); x2 = hex_decode_digit(cp[3]); if (x1 == -1 || x2 == -1) { - tor_free(*result); - return NULL; + /* LCOV_EXCL_START */ + /* we caught this above in the initial loop. */ + tor_assert_nonfatal_unreached(); + tor_free(*result); + return NULL; + /* LCOV_EXCL_STOP */ } *out++ = ((x1<<4) + x2); @@ -2868,7 +2872,11 @@ unescape_string(const char *s, char **result, size_t *size_out) cp += 2; break; default: + /* LCOV_EXCL_START */ + /* we caught this above in the initial loop. */ + tor_assert_nonfatal_unreached(); tor_free(*result); return NULL; + /* LCOV_EXCL_STOP */ } break; default: diff --git a/src/test/test_util.c b/src/test/test_util.c index 55aff31..c3d76c5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1228,6 +1228,41 @@ test_util_config_line_escaped_content(void *arg) tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); + /* more things to try. */ + /* Bad hex: */ + strlcpy(buf1, "Foo \"\\x9g\"\n", sizeof(buf1)); + strlcpy(buf2, "Foo \"\\xg0\"\n", sizeof(buf2)); + strlcpy(buf3, "Foo \"\\xf\"\n", sizeof(buf3)); + /* bad escape */ + strlcpy(buf4, "Foo \"\\q\"\n", sizeof(buf4)); + /* missing endquote */ + strlcpy(buf5, "Foo \"hello\n", sizeof(buf5)); + + str=buf1; + str = parse_config_line_from_str(str, &k, &v); + tt_ptr_op(str,OP_EQ, NULL); + tor_free(k); tor_free(v); + + str=buf2; + str = parse_config_line_from_str(str, &k, &v); + tt_ptr_op(str,OP_EQ, NULL); + tor_free(k); tor_free(v); + + str=buf3; + str = parse_config_line_from_str(str, &k, &v); + tt_ptr_op(str,OP_EQ, NULL); + tor_free(k); tor_free(v); + + str=buf4; + str = parse_config_line_from_str(str, &k, &v); + tt_ptr_op(str,OP_EQ, NULL); + tor_free(k); tor_free(v); + + str=buf5; + str = parse_config_line_from_str(str, &k, &v); + tt_ptr_op(str,OP_EQ, NULL); + tor_free(k); tor_free(v); + done: tor_free(k); tor_free(v);

1 0

[tor/master] Remove parse_config_line_from_str alias
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit c9ea9de80674d06a08511a27beb4c4fe7396d55f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 15:40:56 2016 -0400 Remove parse_config_line_from_str alias All of our code just uses parse_config_line_from_str_verbose. --- src/common/util.h | 2 -- src/test/test_util.c | 96 ++++++++++++++++++++++++++-------------------------- 2 files changed, 48 insertions(+), 50 deletions(-) diff --git a/src/common/util.h b/src/common/util.h index 3a056bc..7cb33dc 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -371,8 +371,6 @@ char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, const char *parse_config_line_from_str_verbose(const char *line, char **key_out, char **value_out, const char **err_out); -#define parse_config_line_from_str(line,key_out,value_out) \ - parse_config_line_from_str_verbose((line),(key_out),(value_out),NULL) char *expand_filename(const char *filename); struct smartlist_t *tor_listdir(const char *dirname); int path_is_relative(const char *filename); diff --git a/src/test/test_util.c b/src/test/test_util.c index c3d76c5..dd6b53c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -889,106 +889,106 @@ test_util_config_line(void *arg) , sizeof(buf)); str = buf; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k"); tt_str_op(v,OP_EQ, "v"); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "key value with")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "key"); tt_str_op(v,OP_EQ, "value with spaces"); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "keykey")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "keykey"); tt_str_op(v,OP_EQ, "val"); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "k2\n")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k2"); tt_str_op(v,OP_EQ, ""); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "k3 \n")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k3"); tt_str_op(v,OP_EQ, ""); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "#comment")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k4"); tt_str_op(v,OP_EQ, ""); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "k5#abc")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k5"); tt_str_op(v,OP_EQ, ""); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "k6")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k6"); tt_str_op(v,OP_EQ, "val"); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "kseven")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "kseven"); tt_str_op(v,OP_EQ, "a quoted \'string"); tor_free(k); tor_free(v); tt_assert(!strcmpstart(str, "k8 ")); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k8"); tt_str_op(v,OP_EQ, "a quoted\n\"str\\ing\t\x01\x01\x01\""); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k9"); tt_str_op(v,OP_EQ, "a line that spans two lines."); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k10"); tt_str_op(v,OP_EQ, "more than one continuation"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k11"); tt_str_op(v,OP_EQ, "continuation at the start"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k12"); tt_str_op(v,OP_EQ, "line with a embedded"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k13"); tt_str_op(v,OP_EQ, "continuation at the very start"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k14"); tt_str_op(v,OP_EQ, "a line that has a comment and" ); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k15"); tt_str_op(v,OP_EQ, "this should be the next new line"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k16"); tt_str_op(v,OP_EQ, "a line that has a comment and" ); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k17"); tt_str_op(v,OP_EQ, "this should be the next new line"); tor_free(k); tor_free(v); @@ -1023,30 +1023,30 @@ test_util_config_line_quotes(void *arg) , sizeof(buf4)); str = buf1; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "kTrailingSpace"); tt_str_op(v,OP_EQ, "quoted value"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str = buf2; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str = buf3; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str = buf4; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); @@ -1070,12 +1070,12 @@ test_util_config_line_comment_character(void *arg) , sizeof(buf)); str = buf; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k1"); tt_str_op(v,OP_EQ, "# in quotes"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "k2"); tt_str_op(v,OP_EQ, "some value"); tor_free(k); tor_free(v); @@ -1083,7 +1083,7 @@ test_util_config_line_comment_character(void *arg) tt_str_op(str,OP_EQ, "k3 /home/user/myTorNetwork#2\n"); #if 0 - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); test_streq(k, "k3"); test_streq(v, "/home/user/myTorNetwork#2"); tor_free(k); tor_free(v); @@ -1140,57 +1140,57 @@ test_util_config_line_escaped_content(void *arg) str = buf1; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "HexadecimalLower"); tt_str_op(v,OP_EQ, "*"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "HexadecimalUpper"); tt_str_op(v,OP_EQ, "*"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "HexadecimalUpperX"); tt_str_op(v,OP_EQ, "*"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "Octal"); tt_str_op(v,OP_EQ, "*"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "Newline"); tt_str_op(v,OP_EQ, "\n"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "Tab"); tt_str_op(v,OP_EQ, "\t"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "CarriageReturn"); tt_str_op(v,OP_EQ, "\r"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "DoubleQuote"); tt_str_op(v,OP_EQ, "\""); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "SimpleQuote"); tt_str_op(v,OP_EQ, "'"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "Backslash"); tt_str_op(v,OP_EQ, "\\"); tor_free(k); tor_free(v); - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_str_op(k,OP_EQ, "Mix"); tt_str_op(v,OP_EQ, "This is a \"star\":\t'*'\nAnd second line"); tor_free(k); tor_free(v); @@ -1198,33 +1198,33 @@ test_util_config_line_escaped_content(void *arg) str = buf2; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str = buf3; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str = buf4; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); #if 0 str = buf5; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str, OP_EQ, NULL); tor_free(k); tor_free(v); #endif str = buf6; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); @@ -1239,27 +1239,27 @@ test_util_config_line_escaped_content(void *arg) strlcpy(buf5, "Foo \"hello\n", sizeof(buf5)); str=buf1; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str=buf2; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str=buf3; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str=buf4; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); str=buf5; - str = parse_config_line_from_str(str, &k, &v); + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v);

1 0

[tor/master] Coverage on parse_config_line_from_str_verbose.
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit a4189049628134fcfb91a5e45fd69d60e83c86ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 15:52:19 2016 -0400 Coverage on parse_config_line_from_str_verbose. --- src/test/test_util.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index dd6b53c..0720822 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1040,15 +1040,19 @@ test_util_config_line_quotes(void *arg) str = buf3; - str = parse_config_line_from_str_verbose(str, &k, &v, NULL); + const char *err = NULL; + str = parse_config_line_from_str_verbose(str, &k, &v, &err); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); + tt_str_op(err, OP_EQ, "Invalid escape sequence in quoted string"); str = buf4; - str = parse_config_line_from_str_verbose(str, &k, &v, NULL); + err = NULL; + str = parse_config_line_from_str_verbose(str, &k, &v, &err); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); + tt_str_op(err, OP_EQ, "Invalid escape sequence in quoted string"); done: tor_free(k); @@ -1237,6 +1241,8 @@ test_util_config_line_escaped_content(void *arg) strlcpy(buf4, "Foo \"\\q\"\n", sizeof(buf4)); /* missing endquote */ strlcpy(buf5, "Foo \"hello\n", sizeof(buf5)); + /* extra stuff */ + strlcpy(buf6, "Foo \"hello\" world\n", sizeof(buf6)); str=buf1; str = parse_config_line_from_str_verbose(str, &k, &v, NULL); @@ -1259,10 +1265,18 @@ test_util_config_line_escaped_content(void *arg) tor_free(k); tor_free(v); str=buf5; + str = parse_config_line_from_str_verbose(str, &k, &v, NULL); tt_ptr_op(str,OP_EQ, NULL); tor_free(k); tor_free(v); + str=buf6; + const char *err = NULL; + str = parse_config_line_from_str_verbose(str, &k, &v, &err); + tt_ptr_op(str,OP_EQ, NULL); + tor_free(k); tor_free(v); + tt_str_op(err,OP_EQ, "Excess data after quoted string"); + done: tor_free(k); tor_free(v);

1 0

[tor/master] Mark an abort() as unreachable.
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit a8c766220f1c1d60c7ccb2a1f888423145495942 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 15:53:05 2016 -0400 Mark an abort() as unreachable. --- src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index a80d96a..2f7cc4f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3795,7 +3795,7 @@ format_number_sigsafe(unsigned long x, char *buf, int buf_len, /* NOT tor_assert; see above. */ if (cp != buf) { - abort(); + abort(); // LCOV_EXCL_LINE } return len;

1 0

[onionoo/master] Parse ASN database lines without AS names.
by karsten＠torproject.org 16 Jun '16

16 Jun '16

commit c36ddbe3f069f0ab7d2a6b91badf0d6d71d40069 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 15 16:11:59 2016 +0200 Parse ASN database lines without AS names. Fixes #19420. --- .../java/org/torproject/onionoo/updater/LookupService.java | 5 ++--- .../org/torproject/onionoo/updater/LookupServiceTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/LookupService.java b/src/main/java/org/torproject/onionoo/updater/LookupService.java index e800926..57a0885 100644 --- a/src/main/java/org/torproject/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/onionoo/updater/LookupService.java @@ -252,8 +252,7 @@ public class LookupService { long endIpNum = Long.parseLong(parts[1]); while (firstAddressNumber <= endIpNum && firstAddressNumber != -1L) { - if (parts[2].startsWith("AS") && - parts[2].split(" ", 2).length == 2) { + if (parts[2].startsWith("AS")) { addressNumberASN.put(firstAddressNumber, parts[2]); } sortedAddressNumbers.remove(firstAddressNumber); @@ -319,7 +318,7 @@ public class LookupService { String[] parts = addressNumberASN.get(addressNumber).split(" ", 2); lookupResult.setAsNumber(parts[0]); - lookupResult.setAsName(parts[1]); + lookupResult.setAsName(parts.length == 2 ? parts[1] : ""); } lookupResults.put(addressString, lookupResult); } diff --git a/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java b/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java index 7ba3462..7faab7c 100644 --- a/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java +++ b/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java @@ -416,6 +416,17 @@ public class LookupServiceTest { } @Test() + public void testLookupGeoipASNum2NoASName() { + List<String> geoipASNum2Lines = new ArrayList<String>(); + geoipASNum2Lines.add("134743296,134744063,AS3356"); + geoipASNum2Lines.add("134744064,134744319,AS15169"); + geoipASNum2Lines.add("134744320,134750463,AS3356"); + this.assertLookupResult(null, null, geoipASNum2Lines, "8.8.8.8", "us", + "United States", "California", "Mountain View", 37.3860f, + -122.0838f, "AS15169", ""); + } + + @Test() public void testLookupLocationTurkey() { List<String> geoLite2CityBlocksIPv4Lines = new ArrayList<String>(); geoLite2CityBlocksIPv4Lines.add("network,geoname_id,"

1 0

[tor/master] On Windows, tv_sec is long, not time_t.
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit dd73787190ebe9821f8c3574fc1c08d54314699e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 13:57:16 2016 -0400 On Windows, tv_sec is long, not time_t. I'm not angry, Windows: just very disappointed. --- src/test/test_util.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6090dbd..55aff31 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -293,7 +293,12 @@ test_util_time(void *arg) tt_int_op(-1005000L,OP_EQ, tv_udiff(&start, &end)); tt_int_op(-1005L,OP_EQ, tv_mdiff(&start, &end)); +#ifdef _WIN32 + /* Would you believe that tv_sec is a long on windows? Of course you would.*/ + end.tv_sec = LONG_MAX; +#else end.tv_sec = TIME_MAX; +#endif tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end));

1 0

[stem/master] Test when ADD_ONION uses basic auth but no clients
by atagar＠torproject.org 16 Jun '16

16 Jun '16

commit 98e66f8191a47934ea7f65ef4c58fff63fe2fc46 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 10:34:37 2016 -0700 Test when ADD_ONION uses basic auth but no clients Interesting edge case. If you specify the basic auth flag but don't provide any clients then tor balks. --- test/integ/control/controller.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 2bd06a6..7aa8a83 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -674,7 +674,7 @@ class TestController(unittest.TestCase): @require_controller @require_version(Requirement.ADD_ONION_BASIC_AUTH) - def test_with_ephemeral_hidden_services_with_basic_auth(self): + def test_with_ephemeral_hidden_services_basic_auth(self): """ Exercises creating ephemeral hidden services that uses basic authentication. """ @@ -693,6 +693,23 @@ class TestController(unittest.TestCase): self.assertEqual([], controller.list_ephemeral_hidden_services()) @require_controller + @require_version(Requirement.ADD_ONION_BASIC_AUTH) + def test_with_ephemeral_hidden_services_basic_auth_without_credentials(self): + """ + Exercises creating ephemeral hidden services when attempting to use basic + auth but not including any credentials. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + try: + response = controller.create_ephemeral_hidden_service(4567, basic_auth = {}) + self.fail('ADD_ONION should fail when using basic auth without any clients') + except stem.ProtocolError as exc: + self.assertEqual("ADD_ONION response didn't have an OK status: No auth clients specified", str(exc)) + + @require_controller @require_version(Requirement.ADD_ONION) def test_with_detached_ephemeral_hidden_services(self): """

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2016