X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=3943d6dce76ad83ba0eed281e9756d8f58904e6e;hp=8608f309292ff13dc74bc43b5e2b0b5bdc04807f;hb=408371cd5c6c06cdbd51513ab49ff0bc376cda26;hpb=77d9d57a01b019c53aea8f013b4498042a4f8dba diff --git a/command.c b/command.c index 8608f309..3943d6dc 100644 --- a/command.c +++ b/command.c @@ -17,12 +17,12 @@ #include #include +#include "server.lsg.h" #include "para.h" #include "error.h" #include "crypt.h" #include "sideband.h" #include "command.h" -#include "server.cmdline.h" #include "string.h" #include "afh.h" #include "afs.h" @@ -37,7 +37,6 @@ #include "ipc.h" #include "server_cmd.lsg.h" #include "user_list.h" -#include "afs.command_list.h" #include "signal.h" #include "version.h" @@ -48,26 +47,6 @@ static const unsigned server_command_perms[] = {LSG_SERVER_CMD_AUX_INFOS}; static const char * const server_command_perms_txt[] = {LSG_SERVER_CMD_AUX_INFOS}; #undef SERVER_CMD_AUX_INFO -typedef int server_command_handler_t(struct command_context *); - -/* Defines one command of para_server. */ -struct server_command { - /* The name of the command. */ - const char *name; - /* Pointer to the function that handles the command. */ - server_command_handler_t *handler; - /* The privileges a user must have to execute this command. */ - unsigned int perms; - /* One-line description of the command. */ - const char *description; - /* Summary of the command line options. */ - const char *usage; - /* The long help text. */ - const char *help; -}; - -static struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY}; - /** Commands including options must be shorter than this. */ #define MAX_COMMAND_LEN 32768 @@ -128,8 +107,8 @@ static unsigned get_status(struct misc_meta_data *nmmd, bool parser_friendly, clock_get_realtime(¤t_time); /* * 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. + * b->max_size is zero (unlimited), see \ref para_printf(). However, + * clang is not smart enough to prove this and complains nevertheless. * Casting the return value to void silences clang. */ (void)WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status); @@ -267,10 +246,10 @@ static int check_sender_args(struct command_context *cc, return -E_COMMAND_SYNTAX; scd->sender_num = i; arg = lls_input(1, lpr); - for (i = 0; subcmds[i]; i++) + for (i = 0; i < NUM_SENDER_CMDS; i++) if (!strcmp(subcmds[i], arg)) break; - if (!subcmds[i]) + if (i == NUM_SENDER_CMDS) return -E_COMMAND_SYNTAX; scd->cmd_num = i; if (!senders[scd->sender_num].client_cmds[scd->cmd_num]) @@ -423,7 +402,7 @@ static int com_si(struct command_context *cc, mmd->active_connections, mmd->num_commands, mmd->num_connects, - conf.loglevel_arg, + ENUM_STRING_VAL(LOGLEVEL), AUDIO_FORMAT_HANDLERS ); mutex_unlock(mmd_mutex); @@ -583,21 +562,6 @@ static int send_list_of_commands(struct command_context *cc) return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false); } -/* returns string that must be freed by the caller */ -static struct server_command *get_cmd_ptr(const char *name, char **handler) -{ - struct server_command *cmd; - - /* not found, look for commands supported by afs */ - for (cmd = afs_cmds; cmd->name; cmd++) - if (!strcmp(cmd->name, name)) { - if (handler) - *handler = para_strdup("afs"); - return cmd; - } - return NULL; -} - static int com_help(struct command_context *cc, struct lls_parse_result *lpr) { const char *perms; @@ -790,16 +754,6 @@ static int com_tasks(struct command_context *cc, } EXPORT_SERVER_CMD_HANDLER(tasks); -/* - * check if perms are sufficient to exec a command having perms cmd_perms. - * Returns 0 if perms are sufficient, -E_PERM otherwise. - */ -static int check_perms(unsigned int perms, const struct server_command *cmd_ptr) -{ - PARA_DEBUG_LOG("checking permissions\n"); - return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0; -} - static void reset_signals(void) { para_sigaction(SIGCHLD, SIG_IGN); @@ -809,7 +763,7 @@ static void reset_signals(void) } struct connection_features { - bool aes_ctr128_requested; + int dummy; /* none at the moment */ }; static int parse_auth_request(char *buf, int len, struct user **u, @@ -838,7 +792,7 @@ static int parse_auth_request(char *buf, int len, struct user **u, if (strcmp(features[i], "sideband") == 0) continue; if (strcmp(features[i], "aes_ctr128") == 0) - cf->aes_ctr128_requested = true; + continue; else { ret = -E_BAD_FEATURE; goto out; @@ -858,9 +812,8 @@ out: static int run_command(struct command_context *cc, struct iovec *iov, const char *peername) { - int ret, i; - char *p, *end; - struct server_command *cmd = NULL; + int ret, i, argc; + char *p, *end, **argv; const struct lls_command *lcmd = NULL; unsigned perms; struct lls_parse_result *lpr; @@ -872,46 +825,34 @@ static int run_command(struct command_context *cc, struct iovec *iov, p[iov->iov_len - 1] = '\0'; /* just to be sure */ ret = lls(lls_lookup_subcmd(p, server_cmd_suite, &errctx)); - if (ret >= 0) { - perms = server_command_perms[ret]; - if ((perms & cc->u->perms) != perms) - return -E_PERM; - lcmd = lls_cmd(ret, server_cmd_suite); - } else { - cmd = get_cmd_ptr(p, NULL); - if (!cmd) { - send_errctx(cc, errctx); - return ret; - } - perms = cmd->perms; - ret = check_perms(cc->u->perms, cmd); - if (ret < 0) - return ret; + if (ret < 0) { + send_errctx(cc, errctx); + return ret; } + perms = server_command_perms[ret]; + if ((perms & cc->u->perms) != perms) + return -E_PERM; + lcmd = lls_cmd(ret, server_cmd_suite); end = iov->iov_base + iov->iov_len; for (i = 0; p < end; i++) p += strlen(p) + 1; - cc->argc = i; - cc->argv = para_malloc((cc->argc + 1) * sizeof(char *)); + argc = i; + argv = para_malloc((argc + 1) * sizeof(char *)); for (i = 0, p = iov->iov_base; p < end; i++) { - cc->argv[i] = para_strdup(p); + argv[i] = para_strdup(p); p += strlen(p) + 1; } - cc->argv[cc->argc] = NULL; - PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lcmd? - lls_command_name(lcmd) : cmd->name, cc->u->name, peername); - if (lcmd) { - ret = lls(lls_parse(cc->argc, cc->argv, lcmd, &lpr, &errctx)); - if (ret >= 0) { - const struct server_cmd_user_data *ud = lls_user_data(lcmd); - ret = ud->handler(cc, lpr); - lls_free_parse_result(lpr, lcmd); - } else - send_errctx(cc, errctx); - } else { - ret = cmd->handler(cc); - } - free_argv(cc->argv); + argv[argc] = NULL; + PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lls_command_name(lcmd), + cc->u->name, peername); + ret = lls(lls_parse(argc, argv, lcmd, &lpr, &errctx)); + if (ret >= 0) { + const struct server_cmd_user_data *ud = lls_user_data(lcmd); + ret = ud->handler(cc, lpr); + lls_free_parse_result(lpr, lcmd); + } else + send_errctx(cc, errctx); + free_argv(argv); mutex_lock(mmd_mutex); mmd->num_commands++; if (ret >= 0 && (perms & AFS_WRITE)) @@ -943,7 +884,7 @@ static int run_command(struct command_context *cc, struct iovec *iov, * the function if the connection was not authenticated when the timeout * expires. * - * \sa alarm(2), crypt.c, crypt.h + * \sa alarm(2), \ref crypt.c, \ref crypt.h. */ __noreturn void handle_connect(int fd, const char *peername) { @@ -1022,10 +963,9 @@ __noreturn void handle_connect(int fd, const char *peername) alarm(0); PARA_INFO_LOG("good auth for %s\n", cc->u->name); /* init stream cipher keys with the second part of the random buffer */ - cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN, - cf.aes_ctr128_requested); + 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, cf.aes_ctr128_requested); + SESSION_KEY_LEN); ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false); if (ret < 0) goto net_err;