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

[tlsdate/debian-master] add verbosity for privilege dropping attempt
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 7ba9ae21144f9d29d67b5028aec2de1738da0a4e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jun 29 20:08:25 2013 +0200 add verbosity for privilege dropping attempt --- src/tlsdate-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index e625946..cd44c97 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1104,6 +1104,7 @@ main(int argc, char **argv) /* We are not going to set the clock, thus no … [View More]

1 0

[tlsdate/debian-master] David Hill noticed that we sometimes leave &warp_time uninitalized
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit a2b4adc5724ee531fc875c4a64a206584e0df3c6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jun 29 20:05:04 2013 +0200 David Hill noticed that we sometimes leave &warp_time uninitalized --- src/tlsdate-helper.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 35d6779..e625946 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1089,18 +1089,16 @@ main(int argc, … [View More]

1 0

[tlsdate/debian-master] Merge branch 'master' of github.com:ioerror/tlsdate
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit ce042c6f3e561ddef111119692c0307380ac886b Merge: 7ba9ae2 26e983f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Jun 30 05:53:06 2013 +0200 Merge branch 'master' of github.com:ioerror/tlsdate 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 … [View More]

1 0

[tlsdate/debian-master] Add integration testing.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 234454e5faadda2094e7e454563bcd538984b403 Author: elly <elly(a)leptoquark.net> Date: Mon Jul 8 10:21:15 2013 -0400 Add integration testing. These new integration tests mostly focus on tlsdated's subprocess code. Signed-off-by: Elly Fong-Jones <elly(a)leptoquark.net> --- run-tests | 40 ++++++++++++++++++++++++++++++++++++++++ test.conf | 2 ++ tests/README | 1 + tests/common.sh … [View More] | 32 ++++++++++++++++++++++++++++++++ tests/run-idle/output | 1 + tests/run-idle/runs | 1 + tests/run-idle/setup | 4 ++++ tests/run-idle/subproc.sh | 6 ++++++ tests/run-idle/teardown | 4 ++++ tests/run-idle/test.conf | 2 ++ tests/run-once/output | 1 + tests/run-once/run-error | 1 + tests/run-once/subproc.sh | 5 +++++ tests/run-routeup/input | 1 + tests/run-routeup/output | 1 + tests/run-routeup/runs | 1 + tests/run-routeup/setup | 4 ++++ tests/run-routeup/subproc.sh | 6 ++++++ tests/run-routeup/teardown | 4 ++++ tests/subproc-retry/input | 1 + tests/subproc-retry/output | 3 +++ tests/subproc-retry/runs | 1 + tests/subproc-retry/setup | 4 ++++ tests/subproc-retry/subproc.sh | 10 ++++++++++ tests/subproc-retry/teardown | 4 ++++ tests/wait-idle/subproc.sh | 7 +++++++ 26 files changed, 147 insertions(+) diff --git a/run-tests b/run-tests new file mode 100755 index 0000000..693fa59 --- /dev/null +++ b/run-tests @@ -0,0 +1,40 @@ +#!/bin/sh + +run_test() { + [ -x "$1"/setup ] && "$1"/setup + if [ -r "$1"/tlsdated-flags ]; then + flags=$(cat "$1"/tlsdated-flags | sed "s/@TESTDIR@/$1/g") + elif [ -r "$1"/test.conf ]; then + flags="-w -p -r -l -s -f $1/test.conf" + else + flags="-w -p -r -l -s -f test.conf" + fi + # flags are deliberately unquoted here so that they'll be interpolated + timeout 5 src/tlsdated $flags -- "$1"/subproc.sh <"$1"/input >"$1"/run-output \ + 2>"$1"/run-err + [ -x "$1"/teardown ] && "$1"/teardown +} + +test_passed() { + diff "$t"/output "$t"/run-output >/dev/null +} + +total=0 +passed=0 + +for t in tests/*; do + [ ! -d "$t" ] && continue + name="$(basename "$t")" + echo -n "$name: " + run_test "$t" + if test_passed "$t"; then + echo "ok" + passed=$((passed + 1)) + else + echo "failed" + fi + total=$((total + 1)) +done +echo "Passed: $passed/$total" +[ $passed != $total ] +exit $? diff --git a/test.conf b/test.conf new file mode 100644 index 0000000..96827ef --- /dev/null +++ b/test.conf @@ -0,0 +1,2 @@ +min-steady-state-interval 0 +wait-between-tries 1 diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..e0c0e00 --- /dev/null +++ b/tests/README @@ -0,0 +1 @@ +Integration tests for tlsdate/tlsdated. diff --git a/tests/common.sh b/tests/common.sh new file mode 100644 index 0000000..96ba238 --- /dev/null +++ b/tests/common.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +kill_tlsdated() { + kill -9 $PPID +} + +passed() { + kill_tlsdated + echo "ok" +} + +failed() { + kill_tlsdated + echo "failed" +} + +mydir() { + echo "$(dirname "$0")" +} + +counter() { + cat "$(mydir)"/"$1" +} + +inc_counter() { + c=$(counter "$1") + echo $((c + 1)) >"$(mydir)"/"$1" +} + +reset_counter() { + echo 0 > "$(mydir)"/"$1" +} diff --git a/tests/run-idle/input b/tests/run-idle/input new file mode 100644 index 0000000..e69de29 diff --git a/tests/run-idle/output b/tests/run-idle/output new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/tests/run-idle/output @@ -0,0 +1 @@ +ok diff --git a/tests/run-idle/runs b/tests/run-idle/runs new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/run-idle/runs @@ -0,0 +1 @@ +2 diff --git a/tests/run-idle/setup b/tests/run-idle/setup new file mode 100755 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-idle/setup @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/run-idle/subproc.sh b/tests/run-idle/subproc.sh new file mode 100755 index 0000000..649a18e --- /dev/null +++ b/tests/run-idle/subproc.sh @@ -0,0 +1,6 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +c=$(counter "runs") +[ $c -eq 2 ] && passed diff --git a/tests/run-idle/teardown b/tests/run-idle/teardown new file mode 100644 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-idle/teardown @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/run-idle/test.conf b/tests/run-idle/test.conf new file mode 100644 index 0000000..713e8f7 --- /dev/null +++ b/tests/run-idle/test.conf @@ -0,0 +1,2 @@ +min-steady-state-interval 0 +steady-state-interval 2 diff --git a/tests/run-once/input b/tests/run-once/input new file mode 100644 index 0000000..e69de29 diff --git a/tests/run-once/output b/tests/run-once/output new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/tests/run-once/output @@ -0,0 +1 @@ +ok diff --git a/tests/run-once/run-error b/tests/run-once/run-error new file mode 100644 index 0000000..f84e1cf --- /dev/null +++ b/tests/run-once/run-error @@ -0,0 +1 @@ +Killed diff --git a/tests/run-once/subproc.sh b/tests/run-once/subproc.sh new file mode 100755 index 0000000..7ccb759 --- /dev/null +++ b/tests/run-once/subproc.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +echo "ok" +kill_tlsdated diff --git a/tests/run-routeup/input b/tests/run-routeup/input new file mode 100644 index 0000000..4ae8ef0 --- /dev/null +++ b/tests/run-routeup/input @@ -0,0 +1 @@ +u diff --git a/tests/run-routeup/output b/tests/run-routeup/output new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/tests/run-routeup/output @@ -0,0 +1 @@ +ok diff --git a/tests/run-routeup/runs b/tests/run-routeup/runs new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/run-routeup/runs @@ -0,0 +1 @@ +2 diff --git a/tests/run-routeup/setup b/tests/run-routeup/setup new file mode 100755 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-routeup/setup @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/run-routeup/subproc.sh b/tests/run-routeup/subproc.sh new file mode 100755 index 0000000..649a18e --- /dev/null +++ b/tests/run-routeup/subproc.sh @@ -0,0 +1,6 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +c=$(counter "runs") +[ $c -eq 2 ] && passed diff --git a/tests/run-routeup/teardown b/tests/run-routeup/teardown new file mode 100644 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-routeup/teardown @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/subproc-retry/input b/tests/subproc-retry/input new file mode 100644 index 0000000..7898192 --- /dev/null +++ b/tests/subproc-retry/input @@ -0,0 +1 @@ +a diff --git a/tests/subproc-retry/output b/tests/subproc-retry/output new file mode 100644 index 0000000..0dae225 --- /dev/null +++ b/tests/subproc-retry/output @@ -0,0 +1,3 @@ +dying +dying +ok diff --git a/tests/subproc-retry/runs b/tests/subproc-retry/runs new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/tests/subproc-retry/runs @@ -0,0 +1 @@ +3 diff --git a/tests/subproc-retry/setup b/tests/subproc-retry/setup new file mode 100755 index 0000000..c4afd68 --- /dev/null +++ b/tests/subproc-retry/setup @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/subproc-retry/subproc.sh b/tests/subproc-retry/subproc.sh new file mode 100755 index 0000000..c725aa1 --- /dev/null +++ b/tests/subproc-retry/subproc.sh @@ -0,0 +1,10 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +if [ $(counter "runs") -lt 3 ]; then + echo "dying" + echo "$$" >> /tmp/pidz + exit 1 +fi +passed diff --git a/tests/subproc-retry/teardown b/tests/subproc-retry/teardown new file mode 100644 index 0000000..c4afd68 --- /dev/null +++ b/tests/subproc-retry/teardown @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/wait-idle/input b/tests/wait-idle/input new file mode 100644 index 0000000..e69de29 diff --git a/tests/wait-idle/output b/tests/wait-idle/output new file mode 100644 index 0000000..e69de29 diff --git a/tests/wait-idle/subproc.sh b/tests/wait-idle/subproc.sh new file mode 100644 index 0000000..21f5871 --- /dev/null +++ b/tests/wait-idle/subproc.sh @@ -0,0 +1,7 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +c=$(counter "runs") +[ $c -eq 2 ] && failed + [View Less]

1 0

[tlsdate/debian-master] Merge pull request #116 from elly/integration
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 55da3fadccab99150a95445df198ae0ef030ca83 Merge: ce042c6 234454e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Jul 8 09:02:24 2013 -0700 Merge pull request #116 from elly/integration Add integration testing. run-tests | 40 ++++++++++++++++++++++++++++++++++++++++ test.conf | 2 ++ tests/README | 1 + tests/common.sh | 32 ++++++++++++++++++++++++++++++++ tests/run-idle/… [View More]

1 0

[tlsdate/debian-master] Update CHANGELOG for integration tests.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 4012e1f2d6f6a9d2be3860cb3dcd18c0bf8c95e3 Author: elly <elly(a)leptoquark.net> Date: Mon Jul 8 14:01:35 2013 -0400 Update CHANGELOG for integration tests. --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c408a15..e7c89f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ Extensive setup/install documentation is now present in INSTALL for most OSes Add DragonFly BSD 3.3 support Refactored subprocess watching. + … [View More]

1 0

[tlsdate/debian-master] Merge pull request #117 from elly/integration-changelog
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 0bd0c2d1fea2f8ad6361b7912bc99a6a28b1dfa9 Merge: 55da3fa 4012e1f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Jul 8 14:29:22 2013 -0700 Merge pull request #117 from elly/integration-changelog Update CHANGELOG for integration tests. CHANGELOG | 1 + 1 file changed, 1 insertion(+)

1 0

[tlsdate/debian-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 … [View More]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> [View Less]

1 0

[tlsdate/debian-master] Refactor event loop.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit aa04c0126a590fc9646d491151bcbfeed34ba693 Author: elly <elly(a)leptoquark.net> Date: Mon Jun 24 15:36:01 2013 -0400 Refactor event loop. Refactor the event loop to be modular and testable. Also, add support for detecting corruption of the realtime clock, as can be caused by suspend/resume cycles without an rtc battery. The event loop is now driven by a tree of events, which are either sources (currently suspend/resume events, periodic events, and … [View More]network route events) or composite events. Signed-off-by: Elly Fong-Jones <elly(a)leptoquark.net> --- CHANGELOG | 2 + Makefile.am | 2 +- run-tests | 4 +- src/event-unittest.c | 48 ++++++++ src/event.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++ src/event.h | 21 ++++ src/include.am | 10 +- src/tlsdate.h | 4 + src/tlsdated-unittest.c | 80 +++++++++++++ src/tlsdated.c | 300 +++++++++++++++++++++++++---------------------- src/util.c | 187 +++++++++++++++++++++++++++++ src/util.h | 19 +++ tests/common.sh | 2 +- 13 files changed, 831 insertions(+), 143 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e7c89f1..34879c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,8 @@ Add DragonFly BSD 3.3 support Refactored subprocess watching. Added integration tests. Run with ./run-tests + Refactored event loop. + Added suspend/resume RTC corruption detection. 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/Makefile.am b/Makefile.am index 5c2c845..cd5879b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ if !TARGET_OSX # GNU style is "make check", this will make check and test work TESTS+= src/conf_unittest src/proxy-bio_unittest if TARGET_LINUX -TESTS+= src/tlsdated_unittest +TESTS+= src/tlsdated_unittest src/event_unittest endif test: check endif diff --git a/run-tests b/run-tests index 693fa59..e3b4e09 100755 --- a/run-tests +++ b/run-tests @@ -5,9 +5,9 @@ run_test() { if [ -r "$1"/tlsdated-flags ]; then flags=$(cat "$1"/tlsdated-flags | sed "s/@TESTDIR@/$1/g") elif [ -r "$1"/test.conf ]; then - flags="-w -p -r -l -s -f $1/test.conf" + flags="-w -p -r -l -s -f $1/test.conf -v" else - flags="-w -p -r -l -s -f test.conf" + flags="-w -p -r -l -s -f test.conf -v" fi # flags are deliberately unquoted here so that they'll be interpolated timeout 5 src/tlsdated $flags -- "$1"/subproc.sh <"$1"/input >"$1"/run-output \ diff --git a/src/event-unittest.c b/src/event-unittest.c new file mode 100644 index 0000000..a97f941 --- /dev/null +++ b/src/event-unittest.c @@ -0,0 +1,48 @@ +#include "src/event.h" +#include "src/test_harness.h" + +#include <sys/time.h> + +TEST(every) { + struct event *e = event_every(3); + time_t then = time(NULL); + time_t now; + EXPECT_EQ(1, event_wait(e)); + now = time(NULL); + EXPECT_GT(now, then + 2); + event_free(e); +} + +TEST(fdread) { + int fds[2]; + struct event *e; + char z = '0'; + + ASSERT_EQ(0, pipe(fds)); + e = event_fdread(fds[0]); + + write(fds[1], &z, 1); + EXPECT_EQ(1, event_wait(e)); + event_free(e); +} + +TEST(composite) { + struct event *e0 = event_every(2); + struct event *e1 = event_every(3); + struct event *ec = event_composite(); + time_t then = time(NULL); + time_t now; + + ASSERT_EQ(0, event_composite_add(ec, e0)); + ASSERT_EQ(0, event_composite_add(ec, e1)); + EXPECT_EQ(1, event_wait(ec)); + EXPECT_EQ(1, event_wait(ec)); + EXPECT_EQ(1, event_wait(ec)); + now = time(NULL); + EXPECT_EQ(now, then + 4); + event_free(ec); + event_free(e1); + event_free(e0); +} + +TEST_HARNESS_MAIN diff --git a/src/event.c b/src/event.c new file mode 100644 index 0000000..3b2fedb --- /dev/null +++ b/src/event.c @@ -0,0 +1,295 @@ +#include <assert.h> +#include <signal.h> +#include <stdlib.h> +#include <sys/select.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> + +#include "routeup.h" + +struct event { + const char *name; + int (*fd)(struct event *); + int (*wait)(struct event *); + void (*free)(struct event *); +}; + +struct event_fd { + struct event event; + int fd; + pid_t pid; +}; + +struct event_composite { + struct event event; + struct event **children; + size_t nchildren; +}; + +static int _subproc_fd(struct event *e) +{ + struct event_fd *efd = (struct event_fd *)e; + return efd->fd; +} + +static int _subproc_wait(struct event *e) +{ + struct event_fd *efd = (struct event_fd *)e; + char buf; + if (read(_subproc_fd(e), &buf, 1) == 1) + return 1; + /* fd is broken...? */ + close(efd->fd); + efd->fd = -1; + return -1; +} + +static const char kZero = '0'; + +static void _subproc_signal(int fd) +{ + ssize_t _unused = write(fd, &kZero, 1); + (void)_unused; +} + +static void _subproc_free(struct event *e) +{ + struct event_fd *efd = (struct event_fd *)e; + if (efd->pid > 0) { + kill(efd->pid, SIGKILL); + waitpid(efd->pid, NULL, 0); + } + close(efd->fd); + free(efd); +} + +static struct event *_event_subproc(void (*func)(void *, int), void *arg) +{ + struct event_fd *ev = malloc(sizeof *ev); + int fds[2]; + + if (!ev) + return NULL; + + ev->event.fd = _subproc_fd; + ev->event.wait = _subproc_wait; + ev->event.free = _subproc_free; + + if (pipe(fds)) + { + free(ev); + return NULL; + } + + ev->pid = fork(); + if (ev->pid < 0) + { + close(fds[0]); + close(fds[1]); + free(ev); + return NULL; + } + else if (ev->pid == 0) + { + close(fds[0]); + func(arg, fds[1]); + exit(0); + } + + close(fds[1]); + ev->fd = fds[0]; + + return &ev->event; +} + +static void _routeup(void *arg, int fd) +{ + struct routeup *rtup = arg; + while (!routeup_once(rtup, 0)) + _subproc_signal(fd); +} + +struct event *event_routeup() +{ + struct routeup *rtup = malloc(sizeof *rtup); + struct event *e; + if (!rtup) + return NULL; + if (!routeup_setup(rtup)) + { + free(rtup); + return NULL; + } + e = _event_subproc(_routeup, (void*)rtup); + /* free it in the parent only */ + routeup_teardown(rtup); + if (e) + e->name = "routeup"; + return e; +} + +static void _every(void *arg, int fd) +{ + int delay = *(int*)arg; + while (1) + { + sleep(delay); + _subproc_signal(fd); + } +} + +struct event *event_every(int seconds) +{ + struct event *e = _event_subproc(_every, (void *)&seconds); + e->name = "every"; + return e; +} + +static void _suspend(void *arg, int fd) +{ + while (1) + { + static const int kInterval = 60; + static const int kThreshold = 3; + time_t then = time(NULL); + time_t now; + sleep(kInterval); + now = time(NULL); + if (abs(now - then - kInterval) > kThreshold) + _subproc_signal(fd); + } +} + +struct event *event_suspend() +{ + struct event *e = _event_subproc(_suspend, NULL); + e->name = "suspend"; + return e; +} + +struct event *event_fdread(int fd) +{ + struct event_fd *efd = malloc(sizeof *efd); + efd->event.name = "fdread"; + efd->event.fd = _subproc_fd; + efd->event.wait = _subproc_wait; + efd->event.free = _subproc_free; + efd->fd = fd; + return &efd->event; +} + +int event_wait(struct event *e) +{ + assert(e->wait); + return e->wait(e); +} + +void event_free(struct event *e) +{ + assert(e->free); + return e->free(e); +} + +static int _composite_fd(struct event *e) +{ + return -1; +} + +static int _composite_wait(struct event *e) +{ + struct event_composite *ec = (struct event_composite *)e; + fd_set fds; + size_t i; + int n; + int maxfd = -1; + + FD_ZERO(&fds); + for (i = 0; i < ec->nchildren; i++) + { + struct event *child = ec->children[i]; + int fd = child->fd(child); + if (fd != -1) + FD_SET(child->fd(child), &fds); + if (fd > maxfd) + maxfd = fd; + } + + n = select(maxfd + 1, &fds, NULL, NULL, NULL); + if (n < 0) + return -1; + for (i = 0; i < ec->nchildren; i++) + { + struct event *child = ec->children[i]; + int fd = child->fd(child); + if (FD_ISSET(fd, &fds)) + { + /* won't block, but clears the event */ + int r = child->wait(child); + if (r) + /* either error or success, but not 'no event' */ + return r; + } + } + + return 0; +} + +static void _composite_free(struct event *e) +{ + struct event_composite *ec = (struct event_composite *)e; + free(ec->children); + free(ec); +} + +struct event *event_composite(void) +{ + struct event_composite *ec = malloc(sizeof *ec); + if (!ec) + return NULL; + ec->event.name = "composite"; + ec->event.fd = _composite_fd; + ec->event.wait = _composite_wait; + ec->event.free = _composite_free; + ec->children = NULL; + ec->nchildren = 0; + return &ec->event; +} + +int event_composite_add(struct event *comp, struct event *e) +{ + struct event_composite *ec = (struct event_composite *)comp; + size_t i; + size_t nsz; + struct event **nch; + for (i = 0; i < ec->nchildren; i++) + { + if (ec->children[i]) + continue; + ec->children[i] = e; + return 0; + } + nsz = ec->nchildren + 1; + nch = realloc(ec->children, nsz * sizeof(struct event *)); + if (!nch) + return 1; + ec->nchildren = nsz; + ec->children = nch; + ec->children[nsz - 1] = e; + return 0; +} + +int event_composite_del(struct event *comp, struct event *e) +{ + struct event_composite *ec = (struct event_composite *)comp; + size_t i; + for (i = 0; i < ec->nchildren; i++) + { + if (ec->children[i] != e) + continue; + ec->children[i] = NULL; + return 0; + } + return 1; +} diff --git a/src/event.h b/src/event.h new file mode 100644 index 0000000..ce4a535 --- /dev/null +++ b/src/event.h @@ -0,0 +1,21 @@ +/* event.h - event sources */ + +#ifndef EVENT_H +#define EVENT_H + +struct event; + +extern struct event *event_fdread(int fd); +extern struct event *event_routeup(void); +extern struct event *event_suspend(void); +extern struct event *event_every(int seconds); + +extern struct event *event_composite(void); +extern int event_composite_add(struct event *comp, struct event *e); +extern int event_composite_del(struct event *comp, struct event *e); + +extern int event_wait(struct event *e); + +extern void event_free(struct event *e); + +#endif /* !EVENT_H */ diff --git a/src/include.am b/src/include.am index f724f39..953bcd6 100644 --- a/src/include.am +++ b/src/include.am @@ -183,6 +183,7 @@ src_tlsdated_SOURCES+= src/common/android.c endif src_tlsdated_SOURCES+= src/conf.c +src_tlsdated_SOURCES+= src/event.c src_tlsdated_SOURCES+= src/routeup.c src_tlsdated_SOURCES+= src/tlsdated.c src_tlsdated_SOURCES+= src/util.c @@ -192,7 +193,8 @@ src_tlsdate_dbus_announce_LDADD = @DBUS_LIBS@ src_tlsdate_dbus_announce_SOURCES = src/tlsdate-dbus-announce.c src_tlsdated_unittest_LDADD = @SSL_LIBS@ -src_tlsdated_unittest_SOURCES = src/routeup.c +src_tlsdated_unittest_SOURCES = src/event.c +src_tlsdated_unittest_SOURCES+= src/routeup.c src_tlsdated_unittest_SOURCES+= src/tlsdated-unittest.c src_tlsdated_unittest_SOURCES+= src/util.c src_tlsdated_unittest_SOURCES+= src/tlsdated.c @@ -424,6 +426,12 @@ endif endif endif +src_event_unittest_SOURCES = src/event.c +src_event_unittest_SOURCES+= src/event-unittest.c +src_event_unittest_SOURCES+= src/routeup.c +src_event_unittest_SOURCES+= src/util.c +check_PROGRAMS+= src/event_unittest + if !TARGET_OSX check_PROGRAMS+= src/test/proxy-override src/test/return-argc \ src/test/rotate src/test/sleep-wrap diff --git a/src/tlsdate.h b/src/tlsdate.h index 978396d..c1e64ac 100644 --- a/src/tlsdate.h +++ b/src/tlsdate.h @@ -11,6 +11,7 @@ #define TLSDATE_H #include "src/configmake.h" +#include <limits.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -84,6 +85,9 @@ struct opts { int leap; }; +char timestamp_path[PATH_MAX]; + +void sync_hwclock (void *rtc_handle); int is_sane_time (time_t ts); int load_disk_timestamp (const char *path, time_t * t); void save_disk_timestamp (const char *path, time_t t); diff --git a/src/tlsdated-unittest.c b/src/tlsdated-unittest.c index 5baca13..a56e57e 100644 --- a/src/tlsdated-unittest.c +++ b/src/tlsdated-unittest.c @@ -14,6 +14,7 @@ #include <fcntl.h> #include <limits.h> #include <stdlib.h> +#include <sys/time.h> #include <unistd.h> FIXTURE(tempdir) { @@ -195,6 +196,24 @@ TEST(proxy_override) { EXPECT_EQ(0, tlsdate(&opts, environ)); } +FIXTURE(mock_platform) { + struct platform platform; + struct platform *old_platform; +}; + +FIXTURE_SETUP(mock_platform) { + self->old_platform = platform; + self->platform.rtc_open = NULL; + self->platform.rtc_write = NULL; + self->platform.rtc_read = NULL; + self->platform.rtc_close = NULL; + platform = &self->platform; +} + +FIXTURE_TEARDOWN(mock_platform) { + platform = self->old_platform; +} + TEST(tlsdate_args) { struct source s1 = { .next = NULL, @@ -213,4 +232,65 @@ TEST(tlsdate_args) { EXPECT_EQ(9, tlsdate(&opts, environ)); } +/* + * The stuff below this line is ugly. For a lot of these mock functions, we want + * to smuggle some state (our success) back to the caller, but there's no angle + * for that, so we're basically stuck with some static variables to store + * expectations and successes/failures. This could also be done with nested + * functions, but only gcc supports them. + */ +static const time_t sync_hwclock_expected = 12345678; + +static int sync_hwclock_time_get(struct timeval *tv) { + tv->tv_sec = sync_hwclock_expected; + tv->tv_usec = 0; + return 0; +} + +static int sync_hwclock_rtc_write(void *handle, const struct timeval *tv) { + *(int *)handle = tv->tv_sec == sync_hwclock_expected; + return 0; +} + +TEST_F(mock_platform, sync_hwclock) { + int ok = 0; + void *fake_handle = (void *)&ok; + self->platform.time_get = sync_hwclock_time_get; + self->platform.rtc_write = sync_hwclock_rtc_write; + sync_hwclock(fake_handle); + ASSERT_EQ(ok, 1); +} + +static const time_t sync_and_save_expected = 12345678; + +static int sync_and_save_time_get(struct timeval *tv) { + tv->tv_sec = sync_and_save_expected; + tv->tv_usec = 0; + return 0; +} + +static int sync_and_save_rtc_write(void *handle, const struct timeval *tv) { + *(int *)handle += tv->tv_sec == sync_and_save_expected; + return 0; +} + +static int sync_and_save_file_write_ok = 0; + +static int sync_and_save_file_write(const char *path, void *buf, size_t sz) { + if (!strcmp(path, timestamp_path)) + sync_and_save_file_write_ok++; + return 0; +} + +TEST_F(mock_platform, sync_and_save) { + int nosave_ok = 0; + self->platform.time_get = sync_and_save_time_get; + self->platform.rtc_write = sync_and_save_rtc_write; + self->platform.file_write = sync_and_save_file_write; + sync_and_save(&sync_and_save_file_write_ok, 1); + ASSERT_EQ(sync_and_save_file_write_ok, 2); + sync_and_save(&nosave_ok, 0); + ASSERT_EQ(nosave_ok, 1); +} + TEST_HARNESS_MAIN diff --git a/src/tlsdated.c b/src/tlsdated.c index 7816223..0f6759b 100644 --- a/src/tlsdated.c +++ b/src/tlsdated.c @@ -38,12 +38,12 @@ #endif #include "src/conf.h" +#include "src/event.h" #include "src/routeup.h" #include "src/util.h" #include "src/tlsdate.h" const char *kCacheDir = DEFAULT_DAEMON_CACHEDIR; -const char *kTempSuffix = DEFAULT_DAEMON_TMPSUFFIX; int is_sane_time (time_t ts) @@ -145,25 +145,15 @@ tlsdate (struct opts *opts, char *envp[]) int load_disk_timestamp (const char *path, time_t * t) { - int fd = open (path, O_RDONLY | O_NOFOLLOW); time_t tmpt; - if (fd < 0) - { - perror ("Can't open %s for reading", path); - return -1; - } - if (read (fd, &tmpt, sizeof (tmpt)) != sizeof (tmpt)) - { - perror ("Can't read seconds from %s", path); - close (fd); - return -1; - } - close (fd); - if (!is_sane_time (tmpt)) - { - perror ("Timevalue not sane: %lu", tmpt); - return -1; - } + if (platform->file_read(path, &tmpt, sizeof(tmpt))) { + info("can't load time file"); + return -1; + } + if (!is_sane_time(tmpt)) { + info("time %lu not sane", tmpt); + return -1; + } *t = tmpt; return 0; } @@ -172,34 +162,8 @@ load_disk_timestamp (const char *path, time_t * t) void save_disk_timestamp (const char *path, time_t t) { - char tmp[PATH_MAX]; - int fd; - - if (snprintf (tmp, sizeof (tmp), "%s%s", path, kTempSuffix) >= sizeof (tmp)) - { - pinfo ("Path %s too long to use", path); - exit (1); - } - - if ((fd = open (tmp, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, - S_IRUSR | S_IWUSR)) < 0) - { - pinfo ("open failed"); - return; - } - if (write (fd, &t, sizeof (t)) != sizeof (t)) - { - pinfo ("write failed"); - close (fd); - return; - } - if (close (fd)) - { - pinfo ("close failed"); - return; - } - if (rename (tmp, path)) - pinfo ("rename failed"); + if (platform->file_write(path, &t, sizeof(t))) + info("saving disk timestamp failed"); } /* @@ -210,38 +174,17 @@ save_disk_timestamp (const char *path, time_t t) * this function except try later. */ void -sync_hwclock (int fd) +sync_hwclock (void *rtc_handle) { struct timeval tv; - struct tm *tm; - struct rtc_time rtctm; - - if (gettimeofday (&tv, NULL)) - { - pinfo ("gettimeofday() failed"); - return; - } - - tm = gmtime (&tv.tv_sec); - - /* these structs are identical, but separately defined */ - rtctm.tm_sec = tm->tm_sec; - rtctm.tm_min = tm->tm_min; - rtctm.tm_hour = tm->tm_hour; - rtctm.tm_mday = tm->tm_mday; - rtctm.tm_mon = tm->tm_mon; - rtctm.tm_year = tm->tm_year; - rtctm.tm_wday = tm->tm_wday; - rtctm.tm_yday = tm->tm_yday; - rtctm.tm_isdst = tm->tm_isdst; - - if (ioctl (fd, RTC_SET_TIME, &rtctm)) - { - pinfo ("ioctl(%d, RTC_SET_TIME, ...) failed", fd); - return; - } + if (platform->time_get(&tv)) + { + pinfo("gettimeofday() failed"); + return; + } - info ("synced rtc to sysclock"); + if (platform->rtc_write(rtc_handle, &tv)) + info("rtc_write() failed"); } /* @@ -274,14 +217,14 @@ wait_for_event (struct routeup *rtc, int should_netlink, int timeout) char timestamp_path[PATH_MAX]; void -sync_and_save (int hwclock_fd, int should_sync, int should_save) +sync_and_save (void *hwclock_handle, int should_save) { struct timeval tv; - if (should_sync) - sync_hwclock (hwclock_fd); + if (hwclock_handle) + sync_hwclock (hwclock_handle); if (should_save) { - if (gettimeofday (&tv, NULL)) + if (platform->time_get(&tv)) pfatal ("gettimeofday() failed"); save_disk_timestamp (timestamp_path, tv.tv_sec); } @@ -320,6 +263,12 @@ add_jitter (int base, int jitter) return base + (abs(n) % (2 * jitter)) - jitter; } +int +calc_wait_time (const struct opts *opts) +{ + return add_jitter (opts->steady_state_interval, opts->jitter); +} + #ifdef TLSDATED_MAIN #ifdef HAVE_DBUS void @@ -348,6 +297,7 @@ void sigterm_handler (int _unused) { struct timeval tv; + platform->pgrp_kill(); if (gettimeofday (&tv, NULL)) /* can't use stdio or syslog inside a sig handler */ exit (2); @@ -356,6 +306,13 @@ sigterm_handler (int _unused) } void +sigterm_handler_nosave (int _unused) +{ + platform->pgrp_kill(); + exit(0); +} + +void usage (const char *progn) { printf ("Usage: %s [flags...] [--] [tlsdate command...]\n", progn); @@ -608,15 +565,60 @@ check_conf(struct opts *opts) opts->jitter, opts->steady_state_interval); } +struct tlsdated_state +{ + struct routeup rtc; + time_t last_success; + struct opts *opts; + char *envp[]; +}; + +static time_t now(void) +{ + struct timeval tv; + if (!platform->time_get(&tv)) + return 0; + return tv.tv_sec; +} + +int tlsdate_retry(struct opts *opts, char *envp[]) +{ + int backoff = opts->wait_between_tries; + int i; + + for (i = 0; i < opts->max_tries; i++) + { + if (!tlsdate(opts, envp)) + return 0; + if (backoff < 1) + fatal("backoff too small? %d", backoff); + sleep(backoff); + if (backoff < MAX_SANE_BACKOFF) + backoff *= 2; + } + return 1; +} + int API main (int argc, char *argv[], char *envp[]) { - struct routeup rtc; - int hwclock_fd = -1; + void *hwclock_handle = NULL; time_t last_success = 0; struct opts opts; - int wait_time = 0; struct timeval tv = { 0, 0 }; + int r; + + struct event *routeup = NULL; + struct event *suspend = NULL; + struct event *periodic = NULL; /* XXX */ + struct event *composite = event_composite(); + + if (platform->pgrp_enter()) + pfatal("pgrp_enter() failed"); + + suspend = event_suspend(); + + event_composite_add(composite, suspend); set_conf_defaults(&opts); parse_argv(&opts, argc, argv); @@ -624,6 +626,9 @@ main (int argc, char *argv[], char *envp[]) load_conf(&opts); check_conf(&opts); + periodic = event_every(opts.steady_state_interval); + event_composite_add(composite, periodic); + info ("started up, loaded config file"); if (!opts.should_load_disk || load_disk_timestamp (timestamp_path, &tv.tv_sec)) @@ -636,49 +641,53 @@ main (int argc, char *argv[], char *envp[]) (char *) DEFAULT_PROXY); /* grab a handle to /dev/rtc for sync_hwclock() */ - if (opts.should_sync_hwclock && (hwclock_fd = open (DEFAULT_RTC_DEVICE, O_RDONLY)) < 0) - { - pinfo ("can't open hwclock fd"); - opts.should_sync_hwclock = 0; - } + if (opts.should_sync_hwclock && !(hwclock_handle = platform->rtc_open())) + pinfo ("can't open hwclock fd"); + + if (opts.should_netlink) + routeup = event_routeup(); + else + routeup = event_fdread(STDIN_FILENO); + event_composite_add(composite, routeup); - /* set up a netlink context if we need one */ - if (opts.should_netlink && routeup_setup (&rtc)) + if (!routeup) pfatal ("Can't open netlink socket"); if (!is_sane_time (time (NULL))) - { - /* - * If the time is before the build timestamp, we're probably on - * a system with a broken rtc. Try loading the timestamp off - * disk. - */ - tv.tv_sec = RECENT_COMPILE_DATE; - if (opts.should_load_disk && - load_disk_timestamp (timestamp_path, &tv.tv_sec)) - pinfo ("can't load disk timestamp"); - if (!opts.dry_run && settimeofday (&tv, NULL)) - pfatal ("settimeofday() failed"); - dbus_announce(); - /* - * don't save here - we either just loaded this time or used the - * default time, and neither of those are good to save - */ - sync_and_save (hwclock_fd, opts.should_sync_hwclock, 0); - } + { + /* + * If the time is before the build timestamp, we're probably on + * a system with a broken rtc. Try loading the timestamp off + * disk. + */ + tv.tv_sec = RECENT_COMPILE_DATE; + if (opts.should_load_disk + && load_disk_timestamp (timestamp_path, &tv.tv_sec)) + pinfo ("can't load disk timestamp"); + if (!opts.dry_run && settimeofday (&tv, NULL)) + pfatal ("settimeofday() failed"); + dbus_announce(); + /* + * don't save here - we either just loaded this time or used the + * default time, and neither of those are good to save + */ + sync_and_save (hwclock_handle, 0); + } - /* register a signal handler to save time at shutdown */ if (opts.should_save_disk) signal (SIGTERM, sigterm_handler); + else + signal (SIGTERM, sigterm_handler_nosave); /* * Try once right away. If we fail, wait for a route to appear, then try * for a while; repeat whenever another route appears. Try until we * succeed. */ - if (!tlsdate (&opts, envp)) { + if (!tlsdate (&opts, envp)) + { last_success = time (NULL); - sync_and_save (hwclock_fd, opts.should_sync_hwclock, opts.should_save_disk); + sync_and_save (hwclock_handle, opts.should_save_disk); dbus_announce(); } @@ -688,36 +697,51 @@ main (int argc, char *argv[], char *envp[]) * this should handle cases like a VPN being brought up and down * periodically. */ - wait_time = add_jitter(opts.steady_state_interval, opts.jitter); - while (wait_for_event (&rtc, opts.should_netlink, wait_time) >= 0) + + /* + * The event loop. + * When we start up, we may have no time fix at all; we'll call this "active + * mode", where we are actively looking for opportunities to get a time fix. + * Once we get a time fix, we go into "passive mode", where we're looking to + * prevent clock drift or rtc corruption. The difference between these two + * modes is whether we're aggressive about checking for time after network + * routes come up. + * + * To do this, we create some event sources: + * e0 = event_routeup() + * e1 = event_suspend() + * e2 = event_every(interval) + * Then we create a couple of composite events: + * active = event_anyof(3, e0, e1, e2) + * Whenever our wait for an event returns, we start checking (i.e., running + * tlsdate with exponential backoff until it succeeds). If checking succeeds + * and we were in active state, we go to passive state; otherwise we return to + * our previous state. + */ + + while ((r = event_wait(composite))) + { + if (r < 0) { - /* - * If a route just came up, run tlsdate; if it - * succeeded, then we're good and can keep time locally - * from now on. - */ - int i; - int backoff = opts.wait_between_tries; - wait_time = add_jitter(opts.steady_state_interval, opts.jitter); - if (time (NULL) - last_success < opts.min_steady_state_interval) - continue; - for (i = 0; i < opts.max_tries && tlsdate (&opts, envp); ++i) { - if (backoff < 1) - fatal ("backoff too small? %d", backoff); - sleep (backoff); - if (backoff < MAX_SANE_BACKOFF) - backoff *= 2; - } - if (i != opts.max_tries) - { - last_success = time (NULL); - info ("tlsdate succeeded"); - sync_and_save (hwclock_fd, opts.should_sync_hwclock, opts.should_save_disk); - dbus_announce(); - } + info("event_wait() failed: %d", r); + continue; } + if (now() - last_success < opts.min_steady_state_interval) + { + info("too soon"); + continue; + } + if (!tlsdate_retry(&opts, envp)) + { + last_success = now(); + info("tlsdate succeeded"); + sync_and_save (hwclock_handle, opts.should_save_disk); + dbus_announce(); + } + } info ("exiting"); + platform->pgrp_kill(); return 1; } #endif /* !TLSDATED_MAIN */ diff --git a/src/util.c b/src/util.c index 30a0f44..fe5c370 100644 --- a/src/util.c +++ b/src/util.c @@ -6,19 +6,29 @@ */ #include "config.h" +#include "tlsdate.h" +#include <fcntl.h> #include <grp.h> +#include <limits.h> +#include <linux/rtc.h> #include <pwd.h> #include <signal.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> +#include <sys/ioctl.h> +#include <sys/time.h> #include <sys/types.h> #include <sys/wait.h> #include <syslog.h> +#include <time.h> #include <unistd.h> #include "src/util.h" +const char *kTempSuffix = DEFAULT_DAEMON_TMPSUFFIX; + /** helper function to print message and die */ void die (const char *fmt, ...) @@ -132,3 +142,180 @@ wait_with_timeout(int *status, int timeout_secs) *status = st; return exited; } + +struct rtc_handle +{ + int fd; +}; + +void *rtc_open() +{ + struct rtc_handle *h = malloc(sizeof *h); + h->fd = open(DEFAULT_RTC_DEVICE, O_RDONLY); + if (h->fd < 0) + { + pinfo("can't open rtc"); + free(h); + return NULL; + } + return h; +} + +int rtc_write(void *handle, const struct timeval *tv) +{ + struct tm tmr; + struct tm *tm; + struct rtc_time rtctm; + int fd = ((struct rtc_handle *)handle)->fd; + + tm = gmtime_r (&tv->tv_sec, &tmr); + + /* these structs are identical, but separately defined */ + rtctm.tm_sec = tm->tm_sec; + rtctm.tm_min = tm->tm_min; + rtctm.tm_hour = tm->tm_hour; + rtctm.tm_mday = tm->tm_mday; + rtctm.tm_mon = tm->tm_mon; + rtctm.tm_year = tm->tm_year; + rtctm.tm_wday = tm->tm_wday; + rtctm.tm_yday = tm->tm_yday; + rtctm.tm_isdst = tm->tm_isdst; + + if (ioctl (fd, RTC_SET_TIME, &rtctm)) + { + pinfo ("ioctl(%d, RTC_SET_TIME, ...) failed", fd); + return 1; + } + + info ("synced rtc to sysclock"); + return 0; +} + +int rtc_read(void *handle, struct timeval *tv) +{ + struct tm tm; + struct rtc_time rtctm; + int fd = ((struct rtc_handle *)handle)->fd; + + if (ioctl (fd, RTC_RD_TIME, &rtctm)) + { + pinfo ("ioctl(%d, RTC_RD_TIME, ...) failed", fd); + return 1; + } + + tm.tm_sec = rtctm.tm_sec; + tm.tm_min = rtctm.tm_min; + tm.tm_hour = rtctm.tm_hour; + tm.tm_mday = rtctm.tm_mday; + tm.tm_mon = rtctm.tm_mon; + tm.tm_year = rtctm.tm_year; + tm.tm_wday = rtctm.tm_wday; + tm.tm_yday = rtctm.tm_yday; + tm.tm_isdst = rtctm.tm_isdst; + + tv->tv_sec = mktime(&tm); + tv->tv_usec = 0; + + return 0; +} + +int rtc_close(void *handle) +{ + struct rtc_handle *h = handle; + close(h->fd); + free(h); + return 0; +} + +int file_write(const char *path, void *buf, size_t sz) +{ + char tmp[PATH_MAX]; + int oflags = O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC; + int perms = S_IRUSR | S_IWUSR; + int fd; + + if (snprintf(tmp, sizeof(tmp), path, kTempSuffix) >= sizeof(tmp)) + { + pinfo("path %s too long to use", path); + exit(1); + } + + if ((fd = open(tmp, oflags, perms)) < 0) + { + pinfo("open(%s) failed", tmp); + return 1; + } + + if (write(fd, buf, sz) != sz) + { + pinfo("write() failed"); + close(fd); + return 1; + } + + if (close(fd)) + { + pinfo("close() failed"); + return 1; + } + + if (rename(tmp, path)) + { + pinfo("rename() failed"); + return 1; + } + + return 0; +} + +int file_read(const char *path, void *buf, size_t sz) +{ + int fd = open(path, O_RDONLY | O_NOFOLLOW); + if (fd < 0) + { + pinfo("open(%s) failed", path); + return 1; + } + + if (read(fd, buf, sz) != sz) + { + pinfo("read() failed"); + close(fd); + return 1; + } + + return close(fd); +} + +int time_get(struct timeval *tv) +{ + return gettimeofday(tv, NULL); +} + +int pgrp_enter(void) +{ + return setpgid(0, 0); +} + +int pgrp_kill(void) +{ + pid_t grp = getpgrp(); + return kill(-grp, SIGKILL); +} + +static struct platform default_platform = { + .rtc_open = rtc_open, + .rtc_write = rtc_write, + .rtc_read = rtc_read, + .rtc_close = rtc_close, + + .file_write = file_write, + .file_read = file_read, + + .time_get = time_get, + + .pgrp_enter = pgrp_enter, + .pgrp_kill = pgrp_kill +}; + +struct platform *platform = &default_platform; diff --git a/src/util.h b/src/util.h index 2632933..4f63340 100644 --- a/src/util.h +++ b/src/util.h @@ -18,6 +18,8 @@ #define API __attribute__((visibility("default"))) +extern const char *kTempSuffix; + extern int verbose; void die (const char *fmt, ...); void verb (const char *fmt, ...); @@ -41,4 +43,21 @@ void drop_privs_to (const char *user, const char *group); * ETIMEDOUT. */ pid_t wait_with_timeout(int *status, int timeout_secs); +struct platform { + void *(*rtc_open)(void); + int (*rtc_write)(void *handle, const struct timeval *tv); + int (*rtc_read)(void *handle, struct timeval *tv); + int (*rtc_close)(void *handle); + + int (*file_write)(const char *path, void *buf, size_t sz); + int (*file_read)(const char *path, void *buf, size_t sz); + + int (*time_get)(struct timeval *tv); + + int (*pgrp_enter)(void); + int (*pgrp_kill)(void); +}; + +extern struct platform *platform; + #endif /* !UTIL_H */ diff --git a/tests/common.sh b/tests/common.sh index 96ba238..4283c01 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -1,7 +1,7 @@ #!/bin/sh kill_tlsdated() { - kill -9 $PPID + kill -TERM $PPID } passed() { [View Less]

