X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=54e5671fc8fc14fd21e85f1c5ce1688707ea8011;hb=2a478be51f6e6d8f56895e3fee3b122625042d8c;hp=f7e9a97425626bb2e393f5478168c2bc3dcb5f56;hpb=8c4e41d4ed8b3d8c3a39d3bef01feec98dc82161;p=tlsproxy%2Ftlsproxy.git diff --git a/src/connection.c b/src/connection.c index f7e9a97..54e5671 100644 --- a/src/connection.c +++ b/src/connection.c @@ -21,6 +21,7 @@ #include "connection.h" #include "verify.h" +#include #include #include #include @@ -103,7 +104,7 @@ void handle_connection(int client_socket) { * certificate. */ int validation_failed; - LOG(LOG_DEBUG, "new connection"); + LOG(DEBUG, "new connection"); server_socket = -1; client_fd_read = NULL; @@ -124,34 +125,34 @@ void handle_connection(int client_socket) { /* Read request line (CONNECT ..) and headers (they are discarded). */ result = read_http_request(client_fd_read, buffer, sizeof(buffer)); if (result == -1) { - LOG(LOG_WARNING, "read_http_request(): client read error"); + LOG(WARNING, "read_http_request(): client read error"); goto out; } else if (result == -2) { - LOG(LOG_WARNING, "read_http_request(): client EOF"); + LOG(WARNING, "read_http_request(): client EOF"); send_bad_request(client_fd_write); goto out; } if (parse_request(buffer, host, port, &version_minor) != 0) { - LOG(LOG_WARNING, "bad request: %s", buffer); + LOG(WARNING, "bad request: %s", buffer); send_bad_request(client_fd_write); goto out; } - LOG(LOG_DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor); + LOG(DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor); /* Connect to proxy server or directly to server. */ if (global_proxy_host != NULL && global_proxy_port != NULL) { - LOG(LOG_DEBUG, "connecting to %s:%s", global_proxy_host, + 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); + LOG(DEBUG, "connecting to %s:%s", host, port); server_socket = connect_to_host(host, port); } if (server_socket == -1) { - LOG(LOG_WARNING, "failed to connect to server"); + LOG(WARNING, "failed to connect to server"); send_forwarding_failure(client_fd_write); goto out; } @@ -170,24 +171,24 @@ void handle_connection(int client_socket) { /* Read response line from proxy server. */ result = read_http_request(server_fd_read, buffer, sizeof(buffer)); if (result == -1) { - LOG(LOG_WARNING, "read_http_request(): proxy read error"); + LOG(WARNING, "read_http_request(): proxy read error"); send_forwarding_failure(client_fd_write); goto out; } else if (result == -2) { - LOG(LOG_WARNING, "read_http_request(): proxy EOF"); + LOG(WARNING, "read_http_request(): proxy EOF"); send_forwarding_failure(client_fd_write); goto out; } /* Check response of proxy server. */ if (strncmp(buffer, "HTTP/1.0 200", 12)) { - LOG(LOG_WARNING, "bad proxy response: %s", buffer); + LOG(WARNING, "bad proxy response: %s", buffer); send_forwarding_failure(client_fd_write); goto out; } } - LOG(LOG_DEBUG, "connection to server established"); + LOG(DEBUG, "connection to server established"); /* If the -u option is used and we don't know this hostname's server * certificate then just pass through the connection and let the client @@ -202,13 +203,13 @@ void handle_connection(int client_socket) { fprintf(client_fd_write, "\r\n"); fflush(client_fd_write); - LOG(LOG_DEBUG, "transferring data"); + LOG(DEBUG, "transferring data"); /* Proxy data between client and server until one side is done * (EOF or error). */ transfer_data(client_socket, server_socket); - LOG(LOG_DEBUG, "finished transferring data"); + LOG(DEBUG, "finished transferring data"); goto out; } @@ -222,29 +223,29 @@ void handle_connection(int client_socket) { result = initialize_tls_session_server(server_socket, &server_session, &server_x509_cred); if (result != 0) { - LOG(LOG_WARNING, "initialize_tls_session_server() failed"); + LOG(WARNING, "initialize_tls_session_server() failed"); send_forwarding_failure(client_fd_write); goto out; } server_session_init = 1; - LOG(LOG_DEBUG, "starting server TLS handshake"); + LOG(DEBUG, "starting server TLS handshake"); /* Try to establish TLS handshake between us and server. */ result = gnutls_handshake(server_session); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_WARNING, "server TLS handshake failed: %s", + LOG(WARNING, "server TLS handshake failed: %s", gnutls_strerror(result)); send_forwarding_failure(client_fd_write); goto out; } server_session_started = 1; - LOG(LOG_DEBUG, "server TLS handshake finished"); + LOG(DEBUG, "server TLS handshake finished"); /* Make sure the server certificate is valid and known. */ if (verify_tls_connection(server_session, host) != 0) { - LOG(LOG_ERROR, "server certificate validation failed!"); + LOG(ERROR, "server certificate validation failed!"); /* We'll send the error message over our TLS connection to the client, * but with an invalid certificate. No data is transfered from/to the * target server. */ @@ -260,7 +261,7 @@ void handle_connection(int client_socket) { &client_session, &client_x509_cred); if (result != 0) { - LOG(LOG_WARNING, "initialize_tls_session_client() failed"); + LOG(WARNING, "initialize_tls_session_client() failed"); send_forwarding_failure(client_fd_write); goto out; } @@ -271,19 +272,19 @@ void handle_connection(int client_socket) { fprintf(client_fd_write, "\r\n"); fflush(client_fd_write); - LOG(LOG_DEBUG, "starting client TLS handshake"); + LOG(DEBUG, "starting client TLS handshake"); /* Try to establish TLS handshake between client and us. */ result = gnutls_handshake(client_session); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_WARNING, "client TLS handshake failed: %s", + LOG(WARNING, "client TLS handshake failed: %s", gnutls_strerror(result)); send_forwarding_failure(client_fd_write); goto out; } client_session_started = 1; - LOG(LOG_DEBUG, "client TLS handshake finished"); + LOG(DEBUG, "client TLS handshake finished"); /* Tell the client that the verification failed. Shouldn't be necessary as * the client should terminate the connection because he received the @@ -293,14 +294,14 @@ void handle_connection(int client_socket) { goto out; } - LOG(LOG_DEBUG, "transferring TLS data"); + LOG(DEBUG, "transferring TLS data"); /* Proxy data between client and server until one side is done (EOF or * error). */ transfer_data_tls(client_socket, server_socket, client_session, server_session); - LOG(LOG_DEBUG, "finished transferring TLS data"); + LOG(DEBUG, "finished transferring TLS data"); out: /* Close TLS sessions if necessary. Use GNUTLS_SHUT_RDWR so the data is @@ -331,7 +332,7 @@ out: } else if (server_socket != -1) { close(server_socket); } - LOG(LOG_DEBUG, "connection to server closed"); + LOG(DEBUG, "connection to server closed"); /* Close connection to client. */ if (client_fd_read != NULL) { if (client_fd_write != NULL) { @@ -341,9 +342,9 @@ out: } else { close(client_socket); } - LOG(LOG_DEBUG, "connection to client closed"); + LOG(DEBUG, "connection to client closed"); - LOG(LOG_DEBUG, "connection finished"); + LOG(DEBUG, "connection finished"); } @@ -360,7 +361,7 @@ static int initialize_tls_session_client(int peer_socket, use_invalid_cert = (!strcmp(hostname, "invalid")); if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): \ failed to get proxy certificate path"); return -1; @@ -368,7 +369,7 @@ failed to get proxy certificate path"); result = gnutls_certificate_allocate_credentials(x509_cred); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): \ gnutls_certificate_allocate_credentials(): %s", gnutls_strerror(result)); @@ -381,7 +382,7 @@ gnutls_certificate_allocate_credentials(): %s", PROXY_CA_FILE, GNUTLS_X509_FMT_PEM); if (result <= 0) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): can't read CA file: '%s'", PROXY_CA_FILE); gnutls_certificate_free_credentials(*x509_cred); @@ -405,7 +406,7 @@ gnutls_certificate_allocate_credentials(): %s", GNUTLS_X509_FMT_PEM); } if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): \ can't read server certificate ('%s') or key file ('%s'): %s", path, PROXY_KEY_FILE, gnutls_strerror(result)); @@ -418,7 +419,7 @@ can't read server certificate ('%s') or key file ('%s'): %s", result = gnutls_init(session, GNUTLS_SERVER); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): gnutls_init(): %s", gnutls_strerror(result)); gnutls_certificate_free_credentials(*x509_cred); @@ -426,7 +427,7 @@ can't read server certificate ('%s') or key file ('%s'): %s", } result = gnutls_priority_set(*session, global_tls_priority_cache); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): gnutls_priority_set(): %s", gnutls_strerror(result)); gnutls_deinit(*session); @@ -436,7 +437,7 @@ can't read server certificate ('%s') or key file ('%s'): %s", result = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, *x509_cred); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_client(): gnutls_credentials_set(): %s", gnutls_strerror(result)); gnutls_deinit(*session); @@ -455,7 +456,7 @@ static int initialize_tls_session_server(int peer_socket, result = gnutls_certificate_allocate_credentials(x509_cred); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_server(): \ gnutls_certificate_allocate_credentials(): %s", gnutls_strerror(result)); @@ -464,7 +465,7 @@ gnutls_certificate_allocate_credentials(): %s", result = gnutls_init(session, GNUTLS_CLIENT); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_server(): gnutls_init(): %s", gnutls_strerror(result)); gnutls_certificate_free_credentials(*x509_cred); @@ -472,7 +473,7 @@ gnutls_certificate_allocate_credentials(): %s", } result = gnutls_priority_set(*session, global_tls_priority_cache); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_server(): gnutls_priority_set(): %s", gnutls_strerror(result)); gnutls_deinit(*session); @@ -482,7 +483,7 @@ gnutls_certificate_allocate_credentials(): %s", result = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, *x509_cred); if (result != GNUTLS_E_SUCCESS) { - LOG(LOG_ERROR, + LOG(ERROR, "initialize_tls_session_server(): gnutls_credentials_set(): %s", gnutls_strerror(result)); gnutls_deinit(*session); @@ -499,13 +500,13 @@ gnutls_certificate_allocate_credentials(): %s", static int fdopen_read_write(int socket, FILE **read_fd, FILE **write_fd) { *read_fd = fdopen(socket, "r"); if (*read_fd == NULL) { - LOG_PERROR(LOG_WARNING, "fdopen_read_write(): fdopen(\"r\") failed"); + LOG_PERROR(WARNING, "fdopen_read_write(): fdopen(\"r\") failed"); return -1; } *write_fd = fdopen(dup(socket), "w"); if (*write_fd == NULL) { - LOG_PERROR(LOG_WARNING, "fdopen_read_write(): fdopen(\"w\") failed"); + LOG_PERROR(WARNING, "fdopen_read_write(): fdopen(\"w\") failed"); fclose(*read_fd); *read_fd = NULL; /* "tell" caller read_fd is already closed */ return -1; @@ -523,7 +524,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { if (fgets(request, (int)length, client_fd) == NULL) { if (ferror(client_fd)) { - LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()"); + LOG_PERROR(WARNING, "read_http_request(): fgets()"); return -1; } /* EOF */ @@ -537,7 +538,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { } } if (ferror(client_fd)) { - LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()"); + LOG_PERROR(WARNING, "read_http_request(): fgets()"); return -1; } @@ -545,54 +546,30 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { } static void send_bad_request(FILE *client_fd) { -#define RESPONSE_ERROR "400 Bad Request" -#define RESPONSE_MSG "Your browser sent an invalid request." - fprintf(client_fd, HTTP_RESPONSE_FORMAT, - RESPONSE_ERROR, RESPONSE_ERROR, RESPONSE_ERROR, - RESPONSE_MSG); + const char error[] = "400 Bad Request"; + const char msg[] = "Your browser sent an invalid request."; + fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, error, error, msg); fflush(client_fd); -#undef RESPONSE_ERROR -#undef RESPONSE_MSG } static void send_forwarding_failure(FILE *client_fd) { -#define RESPONSE_ERROR "503 Forwarding failure" -#define RESPONSE_MSG "Failed to connect to server, check logs." - fprintf(client_fd, HTTP_RESPONSE_FORMAT, - RESPONSE_ERROR, RESPONSE_ERROR, RESPONSE_ERROR, - RESPONSE_MSG); + const char error[] = "503 Forwarding failure"; + const char msg[] = "Failed to connect to server, check logs."; + fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, error, error, msg); fflush(client_fd); -#undef RESPONSE_ERROR -#undef RESPONSE_MSG } static void tls_send_invalid_cert_message(gnutls_session_t session) { -#define RESPONSE_ERROR "500 Internal Server Error" -#define RESPONSE_MSG "Server certificate validation failed, check logs." + const char error[] = "500 Internal Server Error"; + const char msg[] = "Server certificate validation failed, check logs."; int result; - char buffer[sizeof(HTTP_RESPONSE_FORMAT) - 1 /* '\0' */ - - 4 * 2 /* four %s */ - + (sizeof(RESPONSE_ERROR) - 1 /* '\0' */) * 3 - + sizeof(RESPONSE_MSG) - 1 /* '\0' */ - + 1 /* '\0' */]; - - result = snprintf(buffer, sizeof(buffer), - HTTP_RESPONSE_FORMAT, - RESPONSE_ERROR, RESPONSE_ERROR, RESPONSE_ERROR, - RESPONSE_MSG); - if (result < 0) { - LOG_PERROR(LOG_ERROR, - "tls_send_invalid_cert_message(): snprintf failed"); - return; - } else if ((size_t)result >= sizeof(buffer)) { - LOG(LOG_ERROR, - "tls_send_invalid_cert_message(): snprintf buffer too short"); - return; - } - - gnutls_record_send(session, buffer, sizeof(buffer) - 1); - /* don't send trailing '\0' */ -#undef RESPONSE_ERROR -#undef RESPONSE_MSG + char buffer[sizeof(HTTP_RESPONSE_FORMAT) + + 3 * sizeof(error) + sizeof(msg)]; + + result = snprintf(buffer, sizeof(buffer), HTTP_RESPONSE_FORMAT, + error, error, error, msg); + assert(result > 0 && (size_t)result < sizeof(buffer)); + + gnutls_record_send(session, buffer, strlen(buffer)); } @@ -610,7 +587,7 @@ static void transfer_data(int client, int server) { for (;;) { int result = poll(fds, 2 /* fd count */, -1 /* no timeout */); if (result < 0) { - LOG_PERROR(LOG_ERROR, "transfer_data(): poll()"); + LOG_PERROR(ERROR, "transfer_data(): poll()"); return; } @@ -647,11 +624,11 @@ static int read_from_write_to(int from, int to) { ssize_t size_written; char buffer[4096]; - LOG(LOG_DEBUG, "read_from_write_to(): %d -> %d", from, to); + LOG(DEBUG, "read_from_write_to(): %d -> %d", from, to); size_read = read(from, buffer, sizeof(buffer)); if (size_read < 0) { - LOG_PERROR(LOG_WARNING, "read_from_write_to(): read()"); + LOG_PERROR(WARNING, "read_from_write_to(): read()"); return -1; /* EOF */ } else if (size_read == 0) { @@ -660,11 +637,11 @@ static int read_from_write_to(int from, int to) { size_written = write(to, buffer, (size_t)size_read); if (size_written < 0) { - LOG_PERROR(LOG_WARNING, "read_from_write_to(): write()"); + LOG_PERROR(WARNING, "read_from_write_to(): write()"); return -1; } if (size_read != size_written) { - LOG(LOG_ERROR, "read_from_write_to(): only written %ld of %ld bytes!", + LOG(ERROR, "read_from_write_to(): only written %ld of %ld bytes!", (long int)size_written, (long int)size_read); return -1; } @@ -692,13 +669,13 @@ static void transfer_data_tls(int client, int server, if (gnutls_record_get_max_size(server_session) < buffer_size) { buffer_size = gnutls_record_get_max_size(server_session); } - LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld", + LOG(DEBUG, "transfer_data_tls(): suggested buffer size: %ld", (long int)buffer_size); for (;;) { int result = poll(fds, 2 /* fd count */, -1 /* no timeout */); if (result < 0) { - LOG_PERROR(LOG_ERROR, "transfer_data(): poll()"); + LOG_PERROR(ERROR, "transfer_data(): poll()"); return; } @@ -741,12 +718,12 @@ static int read_from_write_to_tls(gnutls_session_t from, if (buffer_size > sizeof(buffer)) { buffer_size = sizeof(buffer); } - LOG(LOG_DEBUG, "read_from_write_to_tls(): used buffer size: %ld", + LOG(DEBUG, "read_from_write_to_tls(): used buffer size: %ld", (long int)buffer_size); size_read = gnutls_record_recv(from, buffer, buffer_size); if (size_read < 0) { - LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s", + LOG(WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s", gnutls_strerror((int)size_read)); return -1; /* EOF */ @@ -756,12 +733,12 @@ static int read_from_write_to_tls(gnutls_session_t from, size_written = gnutls_record_send(to, buffer, (size_t)size_read); if (size_written < 0) { - LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s", + LOG(WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s", gnutls_strerror((int)size_written)); return -1; } if (size_read != size_written) { - LOG(LOG_ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!", + LOG(ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!", (long int)size_written, (long int)size_read); return -1; } @@ -793,9 +770,9 @@ static int connect_to_host(const char *hostname, const char *port) { gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result); if (gai_return != 0) { if (gai_return == EAI_SYSTEM) { - LOG_PERROR(LOG_WARNING, "connect_to_host(): getaddrinfo()"); + LOG_PERROR(WARNING, "connect_to_host(): getaddrinfo()"); } else { - LOG(LOG_WARNING, "connect_to_host(): getaddrinfo(): %s", + LOG(WARNING, "connect_to_host(): getaddrinfo(): %s", gai_strerror(gai_return)); } return -1; @@ -808,14 +785,14 @@ static int connect_to_host(const char *hostname, const char *port) { server->ai_socktype, server->ai_protocol); if (server_socket == -1) { - LOG_PERROR(LOG_DEBUG, "connect_to_host(): socket(), trying next"); + LOG_PERROR(DEBUG, "connect_to_host(): socket(), trying next"); continue; } if (connect(server_socket, server->ai_addr, server->ai_addrlen) != -1) { break; } - LOG_PERROR(LOG_DEBUG, "connect_to_host(): connect(), trying next"); + LOG_PERROR(DEBUG, "connect_to_host(): connect(), trying next"); close(server_socket); } @@ -823,7 +800,7 @@ static int connect_to_host(const char *hostname, const char *port) { freeaddrinfo(gai_result); if (server == NULL) { - LOG_PERROR(LOG_WARNING, "connect_to_host(): no server found, abort"); + LOG_PERROR(WARNING, "connect_to_host(): no server found, abort"); return -1; }