X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=4b3a155277fbdde2ead5c0ba8ed238770b710169;hp=988eae6435889e7892a0f5734d55aee8bfad49ba;hb=a9126f461792a84c760162ecb25100f1593d427d;hpb=5d67c3dcd623fb61ca6ec4b427eeeb51daeca71e

diff --git a/command.c b/command.c
index 988eae64..4b3a1552 100644
--- a/command.c
+++ b/command.c
@@ -14,6 +14,8 @@
 
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
+#include "command.h"
 #include "server.cmdline.h"
 #include "string.h"
 #include "afh.h"
@@ -30,27 +32,27 @@
 #include "user_list.h"
 #include "server_command_list.h"
 #include "afs_command_list.h"
+#include "sched.h"
+#include "signal.h"
 
 /** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
 
-static RC4_KEY rc4_recv_key;
-static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
 extern int mmd_mutex;
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
-static void dummy(int s)
+static void init_rc4_keys(struct rc4_context *rcc)
+{
+	get_random_bytes_or_die(rc4_buf, 2 * RC4_KEY_LEN);
+	RC4_set_key(&rcc->recv_key, RC4_KEY_LEN, rc4_buf);
+	RC4_set_key(&rcc->send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
+}
+
+static void dummy(__a_unused int s)
 {
-	/*
-	 * At least on Solaris, SIGUSR1 is one-shot, i.e. the signal action is
-	 * restored to the default state once the signal handler has been
-	 * called.
-	 */
-	if (s == SIGUSR1)
-		signal(SIGUSR1, dummy);
 }
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
@@ -113,7 +115,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 	char *status, *flags; /* vss status info */
 	char *ut = uptime_str();
 	long offset = (nmmd->offset + 500) / 1000;
-	struct timeval now;
+	struct timeval current_time;
 	struct tm mtime_tm;
 
 	/* report real status */
@@ -123,7 +125,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		localtime_r(&nmmd->mtime, &mtime_tm);
 		strftime(mtime, 29, "%b %d %Y", &mtime_tm);
 	}
-	gettimeofday(&now, NULL);
+	gettimeofday(&current_time, NULL);
 	ret = make_message(
 		"%s: %zu\n" /* file size */
 		"%s: %s\n" /* mtime */
@@ -146,8 +148,8 @@ static char *get_status(struct misc_meta_data *nmmd)
 			(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,
+			(long unsigned)current_time.tv_sec,
+			(long unsigned)current_time.tv_usec,
 
 		nmmd->afd.verbose_ls_output
 
@@ -204,24 +206,16 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 		break;
 	case SENDER_ADD:
 	case SENDER_DELETE:
-		if (argc != 4 && argc != 5)
+		if (argc != 4)
 			return -E_COMMAND_SYNTAX;
-		if (!inet_pton(AF_INET, argv[3], &scd->addr))
-			return -E_COMMAND_SYNTAX;
-		scd->port = -1;
-		if (argc == 5) {
-			scd->port = atoi(argv[4]);
-			if (scd->port < 0 || scd->port > 65535)
-				return -E_COMMAND_SYNTAX;
-		}
-		break;
+		return parse_fec_url(argv[3], scd);
 	default:
 		return -E_COMMAND_SYNTAX;
 	}
 	return 1;
 }
 
-int com_sender(int fd, int argc, char * const * argv)
+int com_sender(struct rc4_context *rc4c, int argc, char * const * argv)
 {
 	int i, ret;
 	struct sender_command_data scd;
@@ -234,7 +228,7 @@ int com_sender(int fd, int argc, char * const * argv)
 			free(msg);
 			msg = tmp;
 		}
-		ret = send_buffer(fd, msg);
+		ret = rc4_send_buffer(rc4c, msg);
 		free(msg);
 		return ret;
 	}
@@ -244,7 +238,7 @@ int com_sender(int fd, int argc, char * const * argv)
 		if (scd.sender_num < 0)
 			return ret;
 		msg = senders[scd.sender_num].help();
-		ret = send_buffer(fd, msg);
+		ret = rc4_send_buffer(rc4c, msg);
 		free(msg);
 		return ret;
 	}
@@ -263,7 +257,7 @@ int com_sender(int fd, int argc, char * const * argv)
 }
 
 /* server info */
-int com_si(int fd, int argc, __a_unused char * const * argv)
+int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	int i, ret;
 	char *ut;
@@ -280,7 +274,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 		sender_list = para_strcat(sender_list, " ");
 	}
 	ut = uptime_str();
-	ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
+	ret = rc4_send_va_buffer(rc4c, "up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
@@ -307,18 +301,18 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 }
 
 /* version */
