X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=b7334fc52c434a5c9cc69eb3f6fa3dcf8769e18c;hp=8275ccd0646adaacbd257ab08edcdeedb7e95c7d;hb=a27ec6094608c05a9f87e445902c29d15ca11547;hpb=b2917b2a0a68f84da34e7435ad697d798a0260da diff --git a/server.c b/server.c index 8275ccd0..b7334fc5 100644 --- a/server.c +++ b/server.c @@ -41,6 +41,8 @@ #include "daemon.h" #include "string.h" #include "ipc.h" +#include "fd.h" +#include "crypt.h" /** define the array of error lists needed by para_server */ INIT_SERVER_ERRLISTS; @@ -55,22 +57,24 @@ struct misc_meta_data *mmd; * It also contains the options for all audio file selectors and all supported * senders. */ -struct gengetopt_args_info conf; +struct server_args_info conf; char *user_list = NULL; +struct list_head _user_list; +extern void dccp_send_init(struct sender *); extern void http_send_init(struct sender *); extern void ortp_send_init(struct sender *); -extern struct audio_format afl[]; +/* TODO: This is better handled by autoconf */ /** the list of supported audio file selectors */ -struct audio_file_selector dblist[] = { +struct audio_file_selector selectors[] = { { .name = "random", - .init = random_dbtool_init, + .init = random_selector_init, .update_audio_file = NULL, }, { - .name = "plm", - .init = plm_dbtool_init, + .name = "playlist", + .init = playlist_selector_init, .update_audio_file = NULL, .pre_select = NULL, .post_select = NULL, @@ -78,7 +82,7 @@ struct audio_file_selector dblist[] = { #ifdef HAVE_MYSQL { .name = "mysql", - .init = mysql_dbtool_init, + .init = mysql_selector_init, .update_audio_file = NULL, .pre_select = NULL, .post_select = NULL, @@ -95,6 +99,10 @@ struct sender senders[] = { .name = "http", .init = http_send_init, }, + { + .name = "dccp", + .init = dccp_send_init, + }, #ifdef HAVE_ORTP { .name = "ortp", @@ -118,7 +126,7 @@ static int signal_pipe; * \param ll the log level * \param fmt the format string describing the log message */ -void para_log(int ll, char* fmt,...) +void para_log(int ll, const char* fmt,...) { va_list argp; FILE *outfd; @@ -129,15 +137,7 @@ void para_log(int ll, char* fmt,...) if (ll < conf.loglevel_arg) return; - if (!logfile) { - if (ll < WARNING) - outfd = stdout; - else - outfd = stderr; - } else - outfd = logfile; - if (conf.daemon_given && !logfile) - return; + outfd = logfile? logfile : stderr; time(&t1); tm = localtime(&t1); strftime(str, MAXLINE, "%b %d %H:%M:%S", tm); @@ -174,7 +174,7 @@ static void shm_init(void) goto err_out; mmd_mutex = ret; - mmd->dbt_num = 0; + mmd->selector_num = 0; mmd->num_played = 0; mmd->num_commands = 0; mmd->events = 0; @@ -236,7 +236,7 @@ static void parse_config(int override) } if (!ret) { int tmp = conf.daemon_given; - cmdline_parser_configfile(cf, &conf, override, 0, 0); + server_cmdline_parser_configfile(cf, &conf, override, 0, 0); conf.daemon_given = tmp; } /* logfile */ @@ -263,7 +263,6 @@ static void setup_signal_handling(void) int ret = 0; signal_pipe = para_signal_init(); -// fcntl(signal_pipe, F_SETFL, O_NONBLOCK); PARA_NOTICE_LOG("%s", "setting up signal handlers\n"); ret += para_install_sighandler(SIGINT); ret += para_install_sighandler(SIGTERM); @@ -277,39 +276,150 @@ static void setup_signal_handling(void) } } -static void init_dbtool(void) +/* + * lookup user in user_list file. Fills in a user struct containing + * filename of the user's public key as well as the permissions of that user. + * Returns 1 on success, 0 if user does not exist and < 0 on errors. + */ +static void populate_user_list(void) { + FILE *file_ptr = NULL; + char *char_ptr; + char line[MAXLINE]; + /* keyword, user, key, perms */ + char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE]; + int num, ret; + + file_ptr = fopen(user_list, "r"); + ret = -E_USERLIST; + if (!file_ptr) + goto out; + for (;;) { + struct _user *u; + ret = para_fgets(line, MAXLINE, file_ptr); + if (ret < 0) + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + if (ret <= 0) + break; + if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3) + continue; + if (strcmp(w, "user")) + continue; + PARA_DEBUG_LOG("found entry for %s\n", n); + u = para_malloc(sizeof(struct _user)); + u->name = para_strdup(n); + u->rsa = para_malloc(sizeof(RSA)); + ret = get_rsa_key(k, &u->rsa, 0 /* public */); + if (ret < 0) + break; + u->perms = 0; + char_ptr = p; + num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]", + tmp[0], tmp[1], tmp[2], tmp[3]); + PARA_DEBUG_LOG("found %i perm entries\n", num); + u->perms = 0; + while (num > 0) { + num--; + if (!strcmp(tmp[num], "AFS_READ")) + u->perms |= AFS_READ; + else if (!strcmp(tmp[num], "AFS_WRITE")) + u->perms |= AFS_WRITE; + else if (!strcmp(tmp[num], "DB_READ")) + u->perms |= DB_READ; + else if (!strcmp(tmp[num], "DB_WRITE")) + u->perms |= DB_WRITE; + else /* unknown permission */ + PARA_WARNING_LOG("unknown permission: %s\n", + tmp[num]); + } + para_list_add(&u->node, &_user_list); + } +out: + if (file_ptr) + fclose(file_ptr); + if (ret >= 0) + return; + PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + exit(EXIT_FAILURE); +} + +static void init_user_list(void) +{ + struct _user *u, *tmp; + static int initialized; + + if (initialized) { + list_for_each_entry_safe(u, tmp, &_user_list, node) { + list_del(&u->node); + free(u->name); + free(u->rsa); + free(u); + } + } else + INIT_LIST_HEAD(&_user_list); + initialized = 1; + populate_user_list(); +} + +/** + * lookup user in user_list. + * + * \param user: must initially contain the name of the user and is filled + * in by this function on success. + * + * \return 1 on success and < 0 on errors. + */ +int _get_user(struct _user *user) +{ + struct _user *u; + list_for_each_entry(u, &_user_list, node) { + if (strcmp(u->name, user->name)) + continue; + *user = *u; + return 1; + } + return -E_BAD_USER; +} + +static void init_selector(void) { int i, ret; - mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */ + mmd->selector_change = -1; /* no change nec., set to new num by com_chs */ if (!conf.selector_given) goto random; - for (i = 0; dblist[i].name; i++) { - if (strcmp(dblist[i].name, conf.selector_arg)) + for (i = 0; selectors[i].name; i++) { + if (strcmp(selectors[i].name, conf.selector_arg)) continue; PARA_NOTICE_LOG("initializing %s audio file selector\n", - dblist[i].name); - ret = dblist[i].init(&dblist[i]); + selectors[i].name); + ret = selectors[i].init(&selectors[i]); if (ret < 0) { PARA_WARNING_LOG("%s", PARA_STRERROR(-ret)); break; } - mmd->dbt_num = i; + mmd->selector_num = i; return; } PARA_WARNING_LOG("%s", "falling back to the random selector\n"); random: - mmd->dbt_num = 0; - dblist[0].init(&dblist[0]); /* always successful */ + mmd->selector_num = 0; + selectors[0].init(&selectors[0]); /* always successful */ } static unsigned init_network(void) { - int sockfd = init_tcp_socket(conf.port_arg); + int fd, ret = init_tcp_socket(conf.port_arg); - if (sockfd < 0) - exit(EXIT_FAILURE); - return sockfd; + if (ret < 0) + goto err; + fd = ret; + ret = mark_fd_nonblock(fd); + if (ret < 0) + goto err; + return fd; +err: + PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + exit(EXIT_FAILURE); } static void init_random_seed(void) @@ -317,7 +427,7 @@ static void init_random_seed(void) int fd, ret = -1, len = sizeof(unsigned int); unsigned int seed; - fd = open("/dev/random", O_RDONLY); + fd = open("/dev/urandom", O_RDONLY); if (fd < 0) goto out; ret = -2; @@ -342,17 +452,18 @@ static unsigned do_inits(int argc, char **argv) init_random_seed(); /* parse command line options */ - cmdline_parser(argc, argv, &conf); - para_drop_privileges(conf.user_arg); + server_cmdline_parser(argc, argv, &conf); + para_drop_privileges(conf.user_arg, conf.group_arg); /* parse config file, open log and set defaults */ parse_config(0); log_welcome("para_server", conf.loglevel_arg); shm_init(); /* init mmd struct */ server_uptime(UPTIME_SET); /* reset server uptime */ + init_user_list(); /* become daemon */ if (conf.daemon_given) daemon_init(); - init_dbtool(); + init_selector(); PARA_NOTICE_LOG("%s", "initializing audio file sender\n"); /* audio file sender */ afs_init(); @@ -362,29 +473,25 @@ static unsigned do_inits(int argc, char **argv) /* init network socket */ PARA_NOTICE_LOG("%s", "initializing tcp command socket\n"); sockfd = init_network(); - if (conf.autoplay_given) { - mmd->afs_status_flags |= AFS_PLAYING; - mmd->new_afs_status_flags |= AFS_PLAYING; - } PARA_NOTICE_LOG("%s", "init complete\n"); return sockfd; } -static void handle_dbt_change(void) +static void change_selector(void) { - int ret, old = mmd->dbt_num, new = mmd->dbt_change; + int ret, old = mmd->selector_num, new = mmd->selector_change; - dblist[old].shutdown(); - ret = dblist[new].init(&dblist[new]); - mmd->dbt_change = -1; /* reset */ + selectors[old].shutdown(); + ret = selectors[new].init(&selectors[new]); + mmd->selector_change = -1; /* reset */ if (ret >= 0) { - mmd->dbt_num = new; + mmd->selector_num = new; return; } /* init failed */ PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret)); - dblist[0].init(&dblist[0]); - mmd->dbt_num = 0; + selectors[0].init(&selectors[0]); + mmd->selector_num = 0; } /* @@ -396,8 +503,8 @@ static void handle_sighup(void) close_log(logfile); /* gets reopened if necessary by parse_config */ logfile = NULL; parse_config(1); /* reopens log */ - mmd->dbt_change = mmd->dbt_num; /* do not change selector */ - handle_dbt_change(); /* reload selector */ + mmd->selector_change = mmd->selector_num; /* do not change selector.. */ + change_selector(); /* .. just reload */ } static void status_refresh(void) @@ -431,7 +538,7 @@ int main(int argc, char *argv[]) /* listen on sock_fd, new connection on new_fd */ int sockfd, new_fd; struct sockaddr_in their_addr; - int err, i, max_fileno, ret; + int i, max_fileno, ret; pid_t chld_pid; fd_set rfds, wfds; struct timeval *timeout; @@ -439,14 +546,12 @@ int main(int argc, char *argv[]) valid_fd_012(); sockfd = do_inits(argc, argv); repeat: - /* check socket and signal pipe in any case */ FD_ZERO(&rfds); FD_ZERO(&wfds); - FD_SET(sockfd, &rfds); - max_fileno = sockfd; - FD_SET(signal_pipe, &rfds); - max_fileno = MAX(max_fileno, signal_pipe); - + max_fileno = -1; + /* check socket and signal pipe in any case */ + para_fd_set(sockfd, &rfds, &max_fileno); + para_fd_set(signal_pipe, &rfds, &max_fileno); timeout = afs_preselect(); status_refresh(); for (i = 0; senders[i].name; i++) { @@ -454,44 +559,30 @@ repeat: continue; if (!senders[i].pre_select) continue; - senders[i].pre_select(mmd->audio_format >= 0? - &afl[mmd->audio_format] : NULL, - &max_fileno, - &rfds, &wfds); + senders[i].pre_select( &max_fileno, &rfds, &wfds); } - if (dblist[mmd->dbt_num].pre_select) { - ret = dblist[mmd->dbt_num].pre_select(&rfds, &wfds); - max_fileno = MAX(max_fileno, ret); + if (selectors[mmd->selector_num].pre_select) { + ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds); + max_fileno = PARA_MAX(max_fileno, ret); } mmd_unlock(); -// PARA_DEBUG_LOG("%s: select (max = %i)\n", __func__, max_fileno); - ret = select(max_fileno + 1, &rfds, &wfds, NULL, timeout); - err = errno; - //PARA_DEBUG_LOG("%s: select returned %i\n", __func__, ret); + ret = para_select(max_fileno + 1, &rfds, &wfds, timeout); mmd_lock(); - if (mmd->dbt_change >= 0) - handle_dbt_change(); - if (dblist[mmd->dbt_num].post_select) - dblist[mmd->dbt_num].post_select(&rfds, &wfds); - if (ret < 0 && err == EINTR) - goto repeat; - if (ret < 0) { - PARA_CRIT_LOG("select error (%s)\n", strerror(err)); + if (mmd->selector_change >= 0) + change_selector(); + if (selectors[mmd->selector_num].post_select) + selectors[mmd->selector_num].post_select(&rfds, &wfds); + if (ret < 0) goto repeat; - } for (i = 0; senders[i].name; i++) { if (senders[i].status != SENDER_ON) continue; if (!senders[i].post_select) continue; - senders[i].post_select(mmd->audio_format >= 0? - &afl[mmd->audio_format] : NULL, - &rfds, &wfds); - } - if (!ret) { - afs_send_chunk(); - status_refresh(); + senders[i].post_select(&rfds, &wfds); } + afs_send_chunk(); + status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig; sig = para_next_signal(); @@ -507,7 +598,7 @@ repeat: case SIGTERM: PARA_EMERG_LOG("terminating on signal %d\n", sig); kill(0, SIGTERM); - dblist[mmd->dbt_num].shutdown(); + selectors[mmd->selector_num].shutdown(); mutex_destroy(mmd_mutex); shm_detach(mmd); shm_destroy(mmd_shm_id);