* drop priviliges

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@130 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 5f561dbe209320e960ccee5696cbd1423fb58eda..1e9db4d42e3adabbd49c10e4861787e59b65ca9b 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -24,7 +24,9 @@ AM_CFLAGS= \
        -I$(top_srcdir) \
        -D_GNU_SOURCE \
        -DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
-       -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
+       -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" \
+       -DAVAHI_USER=\"avahi\" \
+       -DAVAHI_GROUP=\"avahi\"
 AM_LDADD=-lexpat
 
 # GLIB 2.0

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index ec7611471ded7ddf883cd48a8027ad0f3eca5034..7fce3a546d8b0b7086d93e9341e01a664cbf0919 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -29,6 +29,8 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#include <grp.h>
+#include <pwd.h>
 
 #include <libdaemon/dfork.h>
 #include <libdaemon/dsignal.h>
@@ -59,6 +61,7 @@ typedef struct {
     gboolean daemonize;
     gchar *config_file;
     gboolean enable_dbus;
+    gboolean drop_root;
 } DaemonConfig;
 
 static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
@@ -194,6 +197,8 @@ static gint load_config_file(DaemonConfig *config) {
                     config->server_config.use_iff_running = is_yes(v);
                 else if (g_strcasecmp(*k, "enable-dbus") == 0)
                     config->enable_dbus = is_yes(v);
+                else if (g_strcasecmp(*k, "drop-root") == 0)
+                    config->drop_root = is_yes(v);
                 else {
                     fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
                     goto finish;
@@ -410,6 +415,65 @@ finish:
     return r;
 }
 
+static gint drop_root(void) {
+    struct passwd *pw;
+    struct group * gr;
+    gint r;
+    
+    if (!(pw = getpwnam(AVAHI_USER))) {
+        avahi_log_error( "Failed to find user '"AVAHI_USER"'.");
+        return -1;
+    }
+
+    if (!(gr = getgrnam(AVAHI_GROUP))) {
+        avahi_log_error( "Failed to find group '"AVAHI_GROUP"'.");
+        return -1;
+    }
+
+    avahi_log_info("Found user '"AVAHI_USER"' (UID %lu) and group '"AVAHI_GROUP"' (GID %lu).", (unsigned long) pw->pw_uid, (unsigned long) gr->gr_gid);
+
+    if (initgroups(AVAHI_USER, gr->gr_gid) != 0) {
+        avahi_log_error("Failed to change group list: %s", strerror(errno));
+        return -1;
+    }
+
+#if defined(HAVE_SETRESGID)
+    r = setresgid(gr->gr_gid, gr->gr_gid, gr->gr_gid);
+#elif defined(HAVE_SETREGID)
+    r = setregid(gr->gr_gid, gr->gr_gid);
+#else
+    if ((r = setgid(gr->gr_gid)) >= 0)
+        r = setegid(gr->gr_gid);
+#endif
+
+    if (r < 0) {
+        avahi_log_error("Failed to change GID: %s", strerror(errno));
+        return -1;
+    }
+
+#if defined(HAVE_SETRESUID)
+    r = setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid);
+#elif defined(HAVE_SETREUID)
+    r = setreuid(pw->pw_uid, pw->pw_uid);
+#else
+    if ((r = setuid(pw->pw_uid)) >= 0)
+        r = seteuid(pw->pw_uid);
+#endif
+
+    if (r < 0) {
+        avahi_log_error("Failed to change UID: %s", strerror(errno));
+        return -1;
+    }
+
+    g_setenv("USER", pw->pw_name, 1);
+    g_setenv("LOGNAME", pw->pw_name, 1);
+    g_setenv("HOME", pw->pw_dir, 1);
+    
+    avahi_log_info("Successfully dropped root privileges.");
+
+    return 0;
+}
+
 int main(int argc, char *argv[]) {
     gint r = 255;
     DaemonConfig config;
@@ -423,6 +487,7 @@ int main(int argc, char *argv[]) {
     config.daemonize = FALSE;
     config.config_file = NULL;
     config.enable_dbus = TRUE;
+    config.drop_root = TRUE;
 
     if ((argv0 = strrchr(argv[0], '/')))
         argv0++;
@@ -494,6 +559,8 @@ int main(int argc, char *argv[]) {
             /* Child */
         }
 
+        chdir("/");
+
         if (daemon_pid_file_create() < 0) {
             avahi_log_error("Failed to create PID file: %s", strerror(errno));
 
@@ -503,6 +570,11 @@ int main(int argc, char *argv[]) {
         } else
             wrote_pid_file = TRUE;
 
+        if (config.drop_root) {
+            if (drop_root() < 0)
+                goto finish;
+        }
+
         if (run_server(&config) == 0)
             r = 0;
     }

diff --git a/configure.ac b/configure.ac
index e0f35cfdd6ed1f2f0c6b7e1f0aa006549fa9987e..bcdb411685dcd827899187515024c7e60afe4ea8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,9 @@ AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([gethostname memset select socket strchr strcspn strerror uname])
 
+AC_CHECK_FUNCS(setresuid)
+AC_CHECK_FUNCS(setreuid)
+
 # Check for GLIB 2.0
 PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ])
 AC_SUBST(GLIB20_CFLAGS)