pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only delete empty expeditions when the dz is empty

Browse Source 
Zones are no longer able to delete expeditions. World now tracks empty
expeditions in cache and only deletes them when it detects an
expedition's dynamic zone instance has no more clients inside.

This fixes an exploit where lockouts couldn't be applied to expeditions
after all members were removed because zones were deleting the expedition
immediately. Clients still inside the dz were able to complete events
before being kicked from the instance while not having an expedition.

Expeditions are no longer purged from database in the world purge
instance timer to avoid a possible race with this new system
This commit is contained in:
hg
2020-05-26 22:32:08 -04:00
parent dcbcc5a156
commit 148af3edfc
10 changed files with 167 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/expedition.cpp
+21 -28
View File
@@ -132,7 +132,7 @@ Expedition* Expedition::TryCreate(
auto inserted = zone->expedition_cache.emplace(expedition_id, std::move(expedition));
inserted.first->second->SendUpdatesToZoneMembers();
inserted.first->second->SendWorldExpeditionUpdate(); // cache in other zones
inserted.first->second->SendWorldExpeditionUpdate(ServerOP_ExpeditionCreate); // cache in other zones
Client* leader_client = request.GetLeaderClient();
@@ -486,11 +486,10 @@ void Expedition::RemoveAllMembers(bool enable_removal_timers, bool update_dz_exp
m_dynamiczone.UpdateExpireTime(RuleI(Expedition, EmptyDzShutdownDelaySeconds));
}
ExpeditionDatabase::DeleteAllMembers(m_id);
ExpeditionDatabase::DeleteExpedition(m_id);
ExpeditionDatabase::UpdateAllMembersRemoved(m_id);
SendUpdatesToZoneMembers(true);
SendWorldExpeditionUpdate(true);
SendWorldExpeditionUpdate(ServerOP_ExpeditionMembersRemoved);
}
bool Expedition::RemoveMember(const std::string& remove_char_name)
@@ -519,8 +518,6 @@ bool Expedition::RemoveMember(const std::string& remove_char_name)
uint32_t member_count = ExpeditionDatabase::GetExpeditionMemberCount(m_id);
if (member_count == 0)
{
// zone cache removal will occur in world message handler
ExpeditionDatabase::DeleteExpedition(m_id);
if (RuleB(Expedition, EmptyDzShutdownEnabled))
{
m_dynamiczone.UpdateExpireTime(RuleI(Expedition, EmptyDzShutdownDelaySeconds));
@@ -1412,11 +1409,10 @@ std::unique_ptr<EQApplicationPacket> Expedition::CreateLeaderNamePacket()
return outapp;
}
void Expedition::SendWorldExpeditionUpdate(bool destroyed)
void Expedition::SendWorldExpeditionUpdate(uint16_t server_opcode)
{
uint16_t opcode = destroyed ? ServerOP_ExpeditionDeleted : ServerOP_ExpeditionCreate;
uint32_t pack_size = sizeof(ServerExpeditionID_Struct);
auto pack = std::unique_ptr<ServerPacket>(new ServerPacket(opcode, pack_size));
auto pack = std::unique_ptr<ServerPacket>(new ServerPacket(server_opcode, pack_size));
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
buf->expedition_id = GetID();
buf->sender_zone_id = zone ? zone->GetZoneID() : 0;
@@ -1605,24 +1601,32 @@ void Expedition::HandleWorldMessage(ServerPacket* pack)
break;
}
case ServerOP_ExpeditionDeleted:
case ServerOP_ExpeditionExpired:
{
// sent by world when it deletes expired or empty expeditions
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
auto expedition = Expedition::FindCachedExpeditionByID(buf->expedition_id);
if (zone && expedition)
{
if (!zone->IsZone(buf->sender_zone_id, buf->sender_instance_id))
{
// expired deletions should be silent
bool notify_members = (pack->opcode == ServerOP_ExpeditionDeleted);
expedition->SendUpdatesToZoneMembers(true, notify_members);
}
expedition->SendUpdatesToZoneMembers(true, false); // any members silently removed
// remove even from sender zone
LogExpeditionsModerate("Deleting expedition [{}] from zone cache", buf->expedition_id);
zone->expedition_cache.erase(buf->expedition_id);
}
break;
}
case ServerOP_ExpeditionMembersRemoved:
{
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
if (zone && !zone->IsZone(buf->sender_zone_id, buf->sender_instance_id))
{
auto expedition = Expedition::FindCachedExpeditionByID(buf->expedition_id);
if (expedition)
{
expedition->SendUpdatesToZoneMembers(true);
}
}
break;
}
case ServerOP_ExpeditionLeaderChanged:
{
auto buf = reinterpret_cast<ServerExpeditionMemberChange_Struct*>(pack->pBuffer);
@@ -1656,11 +1660,6 @@ void Expedition::HandleWorldMessage(ServerPacket* pack)
auto expedition = Expedition::FindCachedExpeditionByID(buf->expedition_id);
if (expedition && zone)
{
LogExpeditionsDetail(
"World member change message -- remove: [{}] name: [{}] zone: [{}]:[{}] sender: [{}]:[{}]",
buf->removed, buf->char_name, zone->GetZoneID(), zone->GetInstanceID(), buf->sender_zone_id, buf->sender_instance_id
);
if (!zone->IsZone(buf->sender_zone_id, buf->sender_instance_id))
{
if (buf->removed)
@@ -1672,12 +1671,6 @@ void Expedition::HandleWorldMessage(ServerPacket* pack)
expedition->ProcessMemberAdded(buf->char_name, buf->char_id);
}
}
// remove this expedition from zone cache if last member was removed
if (buf->removed && expedition->GetMemberCount() == 0)
{
zone->expedition_cache.erase(buf->expedition_id);
}
}
break;
}
zone/expedition.h
+1 -1
View File
@@ -156,7 +156,7 @@ private:
void SendLeaderMessage(Client* leader_client, uint16_t chat_type, uint32_t string_id, const std::initializer_list<std::string>& parameters = {});
void SendUpdatesToZoneMembers(bool clear = false, bool message_on_clear = true);
void SendWorldDzLocationUpdate(uint16_t server_opcode, const DynamicZoneLocation& location);
void SendWorldExpeditionUpdate(bool destroyed = false);
void SendWorldExpeditionUpdate(uint16_t server_opcode);
void SendWorldGetOnlineMembers();
void SendWorldAddPlayerInvite(const std::string& inviter_name, const std::string& swap_remove_name, const std::string& add_name, bool pending = false);
void SendWorldLeaderChanged();
zone/expedition_database.cpp
+12 -27
View File
@@ -320,18 +320,6 @@ void ExpeditionDatabase::DeletePendingLockouts(uint32_t character_id)
database.QueryDatabase(query);
}
void ExpeditionDatabase::DeleteExpedition(uint32_t expedition_id)
{
LogExpeditionsDetail("Deleting expedition [{}]", expedition_id);
auto query = fmt::format("DELETE FROM expedition_details WHERE id = {}", expedition_id);
auto results = database.QueryDatabase(query);
if (!results.Success())
{
LogExpeditions("Failed to delete expedition [{}]", expedition_id);
}
}
void ExpeditionDatabase::DeleteLockout(uint32_t expedition_id, const std::string& event_name)
{
LogExpeditionsDetail("Deleting expedition [{}] lockout event [{}]", expedition_id, event_name);
@@ -348,21 +336,6 @@ void ExpeditionDatabase::DeleteLockout(uint32_t expedition_id, const std::string
}
}
void ExpeditionDatabase::DeleteAllMembers(uint32_t expedition_id)
{
LogExpeditionsDetail("Deleting all members of expedition [{}]", expedition_id);
auto query = fmt::format(SQL(
DELETE FROM expedition_members WHERE expedition_id = {};
), expedition_id);
auto results = database.QueryDatabase(query);
if (!results.Success())
{
LogExpeditions("Failed to delete all members of expedition [{}]", expedition_id);
}
}
uint32_t ExpeditionDatabase::GetExpeditionIDFromCharacterID(uint32_t character_id)
{
LogExpeditionsDetail("Getting expedition id for character [{}]", character_id);
@@ -675,6 +648,18 @@ void ExpeditionDatabase::UpdateMemberRemoved(uint32_t expedition_id, uint32_t ch
}
}
void ExpeditionDatabase::UpdateAllMembersRemoved(uint32_t expedition_id)
{
LogExpeditionsDetail("Updating all members of expedition [{}] as removed", expedition_id);
auto query = fmt::format(SQL(
UPDATE expedition_members SET is_current_member = FALSE
WHERE expedition_id = {};
), expedition_id);
database.QueryDatabase(query);
}
void ExpeditionDatabase::UpdateReplayLockoutOnJoin(uint32_t expedition_id, bool add_on_join)
{
LogExpeditionsDetail("Updating replay lockout on join [{}] for expedition [{}]", add_on_join, expedition_id);
zone/expedition_database.h
+1 -2
View File
@@ -44,11 +44,9 @@ namespace ExpeditionDatabase
MySQLRequestResult LoadCharacterLockouts(uint32_t character_id, const std::string& expedition_name);
MySQLRequestResult LoadExpeditionMembers(uint32_t expedition_id);
MySQLRequestResult LoadValidationData(const std::string& character_names_query, const std::string& expedition_name);
void DeleteAllMembers(uint32_t expedition_id);
void DeleteAllCharacterLockouts(uint32_t character_id);
void DeleteAllCharacterLockouts(uint32_t character_id, const std::string& expedition_name);
void DeleteCharacterLockout(uint32_t character_id, const std::string& expedition_name, const std::string& event_name);
void DeleteExpedition(uint32_t expedition_id);
void DeleteLockout(uint32_t expedition_id, const std::string& event_name);
void DeleteMembersLockout(
const std::vector<ExpeditionMember>& members, const std::string& expedition_name, const std::string& event_name);
@@ -69,6 +67,7 @@ namespace ExpeditionDatabase
void UpdateLeaderID(uint32_t expedition_id, uint32_t leader_id);
void UpdateLockState(uint32_t expedition_id, bool is_locked);
void UpdateMemberRemoved(uint32_t expedition_id, uint32_t character_id);
void UpdateAllMembersRemoved(uint32_t expedition_id);
void UpdateReplayLockoutOnJoin(uint32_t expedition_id, bool add_on_join);
};
zone/worldserver.cpp
+1 -1
View File
@@ -2901,13 +2901,13 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
}
case ServerOP_ExpeditionCreate:
case ServerOP_ExpeditionDeleted:
case ServerOP_ExpeditionExpired:
case ServerOP_ExpeditionLeaderChanged:
case ServerOP_ExpeditionLockout:
case ServerOP_ExpeditionLockState:
case ServerOP_ExpeditionMemberChange:
case ServerOP_ExpeditionMemberSwap:
case ServerOP_ExpeditionMemberStatus:
case ServerOP_ExpeditionMembersRemoved:
case ServerOP_ExpeditionReplayOnJoin:
case ServerOP_ExpeditionGetOnlineMembers:
case ServerOP_ExpeditionDzAddPlayer: