X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=d82bd5d71ca3ed6bf2fa40777c5a5b1231fd897f;hp=f9ef6cd75ab8733408d3c2542230ae806281bf85;hb=bda95f9508b456dcea89d300f6d4104e30ab9f3e;hpb=de96aa2a6141626fce73aa682efc37912f4778a4 diff --git a/command.c b/command.c index f9ef6cd7..d82bd5d7 100644 --- a/command.c +++ b/command.c @@ -10,8 +10,6 @@ #include #include #include -#include -#include #include #include @@ -27,7 +25,6 @@ #include "list.h" #include "send.h" #include "vss.h" -#include "rc4.h" #include "net.h" #include "daemon.h" #include "fd.h" @@ -37,6 +34,7 @@ #include "afs_command_list.h" #include "sched.h" #include "signal.h" +#include "version.h" /** Commands including options must be shorter than this. */ #define MAX_COMMAND_LEN 32768 @@ -44,7 +42,7 @@ extern int mmd_mutex; extern struct misc_meta_data *mmd; extern struct sender senders[]; -int send_afs_status(struct rc4_context *rc4c, int parser_friendly); +int send_afs_status(struct stream_cipher_context *scc, int parser_friendly); const char *status_item_list[] = {STATUS_ITEM_ARRAY}; @@ -189,7 +187,7 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman return 1; } -int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) +int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv) { int i, ret; char *msg = NULL; @@ -202,7 +200,7 @@ int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) free(msg); msg = tmp; } - ret = rc4_send_buffer(rc4c, msg); + ret = sc_send_buffer(scc, msg); free(msg); return ret; } @@ -211,7 +209,7 @@ int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) if (scd.sender_num < 0) return ret; msg = senders[scd.sender_num].help(); - ret = rc4_send_buffer(rc4c, msg); + ret = sc_send_buffer(scc, msg); free(msg); return ret; } @@ -240,7 +238,7 @@ int com_sender(struct rc4_context *rc4c, int argc, char * const * argv) } /* server info */ -int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { int i, ret; char *ut; @@ -255,7 +253,8 @@ int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv) free(info); } ut = uptime_str(); - ret = rc4_send_va_buffer(rc4c, "up: %s\nplayed: %u\n" + ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n" + "up: %s\nplayed: %u\n" "server_pid: %d\n" "afs_pid: %d\n" "connections (active/accepted/total): %u/%u/%u\n" @@ -279,11 +278,11 @@ int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv) } /* version */ -int com_version(struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_version(struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; - return rc4_send_buffer(rc4c, VERSION_TEXT("server") + return sc_send_buffer(scc, VERSION_TEXT("server") "built: " BUILD_DATE "\n" UNAME_RS ", " CC_VERSION "\n" ); @@ -345,7 +344,7 @@ static char *empty_status_items(int parser_friendly) #undef EMPTY_STATUS_ITEMS /* stat */ -int com_stat(struct rc4_context *rc4c, int argc, char * const * argv) +int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv) { int i, ret; struct misc_meta_data tmp, *nmmd = &tmp; @@ -380,7 +379,7 @@ int com_stat(struct rc4_context *rc4c, int argc, char * const * argv) for (;;) { mmd_dup(nmmd); s = get_status(nmmd, parser_friendly); - ret = rc4_send_buffer(rc4c, s); + ret = sc_send_buffer(scc, s); free(s); if (ret < 0) goto out; @@ -388,11 +387,11 @@ int com_stat(struct rc4_context *rc4c, int argc, char * const * argv) static char *esi; if (!esi) esi = empty_status_items(parser_friendly); - ret = rc4_send_buffer(rc4c, esi); + ret = sc_send_buffer(scc, esi); if (ret < 0) goto out; } else - send_afs_status(rc4c, parser_friendly); + send_afs_status(scc, parser_friendly); ret = 1; if (num > 0 && !--num) goto out; @@ -404,14 +403,14 @@ out: return ret; } -static int send_list_of_commands(struct rc4_context *rc4c, struct server_command *cmd, +static int send_list_of_commands(struct stream_cipher_context *scc, struct server_command *cmd, const char *handler) { int ret, i; for (i = 1; cmd->name; cmd++, i++) { char *perms = cmd_perms_itohuman(cmd->perms); - ret = rc4_send_va_buffer(rc4c, "%s\t%s\t%s\t%s\n", cmd->name, + ret = sc_send_va_buffer(scc, "%s\t%s\t%s\t%s\n", cmd->name, handler, perms, cmd->description); @@ -444,7 +443,7 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler) } /* help */ -int com_help(struct rc4_context *rc4c, int argc, char * const * argv) +int com_help(struct stream_cipher_context *scc, int argc, char * const * argv) { struct server_command *cmd; char *perms, *handler; @@ -452,16 +451,16 @@ int com_help(struct rc4_context *rc4c, int argc, char * const * argv) if (argc < 2) { /* no argument given, print list of commands */ - if ((ret = send_list_of_commands(rc4c, server_cmds, "server")) < 0) + if ((ret = send_list_of_commands(scc, server_cmds, "server")) < 0) return ret; - return send_list_of_commands(rc4c, afs_cmds, "afs"); + return send_list_of_commands(scc, afs_cmds, "afs"); } /* argument given for help */ cmd = get_cmd_ptr(argv[1], &handler); if (!cmd) return -E_BAD_CMD; perms = cmd_perms_itohuman(cmd->perms); - ret = rc4_send_va_buffer(rc4c, + ret = sc_send_va_buffer(scc, "%s - %s\n\n" "handler: %s\n" "permissions: %s\n" @@ -480,7 +479,7 @@ int com_help(struct rc4_context *rc4c, int argc, char * const * argv) } /* hup */ -int com_hup(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_hup(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -489,7 +488,7 @@ int com_hup(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * con } /* term */ -int com_term(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_term(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -497,7 +496,7 @@ int com_term(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * co return 1; } -int com_play(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_play(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -510,7 +509,7 @@ int com_play(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * co } /* stop */ -int com_stop(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_stop(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -523,7 +522,7 @@ int com_stop(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * co } /* pause */ -int com_pause(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_pause(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -538,7 +537,7 @@ int com_pause(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * c } /* next */ -int com_next(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_next(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -550,7 +549,7 @@ int com_next(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * co } /* nomore */ -int com_nomore(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv) +int com_nomore(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv) { if (argc != 1) return -E_COMMAND_SYNTAX; @@ -562,7 +561,7 @@ int com_nomore(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * } /* ff */ -int com_ff(__a_unused struct rc4_context *rc4c, int argc, char * const * argv) +int com_ff(__a_unused struct stream_cipher_context *scc, int argc, char * const * argv) { long promille; int ret, backwards = 0; @@ -601,7 +600,7 @@ out: } /* jmp */ -int com_jmp(__a_unused struct rc4_context *rc4c, int argc, char * const * argv) +int com_jmp(__a_unused struct stream_cipher_context *scc, int argc, char * const * argv) { long unsigned int i; int ret; @@ -655,7 +654,7 @@ static struct server_command *parse_cmd(const char *cmdstr) return get_cmd_ptr(buf, NULL); } -static int read_command(struct rc4_context *rc4c, char **result) +static int read_command(struct stream_cipher_context *scc, char **result) { int ret; char buf[4096]; @@ -665,7 +664,7 @@ static int read_command(struct rc4_context *rc4c, char **result) size_t numbytes; char *p; - ret = rc4_recv_buffer(rc4c, buf, sizeof(buf)); + ret = sc_recv_buffer(scc, buf, sizeof(buf)); if (ret < 0) goto out; if (!ret) @@ -710,7 +709,7 @@ static void reset_signals(void) * calls this function. * * An RSA-based challenge/response is used to authenticate - * the peer. It that authentication succeeds, a random RC4 + * the peer. It that authentication succeeds, a random * session key is generated and sent back to the peer, * encrypted with its RSA public key. From this point on, * all transfers are crypted with this session key. @@ -724,20 +723,20 @@ static void reset_signals(void) * which terminates the function if the connection was not * authenticated when the timeout expires. * - * \sa alarm(2), rc4(3), crypt.c, crypt.h + * \sa alarm(2), crypt.c, crypt.h */ __noreturn void handle_connect(int fd, const char *peername) { int ret, argc; char buf[4096]; - unsigned char rand_buf[CHALLENGE_SIZE + 2 * RC4_KEY_LEN]; - unsigned char challenge_sha1[HASH_SIZE]; + 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 rc4_context rc4c = {.fd = fd}; + struct stream_cipher_context scc = {.fd = fd}; reset_signals(); /* we need a blocking fd here as recv() might return EAGAIN otherwise. */ @@ -767,7 +766,7 @@ __noreturn void handle_connect(int fd, const char *peername) u = lookup_user(p); if (u) { get_random_bytes_or_die(rand_buf, sizeof(rand_buf)); - ret = para_encrypt_buffer(u->rsa, rand_buf, sizeof(rand_buf), + ret = pub_encrypt(u->pubkey, rand_buf, sizeof(rand_buf), (unsigned char *)buf); if (ret < 0) goto net_err; @@ -796,26 +795,25 @@ __noreturn void handle_connect(int fd, const char *peername) if (!u) goto net_err; /* - * The correct response is the sha1 of the first CHALLENGE_SIZE bytes + * The correct response is the hash of the first CHALLENGE_SIZE bytes * of the random data. */ ret = -E_BAD_AUTH; if (numbytes != HASH_SIZE) goto net_err; - sha1_hash((char *)rand_buf, CHALLENGE_SIZE, challenge_sha1); - if (memcmp(challenge_sha1, buf, HASH_SIZE)) + hash_function((char *)rand_buf, CHALLENGE_SIZE, challenge_hash); + if (memcmp(challenge_hash, buf, HASH_SIZE)) goto net_err; /* auth successful */ alarm(0); PARA_INFO_LOG("good auth for %s\n", u->name); - /* init rc4 keys with the second part of the random buffer */ - RC4_set_key(&rc4c.recv_key, RC4_KEY_LEN, rand_buf + CHALLENGE_SIZE); - RC4_set_key(&rc4c.send_key, RC4_KEY_LEN, rand_buf + CHALLENGE_SIZE - + RC4_KEY_LEN); - ret = rc4_send_buffer(&rc4c, PROCEED_MSG); + /* 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); if (ret < 0) goto net_err; - ret = read_command(&rc4c, &command); + ret = read_command(&scc, &command); if (ret == -E_COMMAND_SYNTAX) goto err_out; if (ret < 0) @@ -835,7 +833,7 @@ __noreturn void handle_connect(int fd, const char *peername) argc = ret; PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name, peername); - ret = cmd->handler(&rc4c, argc, argv); + ret = cmd->handler(&scc, argc, argv); free_argv(argv); mutex_lock(mmd_mutex); mmd->num_commands++; @@ -843,11 +841,13 @@ __noreturn void handle_connect(int fd, const char *peername) if (ret >= 0) goto out; err_out: - rc4_send_va_buffer(&rc4c, "%s\n", para_strerror(-ret)); + sc_send_va_buffer(&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); mutex_lock(mmd_mutex); if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0) mmd->events++;