From 682265d5e2157882861b0091c6b81fa92699b72a Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 1 Jun 2014 22:01:20 +0100 Subject: resolved: run as unpriviliged "systemd-resolve" user This service is not yet network facing, but let's prepare nonetheless. Currently all caps are dropped, but some may need to be kept in the future. --- src/resolve/resolved.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/resolve') diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c index 2eaff60fce..f61b70f46b 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -25,9 +25,13 @@ #include "resolved.h" #include "mkdir.h" +#include "capability.h" int main(int argc, char *argv[]) { _cleanup_manager_free_ Manager *m = NULL; + const char *user = "systemd-resolve"; + uid_t uid; + gid_t gid; int r; log_set_target(LOG_TARGET_AUTO); @@ -42,11 +46,23 @@ int main(int argc, char *argv[]) { goto out; } + r = get_user_creds(&user, &uid, &gid, NULL, NULL); + if (r < 0) { + log_error("Cannot resolve user name %s: %s", user, strerror(-r)); + goto out; + } + /* Always create the directory where resolv.conf will live */ - r = mkdir_label("/run/systemd/resolve", 0755); - if (r < 0) + r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid); + if (r < 0) { log_error("Could not create runtime directory: %s", strerror(-r)); + goto out; + } + + r = drop_privileges(uid, gid, 0); + if (r < 0) + goto out; r = manager_new(&m); if (r < 0) { -- cgit v1.2.3-54-g00ecf