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

[tor/master] Add GETINFO current-time/{local, utc} regression test
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 3a6e37f57f599fe4c94a17422c8e41a7bbe06616 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Apr 16 20:35:45 2018 -0400 Add GETINFO current-time/{local,utc} regression test --- src/test/test_controller.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 1c285bb3a..3b58a78e1 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -1470,6 +1470,61 @@ test_download_status_bridge(void *arg) return; } +/** Set timeval to a mock date and time. This is neccessary + * to make tor_gettimeofday() mockable. */ +static void +mock_tor_gettimeofday(struct timeval *timeval) +{ + timeval->tv_sec = 1523405073; + timeval->tv_usec = 271645; +} + +static void +test_current_time(void *arg) +{ + /* We just need one of these to pass, it doesn't matter what's in it */ + control_connection_t dummy; + /* Get results out */ + char *answer = NULL; + const char *errmsg = NULL; + + (void)arg; + + /* We need these for storing the (mock) time. */ + MOCK(tor_gettimeofday, mock_tor_gettimeofday); + struct timeval now; + tor_gettimeofday(&now); + char timebuf[ISO_TIME_LEN+1]; + + /* Case 1 - local time */ + format_local_iso_time_nospace(timebuf, (time_t)now.tv_sec); + getinfo_helper_current_time(&dummy, + "current-time/local", + &answer, &errmsg); + tt_ptr_op(answer, OP_NE, NULL); + tt_ptr_op(errmsg, OP_EQ, NULL); + tt_str_op(answer, OP_EQ, timebuf); + tor_free(answer); + errmsg = NULL; + + /* Case 2 - UTC time */ + format_iso_time_nospace(timebuf, (time_t)now.tv_sec); + getinfo_helper_current_time(&dummy, + "current-time/utc", + &answer, &errmsg); + tt_ptr_op(answer, OP_NE, NULL); + tt_ptr_op(errmsg, OP_EQ, NULL); + tt_str_op(answer, OP_EQ, timebuf); + tor_free(answer); + errmsg = NULL; + + done: + UNMOCK(tor_gettimeofday); + tor_free(answer); + + return; +} + struct testcase_t controller_tests[] = { { "add_onion_helper_keyarg_v2", test_add_onion_helper_keyarg_v2, 0, NULL, NULL }, @@ -1486,6 +1541,7 @@ struct testcase_t controller_tests[] = { NULL }, { "download_status_desc", test_download_status_desc, 0, NULL, NULL }, { "download_status_bridge", test_download_status_bridge, 0, NULL, NULL }, + { "current_time", test_current_time, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Add format_local_iso_time_nospace()
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 9e3e1b8bfb7739d3add782a9f2fe7242ec9a36ae Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Apr 16 20:14:49 2018 -0400 Add format_local_iso_time_nospace() --- src/common/util.c | 9 +++++++++ src/common/util.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 041e7aee3..b7516b8b6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1821,6 +1821,15 @@ format_iso_time(char *buf, time_t t) strftime(buf, ISO_TIME_LEN+1, "%Y-%m-%d %H:%M:%S", tor_gmtime_r(&t, &tm)); } +/** As format_local_iso_time, but use the yyyy-mm-ddThh:mm:ss format to avoid + * embedding an internal space. */ +void +format_local_iso_time_nospace(char *buf, time_t t) +{ + format_local_iso_time(buf, t); + buf[10] = 'T'; +} + /** As format_iso_time, but use the yyyy-mm-ddThh:mm:ss format to avoid * embedding an internal space. */ void diff --git a/src/common/util.h b/src/common/util.h index ae27e5f01..5708b7fd8 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -269,6 +269,7 @@ int parse_rfc1123_time(const char *buf, time_t *t); #define ISO_TIME_USEC_LEN (ISO_TIME_LEN+7) void format_local_iso_time(char *buf, time_t t); void format_iso_time(char *buf, time_t t); +void format_local_iso_time_nospace(char *buf, time_t t); void format_iso_time_nospace(char *buf, time_t t); void format_iso_time_nospace_usec(char *buf, const struct timeval *tv); int parse_iso_time_(const char *cp, time_t *t, int strict, int nospace);

1 0

[tor/master] Merge remote-tracking branch 'neel/b25511-r4'
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit cd3fc2aa4867e89877bbfb99f4f767d761b91f25 Merge: 8c01aee2e dca36eff8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:13:24 2018 -0400 Merge remote-tracking branch 'neel/b25511-r4' changes/ticket25511 | 5 +++++ src/common/compat_time.c | 4 ++-- src/common/compat_time.h | 2 +- src/common/util.c | 9 ++++++++ src/common/util.h | 1 + src/or/control.c | 28 +++++++++++++++++++++++ src/or/control.h | 4 ++++ src/test/test_controller.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 106 insertions(+), 3 deletions(-)

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 23 Apr '18

23 Apr '18

commit a43082d8ebde7e9c479229433758928708c3e825 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 12:46:44 2018 +0000 Update translations for tails-misc_completed --- uk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk.po b/uk.po index 856759b25..209d10e79 100644 --- a/uk.po +++ b/uk.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-12 19:07+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-04-23 12:35+0000\n" +"Last-Translator: O Herenko <herenko(a)ex.ua>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Apr '18

23 Apr '18

commit 0ef8de24a0f092cd5fcc0d00956c3c3d72582ffe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 12:46:39 2018 +0000 Update translations for tails-misc --- uk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk.po b/uk.po index 856759b25..209d10e79 100644 --- a/uk.po +++ b/uk.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-12 19:07+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-04-23 12:35+0000\n" +"Last-Translator: O Herenko <herenko(a)ex.ua>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[torspec/master] Merge remote-tracking branch 'catalyst/spelling'
by dgoulet＠torproject.org 23 Apr '18

23 Apr '18

commit d88afa188ed10d30e43b3377ff0c8a47ac4916e9 Merge: fb33ac2 913d724 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 23 08:39:46 2018 -0400 Merge remote-tracking branch 'catalyst/spelling' control-spec.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[torspec/master] Note release introduced for current-time/*
by dgoulet＠torproject.org 23 Apr '18

23 Apr '18

commit c2abb79dc1acc480adf467351466a4978800976f Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Apr 20 14:25:41 2018 -0500 Note release introduced for current-time/* --- control-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 80ff5a1..6d7f91a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1069,7 +1069,7 @@ "current-time/local" "current-time/utc" The current system or UTC time, as returned by the system, in ISOTime2 - format. + format. (Introduced in 0.3.4.1-alpha.) "config-can-saveconf" 0 or 1, depending on whether it is possile to use SAVECONF without the

1 0

[torspec/master] Fix spelling errors in control-spec.txt
by dgoulet＠torproject.org 23 Apr '18

23 Apr '18

commit 913d724e9f2af1351500dc68cec4d4cf54e20019 Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Apr 20 14:35:29 2018 -0500 Fix spelling errors in control-spec.txt --- control-spec.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 6d7f91a..e2f749e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -207,7 +207,7 @@ ; For tors older than 0.3.1.3-alpha, LongName may have included an equal ; sign ("=") in lieu of a tilde ("~"). The presence of an equal sign - ; denoted that the OR posessed the "Named" flag: + ; denoted that the OR possessed the "Named" flag: LongName = Fingerprint [ ( "=" / "~" ) Nickname ] @@ -1072,7 +1072,7 @@ format. (Introduced in 0.3.4.1-alpha.) "config-can-saveconf" - 0 or 1, depending on whether it is possile to use SAVECONF without the + 0 or 1, depending on whether it is possible to use SAVECONF without the FORCE flag. (Introduced in 0.3.1.1-alpha.) Examples: @@ -2796,7 +2796,7 @@ Total = Integer count of timeouts stored Timeout = Integer timeout in milliseconds Xm = Estimated integer Pareto parameter Xm in milliseconds - Alpha = Estimated floating point Paredo paremter alpha + Alpha = Estimated floating point Paredo parameter alpha Quantile = Floating point CDF quantile cutoff point for this timeout TimeoutRate = Floating point ratio of circuits that timeout CloseTimeout = How long to keep measurement circs in milliseconds @@ -3084,7 +3084,7 @@ will be ignored and a "HS_DESC" event with "IGNORE" action will be generated. - For HsDir, LongName is always prefered. If HsDir cannot be found in node + For HsDir, LongName is always preferred. If HsDir cannot be found in node list at the time event is sent, Fingerprint will be used instead. If Action is "FAILED", Tor SHOULD send Reason field as well. Possible

1 0

[tor/master] Document default for ControlSocket.
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 8c01aee2e3b8970af96f5b1a662bdf80d0e22489 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 07:47:01 2018 -0400 Document default for ControlSocket. Closes 25897. --- doc/tor.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 05a612d6a..594dedf39 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -368,7 +368,8 @@ GENERAL OPTIONS [[ControlSocket]] **ControlSocket** __Path__:: Like ControlPort, but listens on a Unix domain socket, rather than a TCP - socket. '0' disables ControlSocket (Unix and Unix-like systems only.) + socket. '0' disables ControlSocket. (Unix and Unix-like systems only.) + (Default: 0) [[ControlSocketsGroupWritable]] **ControlSocketsGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 23 Apr '18

23 Apr '18

commit 6e681a231ef35247a3df920e87eedaeef5f155b1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 23 12:26:05 2018 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index f826234..77bbd74 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit f826234e8064014487d871838e8074e83a142e42 +Subproject commit 77bbd742b63fd9708694d7d8623d82a9654b770e

1 0