bus: fake client side creds in the proxy to the caller's creds

[elogind.git] / src / libsystemd-bus / bus-internal.h

diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h
index 2112a29687d1f00fb2e64ea2189b99aefd9b2424..673f30eb912e379ece4a4d597350a59441a3d102 100644 (file)
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -36,6 +36,7 @@
 #include "bus-error.h"
 #include "bus-match.h"
 #include "bus-kernel.h"
 #include "bus-error.h"
 #include "bus-match.h"
 #include "bus-kernel.h"

+#include "kdbus.h"

 
 struct reply_callback {
         sd_bus_message_handler_t callback;
 
 struct reply_callback {
         sd_bus_message_handler_t callback;


@@ -119,11 +120,12 @@ enum bus_state {
         BUS_AUTHENTICATING,
         BUS_HELLO,
         BUS_RUNNING,
         BUS_AUTHENTICATING,
         BUS_HELLO,
         BUS_RUNNING,

+        BUS_CLOSING,

         BUS_CLOSED
 };
 
 static inline bool BUS_IS_OPEN(enum bus_state state) {
         BUS_CLOSED
 };
 
 static inline bool BUS_IS_OPEN(enum bus_state state) {

-        return state > BUS_UNSET && state < BUS_CLOSED;
+        return state > BUS_UNSET && state < BUS_CLOSING;

 }
 
 enum bus_auth {
 }
 
 enum bus_auth {


@@ -146,6 +148,7 @@ struct sd_bus {
         enum bus_state state;
         int input_fd, output_fd;
         int message_version;
         enum bus_state state;
         int input_fd, output_fd;
         int message_version;

+        int message_endian;

 
         bool is_kernel:1;
         bool can_fds:1;
 
         bool is_kernel:1;
         bool can_fds:1;


@@ -155,10 +158,11 @@ struct sd_bus {
         bool anonymous_auth:1;
         bool prefer_readv:1;
         bool prefer_writev:1;
         bool anonymous_auth:1;
         bool prefer_readv:1;
         bool prefer_writev:1;

-        bool processing:1;

         bool match_callbacks_modified:1;
         bool filter_callbacks_modified:1;
         bool nodes_modified:1;
         bool match_callbacks_modified:1;
         bool filter_callbacks_modified:1;
         bool nodes_modified:1;

+        bool trusted:1;
+        bool fake_creds_valid:1;

 
         int use_memfd;
 
 
         int use_memfd;
 


@@ -167,14 +171,17 @@ struct sd_bus {
 
         sd_bus_message **rqueue;
         unsigned rqueue_size;
 
         sd_bus_message **rqueue;
         unsigned rqueue_size;

+        size_t rqueue_allocated;

 
         sd_bus_message **wqueue;
         unsigned wqueue_size;
         size_t windex;
 
         sd_bus_message **wqueue;
         unsigned wqueue_size;
         size_t windex;

+        size_t wqueue_allocated;

 
         uint64_t serial;
 
         char *unique_name;
 
         uint64_t serial;
 
         char *unique_name;

+        uint64_t unique_id;

 
         struct bus_match_node match_callbacks;
         Prioq *reply_callbacks_prioq;
 
         struct bus_match_node match_callbacks;
         Prioq *reply_callbacks_prioq;


@@ -182,8 +189,6 @@ struct sd_bus {
         LIST_HEAD(struct filter_callback, filter_callbacks);
 
         Hashmap *nodes;
         LIST_HEAD(struct filter_callback, filter_callbacks);
 
         Hashmap *nodes;

-
-

         Hashmap *vtable_methods;
         Hashmap *vtable_properties;
 
         Hashmap *vtable_methods;
         Hashmap *vtable_properties;
 


@@ -215,6 +220,8 @@ struct sd_bus {
         struct ucred ucred;
         char label[NAME_MAX];
 
         struct ucred ucred;
         char label[NAME_MAX];
 

+        uint64_t creds_mask;
+

         int *fds;
         unsigned n_fds;
 
         int *fds;
         unsigned n_fds;
 


@@ -239,6 +246,7 @@ struct sd_bus {
         pid_t original_pid;
 
         uint64_t hello_flags;
         pid_t original_pid;
 
         uint64_t hello_flags;

+        uint64_t attach_flags;

 
         uint64_t match_cookie;
 
 
         uint64_t match_cookie;
 


@@ -247,14 +255,21 @@ struct sd_bus {
         sd_event_source *time_event_source;
         sd_event_source *quit_event_source;
         sd_event *event;
         sd_event_source *time_event_source;
         sd_event_source *quit_event_source;
         sd_event *event;

+        int event_priority;

 
         sd_bus_message *current;
 
         sd_bus_message *current;

+
+        sd_bus **default_bus_ptr;
+        pid_t tid;
+
+        struct kdbus_creds fake_creds;
+        char *fake_label;

 };
 
 #define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
 
 };
 
 #define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
 

-#define BUS_WQUEUE_MAX 128
-#define BUS_RQUEUE_MAX 128
+#define BUS_WQUEUE_MAX 1024
+#define BUS_RQUEUE_MAX 64*1024

 
 #define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
 #define BUS_AUTH_SIZE_MAX (64*1024)
 
 #define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
 #define BUS_AUTH_SIZE_MAX (64*1024)


@@ -290,6 +305,10 @@ int bus_ensure_running(sd_bus *bus);
 int bus_start_running(sd_bus *bus);
 int bus_next_address(sd_bus *bus);
 
 int bus_start_running(sd_bus *bus);
 int bus_next_address(sd_bus *bus);
 

+int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m);
+
+int bus_rqueue_make_room(sd_bus *bus);
+

 bool bus_pid_changed(sd_bus *bus);
 
 char *bus_address_escape(const char *v);
 bool bus_pid_changed(sd_bus *bus);
 
 char *bus_address_escape(const char *v);


@@ -303,4 +322,4 @@ char *bus_address_escape(const char *v);
  * bus from the callback doesn't destroy the object we are working
  * on */
 #define BUS_DONT_DESTROY(bus) \
  * bus from the callback doesn't destroy the object we are working
  * on */
 #define BUS_DONT_DESTROY(bus) \

-        _cleanup_bus_unref_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
+        _cleanup_bus_unref_ _unused_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)