#include "string.h"
#include "error.h"
-#if 0
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_conf *conf;
-};
-#endif
+ struct client_args_info conf;
+ char *config_file;
+ char *key_file;
+ char *user;
+ RC4_KEY rc4_recv_key;
+ RC4_KEY rc4_send_key;
-//struct gengetopt_conf conf;
-struct client_args_info conf;
+ char *in_buf;
+ size_t *in_loaded;
+ char *out_buf;
+ size_t *out_loaded;
+};
INIT_CLIENT_ERRLISTS;
+static struct private_client_data *pcd;
+
+static void rc4_send(unsigned long len, const unsigned char *indata,
+ unsigned char *outdata)
+{
+ RC4(&pcd->rc4_send_key, len, indata, outdata);
+}
+
+static void rc4_recv(unsigned long len, const unsigned char *indata,
+ unsigned char *outdata)
+{
+ RC4(&pcd->rc4_recv_key, len, indata, outdata);
+}
+
+
/*
* client log function
*/
va_list argp;
/* ignore log message if loglevel is not high enough */
- if (ll < conf.loglevel_arg)
+ if (pcd && ll < pcd->conf.loglevel_arg)
return;
va_start(argp, fmt);
vfprintf(stderr, fmt, argp);
va_end(argp);
}
-static int get_options(int argc, char *argv[],
- char **config_file, char **key_file)
+static void client_close(struct private_client_data *pcd)
{
- char *home;
- static char default_key_file[_POSIX_PATH_MAX] = "";
- static char default_config_file[_POSIX_PATH_MAX] = "";
- struct stat statbuf;
- int ret;
-
- cmdline_parser(argc, argv, &conf);
- if (!conf.user_given)
- conf.user_arg = para_logname();
- if (!conf.key_file_given) {
- home = para_homedir();
- sprintf(default_key_file, "%s/.paraslash/key.%s", home,
- conf.user_arg);
- free(home);
- }
- if (!conf.config_file_given) {
- home = para_homedir();
- sprintf(default_config_file, "%s/.paraslash/client.conf",
- home);
- free(home);
- }
- if (!conf.config_file_given)
- *config_file = default_config_file;
- else
- *config_file = conf.config_file_arg;
- ret = stat(*config_file, &statbuf);
- if (ret && conf.config_file_given)
- return -E_NO_CONFIG;
- if (!ret)
- cmdline_parser_configfile(*config_file, &conf, 0, 0, 0);
- if (!conf.key_file_given)
- *key_file = default_key_file;
- else
- *key_file = conf.key_file_arg;
- return 1;
-}
-
-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)
-{
- RC4(&rc4_send_key, len, indata, outdata);
-}
-
-static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata)
-{
- RC4(&rc4_recv_key, len, indata, outdata);
+ if (pcd)
+ return;
+ if (pcd->fd >= 0)
+ close(pcd->fd);
+ free(pcd->user);
+ free(pcd->config_file);
+ free(pcd->key_file);
+ free(pcd);
}
-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)
{
*data = para_strdup(append);
}
+static int client_parse_config(int argc, char *argv[],
+ struct private_client_data **pcd_ptr)
+{
+ char *home = para_homedir();
+ struct stat statbuf;
+ int ret;
+ struct private_client_data *p =
+ para_calloc(sizeof(struct private_client_data));
+
+ 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(p->config_file, &p->conf, 0, 0, 0);
+ ret = 1;
+out:
+ free(home);
+ if (ret < 0)
+ client_close(p);
+ else
+ *pcd_ptr = p;
+ return ret;
+}
static int send_stdin(int fd)
{
return 1;
}
+static int client_open(struct private_client_data *pcd)
+{
+ int ret;
+ struct hostent *he;
+ struct sockaddr_in their_addr;
+
+ /* get the host info */
+ PARA_NOTICE_LOG("getting host info of %s\n",
+ pcd->conf.hostname_arg);
+ ret = get_host_info(pcd->conf.hostname_arg, &he);
+ if (ret < 0)
+ goto out;
+ /* get new socket */
+ ret = get_socket();
+ if (ret < 0)
+ goto out;
+ pcd->fd = ret;
+ /* init their_addr */
+ 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;
+ ret = 1;
+out:
+ return ret;
+}
+
+
/*
* MAIN
*/
int main(int argc, char *argv[])
{
- int sockfd = -1, 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] = "";
- ret = get_options(argc, argv, &config_file, &key_file);
+ ret = client_parse_config(argc, argv, &pcd);
if (ret < 0)
goto out;
- if (conf.loglevel_arg <= NOTICE)
+ 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",
- conf.loglevel_arg,
- config_file,
- key_file,
- conf.hostname_arg,
- conf.server_port_arg
+ pcd->conf.loglevel_arg,
+ pcd->config_file,
+ pcd->key_file,
+ pcd->conf.hostname_arg,
+ pcd->conf.server_port_arg
);
- ret = - E_CLIENT_SYNTAX;
- if (!conf.inputs_num)
- goto out;
- /* concat args */
- for (i = 0; i < conf.inputs_num; i++)
- append_str(&command, conf.inputs[i]);
- crypt_function_recv = NULL;
- crypt_function_send = NULL;
- /* get the host info */
- PARA_NOTICE_LOG("getting host info of %s\n",
- conf.hostname_arg);
- ret = get_host_info(conf.hostname_arg, &he);
- if (ret < 0)
- goto out;
- /* get new socket */
- ret = get_socket();
- if (ret < 0)
- goto out;
- sockfd = ret;
- /* init their_addr */
- init_sockaddr(&their_addr, conf.server_port_arg, he);
- /* connect */
- PARA_NOTICE_LOG("connecting to %s\n", conf.hostname_arg);
- ret = para_connect(sockfd, &their_addr);
+ ret = client_open(pcd);
if (ret < 0)
goto out;
/* receive welcome message */
- ret = recv_buffer(sockfd, buf, sizeof(buf));
+ ret = recv_buffer(pcd->fd, buf, sizeof(buf));
if (ret < 0)
goto out;
/* send auth command */
- auth_str = make_message("auth %s%s", conf.plain_given? "" : "rc4 ",
- conf.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);
- ret = send_buffer(sockfd, auth_str);
+ ret = send_buffer(pcd->fd, auth_str);
if (ret < 0)
goto out;
/* receive challenge number */
- ret = recv_buffer(sockfd, buf, sizeof(buf));
+ ret = recv_buffer(pcd->fd, buf, sizeof(buf));
if (ret < 0)
goto out;
if (ret != 64) {
}
PARA_INFO_LOG("%s", "<-- [challenge]\n");
/* decrypt challenge number */
- ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf, 64);
+ 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);
- ret = send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr);
+ 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");
- ret = recv_buffer(sockfd, buf, sizeof(buf));
+ ret = recv_buffer(pcd->fd, buf, sizeof(buf));
if (ret < 0)
goto out;
numbytes = ret;
goto out;
if (numbytes >= PROCEED_MSG_LEN + 32) {
PARA_INFO_LOG("%s", "decrypting session key\n");
- ret = para_decrypt_buffer(key_file, rc4_buf,
+ 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(&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",
+ 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);
}
+ /* concat args */
+ for (i = 0; i < pcd->conf.inputs_num; i++)
+ append_str(&command, pcd->conf.inputs[i]);
/* send command */
PARA_INFO_LOG("--> %s\n", command);
- ret = send_buffer(sockfd, command);
+ ret = send_buffer(pcd->fd, command);
if (ret < 0)
goto out;
free(command);
command = NULL;
- ret = send_buffer(sockfd, EOC_MSG "\n");
+ ret = send_buffer(pcd->fd, EOC_MSG "\n");
if (ret < 0)
goto out;
PARA_NOTICE_LOG("%s", "command sent.\n");
received = 0;
for (;;) {
- ret = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1);
+ ret = recv_bin_buffer(pcd->fd, buf, sizeof(buf) - 1);
if (ret <= 0) {
if (!ret)
PARA_NOTICE_LOG("%s", "connection closed by peer\n");
buf[ret] = '\0';
numbytes = ret;
if (!received && strstr(buf, AWAITING_DATA_MSG)) {
- ret = send_stdin(sockfd);
+ ret = send_stdin(pcd->fd);
goto out;
}
received = 1;
goto out;
}
}
+ client_close(pcd);
out:
- if (sockfd >= 0)
- close(sockfd);
if (ret < 0)
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
projects / paraslash.git / blobdiff