X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=5a08de7431f07733179982b48e3cf7bac8e4d737;hb=b7ce41b809a3b3533d398c0da8fd9787c149434c;hp=7f2071a7975340737e68acdd06237ae759e4d5ca;hpb=8b2ed4a58229f9b377f3a4ae74af36c31c5db1c0;p=tlsproxy%2Ftlsproxy.git diff --git a/src/connection.c b/src/connection.c index 7f2071a..5a08de7 100644 --- a/src/connection.c +++ b/src/connection.c @@ -21,7 +21,9 @@ #include "connection.h" #include "verify.h" +#include #include +#include #include #include #include @@ -35,11 +37,11 @@ /* Format string used to send HTTP/1.0 error responses to the client. * - * %s is used 4 times, first three are the error code (no %n$s!), the last is - * the message. */ + * %s is used 5 times, first is the error code, then additional headers, next + * two are the error code (no %n$s!), the last is the message. */ #define HTTP_RESPONSE_FORMAT "HTTP/1.0 %s\r\n\ Content-Type: text/html; charset=US-ASCII\r\n\ -\r\n\ +%s\r\n\ \n\ \n\ %s\n\ @@ -61,6 +63,7 @@ static int initialize_tls_session_server(int peer_socket, static int fdopen_read_write(int socket, FILE **read_fd, FILE **write_fd); static int read_http_request(FILE *client_fd, char *request, size_t length); static void send_bad_request(FILE *client_fd); +static void send_authentication_required(FILE *client_fd); static void send_forwarding_failure(FILE *client_fd); static void tls_send_invalid_cert_message(gnutls_session_t session); @@ -130,6 +133,10 @@ void handle_connection(int client_socket) { LOG(WARNING, "read_http_request(): client EOF"); send_bad_request(client_fd_write); goto out; + } else if (result == -3) { + LOG(DEBUG, "read_http_request(): proxy authentication failed"); + send_authentication_required(client_fd_write); + goto out; } if (parse_request(buffer, host, port, &version_minor) != 0) { @@ -143,14 +150,14 @@ void handle_connection(int client_socket) { /* Connect to proxy server or directly to server. */ if (global_proxy_host != NULL && global_proxy_port != NULL) { LOG(DEBUG, "connecting to %s:%s", global_proxy_host, - global_proxy_port); + global_proxy_port); server_socket = connect_to_host(global_proxy_host, global_proxy_port); } else { LOG(DEBUG, "connecting to %s:%s", host, port); server_socket = connect_to_host(host, port); } - if (server_socket == -1) { + if (server_socket < 0) { LOG(WARNING, "failed to connect to server"); send_forwarding_failure(client_fd_write); goto out; @@ -234,7 +241,7 @@ void handle_connection(int client_socket) { result = gnutls_handshake(server_session); if (result != GNUTLS_E_SUCCESS) { LOG(WARNING, "server TLS handshake failed: %s", - gnutls_strerror(result)); + gnutls_strerror(result)); send_forwarding_failure(client_fd_write); goto out; } @@ -277,7 +284,7 @@ void handle_connection(int client_socket) { result = gnutls_handshake(client_session); if (result != GNUTLS_E_SUCCESS) { LOG(WARNING, "client TLS handshake failed: %s", - gnutls_strerror(result)); + gnutls_strerror(result)); send_forwarding_failure(client_fd_write); goto out; } @@ -361,16 +368,16 @@ static int initialize_tls_session_client(int peer_socket, if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) { LOG(ERROR, - "initialize_tls_session_client(): \ -failed to get proxy certificate path"); + "initialize_tls_session_client(): " + "failed to get proxy certificate path"); return -1; } result = gnutls_certificate_allocate_credentials(x509_cred); if (result != GNUTLS_E_SUCCESS) { LOG(ERROR, - "initialize_tls_session_client(): \ -gnutls_certificate_allocate_credentials(): %s", + "initialize_tls_session_client(): " + "gnutls_certificate_allocate_credentials(): %s", gnutls_strerror(result)); return -1; } @@ -406,8 +413,8 @@ gnutls_certificate_allocate_credentials(): %s", } if (result != GNUTLS_E_SUCCESS) { LOG(ERROR, - "initialize_tls_session_client(): \ -can't read server certificate ('%s') or key file ('%s'): %s", + "initialize_tls_session_client(): " + "can't read server certificate ('%s') or key file ('%s'): %s", path, PROXY_KEY_FILE, gnutls_strerror(result)); gnutls_certificate_free_credentials(*x509_cred); /* Could be a missing certificate. */ @@ -456,8 +463,8 @@ static int initialize_tls_session_server(int peer_socket, result = gnutls_certificate_allocate_credentials(x509_cred); if (result != GNUTLS_E_SUCCESS) { LOG(ERROR, - "initialize_tls_session_server(): \ -gnutls_certificate_allocate_credentials(): %s", + "initialize_tls_session_server(): " + "gnutls_certificate_allocate_credentials(): %s", gnutls_strerror(result)); return -1; } @@ -520,7 +527,9 @@ static int fdopen_read_write(int socket, FILE **read_fd, FILE **write_fd) { */ static int read_http_request(FILE *client_fd, char *request, size_t length) { char buffer[MAX_REQUEST_LINE]; + int found_proxy_authorization; + assert(length <= INT_MAX); if (fgets(request, (int)length, client_fd) == NULL) { if (ferror(client_fd)) { LOG_PERROR(WARNING, "read_http_request(): fgets()"); @@ -530,7 +539,22 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { return -2; } + found_proxy_authorization = 0; while (fgets(buffer, sizeof(buffer), client_fd) != NULL) { + const char *authentication = "Proxy-Authorization: Basic "; + + if (http_digest_authorization != NULL + && !strncmp(buffer, authentication, strlen(authentication))) { + found_proxy_authorization = 1; + + /* Check if the passphrase matches. */ + strtok(buffer, "\r\n"); + if (strcmp(buffer + strlen(authentication), + http_digest_authorization)) { + return -3; + } + } + /* End of header. */ if (!strcmp(buffer, "\n") || !strcmp(buffer, "\r\n")) { break; @@ -541,58 +565,45 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { return -1; } + if (http_digest_authorization != NULL && !found_proxy_authorization) { + return -3; + } + return 0; } 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); +} +static void send_authentication_required(FILE *client_fd) { + const char error[] = "407 Proxy Authentication Required"; + const char auth[] = "Proxy-Authenticate: Basic realm=\"tlsproxy\"\r\n"; + const char msg[] = "TODO"; + fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, auth, 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(ERROR, - "tls_send_invalid_cert_message(): snprintf failed"); - return; - } else if ((size_t)result >= sizeof(buffer)) { - LOG(ERROR, - "tls_send_invalid_cert_message(): snprintf buffer too short"); - return; - } + 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, sizeof(buffer) - 1); - /* don't send trailing '\0' */ -#undef RESPONSE_ERROR -#undef RESPONSE_MSG + gnutls_record_send(session, buffer, strlen(buffer)); } @@ -665,7 +676,7 @@ static int read_from_write_to(int from, int to) { } if (size_read != size_written) { LOG(ERROR, "read_from_write_to(): only written %ld of %ld bytes!", - (long int)size_written, (long int)size_read); + (long int)size_written, (long int)size_read); return -1; } @@ -693,7 +704,7 @@ static void transfer_data_tls(int client, int server, buffer_size = gnutls_record_get_max_size(server_session); } LOG(DEBUG, "transfer_data_tls(): suggested buffer size: %ld", - (long int)buffer_size); + (long int)buffer_size); for (;;) { int result = poll(fds, 2 /* fd count */, -1 /* no timeout */); @@ -742,12 +753,12 @@ static int read_from_write_to_tls(gnutls_session_t from, buffer_size = sizeof(buffer); } LOG(DEBUG, "read_from_write_to_tls(): used buffer size: %ld", - (long int)buffer_size); + (long int)buffer_size); size_read = gnutls_record_recv(from, buffer, buffer_size); if (size_read < 0) { LOG(WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s", - gnutls_strerror((int)size_read)); + gnutls_strerror((int)size_read)); return -1; /* EOF */ } else if (size_read == 0) { @@ -757,12 +768,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(WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s", - gnutls_strerror((int)size_written)); + gnutls_strerror((int)size_written)); return -1; } if (size_read != size_written) { LOG(ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!", - (long int)size_written, (long int)size_read); + (long int)size_written, (long int)size_read); return -1; } @@ -796,7 +807,7 @@ static int connect_to_host(const char *hostname, const char *port) { LOG_PERROR(WARNING, "connect_to_host(): getaddrinfo()"); } else { LOG(WARNING, "connect_to_host(): getaddrinfo(): %s", - gai_strerror(gai_return)); + gai_strerror(gai_return)); } return -1; } @@ -807,12 +818,12 @@ static int connect_to_host(const char *hostname, const char *port) { server_socket = socket(server->ai_family, server->ai_socktype, server->ai_protocol); - if (server_socket == -1) { + if (server_socket < 0) { LOG_PERROR(DEBUG, "connect_to_host(): socket(), trying next"); continue; } - if (connect(server_socket, server->ai_addr, server->ai_addrlen) != -1) { + if (connect(server_socket, server->ai_addr, server->ai_addrlen) == 0) { break; } LOG_PERROR(DEBUG, "connect_to_host(): connect(), trying next");