-int com_version(int fd, int argc, __a_unused char * const * argv)
+int com_version(struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return send_buffer(fd, VERSION_TEXT("server")
+	return rc4_send_buffer(rc4c, VERSION_TEXT("server")
 		"built: " BUILD_DATE "\n"
 		UNAME_RS ", " CC_VERSION "\n"
 	);
 }
 
 /* stat */
-int com_stat(int fd, int argc, char * const * argv)
+int com_stat(struct rc4_context *rc4c, int argc, char * const * argv)
 {
 	int ret, num = 0;/* status will be printed that many
 			  * times. num <= 0 means: print forever
@@ -326,7 +320,7 @@ int com_stat(int fd, int argc, char * const * argv)
 	struct misc_meta_data tmp, *nmmd = &tmp;
 	char *s;
 
-	signal(SIGUSR1, dummy);
+	para_sigaction(SIGUSR1, dummy);
 
 	if (argc > 1)
 		num = atoi(argv[1]);
@@ -334,7 +328,7 @@ int com_stat(int fd, int argc, char * const * argv)
 
 		mmd_dup(nmmd);
 		s = get_status(nmmd);
-		ret = send_buffer(fd, s);
+		ret = rc4_send_buffer(rc4c, s);
 		free(s);
 		if (ret < 0)
 			goto out;
@@ -349,14 +343,14 @@ out:
 	return ret;
 }
 
-static int send_list_of_commands(int fd, struct server_command *cmd,
+static int send_list_of_commands(struct rc4_context *rc4c, 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 = send_va_buffer(fd, "%s\t%s\t%s\t%s\n", cmd->name,
+		ret = rc4_send_va_buffer(rc4c, "%s\t%s\t%s\t%s\n", cmd->name,
 			handler,
 			perms,
 			cmd->description);
@@ -389,7 +383,7 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler)
 }
 
 /* help */
-int com_help(int fd, int argc, char * const * argv)
+int com_help(struct rc4_context *rc4c, int argc, char * const * argv)
 {
 	struct server_command *cmd;
 	char *perms, *handler;
@@ -397,9 +391,9 @@ int com_help(int fd, int argc, char * const * argv)
 
 	if (argc < 2) {
 		/* no argument given, print list of commands */
-		if ((ret = send_list_of_commands(fd, server_cmds, "server")) < 0)
+		if ((ret = send_list_of_commands(rc4c, server_cmds, "server")) < 0)
 			return ret;
-		return send_list_of_commands(fd, afs_cmds, "afs");
+		return send_list_of_commands(rc4c, afs_cmds, "afs");
 	}
 	/* argument given for help */
 	cmd = get_cmd_ptr(argv[1], &handler);
@@ -408,7 +402,7 @@ int com_help(int fd, int argc, char * const * argv)
 		return -E_BAD_CMD;
 	}
 	perms = cmd_perms_itohuman(cmd->perms);
-	ret = send_va_buffer(fd,
+	ret = rc4_send_va_buffer(rc4c,
 		"%s - %s\n\n"
 		"handler: %s\n"
 		"permissions: %s\n"
@@ -427,7 +421,7 @@ int com_help(int fd, int argc, char * const * argv)
 }
 
 /* hup */
-int com_hup(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_hup(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -436,7 +430,7 @@ int com_hup(__a_unused int fd, int argc, __a_unused char * const * argv)
 }
 
 /* term */
-int com_term(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_term(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -444,7 +438,7 @@ int com_term(__a_unused int fd, int argc, __a_unused char * const * argv)
 	return 1;
 }
 
-int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_play(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -457,7 +451,7 @@ int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)
 }
 
 /* stop */
-int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_stop(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -470,7 +464,7 @@ int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)
 }
 
 /* pause */
-int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_pause(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -485,7 +479,7 @@ int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
 }
 
 /* next */
-int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_next(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -497,7 +491,7 @@ int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
 }
 
 /* nomore */
-int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_nomore(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -509,7 +503,7 @@ int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)
 }
 
 /* ff */
-int com_ff(__a_unused int fd, int argc, char * const * argv)
+int com_ff(__a_unused struct rc4_context *rc4c, int argc, char * const * argv)
 {
 	long promille;
 	int ret, backwards = 0;
@@ -548,7 +542,7 @@ out:
 }
 
 /* jmp */
-int com_jmp(__a_unused int fd, int argc, char * const * argv)
+int com_jmp(__a_unused struct rc4_context *rc4c, int argc, char * const * argv)
 {
 	long unsigned int i;
 	int ret;
@@ -602,32 +596,7 @@ static struct server_command *parse_cmd(const char *cmdstr)
 	return get_cmd_ptr(buf, NULL);
 }
 
-static void init_rc4_keys(void)
-{
-	int i;
-
-	for (i = 0; i < 2 * RC4_KEY_LEN; i++)
-		rc4_buf[i] = para_random(256);
-	PARA_DEBUG_LOG("rc4 keys initialized (%u:%u)\n",
-		(unsigned char) rc4_buf[0],
-		(unsigned char) rc4_buf[RC4_KEY_LEN]);
-	RC4_set_key(&rc4_recv_key, RC4_KEY_LEN, rc4_buf);
-	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, __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, __a_unused void *private_data)
-{
-	RC4(&rc4_send_key, len, indata, outdata);
-}
-
-static int read_command(int fd, char **result)
+static int read_command(struct rc4_context *rc4c, char **result)
 {
 	int ret;
 	char buf[4096];
@@ -637,7 +606,7 @@ static int read_command(int fd, char **result)
 		size_t numbytes;
 		char *p;
 
-		ret = recv_buffer(fd, buf, sizeof(buf));
+		ret = rc4_recv_buffer(rc4c, buf, sizeof(buf));
 		if (ret < 0)
 			goto out;
 		if (!ret)
@@ -663,6 +632,14 @@ out:
 
 }
 
+static void reset_signals(void)
+{
+	para_sigaction(SIGCHLD, SIG_IGN);
+	para_sigaction(SIGINT, SIG_DFL);
+	para_sigaction(SIGTERM, SIG_DFL);
+	para_sigaction(SIGHUP, SIG_DFL);
+}
+
 /**
  * Perform user authentication and execute a command.
  *
@@ -692,7 +669,7 @@ out:
  */
 __noreturn void handle_connect(int fd, const char *peername)
 {
-	int ret, argc, use_rc4 = 0;
+	int ret, argc;
 	char buf[4096];
 	unsigned char crypt_buf[MAXLINE];
 	struct user *u;
@@ -701,17 +678,13 @@ __noreturn void handle_connect(int fd, const char *peername)
 	char **argv = NULL;
 	char *p, *command = NULL;
 	size_t numbytes;
+	struct rc4_context rc4c = {.fd = fd};
 
-	signal(SIGCHLD, SIG_IGN);
-	signal(SIGINT, SIG_DFL);
-	signal(SIGTERM, SIG_DFL);
-	signal(SIGHUP, SIG_DFL);
-
+	reset_signals();
 	/* we need a blocking fd here as recv() might return EAGAIN otherwise. */
 	ret = mark_fd_blocking(fd);
 	if (ret < 0)
 		goto err_out;
-	challenge_nr = random();
 	/* send Welcome message */
 	ret = send_va_buffer(fd, "This is para_server, version "
 		PACKAGE_VERSION  ".\n" );
@@ -721,27 +694,22 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = recv_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto err_out;
-	if (ret <= 6) {
+	if (ret < 10) {
 		ret = -E_AUTH;
 		goto err_out;
 	}
 	numbytes = ret;
 	ret = -E_AUTH;
-	if (strncmp(buf, "auth ", 5))
+	if (strncmp(buf, "auth rc4 ", 9))
 		goto err_out;
-
-	if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
-		p = buf + 5; /* client version < 0.2.6 */
-	else {
-		p = buf + 9; /* client version >= 0.2.6 */
-		use_rc4 = 1;
-	}
-	PARA_DEBUG_LOG("received %s request for user %s\n",
-		use_rc4? "rc4" : "auth", p);
+	p = buf + 9;
+	PARA_DEBUG_LOG("received auth request for user %s\n", p);
 	ret = -E_BAD_USER;
 	u = lookup_user(p);
 	if (!u)
 		goto err_out;
+	get_random_bytes_or_die((unsigned char *)&challenge_nr,
+		sizeof(challenge_nr));
 	ret = para_encrypt_challenge(u->rsa, challenge_nr, crypt_buf);
 	if (ret <= 0)
 		goto err_out;
@@ -765,21 +733,17 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* auth successful, send 'Proceed' message */
 	PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
 	sprintf(buf, "%s", PROCEED_MSG);
-	if (use_rc4) {
-		init_rc4_keys();
-		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;
-		numbytes = ret + strlen(PROCEED_MSG) + 1;
-	} else
-		numbytes = strlen(buf);
+	init_rc4_keys(&rc4c);
+	/* Should we also encrypt the proceed message? */
+	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;
+	numbytes = ret + strlen(PROCEED_MSG) + 1;
 	ret = send_bin_buffer(fd, buf, numbytes);
 	if (ret < 0)
 		goto net_err;
-	if (use_rc4)
-		enable_crypt(fd, rc4_recv, rc4_send, NULL);
-	ret = read_command(fd, &command);
+	ret = read_command(&rc4c, &command);
 	if (ret == -E_COMMAND_SYNTAX)
 		goto err_out;
 	if (ret < 0)
@@ -795,16 +759,16 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* valid command and sufficient perms */
 	alarm(0);
 	argc = split_args(command, &argv, "\n");
+	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
+			peername);
+	ret = cmd->handler(&rc4c, argc, argv);
 	mutex_lock(mmd_mutex);
 	mmd->num_commands++;
 	mutex_unlock(mmd_mutex);
-	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
-			peername);
-	ret = cmd->handler(fd, argc, argv);
 	if (ret >= 0)
 		goto out;
 err_out:
-	send_va_buffer(fd, "%s\n", para_strerror(-ret));
+	rc4_send_va_buffer(&rc4c, "%s\n", para_strerror(-ret));
 net_err:
 	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 out: