X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=0380d5678b3aae84d34bdb62838c3f9cd475cf82;hp=9b39acd371e9efb36622c9b5b93a51169038a8be;hb=a87d4a87ac7418084eb78f0bcb3accff1388df3a;hpb=c020020087c1e0c179d772e897d15be8595d1c70

diff --git a/client.c b/client.c
index 9b39acd3..0380d567 100644
--- a/client.c
+++ b/client.c
@@ -26,8 +26,30 @@
 #include <openssl/rc4.h>
 #include "net.h"
 #include "string.h"
+#include "error.h"
 
-struct gengetopt_args_info args_info;
+enum {CL_CONNECTED, CL_SENT_AUTH, CL_RECEIVED_CHALLENGE, CL_SENT_CH_RESPONSE,
+	CL_RECEIVED_PROCEED, CL_SENT_COMMAND, CL_SENDING_STDIN, CL_RECV_DATA};
+
+struct private_client_data {
+	int status;
+	int fd;
+	struct client_args_info conf;
+	char *config_file;
+	char *key_file;
+	char *user;
+	RC4_KEY rc4_recv_key;
+	RC4_KEY rc4_send_key;
+
+	char *in_buf;
+	size_t *in_loaded;
+	char *out_buf;
+	size_t *out_loaded;
+};
+
+INIT_CLIENT_ERRLISTS;
+
+static struct private_client_data *pcd;
 
 /*
  * client log function
@@ -35,78 +57,79 @@ struct gengetopt_args_info args_info;
 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
-	FILE *outfd;
 
 	/* ignore log message if loglevel is not high enough */
-	if (ll < args_info.loglevel_arg)
+	if (pcd && ll < pcd->conf.loglevel_arg)
 		return;
-	if (ll < WARNING)
-		outfd = stdout;
-	else
-		outfd = stderr;
 	va_start(argp, fmt);
-	vfprintf(stdout, fmt, argp);
+	vfprintf(stderr, fmt, argp);
 	va_end(argp);
 }
 
-void get_options(int argc, char *argv[],
-	char **config_file, char **key_file)
+static void client_close(struct private_client_data *pcd)
+{
+	if (pcd)
+		return;
+	if (pcd->fd >= 0)
+		close(pcd->fd);
+	free(pcd->user);
+	free(pcd->config_file);
+	free(pcd->key_file);
+	free(pcd);
+}
+
+static int client_parse_config(int argc, char *argv[],
+		struct private_client_data **pcd_ptr)
 {
-	char *home;
-	static char default_key_file[_POSIX_PATH_MAX] = "";
-	static char default_config_file[_POSIX_PATH_MAX] = "";
+	char *home = para_homedir();
 	struct stat statbuf;
 	int ret;
+	struct private_client_data *p =
+		para_calloc(sizeof(struct private_client_data));
 
-	cmdline_parser(argc, argv, &args_info);
-	if (!args_info.user_given)
-		args_info.user_arg = para_logname();
-	if (!args_info.key_file_given) {
-		home = para_homedir();
-		sprintf(default_key_file, "%s/.paraslash/key.%s", home,
-			args_info.user_arg);
-		free(home);
-	}
-	if (!args_info.config_file_given) {
-		home = para_homedir();
-		sprintf(default_config_file, "%s/.paraslash/client.conf",
-			home);
-		free(home);
-	}
-	if (!args_info.config_file_given)
-		*config_file = default_config_file;
-	else
-		*config_file = args_info.config_file_arg;
-	ret = stat(*config_file, &statbuf);
-	if (ret && args_info.config_file_given) {
-		fprintf(stderr, "can not stat config file %s\n",
-			args_info.config_file_arg);
-		exit(EXIT_FAILURE);
+	p->fd = -1;
+	cmdline_parser(argc, argv, &p->conf);
+	ret = - E_CLIENT_SYNTAX;
+	if (!p->conf.inputs_num)
+		goto out;
+	p->user = p->conf.user_given?
+		para_strdup(p->conf.user_arg) : para_logname();
+
+	p->key_file = p->conf.key_file_given?
+		para_strdup(p->conf.key_file_arg) :
+		make_message("%s/.paraslash/key.%s", home, p->user);
+
+	p->config_file = p->conf.config_file_given?
+		para_strdup(p->conf.config_file_arg) :
+		make_message("%s/.paraslash/client.conf", home);
+	ret = stat(p->config_file, &statbuf);
+	if (ret && p->conf.config_file_given) {
+		ret = -E_NO_CONFIG;
+		goto out;
 	}
 	if (!ret)
-		cmdline_parser_configfile(*config_file, &args_info, 0, 0, 0);
-	if (!args_info.key_file_given)
-		*key_file = default_key_file;
+		cmdline_parser_configfile(p->config_file, &p->conf, 0, 0, 0);
+	ret = 1;
+out:
+	free(home);
+	if (ret < 0)
+		client_close(p);
 	else
-		*key_file = args_info.key_file_arg;
+		*pcd_ptr = p;
+	return ret;
 }
 
-static RC4_KEY rc4_recv_key;
-static RC4_KEY rc4_send_key;
-static unsigned char rc4_buf[2 * RC4_KEY_LEN];
-
-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)
 {
-	RC4(&rc4_send_key, len, indata, outdata);
+	RC4(&pcd->rc4_send_key, len, indata, outdata);
 }
 
