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

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e Merge: f0230ee38 5c3639923 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit beb321d8cdd6e7a2f0b9a0a4758cd71768531959 Merge: 44aa586de 1438c6c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'bug24969_029_v2' into maint-0.2.9
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 9727b4c5d683173888b5a49e8b24c3faa9045521 Merge: d3ff12630 c4be6dfea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:25 2018 -0400 Merge branch 'bug24969_029_v2' into maint-0.2.9 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Permit the nanosleep system call in the seccomp2 callbox
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit c4be6dfeabc8d42ecb6ccea8ca44d1ff0835071a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 10:25:42 2018 -0400 Permit the nanosleep system call in the seccomp2 callbox Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced. --- changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/changes/bug24969 b/changes/bug24969 new file mode 100644 index 000000000..46b2bae6f --- /dev/null +++ b/changes/bug24969 @@ -0,0 +1,3 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Allow the nanosleep() system call, which glibc uses to implement + sleep() and usleep(). Fixes bug 24969; bugfix on 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 87fe08e88..3d27ea66b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -185,6 +185,9 @@ static int filter_nopar_gen[] = { SCMP_SYS(mmap), #endif SCMP_SYS(munmap), +#ifdef __NR_nanosleep + SCMP_SYS(nanosleep), +#endif #ifdef __NR_prlimit SCMP_SYS(prlimit), #endif

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 28dc7a519c712913b8ad0581ac9ee5f875ad27b3 Merge: 02ac1822a 5c3639923 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'bug24969_029_v2' into maint-0.2.9
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 9727b4c5d683173888b5a49e8b24c3faa9045521 Merge: d3ff12630 c4be6dfea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:25 2018 -0400 Merge branch 'bug24969_029_v2' into maint-0.2.9 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e Merge: ce8e7427b 9727b4c5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

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

23 Apr '18

commit e72742d693827a747ad405eb81422d6ee9fd691b Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Apr 16 20:16:37 2018 -0400 Add GETINFO current-time/{local,utc} command to ControlPort --- src/or/control.c | 28 ++++++++++++++++++++++++++++ src/or/control.h | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index 0539ddaca..72122eaaf 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1931,6 +1931,31 @@ getinfo_helper_listeners(control_connection_t *control_conn, return 0; } +/** Implementation helper for GETINFO: answers requests for information about + * the current time in both local and UTF forms. */ +STATIC int +getinfo_helper_current_time(control_connection_t *control_conn, + const char *question, + char **answer, const char **errmsg) +{ + (void)control_conn; + (void)errmsg; + + struct timeval now; + tor_gettimeofday(&now); + char timebuf[ISO_TIME_LEN+1]; + + if (!strcmp(question, "current-time/local")) + format_local_iso_time_nospace(timebuf, (time_t)now.tv_sec); + else if (!strcmp(question, "current-time/utc")) + format_iso_time_nospace(timebuf, (time_t)now.tv_sec); + else + return 0; + + *answer = tor_strdup(timebuf); + return 0; +} + /** Implementation helper for GETINFO: knows the answers for questions about * directory information. */ STATIC int @@ -3073,6 +3098,9 @@ static const getinfo_item_t getinfo_items[] = { DOC("config/defaults", "List of default values for configuration options. " "See also config/names"), + PREFIX("current-time/", current_time, "Current time."), + DOC("current-time/local", "Current time on the local system."), + DOC("current-time/utc", "Current UTC time."), PREFIX("downloads/networkstatus/", downloads, "Download statuses for networkstatus objects"), DOC("downloads/networkstatus/ns", diff --git a/src/or/control.h b/src/or/control.h index 2fd3c553f..2f312a663 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -311,6 +311,10 @@ STATIC int getinfo_helper_dir( control_connection_t *control_conn, const char *question, char **answer, const char **errmsg); +STATIC int getinfo_helper_current_time( + control_connection_t *control_conn, + const char *question, char **answer, + const char **errmsg); #endif /* defined(CONTROL_PRIVATE) */

1 0

[tor/master] Make tor_gettimeofday() mockable
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit ce84de39efc09142d36d5b94963b1aeb2c0a1ae9 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Apr 16 20:18:40 2018 -0400 Make tor_gettimeofday() mockable --- src/common/compat_time.c | 4 ++-- src/common/compat_time.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index b940447b6..966216768 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -71,8 +71,8 @@ tor_sleep_msec(int msec) /** Set *timeval to the current time of day. On error, log and terminate. * (Same as gettimeofday(timeval,NULL), but never returns -1.) */ -void -tor_gettimeofday(struct timeval *timeval) +MOCK_IMPL(void, +tor_gettimeofday, (struct timeval *timeval)) { #ifdef _WIN32 /* Epoch bias copied from perl: number of units between windows epoch and diff --git a/src/common/compat_time.h b/src/common/compat_time.h index 75b57f6f2..09dd6add3 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -173,7 +173,7 @@ void monotime_coarse_add_msec(monotime_coarse_t *out, #define monotime_coarse_add_msec monotime_add_msec #endif /* defined(MONOTIME_COARSE_TYPE_IS_DIFFERENT) */ -void tor_gettimeofday(struct timeval *timeval); +MOCK_DECL(void, tor_gettimeofday, (struct timeval *timeval)); #ifdef TOR_UNIT_TESTS void tor_sleep_msec(int msec);

1 0

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

23 Apr '18

commit dca36eff8fbe9307aa2f74d26841399537e11406 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Apr 16 20:36:28 2018 -0400 Add changes file for GETINFO current-time/{local,utc} --- changes/ticket25511 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket25511 b/changes/ticket25511 new file mode 100644 index 000000000..0a24e265c --- /dev/null +++ b/changes/ticket25511 @@ -0,0 +1,5 @@ + o Minor features (control port): + - Introduce GETINFO "current-time/{local,utc}" to return the local + and UTC times respectively in ISO format. This helps a controller + like Tor Browser detect a time-related error. Closes ticket 25511. + Patch by Neel Chauhan.

1 0