pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-29 00:02:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Authenticate world admin prior to checking against a world short name [skip ci]

Browse Source
This commit is contained in:
Akkadius 2019-07-09 17:39:06 -05:00
parent 193dbe5938
commit 32e8a0fa45
3 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
loginserver/database.cpp
View File

@ -320,14 +320,12 @@ void Database::UpdateLoginHash(
/** /**
* @param short_name * @param short_name
* @param remote_ip * @param login_world_server_admin_id
* @param local_ip
* @return * @return
*/ */
Database::DbWorldRegistration Database::GetWorldRegistration( Database::DbWorldRegistration Database::GetWorldRegistration(
const std::string &short_name, const std::string &short_name,
const std::string &remote_ip, uint32 login_world_server_admin_id
const std::string &local_ip
) )
{ {
auto query = fmt::format( auto query = fmt::format(
@ -342,8 +340,9 @@ Database::DbWorldRegistration Database::GetWorldRegistration(
" login_world_servers AS WSR\n" " login_world_servers AS WSR\n"
" JOIN login_server_list_types AS SLT ON WSR.login_server_list_type_id = SLT.id\n" " JOIN login_server_list_types AS SLT ON WSR.login_server_list_type_id = SLT.id\n"
"WHERE\n" "WHERE\n"
" WSR.short_name = '{0}' LIMIT 1", " WSR.short_name = '{0}' WSR.login_server_admin_id = {1} AND LIMIT 1",
EscapeString(short_name) EscapeString(short_name),
login_world_server_admin_id
); );
Database::DbWorldRegistration world_registration{}; Database::DbWorldRegistration world_registration{};

6
loginserver/database.h
View File

@ -154,14 +154,12 @@ public:
* Returns true if the record was found, false otherwise * Returns true if the record was found, false otherwise
* *
* @param short_name * @param short_name
* @param remote_ip * @param login_world_server_admin_id
* @param local_ip
* @return * @return
*/ */
Database::DbWorldRegistration GetWorldRegistration( Database::DbWorldRegistration GetWorldRegistration(
const std::string &short_name, const std::string &short_name,
const std::string &remote_ip, uint32 login_world_server_admin_id
const std::string &local_ip
); );
/** /**

45
loginserver/world_server.cpp
View File

@ -505,11 +505,49 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct *new_world_server_info
} }
} }
uint32 world_server_admin_id = 0;
/**
* If our world is trying to authenticate, let's try and pull the owner first to try associating
* with a world short_name
*/
if (!GetAccountName().empty() && !GetAccountPassword().empty()) {
Database::DbLoginServerAdmin
login_server_admin = server.db->GetLoginServerAdmin(GetAccountName());
if (login_server_admin.loaded) {
LogDebug(
"WorldServer::Handle_NewLSInfo | Attempting to authenticate world admin... [{0}] ({1}) against worldserver [{2}]",
GetAccountName(),
login_server_admin.id,
GetServerShortName()
);
/**
* Validate password hash
*/
auto mode = server.options.GetEncryptionMode();
if (eqcrypt_verify_hash(
GetAccountName(),
GetAccountPassword(),
login_server_admin.account_password,
mode
)) {
LogDebug(
"WorldServer::Handle_NewLSInfo | Authenticating world admin... [{0}] ({1}) success! World ({2})",
GetAccountName(),
login_server_admin.id,
GetServerShortName()
);
world_server_admin_id = login_server_admin.id;
}
}
}
Database::DbWorldRegistration Database::DbWorldRegistration
world_registration = server.db->GetWorldRegistration( world_registration = server.db->GetWorldRegistration(
GetServerShortName(), GetServerShortName(),
GetRemoteIp(), world_server_admin_id
GetLocalIp()
); );
if (!server.options.IsUnregisteredAllowed()) { if (!server.options.IsUnregisteredAllowed()) {
@ -876,10 +914,9 @@ bool WorldServer::HandleNewLoginserverInfoUnregisteredAllowed(
} }
Database::DbLoginServerAdmin login_server_admin = Database::DbLoginServerAdmin login_server_admin =
server.db->GetLoginServerAdmin(GetAccountName()); server.db->GetLoginServerAdmin(GetAccountName());
uint32 server_admin_id = 0; uint32 server_admin_id = 0;
if (login_server_admin.loaded) { if (login_server_admin.loaded) {
auto mode = server.options.GetEncryptionMode(); auto mode = server.options.GetEncryptionMode();
if (eqcrypt_verify_hash( if (eqcrypt_verify_hash(