-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)
 {
-	RC4(&rc4_recv_key, len, indata, outdata);
+	RC4(&pcd->rc4_recv_key, len, indata, outdata);
 }
-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
-
 
 static void append_str(char **data, const char* append)
 {
@@ -118,146 +141,167 @@ static void append_str(char **data, const char* append)
 		*data = para_strdup(append);
 }
 
+
+static int send_stdin(int fd)
+{
+	char buf[8192];
+	int ret;
+
+	PARA_NOTICE_LOG("%s", "sending stdin\n");
+	for (;;) {
+		ret = read(STDIN_FILENO, buf, sizeof(buf));
+		if (ret <= 0)
+			return ret;
+		ret = send_bin_buffer(fd, buf, ret);
+		if (ret < 0)
+			return ret;
+	}
+	return 1;
+}
+
 /*
  * MAIN
  */
 int main(int argc, char *argv[])
 {
 
-	int sockfd, numbytes, i, received, ret;
+	int numbytes, i, received, ret;
 	struct hostent *he;
 	struct sockaddr_in their_addr;
 	char *command = NULL;
 	char buf[8192];
 	char *auth_str;
-	char *key_file, *config_file;
 	long unsigned challenge_nr;
+	unsigned char rc4_buf[2 * RC4_KEY_LEN] = "";
 
-	get_options(argc, argv, &config_file, &key_file);
-	if (args_info.loglevel_arg <= NOTICE)
+	ret = client_parse_config(argc, argv, &pcd);
+	if (ret < 0)
+		goto out;
+	if (pcd->conf.loglevel_arg <= NOTICE)
 		cmdline_parser_print_version();
 	PARA_INFO_LOG(
 		"current loglevel: %d\n"
 		"using config_file: %s\n"
 		"using key_file: %s\n"
 		"connecting to %s:%d\n",
-		args_info.loglevel_arg,
-		config_file,
-		key_file,
-		args_info.hostname_arg,
-		args_info.server_port_arg
+		pcd->conf.loglevel_arg,
+		pcd->config_file,
+		pcd->key_file,
+		pcd->conf.hostname_arg,
+		pcd->conf.server_port_arg
 	);
-	if (!args_info.inputs_num) {
-		PARA_ERROR_LOG("%s", "syntax error\n");
-		exit(EXIT_FAILURE);
-	}
 	/* concat args */
-	for (i = 0; i < args_info.inputs_num; i++)
-		append_str(&command, args_info.inputs[i]);
-
-	crypt_function_recv = NULL;
-	crypt_function_send = NULL;
+	for (i = 0; i < pcd->conf.inputs_num; i++)
+		append_str(&command, pcd->conf.inputs[i]);
 	/* get the host info */
 	PARA_NOTICE_LOG("getting host info of %s\n",
-		args_info.hostname_arg);
-	if (!(he = get_host_info(args_info.hostname_arg)))
-		exit(EXIT_FAILURE);
+		pcd->conf.hostname_arg);
+	ret = get_host_info(pcd->conf.hostname_arg, &he);
+	if (ret < 0)
+		goto out;
 	/* get new socket */
