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 8328432b5e27e0174590c0c69cb97e92fc36c608..e3a86294755c4283bc3c899a03b72501659b61f3 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -155,8 +155,42 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
     return 0;
 }
 
+
+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,
@@ -171,14 +205,29 @@ int server_certificate_path(FILE **file, const char *hostname,
             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;
     }