some cleanup, and moving the allowed_local_media_path check to the arg parsing on startup instead of when a request comes in

Author: cchadowitz

common/arg.cpp

@@ -3299,7 +3299,14 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
         {"--allowed-local-media-path"}, "PATH",
         string_format("path from which local media files are allowed to be read from (default: none)"),
         [](common_params & params, const std::string & value) {
-            params.allowed_local_media_path = value;
+            try {
+                params.allowed_local_media_path = std::filesystem::canonical(std::filesystem::path(value));
+                if (!std::filesystem::is_directory(params.allowed_local_media_path)) {
+                    throw std::invalid_argument(string_format("allowed local media path must be a dir: %s", params.allowed_local_media_path.c_str()));
+                }
+            } catch (std::filesystem::filesystem_error &err) {
+                throw std::invalid_argument(string_format("invalid allowed local media path: %s", err.what()));
+            }
         }
     ).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_ALLOWED_LOCAL_MEDIA_PATH"));
     add_opt(common_arg(

common/common.h

@@ -10,6 +10,7 @@
 #include <map>
 #include <sstream>
 #include <cmath>
+#include <filesystem>
 
 #include "ggml-opt.h"
 #include "llama-cpp.h"
@@ -433,7 +434,7 @@ struct common_params {
 
     std::string hostname      = "127.0.0.1";
     std::string public_path   = "";                                                                         // NOLINT
-    std::string allowed_local_media_path = "";                                                              // NOLINT
+    std::filesystem::path allowed_local_media_path;                                                         // NOLINT
     std::string api_prefix    = "";                                                                         // NOLINT
     std::string chat_template = "";                                                                         // NOLINT
     bool use_jinja = false;                                                                                 // NOLINT

tools/server/utils.hpp

@@ -533,7 +533,7 @@ struct oaicompat_parser_options {
     bool allow_audio;
     bool enable_thinking = true;
     size_t local_media_max_size_mb;
-    std::string allowed_local_media_path;
+    std::filesystem::path allowed_local_media_path;
 };
 
 // used by /chat/completions endpoint
@@ -643,18 +643,14 @@ static json oaicompat_chat_params_parse(
                     }
 
                 } else if (string_starts_with(url, "file://")) {
-                    // Strip off the leading "file://"
-                    const std::string fname = url.substr(7);
-                    if (opt.allowed_local_media_path == "") {
+                    if (opt.allowed_local_media_path.empty()) {
                         throw std::runtime_error("Local media paths are not enabled");
                     }
-                    const std::filesystem::path allowed_local_media_path = std::filesystem::canonical(std::filesystem::path(opt.allowed_local_media_path));
+                    // Strip off the leading "file://"
+                    const std::string fname = url.substr(7);
                     const std::filesystem::path input_path = std::filesystem::canonical(std::filesystem::path(fname));
-                    if (!std::filesystem::is_directory(allowed_local_media_path)) {
-                        throw std::runtime_error("Invalid local media path: " + opt.allowed_local_media_path);
-                    }
-                    auto [allowed_end, nothing] = std::mismatch(allowed_local_media_path.begin(), allowed_local_media_path.end(), input_path.begin());
-                    if (allowed_end != allowed_local_media_path.end()) {
+                    auto [allowed_end, nothing] = std::mismatch(opt.allowed_local_media_path.begin(), opt.allowed_local_media_path.end(), input_path.begin());
+                    if (allowed_end != opt.allowed_local_media_path.end()) {
                         throw std::runtime_error("Local media file path not allowed: " + fname);
                     }
                     if (!std::filesystem::is_regular_file(input_path)) {