X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus.h;h=1cce9c59b91a656edac8872b1548a0395646c83c;hp=9693f4bac69fe9af28ac2e963681d441c508dad1;hb=79f8d3d2ce51e992493f2d354a5764262c9d564a;hpb=14c24659cdc98e26049b98b965382a0c44eae008 diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 9693f4bac..1cce9c59b 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -37,20 +37,51 @@ _SD_BEGIN_DECLARATIONS; typedef struct sd_bus sd_bus; typedef struct sd_bus_message sd_bus_message; +typedef struct sd_bus_creds sd_bus_creds; typedef struct { const char *name; const char *message; - int need_free; + int _need_free; } sd_bus_error; +/* Flags */ + +enum { + SD_BUS_CREDS_PID = 1ULL << 0, + SD_BUS_CREDS_PID_STARTTIME = 1ULL << 1, + SD_BUS_CREDS_TID = 1ULL << 2, + SD_BUS_CREDS_UID = 1ULL << 3, + SD_BUS_CREDS_GID = 1ULL << 4, + SD_BUS_CREDS_COMM = 1ULL << 5, + SD_BUS_CREDS_TID_COMM = 1ULL << 6, + SD_BUS_CREDS_EXE = 1ULL << 7, + SD_BUS_CREDS_CMDLINE = 1ULL << 8, + SD_BUS_CREDS_CGROUP = 1ULL << 9, + SD_BUS_CREDS_UNIT = 1ULL << 10, + SD_BUS_CREDS_USER_UNIT = 1ULL << 11, + SD_BUS_CREDS_SLICE = 1ULL << 12, + SD_BUS_CREDS_SESSION = 1ULL << 13, + SD_BUS_CREDS_OWNER_UID = 1ULL << 14, + SD_BUS_CREDS_EFFECTIVE_CAPS = 1ULL << 15, + SD_BUS_CREDS_PERMITTED_CAPS = 1ULL << 16, + SD_BUS_CREDS_INHERITABLE_CAPS = 1ULL << 17, + SD_BUS_CREDS_BOUNDING_CAPS = 1ULL << 18, + SD_BUS_CREDS_SELINUX_CONTEXT = 1ULL << 19, + SD_BUS_CREDS_AUDIT_SESSION_ID = 1ULL << 20, + SD_BUS_CREDS_AUDIT_LOGIN_UID = 1ULL << 21, + SD_BUS_CREDS_UNIQUE_NAME = 1ULL << 22, + SD_BUS_CREDS_WELL_KNOWN_NAMES = 1ULL << 23, + _SD_BUS_CREDS_MAX = (1ULL << 24) -1, +}; + /* Callbacks */ -typedef int (*sd_bus_message_handler_t)(sd_bus *bus, sd_bus_message *m, void *userdata); -typedef int (*sd_bus_property_get_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata); -typedef int (*sd_bus_property_set_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, sd_bus_error *error, void *userdata); -typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *interface, void **found, void *userdata); -typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *path, char ***nodes, void *userdata); +typedef int (*sd_bus_message_handler_t)(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error); +typedef int (*sd_bus_property_get_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *ret_error); +typedef int (*sd_bus_property_set_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *ret_error); +typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *interface, void *userdata, void **ret_found, sd_bus_error *ret_error); +typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *path, void *userdata, char ***ret_nodes, sd_bus_error *ret_error); #include "sd-bus-protocol.h" #include "sd-bus-vtable.h" @@ -74,14 +105,7 @@ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id); int sd_bus_set_anonymous(sd_bus *bus, int b); int sd_bus_negotiate_fds(sd_bus *bus, int b); int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b); -int sd_bus_negotiate_attach_creds(sd_bus *bus, int b); -int sd_bus_negotiate_attach_comm(sd_bus *bus, int b); -int sd_bus_negotiate_attach_exe(sd_bus *bus, int b); -int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b); -int sd_bus_negotiate_attach_cgroup(sd_bus *bus, int b); -int sd_bus_negotiate_attach_caps(sd_bus *bus, int b); -int sd_bus_negotiate_attach_selinux_context(sd_bus *bus, int b); -int sd_bus_negotiate_attach_audit(sd_bus *bus, int b); +int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t creds_mask); int sd_bus_start(sd_bus *ret); void sd_bus_close(sd_bus *bus); @@ -92,10 +116,11 @@ sd_bus *sd_bus_unref(sd_bus *bus); int sd_bus_is_open(sd_bus *bus); int sd_bus_can_send(sd_bus *bus, char type); int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *peer); +int sd_bus_get_peer_creds(sd_bus *bus, uint64_t creds_mask, sd_bus_creds **ret); int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial); int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *serial); -int sd_bus_call(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *error, sd_bus_message **reply); +int sd_bus_call(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *ret_error, sd_bus_message **reply); int sd_bus_call_async(sd_bus *bus, sd_bus_message *m, sd_bus_message_handler_t callback, void *userdata, uint64_t usec, uint64_t *serial); int sd_bus_call_async_cancel(sd_bus *bus, uint64_t serial); @@ -111,6 +136,7 @@ int sd_bus_get_tid(sd_bus *bus, pid_t *tid); int sd_bus_attach_event(sd_bus *bus, sd_event *e, int priority); int sd_bus_detach_event(sd_bus *bus); +sd_event *sd_bus_get_event(sd_bus *bus); int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata); int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata); @@ -137,6 +163,7 @@ int sd_bus_add_object_manager(sd_bus *bus, const char *path); int sd_bus_remove_object_manager(sd_bus *bus, const char *path); /* Message object */ + int sd_bus_message_new_signal(sd_bus *bus, const char *path, const char *interface, const char *member, sd_bus_message **m); int sd_bus_message_new_method_call(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_message **m); int sd_bus_message_new_method_return(sd_bus_message *call, sd_bus_message **m); @@ -148,6 +175,8 @@ int sd_bus_message_new_method_errnof(sd_bus_message *call, sd_bus_message **m, i sd_bus_message* sd_bus_message_ref(sd_bus_message *m); sd_bus_message* sd_bus_message_unref(sd_bus_message *m); +sd_bus* sd_bus_message_get_bus(sd_bus_message *m); + int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type); int sd_bus_message_get_serial(sd_bus_message *m, uint64_t *serial); int sd_bus_message_get_reply_serial(sd_bus_message *m, uint64_t *serial); @@ -165,24 +194,7 @@ int sd_bus_message_get_errno(sd_bus_message *m); int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec); int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec); -int sd_bus_message_get_uid(sd_bus_message *m, uid_t *uid); -int sd_bus_message_get_gid(sd_bus_message *m, gid_t *gid); -int sd_bus_message_get_pid(sd_bus_message *m, pid_t *pid); -int sd_bus_message_get_tid(sd_bus_message *m, pid_t *tid); -int sd_bus_message_get_pid_starttime(sd_bus_message *m, uint64_t *usec); -int sd_bus_message_get_selinux_context(sd_bus_message *m, const char **r); -int sd_bus_message_get_comm(sd_bus_message *m, const char **r); -int sd_bus_message_get_tid_comm(sd_bus_message *m, const char **r); -int sd_bus_message_get_exe(sd_bus_message *m, const char **r); -int sd_bus_message_get_cgroup(sd_bus_message *m, const char **r); -int sd_bus_message_get_cmdline(sd_bus_message *m, char ***cmdline); -int sd_bus_message_get_unit(sd_bus_message *m, const char **unit); -int sd_bus_message_get_user_unit(sd_bus_message *m, const char **unit); -int sd_bus_message_get_session(sd_bus_message *m, const char **session); -int sd_bus_message_get_owner_uid(sd_bus_message *m, uid_t *uid); -int sd_bus_message_get_audit_sessionid(sd_bus_message *m, uint32_t *sessionid); -int sd_bus_message_get_audit_loginuid(sd_bus_message *m, uid_t *loginuid); -int sd_bus_message_has_effective_cap(sd_bus_message *m, int capability); +sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m); /* do not unref the result */ int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member); int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member); @@ -218,14 +230,23 @@ int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *content int sd_bus_message_at_end(sd_bus_message *m, int complete); int sd_bus_message_rewind(sd_bus_message *m, int complete); +/* Bus management */ + +int sd_bus_get_unique_name(sd_bus *bus, const char **unique); +int sd_bus_request_name(sd_bus *bus, const char *name, int flags); +int sd_bus_release_name(sd_bus *bus, const char *name); +int sd_bus_list_names(sd_bus *bus, char ***l); /* free the results */ +int sd_bus_get_owner(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */ +int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine); + /* Convenience calls */ -int sd_bus_call_method(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *types, ...); -int sd_bus_get_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *type); -int sd_bus_get_property_trivial(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, char type, void *ptr); -int sd_bus_get_property_string(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, char **ret); /* free the result! */ -int sd_bus_get_property_strv(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, char ***ret); /* free the result! */ -int sd_bus_set_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, const char *type, ...); +int sd_bus_call_method(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, sd_bus_message **reply, const char *types, ...); +int sd_bus_get_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, sd_bus_message **reply, const char *type); +int sd_bus_get_property_trivial(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char type, void *ret_ptr); +int sd_bus_get_property_string(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char **ret); /* free the result! */ +int sd_bus_get_property_strv(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char ***ret); /* free the result! */ +int sd_bus_set_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, const char *ret_type, ...); int sd_bus_reply_method_return(sd_bus_message *call, const char *types, ...); int sd_bus_reply_method_error(sd_bus_message *call, const sd_bus_error *e); @@ -243,16 +264,39 @@ int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *inte int sd_bus_emit_interfaces_removed_strv(sd_bus *bus, const char *path, char **interfaces); int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interface, ...) _sd_sentinel_; -/* Bus management */ - -int sd_bus_get_unique_name(sd_bus *bus, const char **unique); -int sd_bus_request_name(sd_bus *bus, const char *name, int flags); -int sd_bus_release_name(sd_bus *bus, const char *name); -int sd_bus_list_names(sd_bus *bus, char ***l); -int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner); /* free the result! */ -int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid); -int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid); -int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine); +int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_bus_creds **creds); + +/* Credential handling */ + +int sd_bus_creds_new_from_pid(pid_t pid, uint64_t creds_mask, sd_bus_creds **ret); +sd_bus_creds *sd_bus_creds_ref(sd_bus_creds *c); +sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c); +uint64_t sd_bus_creds_get_mask(sd_bus_creds *c); + +int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *pid); +int sd_bus_creds_get_pid_starttime(sd_bus_creds *c, uint64_t *usec); +int sd_bus_creds_get_tid(sd_bus_creds *c, pid_t *tid); +int sd_bus_creds_get_uid(sd_bus_creds *c, uid_t *uid); +int sd_bus_creds_get_gid(sd_bus_creds *c, gid_t *gid); +int sd_bus_creds_get_comm(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_tid_comm(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_exe(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_cmdline(sd_bus_creds *c, char ***cmdline); +int sd_bus_creds_get_cgroup(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_unit(sd_bus_creds *c, const char **unit); +int sd_bus_creds_get_user_unit(sd_bus_creds *c, const char **unit); +int sd_bus_creds_get_slice(sd_bus_creds *c, const char **slice); +int sd_bus_creds_get_session(sd_bus_creds *c, const char **session); +int sd_bus_creds_get_owner_uid(sd_bus_creds *c, uid_t *uid); +int sd_bus_creds_has_effective_cap(sd_bus_creds *c, int capability); +int sd_bus_creds_has_permitted_cap(sd_bus_creds *c, int capability); +int sd_bus_creds_has_inheritable_cap(sd_bus_creds *c, int capability); +int sd_bus_creds_has_bounding_cap(sd_bus_creds *c, int capability); +int sd_bus_creds_get_selinux_context(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_audit_session_id(sd_bus_creds *c, uint32_t *sessionid); +int sd_bus_creds_get_audit_login_uid(sd_bus_creds *c, uid_t *loginuid); +int sd_bus_creds_get_unique_name(sd_bus_creds *c, const char **name); +int sd_bus_creds_get_well_known_names(sd_bus_creds *c, char ***names); /* Error structures */ @@ -270,6 +314,8 @@ int sd_bus_error_copy(sd_bus_error *dest, const sd_bus_error *e); int sd_bus_error_is_set(const sd_bus_error *e); int sd_bus_error_has_name(const sd_bus_error *e, const char *name); +/* Auxiliary macros */ + #define SD_BUS_MESSAGE_APPEND_ID128(x) 16, \ (x).bytes[0], (x).bytes[1], (x).bytes[2], (x).bytes[3], \ (x).bytes[4], (x).bytes[5], (x).bytes[6], (x).bytes[7], \ @@ -282,6 +328,8 @@ int sd_bus_error_has_name(const sd_bus_error *e, const char *name); &(x).bytes[8], &(x).bytes[9], &(x).bytes[10], &(x).bytes[11], \ &(x).bytes[12], &(x).bytes[13], &(x).bytes[14], &(x).bytes[15] +/* Label escaping */ + char *sd_bus_label_escape(const char *s); char *sd_bus_label_unescape(const char *f);