From 718112774884f6b9420d55b506bcdc85012ca366 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sat, 17 Sep 2011 21:26:21 +0200
Subject: [PATCH] src/verify.c: Remove duplicated code.

Moved to new helper function get_certificate_path().
---
 src/verify.c | 53 +++++++++++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/verify.c b/src/verify.c
index e3a8629..1df9b51 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];
@@ -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 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_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,
-            "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) {
+    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_path(): failed to get path");
         return -1;
     }
 
-- 
2.44.1