From 47a2669062882d1b4ed6ae3c7b8926e09f2a978e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 28 Jun 2011 20:50:43 +0200 Subject: [PATCH] logind: implement basic version of AttachDevice() D-Bus call --- Makefile.am | 3 + src/71-seat.rules | 8 +-- src/73-seat-late.rules | 16 ++++++ src/logind-dbus.c | 93 +++++++++++++++++++++++++++++++ src/logind.h | 1 + src/org.freedesktop.login1.policy | 10 ++++ 6 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 src/73-seat-late.rules diff --git a/Makefile.am b/Makefile.am index d110f313b..3d6951acd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -214,6 +214,9 @@ dist_dbussystemservice_DATA = \ src/org.freedesktop.login1.service dist_udevrules_DATA = \ + src/70-uaccess.rules \ + src/71-seat.rules \ + src/73-seat-late.rules \ src/99-systemd.rules dbusinterface_DATA = \ diff --git a/src/71-seat.rules b/src/71-seat.rules index 636cafd39..d6437b024 100644 --- a/src/71-seat.rules +++ b/src/71-seat.rules @@ -12,13 +12,9 @@ SUBSYSTEM=="sound", KERNEL=="card*", TAG+="seat" SUBSYSTEM=="input", TAG+="seat" SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="seat" SUBSYSTEM=="usb", ATTR{bDeviceClass}=="09", TAG+="seat" -SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="0001", ENV{ID_AUTOSEAT}="1" - -IMPORT{parent}="ID_SEAT" -ENV{ID_AUTOSEAT}=="1", ENV{ID_SEAT}=="", ENV{ID_PATH}=="", IMPORT{program}="path_id %p" -ENV{ID_AUTOSEAT}=="1", ENV{ID_SEAT}=="", ENV{ID_PATH}!="", ENV{ID_SEAT}="seat-$env{ID_PATH}" +SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="0001", ENV{ID_AUTOSEAT}="1" -ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}" +TAG=="seat", ENV{ID_PATH}=="", IMPORT{program}="path_id %p" LABEL="seat_end" diff --git a/src/73-seat-late.rules b/src/73-seat-late.rules new file mode 100644 index 000000000..f9436d0ae --- /dev/null +++ b/src/73-seat-late.rules @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +ACTION=="remove", GOTO="seat_late_end" +TAG!="seat", GOTO="seat_late_end" + +ENV{ID_SEAT}=="", ENV{ID_AUTOSEAT}=="1", ENV{ID_PATH}!="", ENV{ID_SEAT}="seat-$env{ID_PATH}" +ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT" + +ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}" + +LABEL="seat_late_end" diff --git a/src/logind-dbus.c b/src/logind-dbus.c index af5176ca3..1ed99c0aa 100644 --- a/src/logind-dbus.c +++ b/src/logind-dbus.c @@ -89,6 +89,11 @@ " \n" \ " \n" \ " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ " \n" \ " \n" \ " \n" \ @@ -531,6 +536,67 @@ fail: return r; } +static bool device_has_tag(struct udev_device *d, const char *tag) { + struct udev_list_entry *first, *item; + + assert(d); + assert(tag); + + first = udev_device_get_tags_list_entry(d); + udev_list_entry_foreach(item, first) + if (streq(udev_list_entry_get_name(item), tag)) + return true; + + return false; +} + +static int attach_device(Manager *m, const char *seat, const char *sysfs) { + struct udev_device *d; + char *rule = NULL, *file = NULL; + const char *path; + int r; + + assert(m); + assert(seat); + assert(sysfs); + + d = udev_device_new_from_syspath(m->udev, sysfs); + if (!d) + return -ENODEV; + + if (!device_has_tag(d, "seat")) { + r = -ENODEV; + goto finish; + } + + path = udev_device_get_property_value(d, "ID_PATH"); + if (!path) { + r = -ENODEV; + goto finish; + } + + if (asprintf(&file, "/etc/udev/rules.d/72-seat-%s.rules", path) < 0) { + r = -ENOMEM; + goto finish; + } + + if (asprintf(&rule, "TAG==\"seat\", ID_PATH==\"%s\", ID_SEAT=\"%s\"", path, seat) < 0) { + r = -ENOMEM; + goto finish; + } + + r = write_one_line_file(file, rule); + +finish: + free(rule); + free(file); + + if (d) + udev_device_unref(d); + + return r; +} + static DBusHandlerResult manager_message_handler( DBusConnection *connection, DBusMessage *message, @@ -957,6 +1023,33 @@ static DBusHandlerResult manager_message_handler( if (!reply) goto oom; + } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "AttachDevice")) { + const char *sysfs, *seat; + dbus_bool_t interactive; + + if (!dbus_message_get_args( + message, + &error, + DBUS_TYPE_STRING, &seat, + DBUS_TYPE_STRING, &sysfs, + DBUS_TYPE_BOOLEAN, &interactive, + DBUS_TYPE_INVALID)) + return bus_send_error_reply(connection, message, &error, -EINVAL); + + if (!path_startswith(sysfs, "/sys") || !seat_name_is_valid(seat)) + return bus_send_error_reply(connection, message, NULL, -EINVAL); + + r = verify_polkit(connection, message, "org.freedesktop.login1.attach-device", interactive, &error); + if (r < 0) + return bus_send_error_reply(connection, message, &error, r); + + r = attach_device(m, seat, sysfs); + if (r < 0) + return bus_send_error_reply(connection, message, NULL, -EINVAL); + + reply = dbus_message_new_method_return(message); + if (!reply) + goto oom; } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Introspectable", "Introspect")) { char *introspection = NULL; diff --git a/src/logind.h b/src/logind.h index 88a7c1808..8702d1aed 100644 --- a/src/logind.h +++ b/src/logind.h @@ -38,6 +38,7 @@ * direct client API * add configuration file * D-Bus method: AttachDevices(seat, devices[]); + * use named pipes to detect when a session dies * * non-local X11 server * reboot/shutdown halt management diff --git a/src/org.freedesktop.login1.policy b/src/org.freedesktop.login1.policy index da66998e5..8f802c1e5 100644 --- a/src/org.freedesktop.login1.policy +++ b/src/org.freedesktop.login1.policy @@ -26,4 +26,14 @@ + + Allow attaching devices to seats + Authentication is required to allow attaching a device to a seat + + auth_admin_keep + auth_admin_keep + auth_admin_keep + + + -- 2.30.2