X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=cdc42fa1a220662ac7413b52fc40aba0f56e14d8;hp=74d82697dd241c8c435bf2f78d0052a1b5df9b10;hb=e151dbb79eac16326585ec0a33cf48029f5f22f4;hpb=474b4dfc006b9a7520d017ca4c82aab589dff934 diff --git a/command.c b/command.c index 74d82697..cdc42fa1 100644 --- a/command.c +++ b/command.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2011 Andre Noll + * Copyright (C) 1997-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -11,7 +11,6 @@ #include #include #include -#include #include "para.h" #include "error.h" @@ -24,6 +23,7 @@ #include "server.h" #include "list.h" #include "send.h" +#include "sched.h" #include "vss.h" #include "net.h" #include "daemon.h" @@ -32,7 +32,6 @@ #include "user_list.h" #include "server_command_list.h" #include "afs_command_list.h" -#include "sched.h" #include "signal.h" #include "version.h" @@ -42,9 +41,7 @@ extern int mmd_mutex; extern struct misc_meta_data *mmd; extern struct sender senders[]; -int send_afs_status(struct stream_cipher_context *scc, int parser_friendly); - -const char *status_item_list[] = {STATUS_ITEM_ARRAY}; +int send_afs_status(struct command_context *cc, int parser_friendly); static void dummy(__a_unused int s) { @@ -108,7 +105,8 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly) { char mtime[30] = ""; char *status, *flags; /* vss status info */ - char *ut = uptime_str(); + /* nobody updates our version of "now" */ + char *ut = get_server_uptime_str(NULL); long offset = (nmmd->offset + 500) / 1000; struct timeval current_time; struct tm mtime_tm; @@ -126,7 +124,7 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly) * The calls to WRITE_STATUS_ITEM() below never fail because * b->max_size is zero (unlimited), see para_printf(). However, clang * is not smart enough to prove this and complains nevertheless. - * Casting the return value to void silences solves this. + * Casting the return value to void silences clang. */ (void)WRITE_STATUS_ITEM(&b, SI_FILE_SIZE, "%zu\n", nmmd->size / 1024); (void)WRITE_STATUS_ITEM(&b, SI_MTIME, "%s\n", mtime); @@ -193,29 +191,29 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman return 1; } -int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv) +int com_sender(struct command_context *cc) { int i, ret; char *msg = NULL; struct sender_command_data scd; - if (argc < 2) { + if (cc->argc < 2) { for (i = 0; senders[i].name; i++) { char *tmp = make_message("%s%s\n", msg? msg : "", senders[i].name); free(msg); msg = tmp; } - ret = sc_send_buffer(scc, msg); + ret = sc_send_buffer(&cc->scc, msg); free(msg); return ret; } - ret = check_sender_args(argc, argv, &scd); + ret = check_sender_args(cc->argc, cc->argv, &scd); if (ret < 0) { if (scd.sender_num < 0) return ret; msg = senders[scd.sender_num].help(); - ret = sc_send_buffer(scc, msg); + ret = sc_send_buffer(&cc->scc, msg); free(msg); return ret; } @@ -224,7 +222,7 @@ int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv) case SENDER_ADD: case SENDER_DELETE: assert(senders[scd.sender_num].resolve_target); - ret = senders[scd.sender_num].resolve_target(argv[3], &scd); + ret = senders[scd.sender_num].resolve_target(cc->argv[3], &scd); if (ret < 0) return ret; } @@ -244,13 +242,13 @@ int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv) } /* server info */ -int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_si(struct command_context *cc) { int i, ret; char *ut; char *sender_info = NULL; - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); for (i = 0; senders[i].name; i++) { @@ -258,8 +256,8 @@ int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const sender_info = para_strcat(sender_info, info); free(info); } - ut = uptime_str(); - ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n" + ut = get_server_uptime_str(now); + ret = sc_send_va_buffer(&cc->scc, "version: " GIT_VERSION "\n" "up: %s\nplayed: %u\n" "server_pid: %d\n" "afs_pid: %d\n" @@ -284,11 +282,11 @@ int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const } /* version */ -int com_version(struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_version(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; - return sc_send_buffer(scc, VERSION_TEXT("server") + return sc_send_buffer(&cc->scc, VERSION_TEXT("server") "built: " BUILD_DATE "\n" UNAME_RS ", " CC_VERSION "\n" ); @@ -350,7 +348,7 @@ static char *empty_status_items(int parser_friendly) #undef EMPTY_STATUS_ITEMS /* stat */ -int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv) +int com_stat(struct command_context *cc) { int i, ret; struct misc_meta_data tmp, *nmmd = &tmp; @@ -360,8 +358,8 @@ int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv) para_sigaction(SIGUSR1, dummy); - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -380,12 +378,12 @@ int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv) } return -E_COMMAND_SYNTAX; } - if (i != argc) + if (i != cc->argc) return -E_COMMAND_SYNTAX; for (;;) { mmd_dup(nmmd); s = get_status(nmmd, parser_friendly); - ret = sc_send_buffer(scc, s); + ret = sc_send_buffer(&cc->scc, s); free(s); if (ret < 0) goto out; @@ -393,11 +391,11 @@ int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv) static char *esi; if (!esi) esi = empty_status_items(parser_friendly); - ret = sc_send_buffer(scc, esi); + ret = sc_send_buffer(&cc->scc, esi); if (ret < 0) goto out; } else - send_afs_status(scc, parser_friendly); + send_afs_status(cc, parser_friendly); ret = 1; if (num > 0 && !--num) goto out; @@ -449,30 +447,30 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler) } /* help */ -int com_help(struct stream_cipher_context *scc, int argc, char * const * argv) +int com_help(struct command_context *cc) { struct server_command *cmd; char *perms, *handler; int ret; - if (argc < 2) { + if (cc->argc < 2) { /* no argument given, print list of commands */ - if ((ret = send_list_of_commands(scc, server_cmds, "server")) < 0) + if ((ret = send_list_of_commands(&cc->scc, server_cmds, "server")) < 0) return ret; - return send_list_of_commands(scc, afs_cmds, "afs"); + return send_list_of_commands(&cc->scc, afs_cmds, "afs"); } /* argument given for help */ - cmd = get_cmd_ptr(argv[1], &handler); + cmd = get_cmd_ptr(cc->argv[1], &handler); if (!cmd) return -E_BAD_CMD; perms = cmd_perms_itohuman(cmd->perms); - ret = sc_send_va_buffer(scc, + ret = sc_send_va_buffer(&cc->scc, "%s - %s\n\n" "handler: %s\n" "permissions: %s\n" "usage: %s\n\n" "%s\n", - argv[1], + cc->argv[1], cmd->description, handler, perms, @@ -485,39 +483,38 @@ int com_help(struct stream_cipher_context *scc, int argc, char * const * argv) } /* hup */ -int com_hup(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_hup(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; kill(getppid(), SIGHUP); return 1; } /* term */ -int com_term(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_term(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; kill(getppid(), SIGTERM); return 1; } -int com_play(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_play(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); mmd->new_vss_status_flags |= VSS_PLAYING; mmd->new_vss_status_flags &= ~VSS_NOMORE; mutex_unlock(mmd_mutex); return 1; - } /* stop */ -int com_stop(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_stop(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); mmd->new_vss_status_flags &= ~VSS_PLAYING; @@ -528,9 +525,9 @@ int com_stop(__a_unused struct stream_cipher_context *scc, int argc, __a_unused } /* pause */ -int com_pause(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_pause(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); if (!vss_paused() && !vss_stopped()) { @@ -543,9 +540,9 @@ int com_pause(__a_unused struct stream_cipher_context *scc, int argc, __a_unused } /* next */ -int com_next(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_next(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); mmd->events++; @@ -555,9 +552,9 @@ int com_next(__a_unused struct stream_cipher_context *scc, int argc, __a_unused } /* nomore */ -int com_nomore(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) +int com_nomore(struct command_context *cc) { - if (argc != 1) + if (cc->argc != 1) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); if (vss_playing() || vss_paused()) @@ -567,16 +564,16 @@ int com_nomore(__a_unused struct stream_cipher_context *scc, int argc, __a_unuse } /* ff */ -int com_ff(__a_unused struct stream_cipher_context *scc, int argc, char * const * argv) +int com_ff(struct command_context *cc) { long promille; int ret, backwards = 0; unsigned i; char c; - if (argc != 2) + if (cc->argc != 2) return -E_COMMAND_SYNTAX; - if (!(ret = sscanf(argv[1], "%u%c", &i, &c))) + if (!(ret = sscanf(cc->argv[1], "%u%c", &i, &c))) return -E_COMMAND_SYNTAX; if (ret > 1 && c == '-') backwards = 1; /* jmp backwards */ @@ -606,14 +603,14 @@ out: } /* jmp */ -int com_jmp(__a_unused struct stream_cipher_context *scc, int argc, char * const * argv) +int com_jmp(struct command_context *cc) { long unsigned int i; int ret; - if (argc != 2) + if (cc->argc != 2) return -E_COMMAND_SYNTAX; - if (sscanf(argv[1], "%lu", &i) <= 0) + if (sscanf(cc->argv[1], "%lu", &i) <= 0) return -E_COMMAND_SYNTAX; mutex_lock(mmd_mutex); ret = -E_NO_AUDIO_FILE; @@ -704,6 +701,46 @@ static void reset_signals(void) para_sigaction(SIGHUP, SIG_DFL); } +static int parse_auth_request(char *buf, int len, struct user **u, + bool *use_sideband) +{ + int ret; + char *p, *username, **features = NULL; + size_t auth_rq_len = strlen(AUTH_REQUEST_MSG); + + *u = NULL; + *use_sideband = false; + if (len < auth_rq_len + 2) + return -E_AUTH_REQUEST; + if (strncmp(buf, AUTH_REQUEST_MSG, auth_rq_len) != 0) + return -E_AUTH_REQUEST; + username = buf + auth_rq_len; + p = strchr(username, ' '); + if (p) { + int i; + if (p == username) + return -E_AUTH_REQUEST; + *p = '\0'; + p++; + create_argv(p, ",", &features); + for (i = 0; features[i]; i++) { + if (strcmp(features[i], "sideband") == 0) + *use_sideband = true; + else { + ret = -E_BAD_FEATURE; + goto out; + } + } + } + PARA_DEBUG_LOG("received auth request for user %s (sideband = %s)\n", + username, *use_sideband? "true" : "false"); + *u = lookup_user(username); + ret = 1; +out: + free_argv(features); + return ret; +} + /** * Perform user authentication and execute a command. * @@ -733,44 +770,40 @@ static void reset_signals(void) */ __noreturn void handle_connect(int fd, const char *peername) { - int ret, argc; + int ret; char buf[4096]; unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN]; unsigned char challenge_hash[HASH_SIZE]; - struct user *u; - struct server_command *cmd = NULL; - char **argv = NULL; char *p, *command = NULL; size_t numbytes; - struct stream_cipher_context scc = {.fd = fd}; + struct command_context cc_struct = {.peer = peername}, *cc = &cc_struct; + cc->scc.fd = fd; reset_signals(); /* we need a blocking fd here as recv() might return EAGAIN otherwise. */ ret = mark_fd_blocking(fd); if (ret < 0) goto net_err; /* send Welcome message */ - ret = send_va_buffer(fd, "This is para_server, version " - PACKAGE_VERSION ".\n" ); + ret = write_va_buffer(fd, "This is para_server, version " + PACKAGE_VERSION ".\n" + "Features: sideband,foo\n" + ); if (ret < 0) goto net_err; /* recv auth request line */ ret = recv_buffer(fd, buf, sizeof(buf)); if (ret < 0) goto net_err; - if (ret < 10) { - ret = -E_AUTH_REQUEST; - goto net_err; - } - ret = -E_AUTH_REQUEST; - if (strncmp(buf, AUTH_REQUEST_MSG, strlen(AUTH_REQUEST_MSG))) + ret = parse_auth_request(buf, ret, &cc->u, &cc->use_sideband); + if (ret < 0) goto net_err; p = buf + strlen(AUTH_REQUEST_MSG); PARA_DEBUG_LOG("received auth request for user %s\n", p); - u = lookup_user(p); - if (u) { + cc->u = lookup_user(p); + if (cc->u) { get_random_bytes_or_die(rand_buf, sizeof(rand_buf)); - ret = pub_encrypt(u->pubkey, rand_buf, sizeof(rand_buf), + ret = pub_encrypt(cc->u->pubkey, rand_buf, sizeof(rand_buf), (unsigned char *)buf); if (ret < 0) goto net_err; @@ -786,7 +819,7 @@ __noreturn void handle_connect(int fd, const char *peername) } PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n", CHALLENGE_SIZE, numbytes); - ret = send_bin_buffer(fd, buf, numbytes); + ret = write_all(fd, buf, numbytes); if (ret < 0) goto net_err; /* recv challenge response */ @@ -796,7 +829,7 @@ __noreturn void handle_connect(int fd, const char *peername) numbytes = ret; PARA_DEBUG_LOG("received %d bytes challenge response\n", ret); ret = -E_BAD_USER; - if (!u) + if (!cc->u) goto net_err; /* * The correct response is the hash of the first CHALLENGE_SIZE bytes @@ -810,50 +843,50 @@ __noreturn void handle_connect(int fd, const char *peername) goto net_err; /* auth successful */ alarm(0); - PARA_INFO_LOG("good auth for %s\n", u->name); + PARA_INFO_LOG("good auth for %s\n", cc->u->name); /* init stream cipher keys with the second part of the random buffer */ - scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN); - scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN, SESSION_KEY_LEN); - ret = sc_send_buffer(&scc, PROCEED_MSG); + cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN); + cc->scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN, SESSION_KEY_LEN); + ret = sc_send_buffer(&cc->scc, PROCEED_MSG); if (ret < 0) goto net_err; - ret = read_command(&scc, &command); + ret = read_command(&cc->scc, &command); if (ret == -E_COMMAND_SYNTAX) goto err_out; if (ret < 0) goto net_err; ret = -E_BAD_CMD; - cmd = parse_cmd(command); - if (!cmd) + cc->cmd = parse_cmd(command); + if (!cc->cmd) goto err_out; /* valid command, check permissions */ - ret = check_perms(u->perms, cmd); + ret = check_perms(cc->u->perms, cc->cmd); if (ret < 0) goto err_out; /* valid command and sufficient perms */ - ret = create_argv(command, "\n", &argv); + ret = create_argv(command, "\n", &cc->argv); if (ret < 0) goto err_out; - argc = ret; - PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name, - peername); - ret = cmd->handler(&scc, argc, argv); - free_argv(argv); + cc->argc = ret; + PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cc->cmd->name, + cc->u->name, peername); + ret = cc->cmd->handler(cc); + free_argv(cc->argv); mutex_lock(mmd_mutex); mmd->num_commands++; mutex_unlock(mmd_mutex); if (ret >= 0) goto out; err_out: - sc_send_va_buffer(&scc, "%s\n", para_strerror(-ret)); + sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); net_err: PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); out: free(command); - sc_free(scc.recv); - sc_free(scc.send); + sc_free(cc->scc.recv); + sc_free(cc->scc.send); mutex_lock(mmd_mutex); - if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0) + if (cc->cmd && (cc->cmd->perms & AFS_WRITE) && ret >= 0) mmd->events++; mmd->active_connections--; mutex_unlock(mmd_mutex);