From 5ac28f39475a9e0bcd64042fb0b38fdad754f72c Mon Sep 17 00:00:00 2001
From: Arkoniak <none@of.your.business>
Date: Tue, 12 Aug 2025 22:23:18 +0300
Subject: [PATCH] bugfix: expanding wildcards in config includes (#4354)

---
 include/config.hpp |  3 ++-
 src/config.cpp     | 34 +++++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/include/config.hpp b/include/config.hpp
index 3490c3f1..bf653c2a 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -35,7 +35,8 @@ class Config {
   void setupConfig(Json::Value &dst, const std::string &config_file, int depth);
   void resolveConfigIncludes(Json::Value &config, int depth);
   void mergeConfig(Json::Value &a_config_, Json::Value &b_config_);
-  static std::optional<std::string> findIncludePath(const std::string &name);
+  static std::vector<std::string> findIncludePath(
+      const std::string &name, const std::vector<std::string> &dirs = CONFIG_DIRS);
 
   std::string config_file_;
 
diff --git a/src/config.cpp b/src/config.cpp
index 2618e679..145056dd 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -106,12 +106,24 @@ void Config::setupConfig(Json::Value &dst, const std::string &config_file, int d
   mergeConfig(dst, tmp_config);
 }
 
-std::optional<std::string> Config::findIncludePath(const std::string &name) {
+std::vector<std::string> Config::findIncludePath(const std::string &name,
+                                                 const std::vector<std::string> &dirs) {
   auto match1 = tryExpandPath(name, "");
   if (!match1.empty()) {
-    return match1.front();
+    return match1;
   }
-  return findConfigPath({name});
+  if (const char *dir = std::getenv(Config::CONFIG_PATH_ENV)) {
+    if (auto res = tryExpandPath(dir, name); !res.empty()) {
+      return res;
+    }
+  }
+  for (const auto &dir : dirs) {
+    if (auto res = tryExpandPath(dir, name); !res.empty()) {
+      return res;
+    }
+  }
+
+  return {};
 }
 
 void Config::resolveConfigIncludes(Json::Value &config, int depth) {
@@ -119,18 +131,22 @@ void Config::resolveConfigIncludes(Json::Value &config, int depth) {
   if (includes.isArray()) {
     for (const auto &include : includes) {
       spdlog::info("Including resource file: {}", include.asString());
-      auto match = findIncludePath(include.asString());
-      if (match.has_value()) {
-        setupConfig(config, match.value(), depth + 1);
+      auto matches = findIncludePath(include.asString());
+      if (!matches.empty()) {
+        for (const auto &match : matches) {
+          setupConfig(config, match, depth + 1);
+        }
       } else {
         spdlog::warn("Unable to find resource file: {}", include.asString());
       }
     }
   } else if (includes.isString()) {
     spdlog::info("Including resource file: {}", includes.asString());
-    auto match = findIncludePath(includes.asString());
-    if (match.has_value()) {
-      setupConfig(config, match.value(), depth + 1);
+    auto matches = findIncludePath(includes.asString());
+    if (!matches.empty()) {
+      for (const auto &match : matches) {
+        setupConfig(config, match, depth + 1);
+      }
     } else {
       spdlog::warn("Unable to find resource file: {}", includes.asString());
     }