- if (NULL != strstr(hostname, "..")) {
- LOG(LOG_WARNING,
- "server_certificate_path(): possible path traversal: '%s'",
- hostname);
+ if (strstr(hostname, "..") != NULL) {
+ LOG(WARNING, "get_certificate_path(): possible path traversal: '%s'",
+ hostname);
+ return -1;
+ }
+ /* Safe as format is no user input. */
+ result = snprintf(buffer, size, format, hostname);
+ if (result < 0) {
+ LOG_PERROR(ERROR, "get_certificate_path(): snprintf failed");
+ return -1;
+ } else if ((size_t)result >= size) {
+ 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 (get_certificate_path(STORED_SERVER_CERT_FORMAT,
+ hostname, path, size) != 0) {
+ LOG_PERROR(ERROR, "server_certificate_file(): failed to get path");