mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-05-24 06:25:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sanitize profile filenames

Browse Source
This commit is contained in:
Adam Honse
2026-04-11 18:30:07 -05:00
parent e22e88d97d
commit e1fc54de85
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ProfileManager.cpp
View File

@@ -279,7 +279,7 @@ void ProfileManager::DeleteProfile(std::string profile_name)
}
else
{
filesystem::path filename = profile_directory / profile_name;
filesystem::path filename = profile_directory / StringUtils::make_filename(profile_name);
filename.concat(".json");
filesystem::remove(filename);
@@ -524,7 +524,7 @@ nlohmann::json ProfileManager::ReadProfileJSON(std::string profile_name)
/*-------------------------------------------------*\
| File extension for v6+ profiles is .json |
\*-------------------------------------------------*/
profile_name += ".json";
profile_name = StringUtils::make_filename(profile_name) + ".json";
/*-------------------------------------------------*\
| Read the profile JSON from the file |
@@ -774,7 +774,7 @@ bool ProfileManager::SaveProfileFromJSON(nlohmann::json profile_json)
{
if(profile_json.contains("profile_name"))
{
std::string profile_filename = profile_json["profile_name"];
std::string profile_filename = StringUtils::make_filename(profile_json["profile_name"]);
profile_filename.append(".json");
@@ -1024,9 +1024,9 @@ void ProfileManager::UpdateProfileList()
nlohmann::json profile_json = ReadProfileFileJSON(file_path);
if(!profile_json.empty())
if(!profile_json.empty() && profile_json.contains("profile_name"))
{
profile_list.push_back(filename.erase(filename.length() - 5));
profile_list.push_back(profile_json["profile_name"]);
}
}
}

1
RGBController/RGBController_Dummy.cpp
View File

@@ -44,7 +44,6 @@ RGBController_Dummy::RGBController_Dummy()
RGBController_Dummy::~RGBController_Dummy()
{
Shutdown();
}
void RGBController_Dummy::SetupZones()

29
StringUtils.cpp
View File

@@ -21,6 +21,7 @@
#include <codecvt>
#include <locale>
#include <regex>
#include <string>
#include "StringUtils.h"
@@ -94,3 +95,31 @@ const std::string StringUtils::remove_null_terminating_chars(std::string input)
return(input);
}
std::string StringUtils::make_filename(std::string input)
{
/*-----------------------------------------------------*\
| Replace : characters with - characters |
\*-----------------------------------------------------*/
input = std::regex_replace(input, std::regex(":"), "-");
/*-----------------------------------------------------*\
| Remove all other characters |
\*-----------------------------------------------------*/
input = std::regex_replace(input, std::regex("[#%&\\{\\}\\\\<>\\*\\?/!`';@+|=]"), "");
/*-----------------------------------------------------*\
| Remove leading . characters |
\*-----------------------------------------------------*/
input = std::regex_replace(input, std::regex("^\\.+"), "");
/*-----------------------------------------------------*\
| Remove control characters |
\*-----------------------------------------------------*/
input = std::regex_replace(input, std::regex("[\\x00-\\x1F\\x7F]"), "");
/*-----------------------------------------------------*\
| Return complete string |
\*-----------------------------------------------------*/
return(input);
}

1
StringUtils.h
View File

@@ -18,4 +18,5 @@ public:
static std::string wstring_to_string(const std::wstring wstring);
static std::string u16string_to_string(const std::u16string wstring);
static const std::string remove_null_terminating_chars(std::string input);
static std::string make_filename(std::string input);
};