tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[tlsdate/debian-master] Add /usr/lib/x86_64-linux-gnu/ to AppArmor profile\
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 7976210871063f98d001221a7eac6901dfd47f81 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 31 11:38:47 2013 +0100 Add /usr/lib/x86_64-linux-gnu/ to AppArmor profile\ This partially addresses Debian bug #704680 --- apparmor-profile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apparmor-profile b/apparmor-profile index 264de28..c21bfa5 100644 --- a/apparmor-profile +++ b/apparmor-profile @@ -59,6 +59,7 @@ /lib64/* rm, /usr/lib/* rm, /lib/x86_64-linux-gnu/* rm, + /usr/lib/x86_64-linux-gnu/* rm, # We'll allow tlsdate to write a new root to chroot into /tmp/ r, @@ -122,6 +123,7 @@ /usr/lib/* rm, /usr/local/lib/* rm, /lib/x86_64-linux-gnu/* rm, + /usr/lib/x86_64-linux-gnu/* rm, # We'll allow tlsdate to write a new root to chroot into /tmp/ r, @@ -187,6 +189,7 @@ /usr/lib/* rm, /usr/local/lib/* rm, /lib/x86_64-linux-gnu/* rm, + /usr/lib/x86_64-linux-gnu/* rm, # We'll allow tlsdate to write a new root to chroot into /tmp/ r, @@ -221,6 +224,7 @@ /lib64/* rm, /usr/lib/* rm, /lib/x86_64-linux-gnu/* rm, + /usr/lib/x86_64-linux-gnu/* rm, } /usr/bin/tlsdate-dbus-announce { @@ -238,4 +242,5 @@ /lib64/* rm, /usr/lib/* rm, /lib/x86_64-linux-gnu/* rm, + /usr/lib/x86_64-linux-gnu/* rm, }

1 0

[tlsdate/debian-master] Merge branch 'master' into debian-master
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

1 0

[tlsdate/debian-master] update CHANGELOG
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit cb883468e35779e4166babf93fb5983a54a3f1cb Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 31 11:47:34 2013 +0100 update CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 206a97d..1996acc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,8 @@ Refactored event loop. Added suspend/resume RTC corruption detection. Add -w option to get time from HTTPS header instead of from TLS ServerHello + Update AppArmor profile + Add simple systemd service file 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate.

1 0

[tlsdate/debian-master] update CHANGELOG
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 152d6dafd925100e0d869e1e29e9eaf4bdbb2042 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 31 11:47:34 2013 +0100 update CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 206a97d..1996acc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,8 @@ Refactored event loop. Added suspend/resume RTC corruption detection. Add -w option to get time from HTTPS header instead of from TLS ServerHello + Update AppArmor profile + Add simple systemd service file 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate.

1 0

[tlsdate/master] update CHANGELOG
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

1 0

