From dfb68f8556df63878add145ad9c656381bc20656 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sun, 11 Feb 2018 17:19:11 +0800 Subject: [PATCH] service: initialize supplementary group ids We currently only call setgid() with user's primary group id for service instance processes. In the case of a user belong to multiple groups, it's natural to also explicitly initialize their supplementary group ids Fixes FS#988 Signed-off-by: Yousong Zhou --- service/instance.c | 13 ++++++++++++- service/instance.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/service/instance.c b/service/instance.c index 74c47fa..917b003 100644 --- a/service/instance.c +++ b/service/instance.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -347,6 +348,10 @@ instance_run(struct service_instance *in, int _stdout, int _stderr) closefd(_stderr); } + if (in->user && in->gid && initgroups(in->user, in->gid)) { + ERROR("failed to initgroups() for user %s: %m\n", in->user); + exit(127); + } if (in->gid && setgid(in->gid)) { ERROR("failed to set group id %d: %m\n", in->gid); exit(127); @@ -613,6 +618,9 @@ instance_config_changed(struct service_instance *in, struct service_instance *in if (in->nice != in_new->nice) return true; + if (string_changed(in->user, in_new->user)) + return true; + if (in->uid != in_new->uid) return true; @@ -862,8 +870,10 @@ instance_config_parse(struct service_instance *in) } if (tb[INSTANCE_ATTR_USER]) { - struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER])); + const char *user = blobmsg_get_string(tb[INSTANCE_ATTR_USER]); + struct passwd *p = getpwnam(user); if (p) { + in->user = strdup(user); in->uid = p->pw_uid; in->gid = p->pw_gid; } @@ -982,6 +992,7 @@ instance_free(struct service_instance *in) watch_del(in); instance_config_cleanup(in); free(in->config); + free(in->user); free(in); } diff --git a/service/instance.h b/service/instance.h index bdd14de..771406c 100644 --- a/service/instance.h +++ b/service/instance.h @@ -42,6 +42,7 @@ struct service_instance { int8_t nice; bool valid; + char *user; uid_t uid; gid_t gid; -- 2.25.1