Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add more sanity checks config options #901

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

add more sanity checks config options #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0386404
before sending a request, we check whether server query are enabled
atomlin-git Mar 24, 2024
8e671d0
find the absolute value of the number of hours and limit that to 24
atomlin-git Mar 24, 2024
fc47232
fix negative weather value in server rule
atomlin-git Mar 24, 2024
38ed02d
print error, if cant create scriptfiles folder
atomlin-git Mar 24, 2024
130b756
add warning, if max_bots >= max_players
atomlin-git Mar 24, 2024
11885f6
fix negative value in cookie_reseed_time variable
atomlin-git Mar 24, 2024
327f593
fix negative values from config
atomlin-git Mar 24, 2024
d76e5dc
corrected the line
atomlin-git Mar 24, 2024
25beb08
corrected the line
atomlin-git Mar 24, 2024
5db4652
add warning to negative config vars
atomlin-git Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 53 additions & 11 deletions Server/Components/LegacyNetwork/legacy_network_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,14 +704,14 @@ void RakNetLegacyNetwork::update()
{
IConfig& config = core->getConfig();

cookieSeedTime = Milliseconds(*config.getInt("network.cookie_reseed_time"));
cookieSeedTime = Milliseconds(abs(*config.getInt("network.cookie_reseed_time")));

SAMPRakNet::SetTimeout(*config.getInt("network.player_timeout"));
SAMPRakNet::SetMinConnectionTime(*config.getInt("network.minimum_connection_time"));
SAMPRakNet::SetMessagesLimit(*config.getInt("network.messages_limit"));
SAMPRakNet::SetMessageHoleLimit(*config.getInt("network.message_hole_limit"));
SAMPRakNet::SetAcksLimit(*config.getInt("network.acks_limit"));
SAMPRakNet::SetNetworkLimitsBanTime(*config.getInt("network.limits_ban_time"));
SAMPRakNet::SetTimeout(abs(*config.getInt("network.player_timeout")));
SAMPRakNet::SetMinConnectionTime(abs(*config.getInt("network.minimum_connection_time")));
SAMPRakNet::SetMessagesLimit(abs(*config.getInt("network.messages_limit")));
SAMPRakNet::SetMessageHoleLimit(abs(*config.getInt("network.message_hole_limit")));
SAMPRakNet::SetAcksLimit(abs(*config.getInt("network.acks_limit")));
SAMPRakNet::SetNetworkLimitsBanTime(abs(*config.getInt("network.limits_ban_time")));

SAMPRakNet::SetLogCookies(*config.getBool("logging.log_cookies"));

Expand Down Expand Up @@ -751,7 +751,7 @@ void RakNetLegacyNetwork::update()
query.setRuleValue<false>("mapname", "San Andreas");
}

query.setRuleValue<false>("weather", std::to_string(*config.getInt("game.weather")));
query.setRuleValue<false>("weather", std::to_string(abs(*config.getInt("game.weather"))));

StringView website = config.getString("website");
if (!website.empty())
Expand All @@ -777,7 +777,7 @@ void RakNetLegacyNetwork::update()
query.setDarkBannerUrl(bannerUrl);
}

query.setRuleValue<false>("worldtime", String(std::to_string(*config.getInt("game.time")) + ":00"));
query.setRuleValue<false>("worldtime", String(std::to_string(abs(*config.getInt("game.time")) % 24) + ":00"));

StringView rconPassword = config.getString("rcon.password");
query.setRconPassword(rconPassword);
Expand Down Expand Up @@ -835,6 +835,42 @@ void RakNetLegacyNetwork::start()
query.setMaxPlayers(maxPlayers);
query.buildPlayerDependentBuffers();

if(*config.getInt("network.player_timeout") < 0)
core->logLn(LogLevel::Warning, "The 'player_timeout' option cannot have a negative value");

if(*config.getInt("network.minimum_connection_time") < 0)
core->logLn(LogLevel::Warning, "The 'minimum_connection_time' option cannot have a negative value");

if(*config.getInt("network.messages_limit") < 0)
core->logLn(LogLevel::Warning, "The 'messages_limit' option cannot have a negative value");

if(*config.getInt("network.message_hole_limit") < 0)
core->logLn(LogLevel::Warning, "The 'message_hole_limit' option cannot have a negative value");

if(*config.getInt("network.acks_limit") < 0)
core->logLn(LogLevel::Warning, "The 'acks_limit' option cannot have a negative value");

if(*config.getInt("network.limits_ban_time") < 0)
core->logLn(LogLevel::Warning, "The 'limits_ban_time' option cannot have a negative value");

if(*config.getInt("network.on_foot_sync_rate") < 0)
core->logLn(LogLevel::Warning, "The 'on_foot_sync_rate' option cannot have a negative value");

if(*config.getInt("network.in_vehicle_sync_rate") < 0)
core->logLn(LogLevel::Warning, "The 'in_vehicle_sync_rate' option cannot have a negative value");

if(*config.getInt("network.aiming_sync_rate") < 0)
core->logLn(LogLevel::Warning, "The 'aiming_sync_rate' option cannot have a negative value");

if(*config.getInt("network.cookie_reseed_time") < 0)
core->logLn(LogLevel::Warning, "The 'cookie_reseed_time' option cannot have a negative value");

if(*config.getInt("game.weather") < 0)
core->logLn(LogLevel::Warning, "The 'weather' option cannot have a negative value");

if(*config.getInt("game.time") < 0)
core->logLn(LogLevel::Warning, "The 'time' option cannot have a negative value");

update();

for (size_t i = 0; i < config.getBansCount(); ++i)
Expand Down Expand Up @@ -867,11 +903,17 @@ void RakNetLegacyNetwork::start()
// Do the request after network is started.
if (*config.getBool("announce"))
{
const String get = "https://api.open.mp/0.3.7/announce/" + std::to_string(port);
core->requestHTTP4(new AnnounceHTTPResponseHandler(core), HTTPRequestType::HTTPRequestType_Get, get.data());
if(*config.getBool("enable_query"))
{
const String get = "https://api.open.mp/0.3.7/announce/" + std::to_string(port);
core->requestHTTP4(new AnnounceHTTPResponseHandler(core), HTTPRequestType::HTTPRequestType_Get, get.data());
} else core->logLn(LogLevel::Warning, "The 'enable_query' option is disabled, so executing 'announce' will not succeed");
}
}

if(*config.getInt("max_bots") >= maxPlayers)
core->logLn(LogLevel::Warning, "The 'max_bots' option more or equal than 'max_players' option. Server work can be unpredictable");

rakNetServer.StartOccasionalPing();
SAMPRakNet::SetPort(port);

Expand Down
5 changes: 2 additions & 3 deletions Server/Components/Pawn/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,8 @@ class PawnComponent final : public IPawnComponent, public CoreEventHandler, publ
// Set AMXFILE environment variable to "{current_dir}/scriptfiles"
ghc::filesystem::path scriptfilesPath = ghc::filesystem::absolute("scriptfiles");
if (!ghc::filesystem::exists(scriptfilesPath) || !ghc::filesystem::is_directory(scriptfilesPath))
{
ghc::filesystem::create_directory(scriptfilesPath);
}
if(!ghc::filesystem::create_directory(scriptfilesPath))
core->logLn(LogLevel::Error, "Cannot access 'scriptfiles' folder");

#if defined(GHC_USE_WCHAR_T)
std::wstring wstr_path = scriptfilesPath.wstring();
Expand Down