X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=4201e48c57e29ebed84552b18aec73e7345b26b4;hp=81200e73a92ab0fec3958c80f883e7fbe79cfc7b;hb=HEAD;hpb=5ea060f8c0faa96f70bbdda34a3862c208fb3fc0 diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index 81200e7..4201e48 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -34,7 +34,7 @@ #include "hostnamed-gen.h" #include "hostnamed.h" -#include "../../polkit-auth.h" +#include "../../util.h" /* format: { * (1) string to be matched against runtime machine's sysctl output. @@ -84,6 +84,7 @@ gboolean dbus_interface_exported; /* reliable because of gdbus operational guara gchar *HOSTNAME, *STATIC_HOSTNAME, *PRETTY_HOSTNAME; gchar *CHASSIS, *ICON; gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS, *OS_CPENAME; +gchar *LOCATION = NULL, *DEPLOYMENT = NULL; /* TODO no specific vm or laptop icon in gnome * NOTE paravirtualization on xen is only available for linuxes right now @@ -110,8 +111,13 @@ const gchar *server_archs[] = { "sparc64" }; -static const gchar *DEFAULT_DOMAIN = ".home.network"; +static const gchar *DEFAULT_DOMAIN = ""; /* blank domains are OK for now */ static const gchar *OS_HOSTNAME_PATH = "/etc/myname"; +static const gchar *OS_CONFIG_PATH = "/etc/machine-info"; +/* XXX */ +static const guint LOCATION_MAXSIZE = 4096; +static const guint DEPLOYMENT_MAXSIZE = 4096; + /* --- begin method/property/dbus signal code --- */ @@ -267,7 +273,7 @@ on_handle_set_static_hostname(Hostname1 *hn1_passed_interf, bsd_hostname_try = get_bsd_hostname(STATIC_HOSTNAME); GError *debug_error; if(!bsd_hostname_try || !g_file_set_contents(OS_HOSTNAME_PATH, bsd_hostname_try, -1, &debug_error)) - g_printf("failed to write to %s! are you root?\n", OS_HOSTNAME_PATH); + g_printf("could not to write to %s! are you root?\n", OS_HOSTNAME_PATH); if(bsd_hostname_try) g_free(bsd_hostname_try); @@ -293,9 +299,7 @@ on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf, gboolean policykit_auth, ret, try_to_set; size_t check_length; check_auth_result is_authed; - GKeyFile *config; - config = g_key_file_new(); proposed_pretty_hostname = NULL; ret = try_to_set = FALSE; @@ -354,26 +358,11 @@ on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf, hostname1_complete_set_pretty_hostname(hn1_passed_interf, invoc); ret = TRUE; - if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) { - - g_key_file_set_string(config, "hostnamed", "PRETTY_HOSTNAME", valid_pretty_hostname_buf); - - /* if((computed_static_hostname = g_hostname_to_ascii(PRETTY_HOSTNAME))) { - - g_strdelimit(computed_static_hostname, " ", '-'); - hostname1_set_static_hostname(hn1_passed_interf, computed_static_hostname); - STATIC_HOSTNAME = computed_static_hostname; - g_ptr_array_add(hostnamed_freeable, computed_static_hostname); - g_key_file_set_string(config, "hostnamed", "StaticHostname", computed_static_hostname); - - } */ - } + if(!config_set(OS_CONFIG_PATH, "PRETTY_HOSTNAME", PRETTY_HOSTNAME)) + g_printf("could not write to %s! are you root?\n", OS_CONFIG_PATH); } } - g_key_file_save_to_file(config, "/etc/machine-info", NULL); - g_key_file_unref(config); - return ret; } @@ -388,9 +377,7 @@ on_handle_set_chassis(Hostname1 *hn1_passed_interf, const gchar *bus_name; gboolean policykit_auth, ret, try_to_set; check_auth_result is_authed; - GKeyFile *config; - config = g_key_file_new(); proposed_chassis_name = NULL; ret = try_to_set = FALSE; valid_chassis_name_buf = (gchar *)g_malloc0(8192); @@ -448,19 +435,13 @@ on_handle_set_chassis(Hostname1 *hn1_passed_interf, hostname1_set_chassis(hn1_passed_interf, CHASSIS); g_ptr_array_add(hostnamed_freeable, valid_chassis_name_buf); hostname1_complete_set_chassis(hn1_passed_interf, invoc); + ret = TRUE; - if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) { - - ret = TRUE; - g_key_file_set_string(config, "hostnamed", "ChassisType", valid_chassis_name_buf); - - } + if(!config_set(OS_CONFIG_PATH, "CHASSIS", valid_chassis_name_buf)) + g_printf("could not write to %s! are you root?\n", OS_CONFIG_PATH); } } - g_key_file_save_to_file(config, "/etc/machine-info", NULL); - g_key_file_unref(config); - return ret; } @@ -475,9 +456,7 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf, const gchar *bus_name; gboolean policykit_auth, ret, try_to_set; check_auth_result is_authed; - GKeyFile *config; - config = g_key_file_new(); proposed_icon_name = NULL; ret = try_to_set = FALSE; @@ -529,21 +508,131 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf, hostname1_set_icon_name(hn1_passed_interf, ICON); g_ptr_array_add(hostnamed_freeable, valid_icon_name_buf); hostname1_complete_set_icon_name(hn1_passed_interf, invoc); + ret = TRUE; - if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) { - - ret = TRUE; - g_key_file_set_string(config, "hostnamed", "IconName", valid_icon_name_buf); + if(!config_set(OS_CONFIG_PATH, "ICON_NAME", valid_icon_name_buf)) + g_printf("could not write to %s! are you root?\n", OS_CONFIG_PATH); - } } } - g_key_file_save_to_file(config, "/etc/machine-info", NULL); - g_key_file_unref(config); - return ret; } +static gboolean +on_handle_set_location(Hostname1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + GVariant *params; + const gchar *bus_name; + gchar *proposed_location, *valid_location_buf; + gboolean policykit_auth, ret, try_to_set; + check_auth_result is_authed; + + ret = try_to_set = FALSE; + + params = g_dbus_method_invocation_get_parameters(invoc); + g_variant_get(params, "(sb)", &proposed_location, &policykit_auth); + bus_name = g_dbus_method_invocation_get_sender(invoc); + + /* verify caller has correct permissions via polkit */ + is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-location", policykit_auth); + + switch(is_authed) { + + case AUTHORIZED_NATIVELY: + case AUTHORIZED_BY_PROMPT: + try_to_set = TRUE; + break; + + case UNAUTHORIZED_NATIVELY: + case UNAUTHORIZED_FAILED_PROMPT: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set location."); + return FALSE; + break; + + case ERROR_BADBUS: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid."); + return FALSE; + break; + + case ERROR_BADACTION: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid."); + return FALSE; + break; + + case ERROR_GENERIC: + default: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set location for unknown reason."); + return FALSE; + break; + } + /* XXX follow systemd impl here */ + LOCATION = (gchar *) g_malloc0(LOCATION_MAXSIZE); + g_strlcpy(LOCATION, proposed_location, LOCATION_MAXSIZE); + hostname1_set_location(hn1_passed_interf, LOCATION); + g_ptr_array_add(hostnamed_freeable, valid_location_buf); + hostname1_complete_set_location(hn1_passed_interf, invoc); + return TRUE; +} + +static gboolean +on_handle_set_deployment(Hostname1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + GVariant *params; + const gchar *bus_name; + gchar *proposed_deployment, *valid_deployment_buf; + gboolean policykit_auth, ret, try_to_set; + check_auth_result is_authed; + + ret = try_to_set = FALSE; + + params = g_dbus_method_invocation_get_parameters(invoc); + g_variant_get(params, "(sb)", &proposed_deployment, &policykit_auth); + bus_name = g_dbus_method_invocation_get_sender(invoc); + + /* verify caller has correct permissions via polkit */ + is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-deployment", policykit_auth); + + switch(is_authed) { + + case AUTHORIZED_NATIVELY: + case AUTHORIZED_BY_PROMPT: + try_to_set = TRUE; + break; + + case UNAUTHORIZED_NATIVELY: + case UNAUTHORIZED_FAILED_PROMPT: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set deployment."); + return FALSE; + break; + + case ERROR_BADBUS: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid."); + return FALSE; + break; + + case ERROR_BADACTION: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid."); + return FALSE; + break; + + case ERROR_GENERIC: + default: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set deployment for unknown reason."); + return FALSE; + break; + } + /* XXX follow systemd impl here */ + DEPLOYMENT = (gchar *) g_malloc0(DEPLOYMENT_MAXSIZE); + g_strlcpy(DEPLOYMENT, proposed_deployment, DEPLOYMENT_MAXSIZE); + hostname1_set_deployment(hn1_passed_interf, DEPLOYMENT); + g_ptr_array_add(hostnamed_freeable, valid_deployment_buf); + hostname1_complete_set_deployment(hn1_passed_interf, invoc); + return TRUE; +} /* note: all hostnamed/hostname1's properties are read-only, * and do not need set_ functions, gdbus-codegen realized @@ -651,6 +740,21 @@ our_get_os_pretty_name() { return "OpenBSD"; } +const gchar * +our_get_location() { + + if(LOCATION) + return LOCATION; + return ""; +} + +const gchar * +our_get_deployment() { + + if(DEPLOYMENT) + return DEPLOYMENT; + return ""; +} /* --- end method/property/dbus signal code, begin bus/name handlers --- */ static void hostnamed_on_bus_acquired(GDBusConnection *conn, @@ -667,6 +771,8 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn, g_signal_connect(hostnamed_interf, "handle-set-pretty-hostname", G_CALLBACK(on_handle_set_pretty_hostname), NULL); g_signal_connect(hostnamed_interf, "handle-set-chassis", G_CALLBACK(on_handle_set_chassis), NULL); g_signal_connect(hostnamed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL); + g_signal_connect(hostnamed_interf, "handle-set-deployment", G_CALLBACK(on_handle_set_deployment), NULL); + g_signal_connect(hostnamed_interf, "handle-set-location", G_CALLBACK(on_handle_set_location), NULL); /* set our properties before export */ hostname1_set_hostname(hostnamed_interf, our_get_hostname()); @@ -679,6 +785,9 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn, hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release()); hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename()); hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name()); + hostname1_set_deployment(hostnamed_interf, our_get_deployment()); + hostname1_set_location(hostnamed_interf, our_get_location()); + if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf), conn, @@ -689,7 +798,6 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn, hostnamed_mem_clean(); } else { - dbus_interface_exported = TRUE; g_printf("exported %s's interface on the system bus...\n", name); } @@ -798,19 +906,20 @@ int main() { gboolean set_names() { /* (1) set up */ - gchar *hostname_buf, *static_hostname_buf, *pretty_hostname_buf; - GKeyFile *config; + gchar *hostname_buf, *static_hostname_buf, *pretty_hostname_buf, *location_buf, *deployment_buf; size_t hostname_divider; hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); static_hostname_buf = (gchar*) g_malloc0(4096); pretty_hostname_buf = (gchar*) g_malloc0(4096); - - config = g_key_file_new(); + location_buf = (gchar*) g_malloc0(LOCATION_MAXSIZE); + deployment_buf = (gchar*) g_malloc0(DEPLOYMENT_MAXSIZE); g_ptr_array_add(hostnamed_freeable, hostname_buf); g_ptr_array_add(hostnamed_freeable, static_hostname_buf); g_ptr_array_add(hostnamed_freeable, pretty_hostname_buf); + g_ptr_array_add(hostnamed_freeable, location_buf); + g_ptr_array_add(hostnamed_freeable, deployment_buf); /* (2) set HOSTNAME */ if(gethostname(hostname_buf, MAXHOSTNAMELEN) || !g_strcmp0(hostname_buf, "")) @@ -823,24 +932,27 @@ gboolean set_names() { strncpy(ret, hostname_buf, hostname_divider); */ /* (3) set PRETTY_HOSTNAME */ - if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL) - && (pretty_hostname_buf = g_key_file_get_value(config, "hostnamed", "PRETTY_HOSTNAME", NULL))) + if((pretty_hostname_buf = config_get(OS_CONFIG_PATH, "PRETTY_HOSTNAME"))) PRETTY_HOSTNAME = pretty_hostname_buf; + else PRETTY_HOSTNAME = ""; /* (4) set STATIC_HOSTNAME */ - if((static_hostname_buf = g_key_file_get_value(config, "hostnamed", "STATIC_HOSTNAME", NULL))) + if(!gethostname(static_hostname_buf, MAXHOSTNAMELEN)) STATIC_HOSTNAME = static_hostname_buf; else STATIC_HOSTNAME = ""; - if(config) - g_key_file_unref(config); + /* XXX */ + location_buf = ""; + LOCATION = location_buf; + deployment_buf = ""; + DEPLOYMENT = deployment_buf; - return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME) ? TRUE : FALSE; + return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME && LOCATION && DEPLOYMENT) ? TRUE : FALSE; } gboolean set_uname_properties() {