diff options
Diffstat (limited to 'src/server/authserver/Server/BattlenetSession.cpp')
| -rw-r--r-- | src/server/authserver/Server/BattlenetSession.cpp | 127 |
1 files changed, 70 insertions, 57 deletions
diff --git a/src/server/authserver/Server/BattlenetSession.cpp b/src/server/authserver/Server/BattlenetSession.cpp index 7abb9df9db9..2242a3ee4eb 100644 --- a/src/server/authserver/Server/BattlenetSession.cpp +++ b/src/server/authserver/Server/BattlenetSession.cpp @@ -30,16 +30,16 @@ std::map<Battlenet::PacketHeader, Battlenet::Session::PacketHandler> InitHandler { std::map<Battlenet::PacketHeader, Battlenet::Session::PacketHandler> handlers; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_AUTH_CHALLENGE, Battlenet::AUTHENTICATION)] = &Battlenet::Session::HandleAuthChallenge; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_AUTH_RECONNECT, Battlenet::AUTHENTICATION)] = &Battlenet::Session::HandleAuthReconnect; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_AUTH_PROOF_RESPONSE, Battlenet::AUTHENTICATION)] = &Battlenet::Session::HandleAuthProofResponse; + handlers[Battlenet::PacketHeader(Battlenet::Authentication::CMSG_LOGON_REQUEST, Battlenet::AUTHENTICATION)] = &Battlenet::Session::HandleLogonRequest; + handlers[Battlenet::PacketHeader(Battlenet::Authentication::CMSG_RESUME_REQUEST, Battlenet::AUTHENTICATION)] = &Battlenet::Session::HandleResumeRequest; + handlers[Battlenet::PacketHeader(Battlenet::Authentication::CMSG_PROOF_RESPONSE, Battlenet::AUTHENTICATION)] = &Battlenet::Session::HandleProofResponse; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_PING, Battlenet::CONNECTION)] = &Battlenet::Session::HandlePing; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_ENABLE_ENCRYPTION, Battlenet::CONNECTION)] = &Battlenet::Session::HandleEnableEncryption; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_DISCONNECT, Battlenet::CONNECTION)] = &Battlenet::Session::HandleDisconnect; + handlers[Battlenet::PacketHeader(Battlenet::Connection::CMSG_PING, Battlenet::CONNECTION)] = &Battlenet::Session::HandlePing; + handlers[Battlenet::PacketHeader(Battlenet::Connection::CMSG_ENABLE_ENCRYPTION, Battlenet::CONNECTION)] = &Battlenet::Session::HandleEnableEncryption; + handlers[Battlenet::PacketHeader(Battlenet::Connection::CMSG_LOGOUT_REQUEST, Battlenet::CONNECTION)] = &Battlenet::Session::HandleLogoutRequest; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_REALM_UPDATE_SUBSCRIBE, Battlenet::WOW)] = &Battlenet::Session::HandleRealmUpdateSubscribe; - handlers[Battlenet::PacketHeader(Battlenet::CMSG_JOIN_REQUEST, Battlenet::WOW)] = &Battlenet::Session::HandleRealmJoinRequest; + handlers[Battlenet::PacketHeader(Battlenet::WoWRealm::CMSG_LIST_SUBSCRIBE_REQUEST, Battlenet::WOWREALM)] = &Battlenet::Session::HandleListSubscribeRequest; + handlers[Battlenet::PacketHeader(Battlenet::WoWRealm::CMSG_JOIN_REQUEST_V2, Battlenet::WOWREALM)] = &Battlenet::Session::HandleJoinRequestV2; return handlers; } @@ -109,7 +109,7 @@ void Battlenet::Session::_SetVSFields(std::string const& pstr) LoginDatabase.Execute(stmt); } -bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& packet) +bool Battlenet::Session::HandleLogonRequest(PacketHeader& header, BitStream& packet) { // Verify that this IP is not in the ip_banned table LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_DEL_EXPIRED_IP_BANS)); @@ -119,19 +119,19 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa stmt->setString(0, ip_address); if (PreparedQueryResult result = LoginDatabase.Query(stmt)) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(LOGIN_BANNED); AsyncWrite(complete); TC_LOG_DEBUG("server.battlenet", "[Battlenet::AuthChallenge] Banned ip '%s:%d' tries to login!", ip_address.c_str(), GetRemotePort()); return true; } - AuthChallenge info(header, packet); + Authentication::LogonRequest info(header, packet); info.Read(); if (info.Program != "WoW") { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_INVALID_PROGRAM); AsyncWrite(complete); return true; @@ -139,7 +139,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa if (!sBattlenetMgr->HasPlatform(info.Platform)) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_INVALID_OS); AsyncWrite(complete); return true; @@ -147,7 +147,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa if (!sBattlenetMgr->HasPlatform(info.Locale)) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_UNSUPPORTED_LANGUAGE); AsyncWrite(complete); return true; @@ -157,7 +157,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa { if (!sBattlenetMgr->HasComponent(&component)) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); if (!sBattlenetMgr->HasProgram(component.Program)) complete->SetAuthResult(AUTH_INVALID_PROGRAM); else if (!sBattlenetMgr->HasPlatform(component.Platform)) @@ -189,7 +189,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa PreparedQueryResult result = LoginDatabase.Query(stmt); if (!result) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_UNKNOWN_ACCOUNT); AsyncWrite(complete); return true; @@ -206,7 +206,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa if (strcmp(fields[4].GetCString(), ip_address.c_str()) != 0) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_ACCOUNT_LOCKED); AsyncWrite(complete); return true; @@ -231,7 +231,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa TC_LOG_DEBUG("server.battlenet", "[Battlenet::AuthChallenge] Account '%s' is locked to country: '%s' Player country is '%s'", _accountName.c_str(), accountCountry.c_str(), loginCountry.c_str()); if (loginCountry != accountCountry) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_ACCOUNT_LOCKED); AsyncWrite(complete); return true; @@ -252,7 +252,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa Field* fields = banresult->Fetch(); if (fields[0].GetUInt32() == fields[1].GetUInt32()) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(LOGIN_BANNED); AsyncWrite(complete); TC_LOG_DEBUG("server.battlenet", "'%s:%d' [Battlenet::AuthChallenge] Banned account %s tried to login!", ip_address.c_str(), GetRemotePort(), _accountName.c_str()); @@ -260,7 +260,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa } else { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(LOGIN_SUSPENDED); AsyncWrite(complete); TC_LOG_DEBUG("server.battlenet", "'%s:%d' [Battlenet::AuthChallenge] Temporarily banned account %s tried to login!", ip_address.c_str(), GetRemotePort(), _accountName.c_str()); @@ -309,7 +309,7 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa _modulesWaitingForData.push(MODULE_PASSWORD); - ProofRequest* request = new ProofRequest(); + Authentication::ProofRequest* request = new Authentication::ProofRequest(); request->Modules.push_back(password); // if has authenticator, send Token module request->Modules.push_back(thumbprint); @@ -317,9 +317,9 @@ bool Battlenet::Session::HandleAuthChallenge(PacketHeader& header, BitStream& pa return true; } -bool Battlenet::Session::HandleAuthReconnect(PacketHeader& header, BitStream& packet) +bool Battlenet::Session::HandleResumeRequest(PacketHeader& header, BitStream& packet) { - AuthResumeInfo reconnect(header, packet); + Authentication::ResumeRequest reconnect(header, packet); reconnect.Read(); TC_LOG_DEBUG("server.battlenet", "%s", reconnect.ToString().c_str()); @@ -338,7 +338,7 @@ bool Battlenet::Session::HandleAuthReconnect(PacketHeader& header, BitStream& pa PreparedQueryResult result = LoginDatabase.Query(stmt); if (!result) { - AuthResume* resume = new AuthResume(); + Authentication::ResumeResponse* resume = new Authentication::ResumeResponse(); resume->SetAuthResult(AUTH_UNKNOWN_ACCOUNT); AsyncWrite(resume); return false; @@ -366,21 +366,21 @@ bool Battlenet::Session::HandleAuthReconnect(PacketHeader& header, BitStream& pa _modulesWaitingForData.push(MODULE_RESUME); - ProofRequest* request = new ProofRequest(); + Authentication::ProofRequest* request = new Authentication::ProofRequest(); request->Modules.push_back(thumbprint); request->Modules.push_back(resume); AsyncWrite(request); return true; } -bool Battlenet::Session::HandleAuthProofResponse(PacketHeader& header, BitStream& packet) +bool Battlenet::Session::HandleProofResponse(PacketHeader& header, BitStream& packet) { - ProofResponse proof(header, packet); + Authentication::ProofResponse proof(header, packet); proof.Read(); if (_modulesWaitingForData.size() < proof.Modules.size()) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); AsyncWrite(complete); return true; @@ -397,8 +397,8 @@ bool Battlenet::Session::HandleAuthProofResponse(PacketHeader& header, BitStream if (!response) { - response = new AuthComplete(); - static_cast<AuthComplete*>(response)->SetAuthResult(AUTH_INTERNAL_ERROR); + response = new Authentication::LogonResponse(); + static_cast<Authentication::LogonResponse*>(response)->SetAuthResult(AUTH_INTERNAL_ERROR); } AsyncWrite(response); @@ -407,7 +407,7 @@ bool Battlenet::Session::HandleAuthProofResponse(PacketHeader& header, BitStream bool Battlenet::Session::HandlePing(PacketHeader& /*header*/, BitStream& /*packet*/) { - AsyncWrite(new Pong()); + AsyncWrite(new Connection::Pong()); return true; } @@ -417,7 +417,7 @@ bool Battlenet::Session::HandleEnableEncryption(PacketHeader& /*header*/, BitStr return true; } -bool Battlenet::Session::HandleDisconnect(PacketHeader& /*header*/, BitStream& /*packet*/) +bool Battlenet::Session::HandleLogoutRequest(PacketHeader& /*header*/, BitStream& /*packet*/) { PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_SESSION_KEY); stmt->setString(0, ""); @@ -427,11 +427,11 @@ bool Battlenet::Session::HandleDisconnect(PacketHeader& /*header*/, BitStream& / return true; } -bool Battlenet::Session::HandleRealmUpdateSubscribe(PacketHeader& /*header*/, BitStream& /*packet*/) +bool Battlenet::Session::HandleListSubscribeRequest(PacketHeader& /*header*/, BitStream& /*packet*/) { sRealmList->UpdateIfNeed(); - RealmCharacterCounts* counts = new RealmCharacterCounts(); + WoWRealm::ListSubscribeResponse* counts = new WoWRealm::ListSubscribeResponse(); PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_CHARACTER_COUNTS); stmt->setUInt32(0, _gameAccountId); @@ -463,7 +463,7 @@ bool Battlenet::Session::HandleRealmUpdateSubscribe(PacketHeader& /*header*/, Bi if (!buildInfo) flag &= ~REALM_FLAG_SPECIFYBUILD; - RealmUpdate* update = new RealmUpdate(); + WoWRealm::ListUpdate* update = new WoWRealm::ListUpdate(); update->Timezone = realm.timezone; update->Population = realm.populationLevel; update->Lock = (realm.allowedSecurityLevel > _accountSecurityLevel) ? 1 : 0; @@ -488,21 +488,22 @@ bool Battlenet::Session::HandleRealmUpdateSubscribe(PacketHeader& /*header*/, Bi counts->RealmData.push_back(update); } - counts->RealmData.push_back(new RealmUpdateComplete()); + counts->RealmData.push_back(new WoWRealm::ListComplete()); AsyncWrite(counts); return true; } -bool Battlenet::Session::HandleRealmJoinRequest(PacketHeader& header, BitStream& packet) +bool Battlenet::Session::HandleJoinRequestV2(PacketHeader& header, BitStream& packet) { - RealmJoinRequest join(header, packet); + WoWRealm::JoinRequestV2 join(header, packet); join.Read(); - RealmJoinResult* result = new RealmJoinResult(); + WoWRealm::JoinResponseV2* result = new WoWRealm::JoinResponseV2(); Realm const* realm = sRealmList->GetRealm(join.Realm); if (!realm || realm->flag & (REALM_FLAG_INVALID | REALM_FLAG_OFFLINE)) { + result->Response = WoWRealm::JoinResponseV2::FAILURE; AsyncWrite(result); return true; } @@ -626,7 +627,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke { if (dataStream->GetSize() != 1 + 128 + 32 + 128) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); ReplaceResponse(response, complete); return false; @@ -634,7 +635,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke if (dataStream->Read<uint8>(8) != 2) // State { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); ReplaceResponse(response, complete); return false; @@ -648,7 +649,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke if (A.isZero()) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); ReplaceResponse(response, complete); return false; @@ -720,7 +721,11 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke if (memcmp(M1.AsByteArray().get(), clientM1.AsByteArray().get(), 32)) { - AuthComplete* complete = new AuthComplete(); + PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_FAILED_LOGINS); + stmt->setString(0, _accountName); + LoginDatabase.Execute(stmt); + + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_UNKNOWN_ACCOUNT); ReplaceResponse(response, complete); return false; @@ -735,7 +740,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke if (!numAccounts) { - AuthComplete* noAccounts = new AuthComplete(); + Authentication::LogonResponse* noAccounts = new Authentication::LogonResponse(); noAccounts->SetAuthResult(LOGIN_NO_GAME_ACCOUNT); ReplaceResponse(response, noAccounts); return false; @@ -767,7 +772,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke password->Data = new uint8[password->DataSize]; memcpy(password->Data, stream.GetBuffer(), password->DataSize); - ProofRequest* request = new ProofRequest(); + Authentication::ProofRequest* request = new Authentication::ProofRequest(); request->Modules.push_back(password); if (numAccounts > 1) { @@ -802,7 +807,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke { delete request; - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); if (fields[2].GetUInt32() == fields[3].GetUInt32()) { complete->SetAuthResult(LOGIN_BANNED); @@ -833,7 +838,7 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se { if (dataStream->Read<uint8>(8) != 1) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); ReplaceResponse(response, complete); return false; @@ -843,7 +848,7 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se std::string account = dataStream->ReadString(8); if (account.empty()) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(LOGIN_NO_GAME_ACCOUNT); ReplaceResponse(response, complete); return false; @@ -865,7 +870,7 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se PreparedQueryResult result = LoginDatabase.Query(stmt); if (!result) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(LOGIN_NO_GAME_ACCOUNT); ReplaceResponse(response, complete); return false; @@ -874,7 +879,7 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se Field* fields = result->Fetch(); if (fields[4].GetBool()) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); if (fields[2].GetUInt32() == fields[3].GetUInt32()) { complete->SetAuthResult(LOGIN_BANNED); @@ -893,7 +898,7 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se _gameAccountId = fields[0].GetUInt32(); _gameAccountName = fields[1].GetString(); - ProofRequest* request = new ProofRequest(); + Authentication::ProofRequest* request = new Authentication::ProofRequest(); request->Modules.push_back(sBattlenetMgr->CreateModule(_os, "RiskFingerprint")); ReplaceResponse(response, request); @@ -903,16 +908,20 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se bool Battlenet::Session::HandleRiskFingerprintModule(BitStream* dataStream, ServerPacket** response) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); if (dataStream->Read<uint8>(8) == 1) { complete->AccountId = _accountId; complete->GameAccountName = _gameAccountName; complete->GameAccountFlags = GAMEACCOUNT_FLAG_PROPASS_LOCK; + PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_FAILED_LOGINS); + stmt->setUInt32(0, _accountId); + if (PreparedQueryResult failedLoginsResult = LoginDatabase.Query(stmt)) + complete->FailedLogins = (*failedLoginsResult)[0].GetUInt32(); SQLTransaction trans = LoginDatabase.BeginTransaction(); - PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_LAST_LOGIN_INFO); + stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_LAST_LOGIN_INFO); stmt->setString(0, GetRemoteIpAddress().to_string()); stmt->setUInt8(1, GetLocaleByName(_locale)); stmt->setString(2, _os); @@ -941,7 +950,7 @@ bool Battlenet::Session::HandleResumeModule(BitStream* dataStream, ServerPacket* { if (dataStream->Read<uint8>(8) != 1) { - AuthResume* complete = new AuthResume(); + Authentication::ResumeResponse* complete = new Authentication::ResumeResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); ReplaceResponse(response, complete); return false; @@ -981,8 +990,12 @@ bool Battlenet::Session::HandleResumeModule(BitStream* dataStream, ServerPacket* if (memcmp(proof.GetDigest(), clientProof.get(), serverPart.GetLength())) { + PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_FAILED_LOGINS); + stmt->setString(0, _accountName); + LoginDatabase.Execute(stmt); + TC_LOG_DEBUG("server.battlenet", "[Battlenet::Resume] Invalid proof!"); - AuthResume* result = new AuthResume(); + Authentication::ResumeResponse* result = new Authentication::ResumeResponse(); result->SetAuthResult(AUTH_UNKNOWN_ACCOUNT); ReplaceResponse(response, result); return false; @@ -1011,7 +1024,7 @@ bool Battlenet::Session::HandleResumeModule(BitStream* dataStream, ServerPacket* resume->Data = new uint8[resume->DataSize]; memcpy(resume->Data, resumeData.GetBuffer(), resume->DataSize); - AuthResume* result = new AuthResume(); + Authentication::ResumeResponse* result = new Authentication::ResumeResponse(); result->Modules.push_back(resume); ReplaceResponse(response, result); _authed = true; @@ -1021,7 +1034,7 @@ bool Battlenet::Session::HandleResumeModule(BitStream* dataStream, ServerPacket* bool Battlenet::Session::UnhandledModule(BitStream* /*dataStream*/, ServerPacket** response) { - AuthComplete* complete = new AuthComplete(); + Authentication::LogonResponse* complete = new Authentication::LogonResponse(); complete->SetAuthResult(AUTH_CORRUPTED_MODULE); ReplaceResponse(response, complete); return false; |