[tlsdate/debian-master] Fix subprocess watching.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 691a39f31465c3118a31d3c8be580cbbaf603578 Author: elly <elly(a)leptoquark.net> Date: Fri Jun 21 12:01:18 2013 -0400 Fix subprocess watching. Currently, the subprocess watching code polls with a delay between attempts. Instead, introduce wait_with_timeout() and use it, simplifying this code. Signed-off-by: Elly Fong-Jones <elly(a)leptoquark.net> --- CHANGELOG | 1 + etc/tlsdated.conf | 3 +- man/tlsdated.conf.5 | 6 ++-- src/tlsdate.h | 6 ++-- src/tlsdated-unittest.c | 14 +++------ src/tlsdated.c | 77 ++++++++++++++++++----------------------------- src/util.c | 31 +++++++++++++++++++ src/util.h | 4 +++ 8 files changed, 75 insertions(+), 67 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fbe7a83..c408a15 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ Add Mac OS X 10.8.3 support Extensive setup/install documentation is now present in INSTALL for most OSes Add DragonFly BSD 3.3 support + Refactored subprocess watching. 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate. diff --git a/etc/tlsdated.conf b/etc/tlsdated.conf index 9f9b43e..c6dbbf0 100644 --- a/etc/tlsdated.conf +++ b/etc/tlsdated.conf @@ -12,8 +12,7 @@ should-netlink yes should-save-disk yes should-sync-hwclock yes steady-state-interval 86400 -subprocess-tries 10 -subprocess-wait-between-tries 3 +subprocess-timeout 30 verbose yes wait-between-tries 10 diff --git a/man/tlsdated.conf.5 b/man/tlsdated.conf.5 index 13fb153..79ed27a 100644 --- a/man/tlsdated.conf.5 +++ b/man/tlsdated.conf.5 @@ -42,10 +42,8 @@ at exit. If enabled, set the hwclock to the fetched time. .IP "steady-state-interval [int]" Check at least once this many seconds when in steady state. -.IP "subprocess-tries [int]" -How many times to try waiting for the subprocess. -.IP "subprocess-wait-between-tries [int]" -How many seconds to wait between each attempt to wait for the subprocess. +.IP "subprocess-timeout [int]" +How many seconds to wait for the subprocess to exit. .IP "verbose [bool]" If enabled, tlsdated will be annoyingly verbose in syslog and on stdout. .IP "wait-between-tries [int]" diff --git a/src/tlsdate.h b/src/tlsdate.h index 5b24980..978396d 100644 --- a/src/tlsdate.h +++ b/src/tlsdate.h @@ -33,8 +33,7 @@ /* tlsdated magic numbers */ #define MAX_TRIES 10 #define WAIT_BETWEEN_TRIES 10 -#define SUBPROCESS_TRIES 10 -#define SUBPROCESS_WAIT_BETWEEN_TRIES 3 +#define SUBPROCESS_TIMEOUT 30 #define STEADY_STATE_INTERVAL 86400 #define DEFAULT_SYNC_HWCLOCK 1 #define DEFAULT_LOAD_FROM_DISK 1 @@ -67,8 +66,7 @@ struct opts { int max_tries; int min_steady_state_interval; int wait_between_tries; - int subprocess_tries; - int subprocess_wait_between_tries; + int subprocess_timeout; int steady_state_interval; const char *base_path; char **base_argv; diff --git a/src/tlsdated-unittest.c b/src/tlsdated-unittest.c index cb30313..5baca13 100644 --- a/src/tlsdated-unittest.c +++ b/src/tlsdated-unittest.c @@ -118,8 +118,7 @@ TEST(tlsdate_tests) { memset(&opts, 0, sizeof(opts)); opts.sources = &source; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 1; extern char **environ; EXPECT_EQ(1, tlsdate(&opts, environ)); args[0] = "/bin/false"; @@ -129,7 +128,7 @@ TEST(tlsdate_tests) { args[0] = "src/test/sleep-wrap"; args[1] = "3"; EXPECT_EQ(-1, tlsdate(&opts, environ)); - opts.subprocess_wait_between_tries = 5; + opts.subprocess_timeout = 5; EXPECT_EQ(0, tlsdate(&opts, environ)); } @@ -167,8 +166,7 @@ TEST(rotate_hosts) { memset(&opts, 0, sizeof(opts)); opts.sources = &s1; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 2; extern char **environ; EXPECT_EQ(1, tlsdate(&opts, environ)); EXPECT_EQ(2, tlsdate(&opts, environ)); @@ -188,8 +186,7 @@ TEST(proxy_override) { memset(&opts, 0, sizeof(opts)); opts.sources = &s1; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 2; extern char **environ; EXPECT_EQ(1, tlsdate(&opts, environ)); s1.proxy = "socks5://bad.proxy"; @@ -210,8 +207,7 @@ TEST(tlsdate_args) { memset(&opts, 0, sizeof(opts)); opts.sources = &s1; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 2; opts.leap = 1; verbose = 1; EXPECT_EQ(9, tlsdate(&opts, environ)); diff --git a/src/tlsdated.c b/src/tlsdated.c index ef9fe68..7816223 100644 --- a/src/tlsdated.c +++ b/src/tlsdated.c @@ -106,43 +106,35 @@ int tlsdate (struct opts *opts, char *envp[]) { pid_t pid; + pid_t exited; + int status; + build_argv(opts); - - if ((pid = fork ()) > 0) - { - /* - * We launched tlsdate; wait for up to kMaxTries intervals of - * kWaitBetweenTries for it to exit, then kill it if it still - * hasn't. - */ - int status = -1; - int i = 0; - for (i = 0; i < opts->subprocess_tries; ++i) + + pid = fork(); + if (pid < 0) { - info ("wait for child attempt %d", i); - if (waitpid (-1, &status, WNOHANG) > 0) - break; - sleep (opts->subprocess_wait_between_tries); + pinfo("fork() failed"); + return -1; } - if (i == opts->subprocess_tries) + else if (pid == 0) { - error ("child hung?"); - kill (pid, SIGKILL); - /* still have to wait() so we don't leak the child. */ - wait (&status); + execve(opts->argv[0], opts->argv, envp); + pinfo("execve() failed"); + exit(1); + } + + exited = wait_with_timeout(&status, opts->subprocess_timeout); + info("child %d exited with %d", exited, status); + + if (exited == -ETIMEDOUT) + { + kill(pid, SIGKILL); + wait(&status); return -1; } - info ("child exited with %d", status); - return WIFEXITED (status) ? WEXITSTATUS (status) : -1; - } - else if (pid < 0) - { - pinfo ("fork() failed"); - return -1; - } - execve (opts->argv[0], opts->argv, envp); - pinfo ("execve() failed"); - exit (1); + + return WIFEXITED(status) ? WEXITSTATUS(status) : -1; } /* @@ -394,8 +386,7 @@ set_conf_defaults(struct opts *opts) opts->max_tries = MAX_TRIES; opts->min_steady_state_interval = STEADY_STATE_INTERVAL; opts->wait_between_tries = WAIT_BETWEEN_TRIES; - opts->subprocess_tries = SUBPROCESS_TRIES; - opts->subprocess_wait_between_tries = SUBPROCESS_WAIT_BETWEEN_TRIES; + opts->subprocess_timeout = SUBPROCESS_TIMEOUT; opts->steady_state_interval = STEADY_STATE_INTERVAL; opts->base_path = kCacheDir; opts->base_argv = kDefaultArgv; @@ -418,7 +409,7 @@ parse_argv(struct opts *opts, int argc, char *argv[]) { int opt; - while ((opt = getopt (argc, argv, "hwrpt:d:T:D:c:a:lsvm:j:f:x:")) != -1) + while ((opt = getopt (argc, argv, "hwrpt:d:c:a:lsvm:j:f:x:")) != -1) { switch (opt) { @@ -437,12 +428,6 @@ parse_argv(struct opts *opts, int argc, char *argv[]) case 'd': opts->wait_between_tries = atoi (optarg); break; - case 'T': - opts->subprocess_tries = atoi (optarg); - break; - case 'D': - opts->subprocess_wait_between_tries = atoi (optarg); - break; case 'c': opts->base_path = optarg; break; @@ -572,10 +557,8 @@ load_conf(struct opts *opts) opts->min_steady_state_interval = atoi (e->value); } else if (!strcmp (e->key, "wait-between-tries") && e->value) { opts->wait_between_tries = atoi (e->value); - } else if (!strcmp (e->key, "subprocess-tries") && e->value) { - opts->subprocess_tries = atoi (e->value); - } else if (!strcmp (e->key, "subprocess-wait-between-tries") && e->value) { - opts->subprocess_wait_between_tries = atoi (e->value); + } else if (!strcmp (e->key, "subprocess-timeout") && e->value) { + opts->subprocess_timeout = atoi (e->value); } else if (!strcmp (e->key, "steady-state-interval") && e->value) { opts->steady_state_interval = atoi (e->value); } else if (!strcmp (e->key, "base-path") && e->value) { @@ -611,10 +594,8 @@ check_conf(struct opts *opts) fatal ("-t argument must be nonzero"); if (!opts->wait_between_tries) fatal ("-d argument must be nonzero"); - if (!opts->subprocess_tries) - fatal ("-T argument must be nonzero"); - if (!opts->subprocess_wait_between_tries) - fatal ("-D argument must be nonzero"); + if (!opts->subprocess_timeout) + fatal ("subprocess timeout must be nonzero"); if (!opts->steady_state_interval) fatal ("-a argument must be nonzero"); if (snprintf (timestamp_path, sizeof (timestamp_path), "%s/timestamp", diff --git a/src/util.c b/src/util.c index 68f3a98..30a0f44 100644 --- a/src/util.c +++ b/src/util.c @@ -9,9 +9,11 @@ #include <grp.h> #include <pwd.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <sys/types.h> +#include <sys/wait.h> #include <syslog.h> #include <unistd.h> @@ -101,3 +103,32 @@ drop_privs_to (const char *user, const char *group) #endif } +pid_t +wait_with_timeout(int *status, int timeout_secs) +{ + int st = 0; + pid_t exited; + /* synthesize waiting with a timeout by using a helper process. We + * launch a child process that will exit in |timeout_secs|, guaranteeing + * that wait() will return by then. */ + pid_t helper = fork(); + if (helper < 0) + return helper; + if (helper == 0) + { + sleep(timeout_secs); + exit(0); + } + + /* use temporary status to avoid touching it if we do ETIMEDOUT */ + exited = wait(&st); + if (exited == helper) + /* helper exited before any other child did */ + return -ETIMEDOUT; + + /* a real child process exited - don't leak the helper */ + kill(helper, SIGKILL); + waitpid(helper, NULL, 0); + *status = st; + return exited; +} diff --git a/src/util.h b/src/util.h index bfd61dd..2632933 100644 --- a/src/util.h +++ b/src/util.h @@ -37,4 +37,8 @@ static inline int min(int x, int y) { return x < y ? x : y; } void drop_privs_to (const char *user, const char *group); +/* like wait(), but with a timeout. Returns ordinary fork() error codes, or + * ETIMEDOUT. */ +pid_t wait_with_timeout(int *status, int timeout_secs); + #endif /* !UTIL_H */

