#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];
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;
}
}
-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;
}
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. */