#include <unistd.h>
#include <stdint.h>
#include <fcntl.h>
+#include <pwd.h>
#include <libubox/md5.h>
INSTANCE_ATTR_NICE,
INSTANCE_ATTR_LIMITS,
INSTANCE_ATTR_WATCH,
+ INSTANCE_ATTR_ERROR,
+ INSTANCE_ATTR_USER,
__INSTANCE_ATTR_MAX
};
[INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
[INSTANCE_ATTR_LIMITS] = { "limits", BLOBMSG_TYPE_TABLE },
[INSTANCE_ATTR_WATCH] = { "watch", BLOBMSG_TYPE_ARRAY },
+ [INSTANCE_ATTR_ERROR] = { "error", BLOBMSG_TYPE_ARRAY },
+ [INSTANCE_ATTR_USER] = { "user", BLOBMSG_TYPE_STRING },
};
struct instance_netdev {
if (fd > STDERR_FILENO)
close(fd);
}
+ if (in->uid || in->gid) {
+ setuid(in->uid);
+ setgid(in->gid);
+ }
execvp(argv[0], argv);
exit(127);
}
{
int pid;
+ if (!avl_is_empty(&in->errors.avl)) {
+ LOG("Not starting instance %s::%s, an error was indicated\n", in->srv->name, in->name);
+ return;
+ }
+
if (in->proc.pending)
return;
if (in->nice != in_new->nice)
return true;
+ if (in->uid != in_new->uid)
+ return true;
+
+ if (in->gid != in_new->gid)
+ return true;
+
if (!blobmsg_list_equal(&in->limits, &in_new->limits))
return true;
+ if (!blobmsg_list_equal(&in->errors, &in_new->errors))
+ return true;
+
return false;
}
close(fd);
}
+static void
+instance_fill_any(struct blobmsg_list *l, struct blob_attr *cur)
+{
+ if (!cur)
+ return;
+
+ blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), false);
+}
+
static bool
instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
{
in->respawn_retry = vals[2];
}
if (tb[INSTANCE_ATTR_TRIGGER]) {
- in->trigger = blob_memdup(tb[INSTANCE_ATTR_TRIGGER]);
- if (!in->trigger)
- return -1;
+ in->trigger = tb[INSTANCE_ATTR_TRIGGER];
trigger_add(in->trigger, in);
}
return false;
}
- if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
- return false;
+ if (tb[INSTANCE_ATTR_USER]) {
+ struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER]));
+ if (p) {
+ in->uid = p->pw_uid;
+ in->gid = p->pw_gid;
+ }
+ }
- if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+ instance_fill_any(&in->data, tb[INSTANCE_ATTR_DATA]);
+
+ if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
return false;
if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))
if (!instance_fill_array(&in->limits, tb[INSTANCE_ATTR_LIMITS], NULL, false))
return false;
+ if (!instance_fill_array(&in->errors, tb[INSTANCE_ATTR_ERROR], NULL, true))
+ return false;
+
return true;
}
blobmsg_list_free(&in->netdev);
blobmsg_list_free(&in->file);
blobmsg_list_free(&in->limits);
+ blobmsg_list_free(&in->errors);
}
static void
blobmsg_list_move(&in->netdev, &in_src->netdev);
blobmsg_list_move(&in->file, &in_src->file);
blobmsg_list_move(&in->limits, &in_src->limits);
+ blobmsg_list_move(&in->errors, &in_src->errors);
in->trigger = in_src->trigger;
in->command = in_src->command;
in->name = in_src->name;
uloop_timeout_cancel(&in->timeout);
trigger_del(in);
watch_del(in);
- free(in->trigger);
instance_config_cleanup(in);
free(in->config);
free(in);
blobmsg_list_simple_init(&in->env);
blobmsg_list_simple_init(&in->data);
blobmsg_list_simple_init(&in->limits);
+ blobmsg_list_simple_init(&in->errors);
in->valid = instance_config_parse(in);
}
blobmsg_add_u32(b, "pid", in->proc.pid);
blobmsg_add_blob(b, in->command);
+ if (!avl_is_empty(&in->errors.avl)) {
+ struct blobmsg_list_node *var;
+ void *e = blobmsg_open_array(b, "errors");
+ blobmsg_list_for_each(&in->errors, var)
+ blobmsg_add_string(b, NULL, blobmsg_data(var->data));
+ blobmsg_close_table(b, e);
+ }
+
if (!avl_is_empty(&in->env.avl)) {
struct blobmsg_list_node *var;
void *e = blobmsg_open_table(b, "env");
blobmsg_close_table(b, e);
}
+ if (!avl_is_empty(&in->data.avl)) {
+ struct blobmsg_list_node *var;
+ void *e = blobmsg_open_table(b, "data");
+ blobmsg_list_for_each(&in->data, var)
+ blobmsg_add_blob(b, var->data);
+ blobmsg_close_table(b, e);
+ }
+
if (!avl_is_empty(&in->limits.avl)) {
struct blobmsg_list_node *var;
void *e = blobmsg_open_table(b, "limits");