X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=blobdiff_plain;f=src%2Ftlsproxy.c;h=40729f08c8240938ea24dca75597a96115c2c474;hp=1e8642fa4ca4e40d93879e058bffb974bc402a8e;hb=4b64428fe11db22f70c304de1bc9f0cc95f1d189;hpb=c5059d4c1e7f0de5a466d471e7ee26b6ccce8396 diff --git a/src/tlsproxy.c b/src/tlsproxy.c index 1e8642f..40729f0 100644 --- a/src/tlsproxy.c +++ b/src/tlsproxy.c @@ -23,24 +23,20 @@ #include "sem.h" #include "connection.h" -/* socket(), bind(), accept(), listen() */ -#include -#include -/* close() */ -#include -/* htons() */ #include -/* sigaction() */ -#include -/* errno */ #include -/* pthread_*() */ #include +#include +#include +#include +#include +#include -/* For GnuTLS. */ +#if GNUTLS_VERSION_NUMBER <= 0x020b00 +/* Necessary for GnuTLS when used with threads. */ #include - GCRY_THREAD_OPTION_PTHREAD_IMPL; +#endif /* Size of ringbuffer. */ @@ -59,7 +55,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL; /* Server should shut down. Set by SIGINT handler. */ -static volatile int done = 0; +static volatile int done; /* = 0 */ /* Number of threads. */ static size_t thread_count; @@ -79,11 +75,12 @@ static void sigint_handler(int signal); static void parse_arguments(int argc, char **argv); static void print_usage(const char *argv); +static char *slurp_file(const char *path); static void initialize_gnutls(void); static void deinitialize_gnutls(void); -static void worker_thread(void); +static void *worker_thread(void *unused); int main(int argc, char **argv) { @@ -100,17 +97,20 @@ int main(int argc, char **argv) { struct sigaction action; + /* Required in a few places. */ + ct_assert(sizeof(size_t) >= sizeof(int)); + ct_assert(sizeof(size_t) >= sizeof(ssize_t)); + parse_arguments(argc, argv); port = atoi(argv[argc - 1]); if (port <= 0 || port > 0xffff ) { - print_usage(argv[0]); - fprintf(stderr, "\ninvalid port: '%s'\n", argv[argc - 1]); + fprintf(stderr, "invalid port: '%s'\n", argv[argc - 1]); return EXIT_FAILURE; } + memset(&action, 0, sizeof(action)); sigemptyset(&action.sa_mask); - action.sa_flags = 0; #ifdef DEBUG /* Setup our SIGINT signal handler which allows a "normal" termination of * the server in DEBUG mode. */ @@ -143,19 +143,11 @@ int main(int argc, char **argv) { return EXIT_FAILURE; } for (i = 0; i < thread_count; i++) { - int result; - pthread_t thread; - - result = pthread_create(&thread, NULL, - (void * (*)(void *))&worker_thread, - NULL); - if (result != 0) { - fprintf(stderr, "failed to create worker thread: %s\n", - strerror(result)); + errno = pthread_create(threads + i, NULL, &worker_thread, NULL); + if (errno != 0) { + perror("failed to create worker thread"); return EXIT_FAILURE; } - - threads[i] = thread; } #ifdef USE_IPV4_ONLY @@ -163,13 +155,13 @@ int main(int argc, char **argv) { #else server_socket = socket(PF_INET6, SOCK_STREAM, 0); #endif - if (server_socket == -1) { + if (server_socket < 0) { perror("socket()"); return EXIT_FAILURE; } /* Fast rebinding for debug mode, could cause invalid packets. */ - if (global_log_level >= LOG_DEBUG_LEVEL) { + if (global_log_level >= LOG_DEBUG1_LEVEL) { int socket_option = 1; setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &socket_option, sizeof(socket_option)); @@ -187,17 +179,17 @@ int main(int argc, char **argv) { server_in.sin6_port = htons((uint16_t)port); /* port to bind to */ #endif if (bind(server_socket, (struct sockaddr *)&server_in, - sizeof(server_in)) == -1) { + sizeof(server_in)) != 0) { perror("bind()"); return EXIT_FAILURE; } /* And accept connections. */ - if (listen(server_socket, 5) == -1) { + if (listen(server_socket, 5) != 0) { perror("listen()"); return EXIT_FAILURE; } - if (global_log_level >= LOG_DEBUG_LEVEL) { + if (global_log_level >= LOG_DEBUG1_LEVEL) { printf("tlsproxy %s\n", VERSION); printf("Listening for connections on port %d.\n", port); @@ -210,7 +202,7 @@ int main(int argc, char **argv) { while (!done) { /* Accept new connection. */ client_socket = accept(server_socket, NULL, NULL); - if (client_socket == -1) { + if (client_socket < 0) { perror("accept()"); break; } @@ -238,9 +230,9 @@ int main(int argc, char **argv) { } } - free(ringbuffer_full); - free(ringbuffer_free); - free(ringbuffer_lock); + sem_del(ringbuffer_full); + sem_del(ringbuffer_free); + sem_del(ringbuffer_lock); free(threads); @@ -272,16 +264,33 @@ static void parse_arguments(int argc, char **argv) { #endif global_passthrough_unknown = 0; - while ((option = getopt(argc, argv, "d:p:t:uh?")) != -1) { + while ((option = getopt(argc, argv, "a:d:p:t:uh?")) != -1) { switch (option) { - case 'd': { - if (atoi(optarg) < 0) { - print_usage(argv[0]); - fprintf(stderr, "\n-d positive number required: '%s'\n", + case 'a': { + http_digest_authorization = slurp_file(optarg); + if (http_digest_authorization == NULL) { + fprintf(stderr, "failed to open authorization file '%s': ", + optarg); + perror(""); + exit(EXIT_FAILURE); + } else if (strlen(http_digest_authorization) == 0) { + fprintf(stderr, "empty authorization file '%s'\n", optarg); exit(EXIT_FAILURE); } + + /* Just in case the file has a trailing newline. */ + strtok(http_digest_authorization, "\r\n"); + + break; + } + case 'd': { global_log_level = atoi(optarg); + if (global_log_level < 0) { + fprintf(stderr, "-d positive number required: '%s'\n", + optarg); + exit(EXIT_FAILURE); + } break; } case 'p': { @@ -293,9 +302,8 @@ static void parse_arguments(int argc, char **argv) { || strlen(position + 1) == 0 || atoi(position + 1) <= 0 || atoi(position + 1) > 0xffff) { - print_usage(argv[0]); - fprintf(stderr, "\ninvalid -p: '%s', format host:port\n", - optarg); + fprintf(stderr, "invalid -p: '%s', format host:port\n", + optarg); exit(EXIT_FAILURE); } @@ -318,8 +326,7 @@ static void parse_arguments(int argc, char **argv) { } case 't': { if (atoi(optarg) <= 0) { - print_usage(argv[0]); - fprintf(stderr, "\n-t positive number required: '%s'\n", + fprintf(stderr, "-t positive number required: '%s'\n", optarg); exit(EXIT_FAILURE); } @@ -338,17 +345,17 @@ static void parse_arguments(int argc, char **argv) { } if (optind >= argc) { - print_usage(argv[0]); - fprintf(stderr, "\nport missing\n"); + fprintf(stderr, "port missing\n"); exit(EXIT_FAILURE); } } static void print_usage(const char *argv) { fprintf(stderr, "tlsproxy %s, a certificate checking TLS proxy\n", VERSION); - fprintf(stderr, "Usage: %s [-d level] [-p host:port] [-t count] [-u] port\n", + fprintf(stderr, "Usage: %s [-a file] [-d level] [-p host:port] [-t count] [-u] port\n", argv); fprintf(stderr, "\n"); + fprintf(stderr, "-a digest authentication file [default: none]\n"); fprintf(stderr, "-d debug level: 0=errors only, 2=debug [default: 1]\n"); fprintf(stderr, "-p proxy hostname and port\n"); fprintf(stderr, "-t number of threads [default: 10]\n"); @@ -359,22 +366,26 @@ static void print_usage(const char *argv) { static void initialize_gnutls(void) { int result; - gcry_error_t error = 0; +/* Recent versions of GnuTLS automatically initialize the cryptography layer + * in gnutls_global_init(). */ +#if GNUTLS_VERSION_NUMBER <= 0x020b00 + gcry_error_t error; /* Thread safe setup. Must be called before gnutls_global_init(). */ error = gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); - if (error) { + if (error != 0) { fprintf(stderr, "gcry_control(): %s/%s\n", gcry_strsource(error), gcry_strerror(error)); exit(EXIT_FAILURE); } /* Prevent usage of blocking /dev/random. */ error = gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); - if (error) { + if (error != 0) { fprintf(stderr, "gcry_control(): %s/%s\n", gcry_strsource(error), gcry_strerror(error)); exit(EXIT_FAILURE); } +#endif /* Initialize GnuTLS. */ result = gnutls_global_init(); @@ -397,9 +408,11 @@ static void deinitialize_gnutls(void) { gnutls_global_deinit(); } -static void worker_thread(void) { +static void *worker_thread(void *unused) { int client_socket; + (void)unused; + for (;;) { /* Get next element from ring buffer. */ P(ringbuffer_full); @@ -416,4 +429,48 @@ static void worker_thread(void) { handle_connection(client_socket); } + + return NULL; +} + +static char *slurp_file(const char *path) { + struct stat stat; + size_t size_read; + char *content = NULL; + + FILE *file = fopen(path, "r"); + if (file == NULL) { + return NULL; + } + + ct_assert(sizeof(stat.st_size) <= sizeof(size_t)); + + if (fstat(fileno(file), &stat) != 0) { + goto out; + } + if (stat.st_size < 0) { /* just in case ... */ + abort(); + } else if ((size_t)stat.st_size >= SIZE_MAX - 1) { + errno = 0; + goto out; + } + + content = malloc((size_t)stat.st_size + 1); + if (content == NULL) { + goto out; + } + + errno = 0; + size_read = fread(content, 1, (size_t)stat.st_size, file); + if (size_read != (size_t)stat.st_size) { + free(content); + content = NULL; + goto out; + } + content[size_read] = '\0'; + +out: + fclose(file); + + return content; }