]> ruderich.org/simon Gitweb - tlsproxy/tlsproxy.git/blobdiff - src/connection.c
Minor source comment fixes.
[tlsproxy/tlsproxy.git] / src / connection.c
index 513be7e6d7a2d3012ae7fa1770feb16cdc0df591..09bfd0aa2739b982ff28acaba99735a96f8e8bdd 100644 (file)
  * should be a good limit to make processing simpler. */
 #define MAX_REQUEST_LINE 4096
 
+/* 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. */
+#define HTTP_RESPONSE_FORMAT "HTTP/1.0 %s\r\n\
+Content-Type: text/html; charset=US-ASCII\r\n\
+\r\n\
+<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n\
+<html>\n\
+<head><title>%s</title></head>\n\
+<body>\n\
+<h1>%s</h1>\n\
+<p>%s</p>\n\
+</body>\n\
+</html>\n"
+
 
 static int initialize_tls_session_client(int peer_socket,
         const char *hostname,
@@ -71,7 +87,7 @@ void handle_connection(int client_socket) {
     char host[MAX_REQUEST_LINE];
     char port[5 + 1];
 
-    int version_minor;
+    int version_minor; /* HTTP/1.x */
     int result;
 
     /* client_x509_cred is used when talking to the client (acting as a TSL
@@ -192,7 +208,7 @@ void handle_connection(int client_socket) {
 
             LOG(LOG_DEBUG, "transferring data");
 
-            /* Proxy data between client and server until one suite is done
+            /* Proxy data between client and server until one side is done
              * (EOF or error). */
             transfer_data(client_socket, server_socket);
 
@@ -206,9 +222,9 @@ void handle_connection(int client_socket) {
         }
     }
 
+    /* Initialize TLS client credentials to talk to the server. */
     result = initialize_tls_session_server(server_socket, &server_session,
                                                           &server_x509_cred);
-    /* Initialize TLS client credentials to talk to the server. */
     if (0 != result) {
         LOG(LOG_WARNING, "initialize_tls_session_server() failed");
         send_forwarding_failure(client_fd);
@@ -234,7 +250,8 @@ void handle_connection(int client_socket) {
     if (0 != verify_tls_connection(server_session, host)) {
         LOG(LOG_ERROR, "server certificate validation failed!");
         /* We send the error message over our TLS connection to the client,
-         * but with an invalid certificate. */
+         * but with an invalid certificate. No data is transfered from/to the
+         * target server. */
         validation_failed = 1;
     }
 
@@ -282,7 +299,7 @@ void handle_connection(int client_socket) {
 
     LOG(LOG_DEBUG, "transferring TLS data");
 
-    /* Proxy data between client and server until one suite is done (EOF or
+    /* Proxy data between client and server until one side is done (EOF or
      * error). */
     transfer_data_tls(client_socket, server_socket,
                       client_session, server_session);
@@ -405,7 +422,7 @@ can't read server certificate ('%s') or key file ('%s'): %s",
         return -2;
     }
 
-    gnutls_certificate_set_dh_params(*x509_cred, tls_dh_params);
+    gnutls_certificate_set_dh_params(*x509_cred, global_tls_dh_params);
 
     result = gnutls_init(session, GNUTLS_SERVER);
     if (GNUTLS_E_SUCCESS != result) {
@@ -415,7 +432,7 @@ can't read server certificate ('%s') or key file ('%s'): %s",
         gnutls_certificate_free_credentials(*x509_cred);
         return -1;
     }
-    result = gnutls_priority_set(*session, tls_priority_cache);
+    result = gnutls_priority_set(*session, global_tls_priority_cache);
     if (GNUTLS_E_SUCCESS != result) {
         LOG(LOG_ERROR,
             "initialize_tls_session_client(): gnutls_priority_set(): %s",
@@ -461,7 +478,7 @@ gnutls_certificate_allocate_credentials(): %s",
         gnutls_certificate_free_credentials(*x509_cred);
         return -1;
     }
-    gnutls_priority_set(*session, tls_priority_cache);
+    gnutls_priority_set(*session, global_tls_priority_cache);
     if (GNUTLS_E_SUCCESS != result) {
         LOG(LOG_ERROR,
             "initialize_tls_session_server(): gnutls_priority_set(): %s",
@@ -518,16 +535,41 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
 }
 
 static void send_bad_request(FILE *client_fd) {
-    fprintf(client_fd, "HTTP/1.0 400 Bad Request\r\n");
-    fprintf(client_fd, "\r\n");
+#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);
+#undef RESPONSE_ERROR
+#undef RESPONSE_MSG
 }
 static void send_forwarding_failure(FILE *client_fd) {
-    fprintf(client_fd, "HTTP/1.0 503 Forwarding failure\r\n");
-    fprintf(client_fd, "\r\n");
+#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);
+#undef RESPONSE_ERROR
+#undef RESPONSE_MSG
 }
 static void tls_send_invalid_cert_message(gnutls_session_t session) {
-    gnutls_record_send(session, "HTTP/1.0 500 Internal Server Error\r\n", 36);
-    gnutls_record_send(session, "\r\n", 2);
+#define RESPONSE_ERROR "500 Internal Server Error"
+#define RESPONSE_MSG   "Server certificate validation failed, check logs."
+
+    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);
+
+    gnutls_record_send(session, buffer, sizeof(buffer) - 1);
+                                        /* don't send trailing '\0' */
+#undef RESPONSE_ERROR
+#undef RESPONSE_MSG
 }