ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow live kicking from ban list

Browse Source
This commit is contained in:
Benau 2019-10-23 14:42:22 +08:00
parent 6c22a3b210
commit 958868526f
4 changed files with 93 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NETWORKING.md
View File

@ -159,10 +159,10 @@ The current server configuration xml looks like this:
<!-- Specified in millisecond for maximum time waiting in sqlite3_busy_handler. You may need a higher value if your database is shared by many servers or having a slow hard disk. -->
<database-timeout value="1000" />
<!-- Ip ban list table name, you need to create the table first, see NETWORKING.md for details, empty to disable. This table can be shared for all servers if you use the same name. -->
<!-- Ip ban list table name, you need to create the table first, see NETWORKING.md for details, empty to disable. This table can be shared for all servers if you use the same name. STK can auto kick active peer from ban list (update per minute) which allows live kicking peer by inserting record to database. -->
<ip-ban-table value="ip_ban" />
<!-- Online ID ban list table name, you need to create the table first, see NETWORKING.md for details, empty to disable. This table can be shared for all servers if you use the same name. -->
<!-- Online ID ban list table name, you need to create the table first, see NETWORKING.md for details, empty to disable. This table can be shared for all servers if you use the same name. STK can auto kick active peer from ban list (update per minute) which allows live kicking peer by inserting record to database. -->
<online-id-ban-table value="online_id_ban" />
<!-- Player reports table name, which will be written when a player reports player in the network user dialog, you need to create the table first, see NETWORKING.md for details, empty to disable. This table can be shared for all servers if you use the same name. -->

90
src/network/protocols/server_lobby.cpp
View File

@ -172,7 +172,7 @@ ServerLobby::~ServerLobby()
void ServerLobby::initDatabase()
{
#ifdef ENABLE_SQLITE3
m_last_cleanup_db_time = StkTime::getMonoTimeMs();
m_last_poll_db_time = StkTime::getMonoTimeMs();
m_db = NULL;
m_ip_ban_table_exists = false;
m_online_id_ban_table_exists = false;
@ -731,19 +731,95 @@ void ServerLobby::createServerIdFile()
//-----------------------------------------------------------------------------
#ifdef ENABLE_SQLITE3
/* Every 1 minute STK will clean up database:
/* Every 1 minute STK will poll database:
* 1. Set disconnected time to now for non-exists host.
* 2. Clear expired player reports if necessary
* 3. Kick active peer from ban list
*/
void ServerLobby::cleanupDatabase()
void ServerLobby::pollDatabase()
{
if (!ServerConfig::m_sql_management || !m_db)
return;
if (StkTime::getMonoTimeMs() < m_last_cleanup_db_time + 60000)
if (StkTime::getMonoTimeMs() < m_last_poll_db_time + 60000)
return;
m_last_cleanup_db_time = StkTime::getMonoTimeMs();
m_last_poll_db_time = StkTime::getMonoTimeMs();
if (m_ip_ban_table_exists)
{
std::string query =
"SELECT ip_start, ip_end, reason, description FROM ";
query += ServerConfig::m_ip_ban_table;
query += " WHERE datetime('now') > datetime(starting_time) AND "
"(expired_days is NULL OR datetime"
"(starting_time, '+'||expired_days||' days') > datetime('now'));";
auto peers = STKHost::get()->getPeers();
sqlite3_exec(m_db, query.c_str(),
[](void* ptr, int count, char** data, char** columns)
{
std::vector<std::shared_ptr<STKPeer> >* peers_ptr =
(std::vector<std::shared_ptr<STKPeer> >*)ptr;
for (std::shared_ptr<STKPeer>& p : *peers_ptr)
{
// IPv4 ban list atm
if (p->isAIPeer() || !p->getIPV6Address().empty())
continue;
uint32_t ip_start = 0;
uint32_t ip_end = 0;
if (!StringUtils::fromString(data[0], ip_start))
continue;
if (!StringUtils::fromString(data[1], ip_end))
continue;
uint32_t peer_addr = p->getAddress().getIP();
if (ip_start <= peer_addr && ip_end >= peer_addr)
{
Log::info("ServerLobby",
"Kick %s, reason: %s, description: %s",
p->getAddress().toString().c_str(),
data[2], data[3]);
p->kick();
}
}
return 0;
}, &peers, NULL);
}
if (m_online_id_ban_table_exists)
{
std::string query = "SELECT online_id, reason, description FROM ";
query += ServerConfig::m_online_id_ban_table;
query += " WHERE datetime('now') > datetime(starting_time) AND "
"(expired_days is NULL OR datetime"
"(starting_time, '+'||expired_days||' days') > datetime('now'));";
auto peers = STKHost::get()->getPeers();
sqlite3_exec(m_db, query.c_str(),
[](void* ptr, int count, char** data, char** columns)
{
std::vector<std::shared_ptr<STKPeer> >* peers_ptr =
(std::vector<std::shared_ptr<STKPeer> >*)ptr;
for (std::shared_ptr<STKPeer>& p : *peers_ptr)
{
if (p->isAIPeer()
|| p->getPlayerProfiles().empty())
continue;
uint32_t online_id = 0;
if (!StringUtils::fromString(data[0], online_id))
continue;
if (online_id == p->getPlayerProfiles()[0]->getOnlineId())
{
Log::info("ServerLobby",
"Kick %s, reason: %s, description: %s",
p->getAddress().toString().c_str(),
data[1], data[2]);
p->kick();
}
}
return 0;
}, &peers, NULL);
}
if (m_player_reports_table_exists &&
ServerConfig::m_player_reports_expired_days != 0.0f)
@ -795,7 +871,7 @@ void ServerLobby::cleanupDatabase()
query = oss.str();
}
easySQLQuery(query);
} // cleanupDatabase
} // pollDatabase
//-----------------------------------------------------------------------------
/** Run simple query with write lock waiting and optional function, this
@ -1023,7 +1099,7 @@ void ServerLobby::asynchronousUpdate()
}
#ifdef ENABLE_SQLITE3
cleanupDatabase();
pollDatabase();
#endif
// Check if server owner has left

4
src/network/protocols/server_lobby.hpp
View File

@ -84,9 +84,9 @@ private:
bool m_ip_geolocation_table_exists;
uint64_t m_last_cleanup_db_time;
uint64_t m_last_poll_db_time;
void cleanupDatabase();
void pollDatabase();
bool easySQLQuery(const std::string& query,
std::function<void(sqlite3_stmt* stmt)> bind_function = nullptr) const;

8
src/network/server_config.hpp
View File

@ -353,14 +353,18 @@ namespace ServerConfig
"ip-ban-table",
"Ip ban list table name, you need to create the table first, see "
"NETWORKING.md for details, empty to disable. "
"This table can be shared for all servers if you use the same name."));
"This table can be shared for all servers if you use the same name. "
"STK can auto kick active peer from ban list (update per minute) which"
"allows live kicking peer by inserting record to database."));
SERVER_CFG_PREFIX StringServerConfigParam m_online_id_ban_table
SERVER_CFG_DEFAULT(StringServerConfigParam("online_id_ban",
"online-id-ban-table",
"Online ID ban list table name, you need to create the table first, "
"see NETWORKING.md for details, empty to disable. "
"This table can be shared for all servers if you use the same name."));
"This table can be shared for all servers if you use the same name. "
"STK can auto kick active peer from ban list (update per minute) which"
"allows live kicking peer by inserting record to database."));
SERVER_CFG_PREFIX StringServerConfigParam m_player_reports_table
SERVER_CFG_DEFAULT(StringServerConfigParam("player_reports",