X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fverify.c;h=f546fd42e2cb9d2982cea39a0c0a6fd8b112b6a0;hb=ceebf9e917885f33396b93504943d7b8e63e782b;hp=4cd9d503d791ae3c427c7ffe3e845037897747cd;hpb=cb291e5cd62b9bd9a740e86b85bd4ae84595b3d3;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/verify.c b/src/verify.c
index 4cd9d50..f546fd4 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -26,6 +26,10 @@
 #include <gnutls/x509.h>
 
 
+static int get_certificate_path(const char *format,
+        const char *hostname, char *buffer, size_t size);
+
+
 int verify_tls_connection(gnutls_session_t session, const char *hostname) {
     int result;
     char path[1024];
@@ -110,7 +114,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
     gnutls_x509_crt_deinit(cert);
 
     /* Open stored server certificate file. */
-    if (0 != server_certificate_path(&file, hostname, path, sizeof(path))) {
+    if (0 != server_certificate_file(&file, hostname, path, sizeof(path))) {
+        LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
 
@@ -121,9 +126,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 +140,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,35 +151,72 @@ 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) {
+
+static int get_certificate_path(const char *format,
+        const char *hostname, char *buffer, size_t size) {
+    int result;
+
     /* Hostname too long. */
-    if (size - strlen(STORED_SERVER_CERT_FORMAT) <= strlen(hostname)) {
+    if (size - strlen(format) <= strlen(hostname)) {
         LOG(LOG_WARNING,
-            "server_certificate_path(): hostname too long: '%s'",
+            "get_certificate_path(): hostname too long: '%s'",
             hostname);
         return -1;
     }
     /* Try to prevent path traversals in hostnames. */
     if (NULL != strstr(hostname, "..")) {
         LOG(LOG_WARNING,
-            "server_certificate_path(): possible path traversal: '%s'",
+            "get_certificate_path(): possible path traversal: '%s'",
             hostname);
         return -1;
     }
-    snprintf(path, size, STORED_SERVER_CERT_FORMAT, hostname);
+    /* Safe as format is no user input. */
+    result = snprintf(buffer, size, format, hostname);
+    if (result < 0) {
+        LOG_PERROR(LOG_ERROR, "get_certificate_path(): snprintf failed");
+        return -1;
+    } else if ((size_t)result >= size) {
+        LOG(LOG_ERROR, "get_certificate_path(): snprintf buffer too short");
+        return -1;
+    }
+
+    return 0;
+}
+
+int proxy_certificate_path(const char *hostname, char *path, size_t size) {
+    return get_certificate_path(PROXY_SERVER_CERT_FORMAT,
+                                hostname, path, size);
+}
+
+int server_certificate_file(FILE **file, const char *hostname,
+                            char *path, size_t size) {
+    if (0 != get_certificate_path(STORED_SERVER_CERT_FORMAT,
+                                  hostname, path, size)) {
+        LOG_PERROR(LOG_ERROR,
+                   "server_certificate_file(): failed to get path");
+        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_file(): failed to open '%s': %s",
+                path, strerror(errno));
+        } else {
+            LOG(LOG_WARNING,
+                "server_certificate_file(): failed to open '%s': %s",
+                path, strerror(errno));
+        }
         /* Couldn't open the file, special case. */
         return -2;
     }