X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=66c658acb3f5c33a98eb2cf4bdf0249f26d9d1bc;hp=1f94bbc25cc634d4b889e975106e32bb67c0c69f;hb=883af7d8af543616fe4ca09b0273dd4f59848779;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99 diff --git a/command.c b/command.c index 1f94bbc2..66c658ac 100644 --- a/command.c +++ b/command.c @@ -18,9 +18,7 @@ /** \file command.c does client authentication and executes server commands */ -#include /* mallinfo */ #include /* gettimeofday */ -#include "crypt.h" #include "server.cmdline.h" #include "db.h" #include "server.h" @@ -32,20 +30,16 @@ #include "net.h" #include "daemon.h" #include "string.h" +#include "fd.h" +#include "user_list.h" -void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, - unsigned char *outdata) = NULL; -void (*crypt_function_send)(unsigned long len, const unsigned char *indata, - unsigned char *outdata) = NULL; static RC4_KEY rc4_recv_key; static RC4_KEY rc4_send_key; static unsigned char rc4_buf[2 * RC4_KEY_LEN]; extern const char *status_item_list[NUM_STAT_ITEMS]; extern struct misc_meta_data *mmd; -extern struct gengetopt_args_info conf; extern struct audio_file_selector selectors[]; -extern struct audio_format afl[]; extern struct sender senders[]; extern char *user_list; struct sockaddr_in *in_addr; @@ -434,9 +428,12 @@ static char *get_status(struct misc_meta_data *nmmd) nmmd->audio_file_info, status_item_list[SI_UPTIME], ut, - status_item_list[SI_STREAM_START], nmmd->stream_start.tv_sec, - nmmd->stream_start.tv_usec, - status_item_list[SI_CURRENT_TIME], now.tv_sec, now.tv_usec + status_item_list[SI_STREAM_START], + (long unsigned)nmmd->stream_start.tv_sec, + (long unsigned)nmmd->stream_start.tv_usec, + status_item_list[SI_CURRENT_TIME], + (long unsigned)now.tv_sec, + (long unsigned)now.tv_usec ); free(bar); @@ -559,7 +556,6 @@ static int com_si(int fd, int argc, __a_unused char **argv) int i, ret; char *ut; char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL; - struct mallinfo mi = mallinfo(); if (argc != 1) return -E_COMMAND_SYNTAX; @@ -578,7 +574,6 @@ static int com_si(int fd, int argc, __a_unused char **argv) ut = uptime_str(); ret = send_va_buffer(fd, "up: %s\nplayed: %u\n" "pid: %d\n" - "mallinfo: %d\n" "connections (active/accepted/total): %u/%u/%u\n" "current loglevel: %i\n" "supported audio file selectors: %s\n" @@ -587,13 +582,12 @@ static int com_si(int fd, int argc, __a_unused char **argv) "%s", ut, mmd->num_played, getppid(), - mi.arena / 1024, mmd->active_connections, mmd->num_commands, mmd->num_connects, conf.loglevel_arg, selector_string, - SUPPORTED_AUDIO_FORMATS, + supported_audio_formats(), sender_list, sender_info ); @@ -610,7 +604,8 @@ static int com_version(int socket_fd, int argc, __a_unused char **argv) { if (argc != 1) return -E_COMMAND_SYNTAX; - return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n" + return send_buffer(socket_fd, "para_server-" PACKAGE_VERSION ", \"" + CODENAME "\"\n" COPYRIGHT "\n" "built: " BUILD_DATE "\n" SYSTEM ", " CC_VERSION "\n" @@ -696,17 +691,20 @@ static int com_stat(int socket_fd, int argc, char **argv) ret = 1; if (num == 1) goto out; - usleep(500000 * 100); + sleep(50); + if (getppid() == 1) + return -E_SERVER_CRASH; } out: return ret; } -static int send_description(int fd, struct server_command *cmd, const char *handler, int num) +static int send_list_of_commands(int fd, struct server_command *cmd, + const char *handler) { int ret, i; - for (i = 1; cmd->name && (!num || i <= num); cmd++, i++) { + for (i = 1; cmd->name; cmd++, i++) { char *perms = cmd_perms_itohuman(cmd->perms); ret = send_va_buffer(fd, "%s\t%s\t%s\t%s\n", cmd->name, handler, @@ -752,13 +750,13 @@ static int com_help(int fd, int argc, char **argv) if (argc < 2) { /* no argument given, print list of commands */ - if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0) + if ((ret = send_list_of_commands(fd, cmd_struct, "server")) < 0) return ret; mmd_lock(); handler = para_strdup(selectors[mmd->selector_num].name); cmd = selectors[mmd->selector_num].cmd_list; mmd_unlock(); - ret = send_description(fd, cmd, handler, 0); + ret = send_list_of_commands(fd, cmd, handler); free(handler); return ret; } @@ -995,73 +993,6 @@ long int para_rand(long unsigned max) return (long int) ((max + 0.0) * (random() / (RAND_MAX + 1.0))); } -/* Open user_list file, returns pointer to opened file on success, - * NULL on errors - */ -static FILE *open_user_list(char *file) -{ - PARA_DEBUG_LOG("opening user list %s\n", file); - return fopen(file, "r"); -} - -/* - * 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 int get_user(struct user *user) { - FILE *file_ptr; - char *char_ptr; - char line[MAXLINE]; - /* keyword, user, key, perms */ - char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE]; - int num; - - file_ptr = open_user_list(user_list); - if (!file_ptr) - return -E_USERLIST; - while (fgets(line, MAXLINE, file_ptr)) { -// PARA_DEBUG_LOG("%s: Read line (%i bytes) " -// "from config file\n", __func__, strlen(line)); - if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3) - continue; - if (!strcmp(w, "user") && !strcmp(user->name, n)) { - PARA_DEBUG_LOG("found entry for %s\n", n); - strcpy(user->name, n); - strcpy(user->pubkey_file, k); - user->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); - user->perms = 0; - while (num > 0) { - num--; - //PARA_DEBUG_LOG("%s: tmp[%i]=%s\n", __func__, - // num, tmp[num]); - if (!strcmp(tmp[num], "AFS_READ")) - user->perms = - user->perms | AFS_READ; - else if (!strcmp(tmp[num], "AFS_WRITE")) - user->perms = - user->perms | AFS_WRITE; - else if (!strcmp(tmp[num], "DB_READ")) - user->perms = user->perms | DB_READ; - else if (!strcmp(tmp[num], "DB_WRITE")) - user->perms = user->perms | DB_WRITE; - else /* unknown permission */ - PARA_WARNING_LOG("unknown permission:" - "%s\n", tmp[num]); - } - fclose(file_ptr); - return 1; - } - } - fclose(file_ptr); - return 0; -} - static void init_rc4_keys(void) { int i; @@ -1075,12 +1006,14 @@ static void init_rc4_keys(void) RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN); } -static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata) +static void rc4_recv(unsigned long len, const unsigned char *indata, + unsigned char *outdata, __a_unused void *private_data) { RC4(&rc4_recv_key, len, indata, outdata); } -static void rc4_send(unsigned long len, const unsigned char *indata, unsigned char *outdata) +static void rc4_send(unsigned long len, const unsigned char *indata, + unsigned char *outdata, __a_unused void *private_data) { RC4(&rc4_send_key, len, indata, outdata); } @@ -1105,7 +1038,8 @@ int handle_connect(int fd, struct sockaddr_in *addr) in_addr = addr; challenge_nr = random(); /* send Welcome message */ - ret = send_va_buffer(fd, "This is para_server, version " VERSION ".\n" ); + ret = send_va_buffer(fd, "This is para_server, version " + PACKAGE_VERSION ".\n" ); if (ret < 0) goto err_out; /* recv auth request line */ @@ -1122,23 +1056,21 @@ int handle_connect(int fd, struct sockaddr_in *addr) goto err_out; if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9)) - strcpy(u.name, buf + 5); /* client version < 0.2.6 */ + u.name = para_strdup(buf + 5); /* client version < 0.2.6 */ else { - strcpy(u.name, buf + 9); /* client version >= 0.2.6 */ + u.name = para_strdup(buf + 9); /* client version >= 0.2.6 */ use_rc4 = 1; } -// strcpy(u.name, buf + 5); /* ok, but ugly */ PARA_DEBUG_LOG("received %s request for user %s\n", use_rc4? "rc4" : "auth", u.name); - /* lookup user in list file */ - if ((ret = get_user(&u)) < 0) + if ((ret = lookup_user(&u)) < 0) goto err_out; if (!ret) { /* user not found */ PARA_WARNING_LOG("auth request for unknown user %s\n", u.name); ret = -E_BAD_USER; goto err_out; } - ret = para_encrypt_challenge(u.pubkey_file, challenge_nr, crypt_buf); + ret = para_encrypt_challenge(u.rsa, challenge_nr, crypt_buf); if (ret <= 0) goto err_out; numbytes = ret; @@ -1163,7 +1095,7 @@ int handle_connect(int fd, struct sockaddr_in *addr) sprintf(buf, "%s", PROCEED_MSG); if (use_rc4) { init_rc4_keys(); - ret = para_encrypt_buffer(u.pubkey_file, rc4_buf, 2 * RC4_KEY_LEN, + ret = para_encrypt_buffer(u.rsa, rc4_buf, 2 * RC4_KEY_LEN, (unsigned char *)buf + PROCEED_MSG_LEN + 1); if (ret <= 0) goto err_out; @@ -1173,11 +1105,8 @@ int handle_connect(int fd, struct sockaddr_in *addr) ret = send_bin_buffer(fd, buf, numbytes); if (ret < 0) goto err_out; - if (use_rc4) { - crypt_function_recv = rc4_recv; - crypt_function_send = rc4_send; - PARA_INFO_LOG("%s", "rc4 encrytion activated\n"); - } + if (use_rc4) + enable_crypt(fd, rc4_recv, rc4_send, NULL); /* read command */ while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) { // PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);