X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=798142f39a348ec6f0ac74e689332d18a1318444;hp=1f226265b0c9c79593f255bba4805cfdb8a53e9a;hb=e4efba96ba3f2d77eb75fc27631e590c8be3c879;hpb=0d37443245a99388afa85e6198bde567504dd16d

diff --git a/audiod.c b/audiod.c
index 1f226265..798142f3 100644
--- a/audiod.c
+++ b/audiod.c
@@ -14,6 +14,7 @@
 #include <sys/un.h>
 #include <netdb.h>
 #include <signal.h>
+#include <pwd.h>
 
 #include "para.h"
 #include "error.h"
@@ -172,6 +173,8 @@ static struct signal_task *signal_task;
 
 static struct status_task status_task_struct;
 
+static uid_t *uid_whitelist;
+
 /**
  * the task that calls the status command of para_server
  *
@@ -390,7 +393,7 @@ empty:
 
 static void parse_config_or_die(void)
 {
-	int ret;
+	int ret, i;
 	char *config_file;
 	struct audiod_cmdline_parser_params params = {
 		.override = 0,
@@ -410,6 +413,7 @@ static void parse_config_or_die(void)
 	ret = file_exists(config_file);
 	if (conf.config_file_given && !ret) {
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
+		free(config_file);
 		goto err;
 	}
 	if (ret) {
@@ -417,9 +421,29 @@ static void parse_config_or_die(void)
 		daemon_set_loglevel(conf.loglevel_arg);
 	}
 	free(config_file);
+	if (conf.user_allow_given > 0) {
+		uid_whitelist = para_malloc(conf.user_allow_given
+			* sizeof(uid_t));
+		for (i = 0; i < conf.user_allow_given; i++) {
+			int32_t val;
+			struct passwd *pw;
+			ret = para_atoi32(conf.user_allow_arg[i], &val);
+			if (ret >= 0) {
+				uid_whitelist[i] = val;
+				continue;
+			}
+			errno = 0; /* see getpwnam(3) */
+			pw = getpwnam(conf.user_allow_arg[i]);
+			if (!pw) {
+				PARA_EMERG_LOG("invalid username: %s\n",
+					conf.user_allow_arg[i]);
+				goto err;
+			}
+			uid_whitelist[i] = pw->pw_uid;
+		}
+	}
 	return;
 err:
-	free(config_file);
 	exit(EXIT_FAILURE);
 }
 
@@ -501,11 +525,11 @@ static void close_filters(struct slot_info *s)
 		return;
 	for (i = a->num_filters - 1; i >= 0; i--) {
 		struct filter_node *fn = s->fns + i;
-		struct filter *f;
+		const struct filter *f;
 
 		if (!fn)
 			continue;
-		f = filters + fn->filter_num;
+		f = filter_get(fn->filter_num);
 		if (f->close)
 			f->close(fn);
 		btr_remove_node(&fn->btrn);
@@ -564,7 +588,7 @@ static void open_filters(struct slot_info *s)
 	parent = s->receiver_node->btrn;
 	for (i = 0; i < nf; i++) {
 		char buf[20];
-		struct filter *f = filters + a->filter_nums[i];
+		const struct filter *f = filter_get(a->filter_nums[i]);
 		fn = s->fns + i;
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
@@ -834,7 +858,7 @@ static int add_filter(int format, char *cmdline)
 	a->filter_conf[nf] = cfg;
 	a->num_filters++;
 	PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
-		filters[filter_num].name);
+		filter_get(filter_num)->name);
 	return filter_num;
 }
 
@@ -969,20 +993,20 @@ static int init_default_filters(void)
 		}
 		/* add "dec" to audio format name */
 		tmp = make_message("%sdec", audio_formats[i]);
-		for (j = 0; filters[j].name; j++)
-			if (!strcmp(tmp, filters[j].name))
+		for (j = 0; filter_get(j); j++)
+			if (!strcmp(tmp, filter_get(j)->name))
 				break;
 		free(tmp);
 		ret = -E_UNSUPPORTED_FILTER;
-		if (!filters[j].name)
+		if (!filter_get(j))
 			goto out;
-		tmp = para_strdup(filters[j].name);
+		tmp = para_strdup(filter_get(j)->name);
 		ret = add_filter(i, tmp);
 		free(tmp);
 		if (ret < 0)
 			goto out;
 		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
-			filters[j].name);
+			filter_get(j)->name);
 	}
 out:
 	return ret;
@@ -1099,7 +1123,7 @@ static int command_post_select(struct sched *s, void *context)
 	for (i = 0; i < 2; i++) {
 		if (ct->fd[i] < 0)
 			continue;
-		ret = handle_connect(ct->fd[i], &s->rfds);
+		ret = handle_connect(ct->fd[i], &s->rfds, uid_whitelist);
 		if (ret < 0) {
 			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 			if (ret == -E_AUDIOD_TERM) {
@@ -1226,6 +1250,7 @@ static void audiod_cleanup(void)
 	close_unused_slots();
 	audiod_cmdline_parser_free(&conf);
 	close_stat_clients();
+	free(uid_whitelist);
 }
 
 /*
@@ -1449,6 +1474,7 @@ int main(int argc, char *argv[])
 	writer_init();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	daemon_set_priority(conf.priority_arg);
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
 	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
@@ -1468,7 +1494,7 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_log_welcome("para_audiod");
+	daemon_log_welcome("audiod");
 	daemon_set_start_time();
 	set_initial_status();
 	FOR_EACH_SLOT(i)