src/connection.c: Move code to get proxy certificate path to verify.c.

[tlsproxy/tlsproxy.git] / src / verify.c

diff --git a/src/verify.c b/src/verify.c
index 6558d42866422a9a85b8f6ce4ae0fb526a20bc35..e3a86294755c4283bc3c899a03b72501659b61f3 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -106,11 +106,12 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         gnutls_x509_crt_deinit(cert);
         return -1;
     }
-    /* We got the certificate as PEM, free it. */
+    /* We got the certificate as PEM, free the crt struct. */
     gnutls_x509_crt_deinit(cert);
 
     /* Open stored server certificate file. */
     if (0 != server_certificate_path(&file, hostname, path, sizeof(path))) {
+        LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
 
@@ -121,9 +122,10 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         size += strlen(buffer);
         /* Make sure the buffer is big enough. */
         if (sizeof(stored_cert) <= size) {
-            LOG(LOG_WARNING, "verify_tls_connection(): '%s' too big",
-                path);
+            LOG(LOG_WARNING, "verify_tls_connection(): '%s' too big", path);
             fclose(file);
+
+            LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
             return -1;
         }
 
@@ -134,6 +136,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         LOG(LOG_WARNING,
             "verify_tls_connection(): failed to read from '%s': %s",
             path, strerror(errno));
+
+        LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
     fclose(file);
@@ -143,13 +147,50 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         LOG(LOG_ERROR,
             "verify_tls_connection(): server certificate changed!",
             path, strerror(errno));
+
+        LOG(LOG_WARNING, "server certificate:\n%s", server_cert);
         return -2;
     }
 
     return 0;
 }
 
-int server_certificate_path(FILE **file, const char *hostname, char *path, size_t size) {
+
+int proxy_certificate_path(const char *hostname, char *path, size_t size) {
+    int result;
+
+    /* Hostname too long. */
+    if (size - strlen(PROXY_SERVER_CERT_FORMAT) <= strlen(hostname)) {
+        LOG(LOG_WARNING,
+            "proxy_certificate_path(): hostname too long: '%s'",
+            hostname);
+        return -1;
+    }
+    /* Try to prevent path traversals in hostnames. */
+    if (NULL != strstr(hostname, "..")) {
+        LOG(LOG_WARNING,
+            "proxy_certificate_path(): possible path traversal: '%s'",
+            hostname);
+        return -1;
+    }
+    result = snprintf(path, size, PROXY_SERVER_CERT_FORMAT, hostname);
+    if (result < 0) {
+        LOG_PERROR(LOG_ERROR,
+                   "proxy_certificate_path(): snprintf failed");
+        return -1;
+    } else if ((size_t)result >= size) {
+        LOG(LOG_ERROR,
+            "proxy_certificate_path(): snprintf buffer too short");
+        return -1;
+    }
+
+    return 0;
+}
+
+int server_certificate_path(FILE **file, const char *hostname,
+                            char *path, size_t size) {
+    int result;
+
     /* Hostname too long. */
     if (size - strlen(STORED_SERVER_CERT_FORMAT) <= strlen(hostname)) {
         LOG(LOG_WARNING,
@@ -164,14 +205,29 @@ int server_certificate_path(FILE **file, const char *hostname, char *path, size_
             hostname);
         return -1;
     }
-    snprintf(path, size, STORED_SERVER_CERT_FORMAT, hostname);
+    result = snprintf(path, size, STORED_SERVER_CERT_FORMAT, hostname);
+    if (result < 0) {
+        LOG_PERROR(LOG_ERROR,
+                   "server_certificate_path(): snprintf failed");
+        return -1;
+    } else if ((size_t)result >= size) {
+        LOG(LOG_ERROR,
+            "server_certificate_path(): snprintf buffer too short");
+        return -1;
+    }
 
     /* Open the stored certificate file. */
     *file = fopen(path, "rb");
     if (NULL == *file) {
-        LOG(global_passthrough_unknown ? LOG_DEBUG : LOG_WARNING,
-            "server_certificate_path(): failed to open '%s': %s",
-            path, strerror(errno));
+        if (global_passthrough_unknown) {
+            LOG(LOG_DEBUG,
+                "server_certificate_path(): failed to open '%s': %s",
+                path, strerror(errno));
+        } else {
+            LOG(LOG_WARNING,
+                "server_certificate_path(): failed to open '%s': %s",
+                path, strerror(errno));
+        }
         /* Couldn't open the file, special case. */
         return -2;
     }