lib: Add validation for cursor file names and propagate the error fro…

…m parsing HL cursor (#32) * Validate cursor file names * Propagate errors from parsing HL cursor * Validate cursor directory names
hyprwm · Apr 12, 2024 · 1787177 · 1787177
1 parent f6a6322
commit 1787177
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/hyprcursor-util/src/main.cpp b/hyprcursor-util/src/main.cpp
@@ -5,6 +5,7 @@
 #include <array>
 #include <format>
 #include <algorithm>
+#include <regex>
 #include <hyprlang.hpp>
 #include "internalSharedTypes.hpp"
 #include "manifest.hpp"
@@ -98,6 +99,9 @@ static std::optional<std::string> createCursorThemeFromPath(const std::string& p
     // iterate over the directory and record all cursors
 
     for (auto& dir : std::filesystem::directory_iterator(CURSORDIR)) {
+        if (!std::regex_match(dir.path().stem().string(), std::regex("^[A-Za-z0-9_\\-\\.]+$")))
+            return "Invalid cursor directory name at " + dir.path().string() + " : characters must be within [A-Za-z0-9_\\-\\.]";
+
         const auto METAPATH = dir.path().string() + "/meta";
 
         auto&      SHAPE = currentTheme.shapes.emplace_back(std::make_unique<SCursorShape>());

diff --git a/libhyprcursor/meta.cpp b/libhyprcursor/meta.cpp
@@ -3,6 +3,7 @@
 #include <hyprlang.hpp>
 #include <toml++/toml.hpp>
 #include <filesystem>
+#include <regex>
 
 #include "VarList.hpp"
 
@@ -95,6 +96,11 @@ static Hyprlang::CParseResult parseDefineSize(const char* C, const char* V) {
         RHS = LL;
     }
 
+    if (!std::regex_match(RHS, std::regex("^[A-Za-z0-9_\\-\\.]+$"))) {
+        result.setError("Invalid cursor file name, characters must be within [A-Za-z0-9_\\-\\.] (if this seems like a mistake, check for invisible characters)");
+        return result;
+    }
+
     size.file = RHS;
 
     if (!size.file.ends_with(".svg")) {
@@ -132,7 +138,9 @@ std::optional<std::string> CMeta::parseHL() {
         meta->registerHandler(::parseDefineSize, "define_size", {.allowFlags = false});
         meta->registerHandler(::parseOverride, "define_override", {.allowFlags = false});
         meta->commence();
-        meta->parse();
+        const auto RESULT = meta->parse();
+        if (RESULT.error)
+            return RESULT.getError();
     } catch (const char* err) { return "failed parsing meta: " + std::string{err}; }
 
     parsedData.hotspotX   = std::any_cast<Hyprlang::FLOAT>(meta->getConfigValue("hotspot_x"));