-	if ((sockfd = get_socket()) < 0)
-		exit(EXIT_FAILURE);
+	ret = get_socket();
+	if (ret < 0)
+		goto out;
+	pcd->fd = ret;
 	/* init their_addr */
-	init_sockaddr(&their_addr, args_info.server_port_arg, he);
-	/* Connect */
-	PARA_NOTICE_LOG("connecting to %s...\n",
-		args_info.hostname_arg);
-	if (para_connect(sockfd, &their_addr) < 0)
-		exit(EXIT_FAILURE);
-	/* Receive Welcome message */
-	if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-		exit(EXIT_FAILURE);
+	init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
+	/* connect */
+	PARA_NOTICE_LOG("connecting to %s\n", pcd->conf.hostname_arg);
+	ret = para_connect(pcd->fd, &their_addr);
+	if (ret < 0)
+		goto out;
+	/* receive welcome message */
+	ret = recv_buffer(pcd->fd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
 	/* send auth command */
-	auth_str = make_message("auth %s%s", args_info.plain_given?  "" : "rc4 ",
-		args_info.user_arg);
+	auth_str = make_message("auth %s%s", pcd->conf.plain_given?  "" : "rc4 ",
+		pcd->user);
 	PARA_INFO_LOG("<-- %s--> %s\n", buf, auth_str);
-	if (send_buffer(sockfd, auth_str) < 0)
-		exit(EXIT_FAILURE);
+	ret = send_buffer(pcd->fd, auth_str);
+	if (ret < 0)
+		goto out;
 	/* receive challenge number */
-	if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-		exit(EXIT_FAILURE);
-	if (numbytes != 64) {
-		PARA_EMERG_LOG("did not receive valid challenge (got %i bytes)\n",
-			numbytes);
-		buf[numbytes] = '\0';
-		PARA_ERROR_LOG("received the following instead: %s\n", buf);
-		exit(EXIT_FAILURE);
+	ret = recv_buffer(pcd->fd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
+	if (ret != 64) {
+		ret = -E_INVALID_CHALLENGE;
+		PARA_ERROR_LOG("received the following: %s\n", buf);
+		goto out;
 	}
-	PARA_INFO_LOG("<-- [challenge (%i bytes)]\n", numbytes);
+	PARA_INFO_LOG("%s", "<-- [challenge]\n");
 	/* decrypt challenge number */
-	ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf,
-		numbytes);
-	if (ret < 0) {
-		PARA_EMERG_LOG("decrypt error (%d). Bad secret key?\n", ret);
-		exit(EXIT_FAILURE);
-	}
+	ret = para_decrypt_challenge(pcd->key_file, &challenge_nr,
+		(unsigned char *) buf, 64);
+	if (ret < 0)
+		goto out;
 	/* send decrypted challenge */
 	PARA_INFO_LOG("--> %lu\n", challenge_nr);
-	if (send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr) < 0)
-		exit(EXIT_FAILURE);
-	/* Wait for approval */
+	ret = send_va_buffer(pcd->fd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr);
+	if (ret < 0)
+		goto out;
+	/* wait for approval */
 	PARA_NOTICE_LOG("%s", "waiting for approval from server\n");
-	if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-		exit(EXIT_FAILURE);
+	ret = recv_buffer(pcd->fd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
+	numbytes = ret;
 	PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
 		"info ++++\n", buf);
-	/* Check if server has sent "Proceed" message */
-	if (!strstr(buf, PROCEED_MSG)) {
-		PARA_EMERG_LOG("%s", "authentication failed\n");
-		exit(EXIT_FAILURE);
-	}
+	/* check if server has sent "Proceed" message */
+	ret = -E_CLIENT_AUTH;
+	if (!strstr(buf, PROCEED_MSG))
+		goto out;
 	if (numbytes >= PROCEED_MSG_LEN + 32) {
 		PARA_INFO_LOG("%s", "decrypting session key\n");
-		if (para_decrypt_buffer(key_file, rc4_buf,
-				(unsigned char *)buf + PROCEED_MSG_LEN + 1,
-				numbytes - PROCEED_MSG_LEN - 1) < 0) {
-			PARA_EMERG_LOG("%s", "error receiving rc4 key\n");
-			exit(EXIT_FAILURE);
-		}
-		RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf);
-		RC4_set_key(&rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
-		PARA_INFO_LOG("rc4 encrytion activated: %x:%x:%x:%x\n",
+		ret = para_decrypt_buffer(pcd->key_file, rc4_buf,
+			(unsigned char *)buf + PROCEED_MSG_LEN + 1,
+			numbytes - PROCEED_MSG_LEN - 1);
+		if (ret < 0)
+			goto out;
+		RC4_set_key(&pcd->rc4_send_key, RC4_KEY_LEN, rc4_buf);
+		RC4_set_key(&pcd->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
+		PARA_INFO_LOG("rc4 encryption activated: %x:%x:%x:%x\n",
 			rc4_buf[0], rc4_buf[1], rc4_buf[2], rc4_buf[3]);
-		crypt_function_recv = rc4_recv;
-		crypt_function_send = rc4_send;
+		enable_crypt(pcd->fd, rc4_recv, rc4_send);
 	}
 	/* send command */
 	PARA_INFO_LOG("--> %s\n", command);
-	if (send_buffer(sockfd, command) < 0)
-		exit(EXIT_FAILURE);
+	ret = send_buffer(pcd->fd, command);
+	if (ret < 0)
+		goto out;
 	free(command);
 	command = NULL;
-	if (send_buffer(sockfd, EOC_MSG "\n") < 0)
-		exit(EXIT_FAILURE);
+	ret = send_buffer(pcd->fd, EOC_MSG "\n");
+	if (ret < 0)
+		goto out;
 	PARA_NOTICE_LOG("%s", "command sent.\n");
 	received = 0;
-	while ((numbytes = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1)) > 0) {
-		buf[numbytes] = '\0';
+	for (;;) {
+		ret = recv_bin_buffer(pcd->fd, buf, sizeof(buf) - 1);
+		if (ret <= 0) {
+			if (!ret)
+				PARA_NOTICE_LOG("%s", "connection closed by peer\n");
+			goto out;
+		}
+		buf[ret] = '\0';
+		numbytes = ret;
 		if (!received && strstr(buf, AWAITING_DATA_MSG)) {
-			PARA_NOTICE_LOG("%s", "sending stdin\n");
-			while ((ret = read(STDIN_FILENO, buf,
-					sizeof(buf))) > 0) {
-				if (send_bin_buffer(sockfd, buf, ret) < 0)
-					break;
-			}
-			PARA_NOTICE_LOG("%s", "closing connection\n");
-			numbytes = 1;
-			break;
+			ret = send_stdin(pcd->fd);
+			goto out;
 		}
 		received = 1;
-		if (write(STDOUT_FILENO, buf, numbytes) != numbytes)
-			break;
+		ret = write(STDOUT_FILENO, buf, numbytes);
+		if (ret != numbytes) {
+			ret = -E_SHORT_CLIENT_WRITE;
+			goto out;
+		}
 	}
-	if (!numbytes)
-		PARA_NOTICE_LOG("%s", "connection closed by peer\n");
-	close(sockfd);
-	return ret >= 0? 0: 1;
+	client_close(pcd);
+out:
+	if (ret < 0)
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }