service: initialize supplementary group ids

[project/procd.git] / service / service.c

diff --git a/service/service.c b/service/service.c
index ce730bc..755147c 100644 (file)
--- a/service/service.c
+++ b/service/service.c
@@ -84,6 +84,7 @@ service_alloc(const char *name)
        s->name = new_name;
        s->avl.key = s->name;
        INIT_LIST_HEAD(&s->validators);
+       blobmsg_list_simple_init(&s->data_blob);
 
        return s;
 }
@@ -95,6 +96,7 @@ enum {
        SERVICE_SET_TRIGGER,
        SERVICE_SET_VALIDATE,
        SERVICE_SET_AUTOSTART,
+       SERVICE_SET_DATA,
        __SERVICE_SET_MAX
 };
 
@@ -105,6 +107,7 @@ static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = {
        [SERVICE_SET_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
        [SERVICE_SET_VALIDATE] = { "validate", BLOBMSG_TYPE_ARRAY },
        [SERVICE_SET_AUTOSTART] = { "autostart", BLOBMSG_TYPE_BOOL },
+       [SERVICE_SET_DATA] = { "data", BLOBMSG_TYPE_TABLE },
 };
 
 static int
@@ -119,6 +122,12 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
                s->trigger = NULL;
        }
 
+       if (s->data) {
+               blobmsg_list_free(&s->data_blob);
+               free(s->data);
+               s->data = NULL;
+       }
+
        service_validate_del(s);
 
        if (tb[SERVICE_SET_AUTOSTART] && !blobmsg_get_bool(tb[SERVICE_SET_AUTOSTART]))
@@ -148,6 +157,14 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
                        vlist_flush(&s->instances);
        }
 
+       if (tb[SERVICE_SET_DATA] && blobmsg_data_len(tb[SERVICE_SET_DATA])) {
+               s->data = blob_memdup(tb[SERVICE_SET_DATA]);
+               if (!s->data)
+                       return -1;
+               blobmsg_list_fill(&s->data_blob, blobmsg_data(s->data),
+                               blobmsg_data_len(s->data), false);
+       }
+
        s->deleted = false;
 
        rc(s->name, "running");
@@ -158,6 +175,8 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
 static void
 service_delete(struct service *s)
 {
+       blobmsg_list_free(&s->data_blob);
+       free(s->data);
        vlist_flush_all(&s->instances);
        s->deleted = true;
        service_stopped(s);
@@ -266,7 +285,7 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
        bool add = !strcmp(method, "add");
        int ret;
 
-       blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
        cur = tb[SERVICE_SET_NAME];
        if (!cur)
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -306,6 +325,14 @@ service_dump(struct service *s, bool verbose)
        if (!s->autostart)
                blobmsg_add_u8(&b, "autostart", false);
 
+       if (!avl_is_empty(&s->data_blob.avl)) {
+               struct blobmsg_list_node *var;
+               i = blobmsg_open_table(&b, "data");
+               blobmsg_list_for_each(&s->data_blob, var)
+                       blobmsg_add_blob(&b, var->data);
+               blobmsg_close_table(&b, i);
+       }
+
        if (!avl_is_empty(&s->instances.avl)) {
                i = blobmsg_open_table(&b, "instances");
                vlist_for_each_element(&s->instances, in, node)
@@ -329,7 +356,7 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
        const char *name = NULL;
        bool verbose = false;
 
-       blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
        if (tb[SERVICE_LIST_ATTR_VERBOSE])
                verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
@@ -358,7 +385,7 @@ service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
        struct service *s;
        struct service_instance *in;
 
-       blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
        cur = tb[SERVICE_DEL_ATTR_NAME];
        if (!cur)
@@ -411,7 +438,7 @@ service_handle_signal(struct ubus_context *ctx, struct ubus_object *obj,
        int sig = SIGHUP;
        int rv = 0;
 
-       blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
        cur = tb[SERVICE_SIGNAL_ATTR_SIGNAL];
        if (cur)
@@ -452,7 +479,7 @@ service_handle_state(struct ubus_context *ctx, struct ubus_object *obj,
        struct service_instance *in;
        int spawn;
 
-       blobmsg_parse(service_state_attrs, __SERVICE_STATE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(service_state_attrs, __SERVICE_STATE_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
        if (!tb[SERVICE_STATE_ATTR_SPAWN])
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -485,7 +512,7 @@ service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
        struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
        struct service *s;
 
-       blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
        cur = tb[SERVICE_SET_NAME];
        if (!cur)
@@ -528,7 +555,7 @@ service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
        if (!msg)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       blobmsg_parse(event_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(event_policy, __EVENT_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
        if (!tb[EVENT_TYPE] || !tb[EVENT_DATA])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
@@ -539,7 +566,7 @@ service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *tb2[__VALIDATE_MAX];
 
                blobmsg_parse(validate_policy, __VALIDATE_MAX, tb2,
-                             blobmsg_data(tb[EVENT_DATA]), blobmsg_len(tb[EVENT_DATA]));
+                             blobmsg_data(tb[EVENT_DATA]), blobmsg_data_len(tb[EVENT_DATA]));
                if (tb2[VALIDATE_PACKAGE])
                        ubus_event_bcast("config.change", "config",
                                         blobmsg_get_string(tb2[VALIDATE_PACKAGE]), NULL, NULL);
@@ -558,7 +585,7 @@ service_handle_validate(struct ubus_context *ctx, struct ubus_object *obj,
        if (!msg)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
        if (tb[VALIDATE_SERVICE]) {
                return 0;
        }
@@ -587,7 +614,7 @@ service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
        const char *instance = NULL;
        const char *type = NULL;
 
-       blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(get_data_policy, __DATA_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
        if (tb[DATA_NAME])
                name = blobmsg_data(tb[DATA_NAME]);
        if (tb[DATA_INSTANCE])
@@ -598,13 +625,24 @@ service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
        blob_buf_init(&b, 0);
        avl_for_each_element(&services, s, avl) {
                void *cs = NULL;
+               void *ci = NULL;
+               struct blobmsg_list_node *var;
 
                if (name && strcmp(name, s->name))
                        continue;
 
+               blobmsg_list_for_each(&s->data_blob, var) {
+                       if (type && strcmp(blobmsg_name(var->data), type))
+                               continue;
+
+                       if (!cs)
+                               cs = blobmsg_open_table(&b, s->name);
+
+                       blobmsg_add_blob(&b, var->data);
+               }
+
                vlist_for_each_element(&s->instances, in, node) {
-                       struct blobmsg_list_node *var;
-                       void *ci = NULL;
+                       ci = NULL;
 
                        if (instance && strcmp(instance, in->name))
                                continue;