Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Stop more nonsense happening in the client module

Browse Source
This commit is contained in:
FutureRave 2022-01-26 22:02:48 +00:00
parent 5c9a5c3eac
commit 35114e454c
No known key found for this signature in database
GPG Key ID: E883E2BC9657D955
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Components/Modules/ScriptExtension.cpp
View File

@ -2,19 +2,21 @@
namespace Components
{
static const char* queryStrings[] = { R"(..)", R"(../)", R"(..\)" };
void ScriptExtension::AddFunctions()
{
//File functions
Script::AddFunction("FileWrite", [](Game::scr_entref_t) // gsc: FileWrite(<filepath>, <string>, <mode>)
{
const std::string path = Game::Scr_GetString(0);
const auto* path = Game::Scr_GetString(0);
auto* text = Game::Scr_GetString(1);
auto* mode = Game::Scr_GetString(2);
if (path.empty())
if (path == nullptr)
{
Game::Scr_ParamError(0, "^1FileWrite: filepath not defined!\n");
Game::Scr_ParamError(0, "^1FileWrite: filepath is not defined!\n");
return;
}
@ -24,10 +26,9 @@ namespace Components
return;
}
std::vector<const char*> queryStrings = { R"(..)", R"(../)", R"(..\)" };
for (auto i = 0u; i < queryStrings.size(); i++)
for (auto i = 0u; i < ARRAYSIZE(queryStrings); ++i)
{
if (path.find(queryStrings[i]) != std::string::npos)
if (std::strstr(path, queryStrings[i]) != nullptr)
{
Logger::Print("^1FileWrite: directory traversal is not allowed!\n");
return;
@ -52,18 +53,17 @@ namespace Components
Script::AddFunction("FileRead", [](Game::scr_entref_t) // gsc: FileRead(<filepath>)
{
std::string path = Game::Scr_GetString(0);
const auto* path = Game::Scr_GetString(0);
if (path.empty())
if (path == nullptr)
{
Game::Scr_ParamError(0, "^1FileRead: filepath not defined!\n");
Game::Scr_ParamError(0, "^1FileRead: filepath is not defined!\n");
return;
}
std::vector<const char*> queryStrings = { R"(..)", R"(../)", R"(..\)" };
for (auto i = 0u; i < queryStrings.size(); i++)
for (auto i = 0u; i < ARRAYSIZE(queryStrings); ++i)
{
if (path.find(queryStrings[i]) != std::string::npos)
if (std::strstr(path, queryStrings[i]) != nullptr)
{
Logger::Print("^1FileRead: directory traversal is not allowed!\n");
return;
@ -81,18 +81,17 @@ namespace Components
Script::AddFunction("FileExists", [](Game::scr_entref_t) // gsc: FileExists(<filepath>)
{
std::string path = Game::Scr_GetString(0);
const auto* path = Game::Scr_GetString(0);
if (path.empty())
if (path == nullptr)
{
Game::Scr_ParamError(0, "^1FileExists: filepath not defined!\n");
Game::Scr_ParamError(0, "^1FileExists: filepath is not defined!\n");
return;
}
std::vector<const char*> queryStrings = { R"(..)", R"(../)", R"(..\)" };
for (auto i = 0u; i < queryStrings.size(); i++)
for (auto i = 0u; i < ARRAYSIZE(queryStrings); ++i)
{
if (path.find(queryStrings[i]) != std::string::npos)
if (std::strstr(path, queryStrings[i]) != nullptr)
{
Logger::Print("^1FileExists: directory traversal is not allowed!\n");
return;
@ -104,18 +103,17 @@ namespace Components
Script::AddFunction("FileRemove", [](Game::scr_entref_t) // gsc: FileRemove(<filepath>)
{
std::string path = Game::Scr_GetString(0);
const auto* path = Game::Scr_GetString(0);
if (path.empty())
if (path == nullptr)
{
Game::Scr_ParamError(0, "^1FileRemove: filepath not defined!\n");
Game::Scr_ParamError(0, "^1FileRemove: filepath is not defined!\n");
return;
}
std::vector<const char*> queryStrings = { R"(..)", R"(../)", R"(..\)" };
for (auto i = 0u; i < queryStrings.size(); i++)
for (auto i = 0u; i < ARRAYSIZE(queryStrings); ++i)
{
if (path.find(queryStrings[i]) != std::string::npos)
if (std::strstr(path, queryStrings[i]) != nullptr)
{
Logger::Print("^1fileRemove: directory traversal is not allowed!\n");
return;