X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Ftimedated%2Ftimedated.c;h=4de0a2326561d4b289c59d14eb768fbd60be39f3;hp=41483a4ac162d7b46534c9d4fb406dd64f5a61c8;hb=0e955e924cbf2a60e3f395da9323bde28614f770;hpb=fe95904343623a78153b89fd1c2f1c0c4544c606 diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c index 41483a4..4de0a23 100644 --- a/src/interfaces/timedated/timedated.c +++ b/src/interfaces/timedated/timedated.c @@ -20,8 +20,11 @@ #include #include +#include +#include #include #include +#include #include #include @@ -33,6 +36,8 @@ #include "../../util.h" +#define TZNAME_MAX PATH_MAX + GPtrArray *timedated_freeable; Timedate1 *timedated_interf; @@ -108,24 +113,20 @@ on_handle_set_time(Timedate1 *td1_passed_interf, } else if(relative) { - new_time = (struct timespec *) g_malloc0(sizeof(struct timespec)); cur_time = g_get_real_time(); - if(proposed_time < 0 && cur_time + proposed_time > proposed_time) { + if(proposed_time < 0 && cur_time + proposed_time > cur_time) { g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EINVAL", "Resultant time out of bounds."); return FALSE; - } else if(cur_time + proposed_time < proposed_time) { + } else if(proposed_time > 0 && cur_time + proposed_time < cur_time) { g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EINVAL", "Resultant time out of bounds."); return FALSE; } - new_time = (struct timespec *) g_malloc0(sizeof(struct timespec)); - new_time->tv_sec = proposed_time; - new_time->tv_nsec = 0; - g_ptr_array_add(timedated_freeable, new_time); + new_time = mktimespec(proposed_time); if(!clock_settime(CLOCK_REALTIME, new_time)) { @@ -138,12 +139,10 @@ on_handle_set_time(Timedate1 *td1_passed_interf, return FALSE; } - } else if(proposed_time >= 0) { + } else if(proposed_time > 0) { + - new_time = (struct timespec *) g_malloc0(sizeof(struct timespec)); - new_time->tv_sec = proposed_time; - new_time->tv_nsec = 0; - g_ptr_array_add(timedated_freeable, new_time); + new_time = mktimespec(proposed_time); if(!clock_settime(CLOCK_REALTIME, new_time)) { @@ -168,7 +167,102 @@ on_handle_set_timezone(Timedate1 *td1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { - return FALSE; + + GVariant *params; + gchar *proposed_tz; + const gchar *bus_name; + gboolean policykit_auth; + check_auth_result is_authed; + + gchar *tz_target_path; + struct stat *statbuf; + extern int errno; + + params = g_dbus_method_invocation_get_parameters(invoc); + g_variant_get(params, "(sb)", &proposed_tz, &policykit_auth); + bus_name = g_dbus_method_invocation_get_sender(invoc); + + is_authed = polkit_try_auth(bus_name, "org.freedesktop.timedate1.set-timezone", policykit_auth); + + switch(is_authed) { + + case AUTHORIZED_NATIVELY: + case AUTHORIZED_BY_PROMPT: + break; + + case UNAUTHORIZED_NATIVELY: + case UNAUTHORIZED_FAILED_PROMPT: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EACCES", "Insufficient permissions to set timezone."); + return FALSE; + + case ERROR_BADBUS: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EFAULT", "Provided bus name is invalid."); + return FALSE; + + case ERROR_BADACTION: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EFAULT", "Provided action ID is invalid."); + return FALSE; + + case ERROR_GENERIC: + default: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ECANCELED", "Failed to set timezone for unknown reasons."); + return FALSE; + } + + statbuf = (struct stat*) calloc(1, sizeof(struct stat)); + tz_target_path = (gchar *) calloc(1, TZNAME_MAX); + + g_ptr_array_add(timedated_freeable, statbuf); + g_ptr_array_add(timedated_freeable, tz_target_path); + + strlcat(tz_target_path, TZDIR, TZNAME_MAX); + strlcat(tz_target_path, "/", TZNAME_MAX); + strlcat(tz_target_path, proposed_tz, TZNAME_MAX); + + if(strstr(tz_target_path, "../")) { + + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EBADF", "Provided timezone is invalid."); + return FALSE; + } + + if(!statbuf) + return FALSE; + + if(lstat(tz_target_path, statbuf)) { + + switch(errno) { + + case ENOENT: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ENOENT", "Specified timezone does not exist."); + break; + + default: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EBADF", "Specified timezone is invalid."); + break; + } + + return FALSE; + } + + if(!S_ISREG(statbuf->st_mode)) { + + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EBADF", "Specified path is of an inappropriate type."); + return FALSE; + } + + memset(statbuf, 0, sizeof statbuf); + + if(!lstat(TZDEFAULT, statbuf)) + if(remove(TZDEFAULT)) + return FALSE; + + if(symlink(tz_target_path, TZDEFAULT)) + return FALSE; + + + timedate1_complete_set_timezone(td1_passed_interf, invoc); + + return TRUE; } static gboolean @@ -176,7 +270,9 @@ on_handle_set_local_rtc(Timedate1 *td1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { - return FALSE; + + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ENODEV", "Unix RTC must be in UTC."); + return TRUE; } static gboolean @@ -184,7 +280,80 @@ on_handle_set_ntp(Timedate1 *td1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { - return FALSE; + + GVariant *params; + const gchar *bus_name; + gboolean policykit_auth; + check_auth_result is_authed; + + /* revert to rcctl when 5.7 rolls around */ + gint ntpd_notrunning, ntpd_notenabled; /* this logic flip is due to rcctl returning 0 on success, + * in this case an error means ntpd is not running or not enabled */ + gboolean proposed_ntpstate; + GError *sh_errors; + + extern int errno; + + params = g_dbus_method_invocation_get_parameters(invoc); + g_variant_get(params, "(bb)", &proposed_ntpstate, &policykit_auth); + bus_name = g_dbus_method_invocation_get_sender(invoc); + + is_authed = polkit_try_auth(bus_name, "org.freedesktop.timedate1.set-ntp", policykit_auth); + + switch(is_authed) { + + case AUTHORIZED_NATIVELY: + case AUTHORIZED_BY_PROMPT: + break; + + case UNAUTHORIZED_NATIVELY: + case UNAUTHORIZED_FAILED_PROMPT: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EACCES", "Insufficient permissions to toggle the NTP daemon."); + return FALSE; + + case ERROR_BADBUS: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EFAULT", "Provided bus name is invalid."); + return FALSE; + + case ERROR_BADACTION: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EFAULT", "Provided action ID is invalid."); + return FALSE; + + case ERROR_GENERIC: + default: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ECANCELED", "Failed to toggle the NTP daemon for unknown reasons."); + return FALSE; + } + + ntpd_notrunning = 0; /* GLib does not bother asserting the passed return value int to zero */ + ntpd_notenabled = 0; /* if the program's exit status is also zero, hence this decl. */ + + if((ntpd_notrunning = system("/etc/rc.d/ntpd check > /dev/null 2>&1")) == -1) + return FALSE; + + if((ntpd_notenabled = system("/etc/rc.d/ntpd status > /dev/null 2>&1")) == -1) + return FALSE; + + if(proposed_ntpstate) { + + if(ntpd_notrunning) + system("/etc/rc.d/ntpd -f start > /dev/null 2>&1"); + + if(ntpd_notenabled) + system("/etc/rc.d/ntpd enable > /dev/null 2>&1"); + + } else { + + if(!ntpd_notrunning) + system("/etc/rc.d/ntpd stop > /dev/null 2>&1"); + + if(!ntpd_notenabled) + system("/etc/rc.d/ntpd disable > /dev/null 2>&1"); + } + + timedate1_complete_set_ntp(td1_passed_interf, invoc); + + return TRUE; } const gchar * @@ -222,15 +391,17 @@ our_get_timezone() { g_printf("%s is not a symlink! attempting to match checksums in %s...\n", OS_LOCALTIME, OS_TIMEZONE_PATH); hash_to_match = get_file_sha256(OS_LOCALTIME); - ret = lookup_hash(hash_to_match); + /* ret = lookup_hash(hash_to_match); */ + return FALSE; /* TODO fix me for real */ if(hash_to_match) g_free(hash_to_match); } - + return ret; } +/* Unix time must be in UTC. */ gboolean our_get_local_rtc() { @@ -250,9 +421,18 @@ our_get_can_ntp() { gboolean our_get_ntp() { - const gboolean ret = FALSE; + int system_ret; - return ret; + if((system_ret = system("/etc/rc.d/ntpd check > /dev/null 2>&1")) == -1) { + + g_printf("failed to check NTP\n"); + return FALSE; + } + + if(system_ret) + return FALSE; + + return TRUE; } gboolean @@ -378,8 +558,8 @@ int main() { set_signal_handlers(); - if(!build_lookup_table()) - return 1; + /*if(!build_lookup_table()) + return 1; */ timedated_loop = g_main_loop_new(NULL, TRUE); timedated_freeable = g_ptr_array_new(); @@ -453,7 +633,7 @@ static struct timezone_checksum_pair parse_timezone_path(gchar **pair) { return ret; } -/* TODO need to deconstruct tz_table on exit */ +/* TODO need to deconstruct tz_table on exit static gboolean build_lookup_table() { gchar *find_cmd, **map_pairs, *find_output, *path_buf, *sum_buf, **entry_buf; @@ -504,4 +684,32 @@ static gchar *lookup_hash(gchar *hash) { i++; return NULL; +}*/ + +/* takes number of microseconds since epoch and returns a + * ptr to a timespec suitable to be passed to clock_settime(3) + */ +static struct timespec* mktimespec(gint64 us) { + + long nanoseconds; + time_t seconds; + + gint64 div_buf_remainder, div_buf_s, div_buf_ns; + struct timespec *ret; + + div_buf_s = (us / 1000000); /* us / 10^6 = s */ + div_buf_remainder = (us % 1000000); /* fraction of second lost from prev. line */ + div_buf_ns = div_buf_remainder * 1000; /* us * 10^3 = ns */ + + seconds = (time_t) div_buf_s; /* porting note: most systems use 32 bit time, adjust accordingly */ + nanoseconds = (long) div_buf_ns; + + ret = (struct timespec *) calloc(1, sizeof(struct timespec)); + + ret->tv_sec = seconds; + ret->tv_nsec = nanoseconds; + + g_ptr_array_add(timedated_freeable, ret); + + return ret; }