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

diff --git a/src/verify.c b/src/verify.c
index e3a8629..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,7 @@ 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;
     }
@@ -156,63 +160,48 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 }
 
 
-int proxy_certificate_path(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(PROXY_SERVER_CERT_FORMAT) <= strlen(hostname)) {
+    if (size - strlen(format) <= strlen(hostname)) {
         LOG(LOG_WARNING,
-            "proxy_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,
-            "proxy_certificate_path(): possible path traversal: '%s'",
+            "get_certificate_path(): possible path traversal: '%s'",
             hostname);
         return -1;
     }
-    result = snprintf(path, size, PROXY_SERVER_CERT_FORMAT, hostname);
+    /* Safe as format is no user input. */
+    result = snprintf(buffer, size, format, hostname);
     if (result < 0) {
-        LOG_PERROR(LOG_ERROR,
-                   "proxy_certificate_path(): snprintf failed");
+        LOG_PERROR(LOG_ERROR, "get_certificate_path(): snprintf failed");
         return -1;
     } else if ((size_t)result >= size) {
-        LOG(LOG_ERROR,
-            "proxy_certificate_path(): snprintf buffer too short");
+        LOG(LOG_ERROR, "get_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;
+int proxy_certificate_path(const char *hostname, char *path, size_t size) {
+    return get_certificate_path(PROXY_SERVER_CERT_FORMAT,
+                                hostname, path, size);
+}
 
-    /* Hostname too long. */
-    if (size - strlen(STORED_SERVER_CERT_FORMAT) <= strlen(hostname)) {
-        LOG(LOG_WARNING,
-            "server_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'",
-            hostname);
-        return -1;
-    }
-    result = snprintf(path, size, STORED_SERVER_CERT_FORMAT, hostname);
-    if (result < 0) {
+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_path(): snprintf failed");
-        return -1;
-    } else if ((size_t)result >= size) {
-        LOG(LOG_ERROR,
-            "server_certificate_path(): snprintf buffer too short");
+                   "server_certificate_file(): failed to get path");
         return -1;
     }
 
@@ -221,11 +210,11 @@ int server_certificate_path(FILE **file, const char *hostname,
     if (NULL == *file) {
         if (global_passthrough_unknown) {
             LOG(LOG_DEBUG,
-                "server_certificate_path(): failed to open '%s': %s",
+                "server_certificate_file(): failed to open '%s': %s",
                 path, strerror(errno));
         } else {
             LOG(LOG_WARNING,
-                "server_certificate_path(): failed to open '%s': %s",
+                "server_certificate_file(): failed to open '%s': %s",
                 path, strerror(errno));
         }
         /* Couldn't open the file, special case. */