1 0

[tlsdate/debian-master] Rudimentary support for HTTP Date headers
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 16ee83468552bee9205d6de6b3c4633b160986d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 14:26:05 2013 -0400 Rudimentary support for HTTP Date headers Since I'm going on a personal crusade to kill off gmt_unix_time, I should provide an alternative. That alternative can be the Date header from HTTP -- unlike gmt_unix_time, the Date header is required by the RFC to actually be an accurate clock-like clock, and nobody is trying to get … [View More]rid of it. This code is pretty hack-ish and does some nonportable stuff, like using memmem() and timegm(). It's not super-tolerant of non-standards-compliant HTTP servers. I hope I didn't make any pointer mistakes. --- src/tlsdate-helper.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/tlsdate-helper.h | 2 +- src/tlsdate.c | 10 ++- src/util.c | 6 ++ 4 files changed, 183 insertions(+), 10 deletions(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 4058f5e..2a92195 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -193,6 +193,129 @@ make_ssl_bio(SSL_CTX *ctx) return ssl; } + +static int +write_all_to_bio(BIO *bio, const char *string) +{ + int n = (int) strlen(string); + int r; + + while (n) { + r = BIO_write(bio, string, n); + if (r > 0) { + if (r > n) + return -1; + n -= r; + string += r; + } else { + return 0; + } + } + + return 1; +} + +static int +handle_date_line(const char *dateline, uint32_t *result) +{ + int year,mon,day,hour,min,sec; + char month[4]; + struct tm tm; + int i; + time_t t; + + static const char *MONTHS[] = + { "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL }; + + if (strncmp("\r\nDate: ", dateline, 8)) + return 0; + + dateline += 8; + verb("V: The alleged date is <%s>\n", dateline); + + while (*dateline == ' ') + ++dateline; + while (*dateline && *dateline != ' ') + ++dateline; + while (*dateline == ' ') + ++dateline; + /* We just skipped over the day of the week. Now we have:*/ + if (sscanf(dateline, "%d %3s %d %d:%d:%d", + &day, month, &year, &hour, &min, &sec) == 6 || + sscanf(dateline, "%d-%3s-%d %d:%d:%d", + &day, month, &year, &hour, &min, &sec) == 6 || + sscanf(dateline, "%3s %d %d:%d:%d %d", + month, &day, &hour, &min, &sec, &year) == 6) { + + if (year < 100) + year += 1900; + + verb("V: Parsed the date: %04d-%s-%02d %02d:%02d:%02d\n", + year, month, day, hour, min, sec); + } else { + verb("V: Couldn't parse date.\n"); + return -1; + } + + for (i = 0; ; ++i) { + if (!MONTHS[i]) + return -2; + if (!strcmp(month, MONTHS[i])) { + mon = i; + break; + } + } + + memset(&tm, 0, sizeof(tm)); + tm.tm_year = year - 1900; + tm.tm_mon = mon; + tm.tm_mday = day; + tm.tm_hour = hour; + tm.tm_min = min; + tm.tm_sec = sec; + + t = timegm(&tm); + if (t > 0xffffffff || t < 0) + return -1; + + *result = (uint32_t) t; + + return 1; +} + +#define MAX_HTTP_HEADERS_SIZE 8192 + +static int +read_http_date_from_bio(BIO *bio, uint32_t *result) +{ + int n; + char buf[MAX_HTTP_HEADERS_SIZE]; + int buf_len=0; + char *dateline, *endofline; + + while (buf_len < sizeof(buf)-1) { + n = BIO_read(bio, buf+buf_len, sizeof(buf)-buf_len-1); + if (n <= 0) + return 0; + buf_len += n; + buf[buf_len] = 0; + verb("V: read %d bytes.", n, buf); + + dateline = memmem(buf, buf_len, "\r\nDate: ", 8); + if (NULL == dateline) + continue; + + endofline = memmem(dateline+2, buf_len - (dateline-buf+2), "\r\n", 2); + if (NULL == endofline) + continue; + + *endofline = 0; + return handle_date_line(dateline, result); + } + return -2; +} + /** helper function for 'malloc' */ static void * xmalloc (size_t size) @@ -773,6 +896,13 @@ inspect_key (SSL *ssl, const char *hostname) } #endif +#define HTTP_REQUEST \ + "HEAD / HTTP/1.1\r\n" \ + "User-Agent: %s\r\n" \ + "Host: %s\r\n" \ + "\r\n" +#define HTTP_USER_AGENT "TLSDate/1.0" + #ifdef USE_POLARSSL void check_timestamp (uint32_t server_time) @@ -819,9 +949,12 @@ static int ssl_do_handshake_part(ssl_context *ssl) * 'time_map'. * * @param time_map where to store the current time + * @param time_is_an_illusion + * @param http whether to do an http request and take the date from that + * instead. */ static void -run_ssl (uint32_t *time_map, int time_is_an_illusion) +run_ssl (uint32_t *time_map, int time_is_an_illusion, int http) { entropy_context entropy; ctr_drbg_context ctr_drbg; @@ -958,14 +1091,18 @@ run_ssl (uint32_t *time_map, int time_is_an_illusion) * 'time_map'. * * @param time_map where to store the current time + * @param time_is_an_illusion + * @param http whether to do an http request and take the date from that + * instead. */ static void -run_ssl (uint32_t *time_map, int time_is_an_illusion) +run_ssl (uint32_t *time_map, int time_is_an_illusion, int http) { BIO *s_bio; SSL_CTX *ctx; SSL *ssl; struct stat statbuf; + uint32_t result_time; SSL_load_error_strings(); SSL_library_init(); @@ -1044,6 +1181,28 @@ run_ssl (uint32_t *time_map, int time_is_an_illusion) if (1 != BIO_do_handshake(s_bio)) die ("SSL handshake failed\n"); + if (http) { + char buf[1024]; + verb("V: Starting HTTP\n"); + if (snprintf(buf, sizeof(buf), + HTTP_REQUEST, HTTP_USER_AGENT, hostname_to_verify) >= 1024) + die("hostname too long"); + buf[1023]='\0'; /* Unneeded. */ + verb("V: Writing HTTP request\n"); + if (1 != write_all_to_bio(s_bio, buf)) + die ("write all to bio failed.\n"); + verb("V: Reading HTTP response\n"); + if (1 != read_http_date_from_bio(s_bio, &result_time)) + die ("read all from bio failed.\n"); + verb("V: Got HTTP response. T=%lu\n", (unsigned long)result_time); + + result_time = htonl(result_time); + } else { + // from /usr/include/openssl/ssl3.h + // ssl->s3->server_random is an unsigned char of 32 bits + memcpy(&result_time, ssl->s3->server_random, sizeof (uint32_t)); + } + // Verify the peer certificate against the CA certs on the local system if (ca_racket) { inspect_key (ssl, hostname_to_verify); @@ -1051,9 +1210,9 @@ run_ssl (uint32_t *time_map, int time_is_an_illusion) verb ("V: Certificate verification skipped!\n"); } check_key_length(ssl); - // from /usr/include/openssl/ssl3.h - // ssl->s3->server_random is an unsigned char of 32 bits - memcpy(time_map, ssl->s3->server_random, sizeof (uint32_t)); + + memcpy(time_map, &result_time, sizeof (uint32_t)); + SSL_free(ssl); SSL_CTX_free(ctx); } @@ -1074,8 +1233,9 @@ main(int argc, char **argv) int showtime_raw; int timewarp; int leap; + int http; - if (argc != 12) + if (argc != 13) return 1; host = argv[1]; hostname_to_verify = argv[1]; @@ -1090,6 +1250,7 @@ main(int argc, char **argv) timewarp = (0 == strcmp ("timewarp", argv[9])); leap = (0 == strcmp ("leapaway", argv[10])); proxy = (0 == strcmp ("none", argv[11]) ? NULL : argv[11]); + http = (0 == (strcmp("http", argv[12]))); /* Initalize warp_time with RECENT_COMPILE_DATE */ clock_init_time(&warp_time, RECENT_COMPILE_DATE, 0); @@ -1169,7 +1330,7 @@ main(int argc, char **argv) if (0 == ssl_child) { drop_privs_to (UNPRIV_USER, UNPRIV_GROUP); - run_ssl (time_map, leap); + run_ssl (time_map, leap, http); (void) munmap (time_map, sizeof (uint32_t)); _exit (0); } diff --git a/src/tlsdate-helper.h b/src/tlsdate-helper.h index 2456efc..6890a88 100644 --- a/src/tlsdate-helper.h +++ b/src/tlsdate-helper.h @@ -118,6 +118,6 @@ void inspect_key (SSL *ssl, const char *hostname); uint32_t dns_label_count (char *label, char *delim); uint32_t check_wildcard_match_rfc2595 (const char *orig_hostname, const char *orig_cert_wild_card); -static void run_ssl (uint32_t *time_map, int time_is_an_illusion); +static void run_ssl (uint32_t *time_map, int time_is_an_illusion, int http); #endif diff --git a/src/tlsdate.c b/src/tlsdate.c index 26e9432..82dd217 100644 --- a/src/tlsdate.c +++ b/src/tlsdate.c @@ -94,7 +94,8 @@ usage(void) " [-V|--showtime] [human|raw]\n" " [-t|--timewarp]\n" " [-l|--leap]\n" - " [-x|--proxy] [url]\n"); + " [-x|--proxy] [url]\n" + " [-w|--http]\n"); } @@ -112,6 +113,7 @@ main(int argc, char **argv) int timewarp; int leap; const char *proxy; + int http; host = DEFAULT_HOST; port = DEFAULT_PORT; @@ -124,6 +126,7 @@ main(int argc, char **argv) timewarp = 0; leap = 0; proxy = NULL; + http = 0; while (1) { int option_index = 0; @@ -143,10 +146,11 @@ main(int argc, char **argv) {"timewarp", 0, 0, 't'}, {"leap", 0, 0, 'l'}, {"proxy", 0, 0, 'x'}, + {"http", 0, 0, 'w'}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "vV::shH:p:P:nC:tlx:", + c = getopt_long(argc, argv, "vV::shH:p:P:nC:tlx:w", long_options, &option_index); if (c == -1) break; @@ -164,6 +168,7 @@ main(int argc, char **argv) case 't': timewarp = 1; break; case 'l': leap = 1; break; case 'x': proxy = optarg; break; + case 'w': http = 1; break; case '?': break; default : fprintf(stderr, "Unknown option!\n"); usage(); exit(1); } @@ -194,6 +199,7 @@ main(int argc, char **argv) (timewarp ? "timewarp" : "no-fun"), (leap ? "leapaway" : "holdfast"), (proxy ? proxy : "none"), + (http ? "http" : "tls"), NULL); perror("Failed to run tlsdate-helper"); return 1; diff --git a/src/util.c b/src/util.c index fe5c370..129de8d 100644 --- a/src/util.c +++ b/src/util.c @@ -11,7 +11,9 @@ #include <fcntl.h> #include <grp.h> #include <limits.h> +#ifdef __linux__ #include <linux/rtc.h> +#endif #include <pwd.h> #include <signal.h> #include <stdarg.h> @@ -143,6 +145,7 @@ wait_with_timeout(int *status, int timeout_secs) return exited; } +#ifdef __linux__ struct rtc_handle { int fd; @@ -226,6 +229,7 @@ int rtc_close(void *handle) free(h); return 0; } +#endif int file_write(const char *path, void *buf, size_t sz) { @@ -304,10 +308,12 @@ int pgrp_kill(void) } static struct platform default_platform = { +#ifdef __linux__ .rtc_open = rtc_open, .rtc_write = rtc_write, .rtc_read = rtc_read, .rtc_close = rtc_close, +#endif .file_write = file_write, .file_read = file_read, [View Less]

1 0