/*
* Handle connections.
*
- * Copyright (C) 2011 Simon Ruderich
+ * Copyright (C) 2011-2012 Simon Ruderich
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <errno.h>
-/* Maximum line of a HTTP request line. Longer request lines are aborted with
- * an error. The standard doesn't specify a maximum line length but this
- * should be a good limit to make processing simpler. */
+/* Maximum length of a HTTP request line. Longer request lines are aborted
+ * with an error. The standard doesn't specify a maximum line length but this
+ * should be a good limit to make processing simpler. As HTTPS is used this
+ * doesn't limit long GET requests. */
#define MAX_REQUEST_LINE 4096
/* Format string used to send HTTP/1.0 error responses to the client.
static void transfer_data_tls(int client, int server,
gnutls_session_t client_session,
gnutls_session_t server_session);
-static int read_from_write_to_tls(gnutls_session_t from, gnutls_session_t to);
+static int read_from_write_to_tls(gnutls_session_t from, gnutls_session_t to,
+ size_t buffer_size);
static int connect_to_host(const char *hostname, const char *port);
* certificate then just pass through the connection and let the client
* verify the server certificate. */
if (global_passthrough_unknown) {
- char path[1024];
+ char path[TLSPROXY_MAX_PATH_LENGTH];
FILE *file = NULL;
- if (-2 == server_certificate_path(&file, host, path, sizeof(path))) {
+ if (-2 == server_certificate_file(&file, host, path, sizeof(path))) {
/* We've established a connection, tell the client. */
fprintf(client_fd, "HTTP/1.0 200 Connection established\r\n");
fprintf(client_fd, "\r\n");
goto out;
}
- /* server_certificate_path() may open the file, close it. */
+ /* server_certificate_file() may have opened the file, close it. */
if (NULL != file) {
fclose(file);
}
/* Initialize TLS server credentials to talk to the client. */
result = initialize_tls_session_client(client_socket,
- /* use special host if the server
+ /* use a special host if the server
* certificate was invalid */
(validation_failed) ? "invalid"
: host,
gnutls_certificate_credentials_t *x509_cred) {
int result;
int use_invalid_cert;
- char path[1024];
+ char path[TLSPROXY_MAX_PATH_LENGTH];
/* The "invalid" hostname is special. If it's used we send an invalid
* certificate to let the client know something is wrong. */
- use_invalid_cert = 0 == strcmp(hostname, "invalid");
+ use_invalid_cert = (0 == strcmp(hostname, "invalid"));
- /* Hostname too long. */
- if (sizeof(path) - strlen(PROXY_SERVER_CERT_FORMAT) <= strlen(hostname)) {
- LOG(LOG_WARNING,
- "initialize_tls_session_client(): hostname too long: '%s'",
- hostname);
- return -1;
- }
- /* Try to prevent path traversals in hostnames. */
- if (NULL != strstr(hostname, "..")) {
- LOG(LOG_WARNING,
- "initialize_tls_session_client(): possible path traversal: '%s'",
- hostname);
- return -1;
- }
- result = snprintf(path, sizeof(path), PROXY_SERVER_CERT_FORMAT, hostname);
- if (result < 0) {
- LOG_PERROR(LOG_ERROR,
- "initialize_tls_session_client(): snprintf failed");
- return -1;
- } else if ((size_t)result >= sizeof(path)) {
+ if (0 != proxy_certificate_path(hostname, path, sizeof(path))) {
LOG(LOG_ERROR,
- "initialize_tls_session_client(): snprintf buffer too short");
+ "initialize_tls_session_client(): \
+failed to get proxy certificate path");
return -1;
}
gnutls_certificate_free_credentials(*x509_cred);
return -1;
}
- gnutls_priority_set(*session, global_tls_priority_cache);
+ result = gnutls_priority_set(*session, global_tls_priority_cache);
if (GNUTLS_E_SUCCESS != result) {
LOG(LOG_ERROR,
"initialize_tls_session_server(): gnutls_priority_set(): %s",
return -2;
}
- while (NULL != fgets(buffer, MAX_REQUEST_LINE, client_fd)) {
+ while (NULL != fgets(buffer, sizeof(buffer), client_fd)) {
/* End of header. */
if (0 == strcmp(buffer, "\n") || 0 == strcmp(buffer, "\r\n")) {
break;
static void transfer_data_tls(int client, int server,
gnutls_session_t client_session,
gnutls_session_t server_session) {
+ size_t buffer_size;
+
struct pollfd fds[2];
fds[0].fd = client;
fds[0].events = POLLIN | POLLPRI | POLLHUP | POLLERR;
fds[1].events = POLLIN | POLLPRI | POLLHUP | POLLERR;
fds[1].revents = 0;
+ /* Get maximum possible buffer size. */
+ buffer_size = gnutls_record_get_max_size(client_session);
+ if (buffer_size > gnutls_record_get_max_size(server_session)) {
+ buffer_size = gnutls_record_get_max_size(server_session);
+ }
+ LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
+ (long int)buffer_size);
+
for (;;) {
int result = poll(fds, 2, -1 /* no timeout */);
if (result < 0) {
/* Data available from client. */
if (fds[0].revents & POLLIN || fds[0].revents & POLLPRI) {
- if (0 != read_from_write_to_tls(client_session, server_session)) {
+ if (0 != read_from_write_to_tls(client_session, server_session,
+ buffer_size)) {
/* EOF (or other error) */
break;
}
}
/* Data available from server. */
if (fds[1].revents & POLLIN || fds[1].revents & POLLPRI) {
- if (0 != read_from_write_to_tls(server_session, client_session)) {
+ if (0 != read_from_write_to_tls(server_session, client_session,
+ buffer_size)) {
/* EOF (or other error) */
break;
}
/* Read available data from session from and write to session to. */
static int read_from_write_to_tls(gnutls_session_t from,
- gnutls_session_t to) {
- size_t size;
+ gnutls_session_t to,
+ size_t buffer_size) {
ssize_t size_read;
ssize_t size_written;
char buffer[16384];
- /* Get maximum possible buffer size. */
- size = gnutls_record_get_max_size(from);
- LOG(LOG_DEBUG, "read_from_write_to_tls(): suggested buffer size: %ld",
- (long int)size);
- if (size > gnutls_record_get_max_size(to)) {
- size = gnutls_record_get_max_size(to);
- }
- if (size > sizeof(buffer)) {
- size = sizeof(buffer);
+ if (buffer_size > sizeof(buffer)) {
+ buffer_size = sizeof(buffer);
}
LOG(LOG_DEBUG, "read_from_write_to_tls(): used buffer size: %ld",
- (long int)size);
+ (long int)buffer_size);
- size_read = gnutls_record_recv(from, buffer, size);
+ size_read = gnutls_record_recv(from, buffer, buffer_size);
if (0 > size_read) {
LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s",
gnutls_strerror((int)size_read));