X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=9a47ee1829389428c29691dec7c8e4a630f6e2cb;hb=8901c257215d60e07dd12ad2dad8d2c9569892aa;hp=418c424c03e3d3f362cc7f9d9b22ac466951689c;hpb=1c56e6d7e4f7f80eab3a630ce81b2b6481072121;p=tlsproxy%2Ftlsproxy.git diff --git a/src/connection.c b/src/connection.c index 418c424..9a47ee1 100644 --- a/src/connection.c +++ b/src/connection.c @@ -26,6 +26,12 @@ #include /* poll() */ #include +/* errno */ +#include +/* va_*() */ +#include +/* pthread_*() */ +#include /* Maximum line of a HTTP request line. Longer request lines are aborted with @@ -33,10 +39,26 @@ * should be a good limit to make processing simpler. */ #define MAX_REQUEST_LINE 4096 +/* Helper macro for LOG/LOG_PERROR. Print file/line number if compiled with + * debug output. */ +#ifdef DEBUG +#define LOG_PRINT_LOCATION fprintf(stdout, "%s:%-3d ", __FILE__, __LINE__); +#else +#define LOG_PRINT_LOCATION +#endif +/* Call log_message() and print current file and line number. */ +#define LOG \ + LOG_PRINT_LOCATION \ + log_message +/* perror() replacement with debug level support. */ +#define LOG_PERROR(level, message) \ + LOG_PRINT_LOCATION \ + log_message(level, "%s: %s", message, strerror(errno)) + static int read_http_request(FILE *client_fd, char *request, size_t length); -static void send_close_bad_request(FILE *client_fd); -static void send_close_forwarding_failure(FILE *client_fd); +static void send_bad_request(FILE *client_fd); +static void send_forwarding_failure(FILE *client_fd); static void transfer_data(int client, int server); static int read_from_write_to(int from, int to); @@ -46,6 +68,8 @@ static int connect_to_host(const char *hostname, const char *port); static int parse_request(const char *buffer, char *host, char *port, int *version_minor); +static void log_message(int level, const char *format, ...); + void handle_connection(int client_socket) { int server_socket; @@ -58,93 +82,89 @@ void handle_connection(int client_socket) { int version_minor; int result; + LOG(LOG_DEBUG, "new connection"); + + server_socket = -1; + client_fd = NULL; + server_fd = NULL; + client_fd = fdopen(client_socket, "a+"); if (NULL == client_fd) { - perror("fdopen()"); - close(client_socket); - return; + LOG_PERROR(LOG_WARNING, "fdopen(): client failed"); + goto out; } -#ifdef DEBUG - printf("New connection:\n"); -#endif - /* Read request line (CONNECT ..) and headers (they are discarded). */ result = read_http_request(client_fd, buffer, sizeof(buffer)); if (-1 == result) { - /* Read error, client_fd already closed. */ - return; + /* Read error. */ + LOG(LOG_WARNING, "read_http_request(): client read error"); + goto out; } else if (-2 == result) { /* EOF */ - send_close_bad_request(client_fd); - return; + LOG(LOG_WARNING, "read_http_request(): client EOF"); + send_bad_request(client_fd); + goto out; } -#ifdef DEBUG - printf(" request: %s", buffer); -#endif - if (0 != parse_request(buffer, host, port, &version_minor)) { - send_close_bad_request(client_fd); -#ifdef DEBUG - printf(" bad request\n"); -#endif - return; + LOG(LOG_WARNING, "bad request: %s", buffer); + send_bad_request(client_fd); + goto out; } -#ifdef DEBUG - printf(" %s:%s (HTTP 1.%d)\n", host, port, version_minor); -#endif + LOG(LOG_DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor); /* Connect to proxy server or directly to server. */ - if (NULL != use_proxy_host && NULL != use_proxy_port) { - server_socket = connect_to_host(use_proxy_host, use_proxy_port); + if (NULL != global_proxy_host && NULL != global_proxy_port) { + LOG(LOG_DEBUG, "connecting to %s:%s", global_proxy_host, + global_proxy_port); + server_socket = connect_to_host(global_proxy_host, global_proxy_port); } else { + LOG(LOG_DEBUG, "connecting to %s:%s", host, port); server_socket = connect_to_host(host, port); } if (-1 == server_socket) { - send_close_forwarding_failure(client_fd); - return; + LOG(LOG_WARNING, "failed to connect to server"); + send_forwarding_failure(client_fd); + goto out; } server_fd = fdopen(server_socket, "a+"); if (NULL == server_fd) { - send_close_forwarding_failure(client_fd); - return; + LOG_PERROR(LOG_WARNING, "fdopen(): server failed"); + send_forwarding_failure(client_fd); + goto out; } /* Connect to proxy if requested (command line option). */ - if (NULL != use_proxy_host && NULL != use_proxy_port) { + if (NULL != global_proxy_host && NULL != global_proxy_port) { fprintf(server_fd, "CONNECT %s:%s HTTP/1.0\r\n", host, port); fprintf(server_fd, "\r\n"); /* Read response line from proxy server. */ result = read_http_request(server_fd, buffer, sizeof(buffer)); if (-1 == result) { - /* Read error, server_fd already closed. */ - send_close_forwarding_failure(client_fd); - return; + /* Read error. */ + LOG(LOG_WARNING, "read_http_request(): proxy read error"); + send_forwarding_failure(client_fd); + goto out; } else if (-2 == result) { /* EOF */ - fclose(server_fd); - send_close_forwarding_failure(client_fd); - return; + LOG(LOG_WARNING, "read_http_request(): proxy EOF"); + send_forwarding_failure(client_fd); + goto out; } /* Check response of proxy server. */ if (0 != strncmp(buffer, "HTTP/1.0 200", 12)) { -#ifdef DEBUG - printf(" bad proxy response\n"); -#endif - fclose(server_fd); - send_close_forwarding_failure(client_fd); - return; + LOG(LOG_WARNING, "bad proxy response: %s", buffer); + send_forwarding_failure(client_fd); + goto out; } } -#ifdef DEBUG - printf(" connection to server established\n"); -#endif + LOG(LOG_DEBUG, "connection to server established"); /* We've established a connection, tell the client. */ fprintf(client_fd, "HTTP/1.0 200 Connection established\r\n"); @@ -154,22 +174,35 @@ void handle_connection(int client_socket) { /* And transfer all data between client and server transparently. */ transfer_data(client_socket, server_socket); - fclose(client_fd); - fclose(server_fd); +out: + /* Close connection to server/proxy. */ + if (NULL != server_fd) { + fclose(server_fd); + } else if (-1 != server_socket) { + close(server_socket); + } + LOG(LOG_DEBUG, "connection to server closed"); + /* Close connection to client. */ + if (NULL != client_fd) { + fclose(client_fd); + } else { + close(client_socket); + } + LOG(LOG_DEBUG, "connection to client closed"); + + LOG(LOG_DEBUG, "connection finished"); } /* Read HTTP request line and headers (ignored). * - * On success 0 is returned, -1 on client error (we close client descriptor in - * this case), -2 on unexpected EOF. + * On success 0 is returned, -1 on client error, -2 on unexpected EOF. */ static int read_http_request(FILE *client_fd, char *request, size_t length) { char buffer[MAX_REQUEST_LINE]; if (NULL == fgets(request, (int)length, client_fd)) { if (ferror(client_fd)) { - perror("fgets(), request"); - fclose(client_fd); + LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()"); return -1; } @@ -183,23 +216,20 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { } } if (ferror(client_fd)) { - perror("fgets(), header"); - fclose(client_fd); + LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()"); return -1; } return 0; } -static void send_close_bad_request(FILE *client_fd) { +static void send_bad_request(FILE *client_fd) { fprintf(client_fd, "HTTP/1.0 400 Bad Request\r\n"); fprintf(client_fd, "\r\n"); - fclose(client_fd); } -static void send_close_forwarding_failure(FILE *client_fd) { +static void send_forwarding_failure(FILE *client_fd) { fprintf(client_fd, "HTTP/1.0 503 Forwarding failure\r\n"); fprintf(client_fd, "\r\n"); - fclose(client_fd); } @@ -217,7 +247,7 @@ static void transfer_data(int client, int server) { for (;;) { int result = poll(fds, 2, -1 /* no timeout */); if (result < 0) { - perror("poll()"); + LOG_PERROR(LOG_ERROR, "transfer_data(): poll()"); return; } @@ -256,7 +286,7 @@ static int read_from_write_to(int from, int to) { size_read = read(from, buffer, sizeof(buffer)); if (0 > size_read) { - perror("read()"); + LOG_PERROR(LOG_WARNING, "read_from_write_to(): read()"); return -1; } /* EOF */ @@ -266,12 +296,12 @@ static int read_from_write_to(int from, int to) { size_written = write(to, buffer, (size_t)size_read); if (0 > size_written) { - perror("write()"); + LOG_PERROR(LOG_WARNING, "read_from_write_to(): write()"); return -1; } if (size_read != size_written) { - printf("only written %ld of %ld bytes!\n", (long int)size_read, - (long int)size_written); + LOG(LOG_ERROR, "read_from_write_to(): only written %ld of %ld bytes!", + (long int)size_written, (long int)size_read); return -1; } @@ -301,7 +331,7 @@ static int connect_to_host(const char *hostname, const char *port) { | AI_V4MAPPED; /* support IPv4 through IPv6 */ gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result); if (0 != gai_return) { - perror("getaddrinfo()"); + LOG_PERROR(LOG_WARNING, "connect_to_host(): getaddrinfo()"); return -1; } @@ -312,7 +342,7 @@ static int connect_to_host(const char *hostname, const char *port) { server->ai_socktype, server->ai_protocol); if (-1 == server_socket) { - perror("socket(), trying next"); + LOG_PERROR(LOG_DEBUG, "connect_to_host(): socket(), trying next"); continue; } @@ -320,7 +350,7 @@ static int connect_to_host(const char *hostname, const char *port) { server->ai_addrlen)) { break; } - perror("connect(), trying next"); + LOG_PERROR(LOG_DEBUG, "connect_to_host(): connect(), trying next"); close(server_socket); } @@ -328,7 +358,7 @@ static int connect_to_host(const char *hostname, const char *port) { freeaddrinfo(gai_result); if (NULL == server) { - fprintf(stderr, "no server found, aborting\n"); + LOG_PERROR(LOG_WARNING, "connect_to_host(): no server found, abort"); return -1; } @@ -373,3 +403,26 @@ static int parse_request(const char *request, char *host, char *port, return 0; } + + +static void log_message(int level, const char *format, ...) { + va_list ap; + const char *level_string; + + if (global_log_level < level) { + return; + } + + switch (level) { + case LOG_ERROR: level_string = "ERROR"; break; + case LOG_WARNING: level_string = "WARNING"; break; + case LOG_DEBUG: level_string = "DEBUG"; break; + default: level_string = "UNKNOWN"; + } + + va_start(ap, format); + fprintf(stdout, "[%s] [%d] ", level_string, (int)pthread_self()); + vfprintf(stdout, format, ap); + fprintf(stdout, "\n"); + va_end(ap); +}