1 0

[tlsdate/master] add systemd service file for tlsdated
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 8282207cf1613e2ef444e06ac1dab7d88cd2c2ef Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 31 11:36:10 2013 +0100 add systemd service file for tlsdated --- tlsdate.service | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tlsdate.service b/tlsdate.service new file mode 100644 index 0000000..6a116be --- /dev/null +++ b/tlsdate.service @@ -0,0 +1,6 @@ +[Unit] +Description=Secure parasitic rdate replacement + +[Service] +ExecStart=/usr/bin/tlsdated +Type=forking

1 0

[tlsdate/master] Add /usr/lib/x86_64-linux-gnu/ to AppArmor profile\
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

1 0

[tlsdate/master] tlsdate: add optional --showtime support for "raw"
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit eb5bdfc0f9980991a49151e9bb513f0e83b489e1 Author: Will Drewry <wad(a)chromium.org> Date: Fri Sep 13 15:57:10 2013 -0500 tlsdate: add optional --showtime support for "raw" Add support for optional arguments to --showtime, "raw" and "human". Human readable output is what --showtime and -V do already. Passing in --showtime=raw will tell tlsdate-helper to write the raw unix time directly to stdout in host byte order. The purpose of this change is to provide easier integration of privilege isolation for time setting. If tlsdate is called from a wrapper, like tlsdated, it should be possible to pass the time back to a privileged time-setter with the minimum of needed parsing. --- src/tlsdate-helper.c | 7 +++++++ src/tlsdate.c | 7 ++++--- src/tlsdate.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index cd44c97..4058f5e 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1071,6 +1071,7 @@ main(int argc, char **argv) uint32_t server_time_s; int setclock; int showtime; + int showtime_raw; int timewarp; int leap; @@ -1085,6 +1086,7 @@ main(int argc, char **argv) verbose = (0 != strcmp ("quiet", argv[5])); setclock = (0 == strcmp ("setclock", argv[7])); showtime = (0 == strcmp ("showtime", argv[8])); + showtime_raw = (0 == strcmp ("showtime=raw", argv[8])); timewarp = (0 == strcmp ("timewarp", argv[9])); leap = (0 == strcmp ("leapaway", argv[10])); proxy = (0 == strcmp ("none", argv[11]) ? NULL : argv[11]); @@ -1205,6 +1207,11 @@ main(int argc, char **argv) "server or run it again\n", TLS_RTT_THRESHOLD); } + if (showtime_raw) + { + fwrite(&server_time_s, sizeof(server_time_s), 1, stdout); + } + if (showtime) { struct tm ltm; diff --git a/src/tlsdate.c b/src/tlsdate.c index c8bc09c..c19ef69 100644 --- a/src/tlsdate.c +++ b/src/tlsdate.c @@ -91,7 +91,7 @@ usage(void) " [-P|--protocol] [sslv23|sslv3|tlsv1]\n" " [-C|--certcontainer] [dirname|filename]\n" " [-v|--verbose]\n" - " [-V|--showtime]\n" + " [-V|--showtime] [human|raw]\n" " [-t|--timewarp]\n" " [-l|--leap]\n" " [-x|--proxy] [url]\n"); @@ -132,7 +132,7 @@ main(int argc, char **argv) static struct option long_options[] = { {"verbose", 0, 0, 'v'}, - {"showtime", 0, 0, 'V'}, + {"showtime", 2, 0, 'R'}, {"skip-verification", 0, 0, 's'}, {"help", 0, 0, 'h'}, {"host", 0, 0, 'H'}, @@ -154,6 +154,7 @@ main(int argc, char **argv) switch (c) { case 'v': verbose = 1; break; case 'V': showtime = 1; break; + case 'R': showtime = (optarg && 0 == strcmp("raw", optarg) ? 2:1); break; case 's': ca_racket = 0; break; case 'h': usage(); exit(1); break; case 'H': host = optarg; break; @@ -190,7 +191,7 @@ main(int argc, char **argv) (verbose ? "verbose" : "quiet"), ca_cert_container, (setclock ? "setclock" : "dont-set-clock"), - (showtime ? "showtime" : "no-showtime"), + (showtime ? (showtime == 2 ? "showtime=raw" : "showtime") : "no-showtime"), (timewarp ? "timewarp" : "no-fun"), (leap ? "leapaway" : "holdfast"), (proxy ? proxy : "none"), diff --git a/src/tlsdate.h b/src/tlsdate.h index 978396d..ccd8e51 100644 --- a/src/tlsdate.h +++ b/src/tlsdate.h @@ -14,6 +14,7 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <getopt.h> #include <time.h> #include <unistd.h>

1 0

[tlsdate/master] tlsdate, docs: make -V taken an optional arg to simplify showtime
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit d8fc0e8f732886507322b65865e933f663cc720e Author: Will Drewry <wad(a)chromium.org> Date: Fri Sep 13 19:47:38 2013 -0500 tlsdate, docs: make -V taken an optional arg to simplify showtime Update the man pages and simplify the processing of -V and --showtime to share the optional argument path. --- man/tlsdate.1 | 5 +++-- src/tlsdate.c | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/tlsdate.1 b/man/tlsdate.1 index 8ce9d18..e34c81d 100644 --- a/man/tlsdate.1 +++ b/man/tlsdate.1 @@ -49,8 +49,9 @@ The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed: The proxy support should not leak DNS requests and is suitable for use with Tor. .IP "\-v | \-\-verbose" Provide verbose output -.IP "\-V | \-\-showtime" -Show the time retrieved from the remote server +.IP "\-V | \-\-showtime [human|raw]" +Show the time retrieved from the remote server in a human-readable format or as +a raw time_t. .IP "\-t | \-\-timewarp" If the local clock is before RECENT_COMPILE_DATE; we set the clock to the RECENT_COMPILE_DATE. If the local clock is after RECENT_COMPILE_DATE, we leave diff --git a/src/tlsdate.c b/src/tlsdate.c index c19ef69..26e9432 100644 --- a/src/tlsdate.c +++ b/src/tlsdate.c @@ -132,7 +132,7 @@ main(int argc, char **argv) static struct option long_options[] = { {"verbose", 0, 0, 'v'}, - {"showtime", 2, 0, 'R'}, + {"showtime", 2, 0, 'V'}, {"skip-verification", 0, 0, 's'}, {"help", 0, 0, 'h'}, {"host", 0, 0, 'H'}, @@ -146,15 +146,14 @@ main(int argc, char **argv) {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "vVshH:p:P:nC:tlx:", + c = getopt_long(argc, argv, "vV::shH:p:P:nC:tlx:", long_options, &option_index); if (c == -1) break; switch (c) { case 'v': verbose = 1; break; - case 'V': showtime = 1; break; - case 'R': showtime = (optarg && 0 == strcmp("raw", optarg) ? 2:1); break; + case 'V': showtime = (optarg && 0 == strcmp("raw", optarg) ? 2:1); break; case 's': ca_racket = 0; break; case 'h': usage(); exit(1); break; case 'H': host = optarg; break;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
129
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013