src/verify.c: Remove duplicated code.

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

diff --git a/src/connection.c b/src/connection.c
index 1fb74cc155a86f2caa6dd59a6ae88d037910d8b7..42b8ac36b384b0417ddf00687ca5373b48ff15f7 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -359,28 +359,10 @@ static int initialize_tls_session_client(int peer_socket,
      * certificate to let the client know something is wrong. */
     use_invalid_cert = 0 == strcmp(hostname, "invalid");
 
-    /* Hostname too long. */
-    if (sizeof(path) - strlen(PROXY_SERVER_CERT_FORMAT) <= strlen(hostname)) {
-        LOG(LOG_WARNING,
-            "initialize_tls_session_client(): hostname too long: '%s'",
-            hostname);
-        return -1;
-    }
-    /* Try to prevent path traversals in hostnames. */
-    if (NULL != strstr(hostname, "..")) {
-        LOG(LOG_WARNING,
-            "initialize_tls_session_client(): possible path traversal: '%s'",
-            hostname);
-        return -1;
-    }
-    result = snprintf(path, sizeof(path), PROXY_SERVER_CERT_FORMAT, hostname);
-    if (result < 0) {
-        LOG_PERROR(LOG_ERROR,
-                   "initialize_tls_session_client(): snprintf failed");
-        return -1;
-    } else if ((size_t)result >= sizeof(path)) {
+    if (0 != proxy_certificate_path(hostname, path, sizeof(path))) {
         LOG(LOG_ERROR,
-            "initialize_tls_session_client(): snprintf buffer too short");
+            "initialize_tls_session_client(): \
+failed to get proxy certificate path");
         return -1;
     }