#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);
goto out;
}
- /* server_certificate_path() may open the file, close it. */
+ /* server_certificate_path() 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,
* certificate to let the client know something is wrong. */
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);
+ if (0 != proxy_certificate_path(hostname, path, sizeof(path))) {
+ LOG(LOG_ERROR,
+ "initialize_tls_session_client(): \
+failed to get proxy certificate path");
return -1;
}
- snprintf(path, sizeof(path), PROXY_SERVER_CERT_FORMAT, hostname);
result = gnutls_certificate_allocate_credentials(x509_cred);
if (GNUTLS_E_SUCCESS != result) {
result = gnutls_certificate_set_x509_trust_file(*x509_cred,
PROXY_CA_FILE,
GNUTLS_X509_FMT_PEM);
+ if (0 >= result) {
+ LOG(LOG_ERROR,
+ "initialize_tls_session_client(): can't read CA file: '%s'",
+ PROXY_CA_FILE);
+ gnutls_certificate_free_credentials(*x509_cred);
+ return -1;
+ }
+ }
/* If the invalid hostname was specified do nothing, we use a self-signed
* certificate in this case. */
- } else {
- result = 1;
- }
- if (0 >= result) {
- LOG(LOG_ERROR,
- "initialize_tls_session_client(): can't read CA file: '%s'",
- PROXY_CA_FILE);
- gnutls_certificate_free_credentials(*x509_cred);
- return -1;
- }
+
/* And certificate for this website and proxy's private key. */
if (!use_invalid_cert) {
result = gnutls_certificate_set_x509_key_file(*x509_cred,
#define RESPONSE_ERROR "500 Internal Server Error"
#define RESPONSE_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' */];
- snprintf(buffer, sizeof(buffer),
- HTTP_RESPONSE_FORMAT,
- RESPONSE_ERROR, RESPONSE_ERROR, RESPONSE_ERROR, RESPONSE_MSG);
+ 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' */
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);
+ LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
+ (long int)buffer_size);
+ if (buffer_size > gnutls_record_get_max_size(server_session)) {
+ buffer_size = gnutls_record_get_max_size(server_session);
+ }
+
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));
ruderich.org/simon / tlsproxy / tlsproxy.git / blobdiff