#include "para.h"
#include "config.h"
-#include <readline/readline.h>
-#include <readline/history.h>
#include "client.cmdline.h"
#include "crypt.h"
#include "rc4.h"
#include <openssl/rc4.h>
#include "net.h"
#include "string.h"
-
-/* A static variable for holding the line. */
-static char *line_read;
+#include "error.h"
struct gengetopt_args_info args_info;
+INIT_CLIENT_ERRLISTS;
+
/*
* client log function
*/
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)
return;
- if (ll < WARNING)
- outfd = stdout;
- else
- outfd = stderr;
va_start(argp, fmt);
- vfprintf(stdout, fmt, argp);
+ vfprintf(stderr, fmt, argp);
va_end(argp);
}
-/*
- * Read a string, and return a pointer to it. Returns NULL on EOF.
- */
-static char *rl_gets(void)
-{
- free(line_read);
- /* Get a line from the user. */
- line_read = readline("para_client> ");
- /* If the line has any text in it, save it on the history. */
- if (line_read && *line_read)
- add_history(line_read);
- return line_read;
-}
-
-/*
- * do several cleanups on sigint
- */
-static void sigint_handler(__unused int i)
-{
- rl_cleanup_after_signal();
- rl_reset_after_signal();
-}
-
-void get_options(int argc, char *argv[],
+static int get_options(int argc, char *argv[],
char **config_file, char **key_file)
{
char *home;
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);
- }
+ if (ret && args_info.config_file_given)
+ return -E_NO_CONFIG;
if (!ret)
cmdline_parser_configfile(*config_file, &args_info, 0, 0, 0);
if (!args_info.key_file_given)
*key_file = default_key_file;
else
*key_file = args_info.key_file_arg;
+ return 1;
}
static RC4_KEY rc4_recv_key;
*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, interactive, received, ret;
+ int sockfd = -1, numbytes, i, received, ret;
struct hostent *he;
struct sockaddr_in their_addr;
char *command = NULL;
char *auth_str;
char *key_file, *config_file;
long unsigned challenge_nr;
- char *line;
- get_options(argc, argv, &config_file, &key_file);
+ ret = get_options(argc, argv, &config_file, &key_file);
+ if (ret < 0)
+ goto out;
if (args_info.loglevel_arg <= NOTICE)
cmdline_parser_print_version();
PARA_INFO_LOG(
args_info.hostname_arg,
args_info.server_port_arg
);
- interactive = args_info.inputs_num == 0? 1 : 0;
- if (interactive) {
- PARA_NOTICE_LOG("%s", "no command, entering interactive mode\n");
- signal(SIGINT, sigint_handler);
- } else {
- /* not interactive, concat args */
- for (i = 0; i < args_info.inputs_num; i++)
- append_str(&command, args_info.inputs[i]);
- }
-interactive_loop:
+ ret = - E_CLIENT_SYNTAX;
+ if (!args_info.inputs_num)
+ goto out;
+ /* 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;
- if (interactive) {
- int i = 0;
- char *p;
-
- rl_save_prompt();
- rl_message("\n");
- rl_kill_full_line(0, 0);
- rl_free_line_state();
- /* read a line via readline */
- line = rl_gets();
- if (!line)
- return 0;
- if (!line[0])
- goto interactive_loop;
- p = line;
- while (sscanf(p, "%200s%n", buf, &i) == 1) {
- append_str(&command, buf);
- p += 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);
+ ret = get_host_info(args_info.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;
+ sockfd = 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);
+ /* connect */
+ PARA_NOTICE_LOG("connecting to %s\n", args_info.hostname_arg);
+ ret = para_connect(sockfd, &their_addr);
+ if (ret < 0)
+ goto out;
+ /* receive welcome message */
+ ret = recv_buffer(sockfd, 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);
PARA_INFO_LOG("<-- %s--> %s\n", buf, auth_str);
- if (send_buffer(sockfd, auth_str) < 0)
- exit(EXIT_FAILURE);
+ ret = send_buffer(sockfd, 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);
- goto write_out;
+ ret = recv_buffer(sockfd, 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(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(sockfd, "%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(sockfd, 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);
- }
+ ret = para_decrypt_buffer(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",
}
/* send command */
PARA_INFO_LOG("--> %s\n", command);
- if (send_buffer(sockfd, command) < 0)
- exit(EXIT_FAILURE);
+ ret = send_buffer(sockfd, command);
+ if (ret < 0)
+ goto out;
free(command);
command = NULL;
- if (send_buffer(sockfd, EOC_MSG "\n") < 0)
- exit(EXIT_FAILURE);
+ ret = send_buffer(sockfd, EOC_MSG "\n");
+ if (ret < 0)
+ goto out;
PARA_NOTICE_LOG("%s", "command sent.\n");
-write_out:
received = 0;
- /* write server output to stdout */
- while ((numbytes = recv_bin_buffer(sockfd, buf, sizeof(buf))) > 0) {
- int ret;
-
+ for (;;) {
+ ret = recv_bin_buffer(sockfd, 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", "<-- awaiting data\n");
- PARA_NOTICE_LOG("%s", "--> sending stdin\n");
- while ((ret = read(STDIN_FILENO, buf,
- sizeof(buf))) > 0)
- send_bin_buffer(sockfd, buf, ret);
- PARA_NOTICE_LOG("%s", "closing connection\n");
- numbytes = 1;
- break;
+ ret = send_stdin(sockfd);
+ 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);
- if (interactive)
- goto interactive_loop;
- return 0;
+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