#include <assert.h>
#include <errno.h>
+#include <limits.h>
#include <netdb.h>
#include <poll.h>
#include <unistd.h>
/* 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\
<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n\
<html>\n\
<head><title>%s</title></head>\n\
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);
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) {
/* 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;
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;
}
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;
}
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;
}
}
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. */
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;
}
*/
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()");
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;
return -1;
}
+ if (http_digest_authorization != NULL && !found_proxy_authorization) {
+ return -3;
+ }
+
return 0;
}
static void send_bad_request(FILE *client_fd) {
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);
+ 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);
}
static void send_forwarding_failure(FILE *client_fd) {
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);
+ fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, "", error, error, msg);
fflush(client_fd);
}
static void tls_send_invalid_cert_message(gnutls_session_t session) {
+ 3 * sizeof(error) + sizeof(msg)];
result = snprintf(buffer, sizeof(buffer), HTTP_RESPONSE_FORMAT,
- error, error, error, msg);
+ error, "", error, error, msg);
assert(result > 0 && (size_t)result < sizeof(buffer));
gnutls_record_send(session, buffer, strlen(buffer));
}
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;
}
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 */);
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) {
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;
}
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;
}
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");
ruderich.org/simon / tlsproxy / tlsproxy.git / blobdiff