Core/PacketIO: Reduce differences between branches

(cherry picked from commit bacc90b)

Author: Shauren

src/common/Cryptography/Authentication/WorldPacketCrypt.cpp

@@ -25,10 +25,16 @@ WorldPacketCrypt::WorldPacketCrypt() : _initialized(false)
 
 void WorldPacketCrypt::Init(SessionKey const& K)
 {
-    uint8 ServerEncryptionKey[] = { 0xCC, 0x98, 0xAE, 0x04, 0xE8, 0x97, 0xEA, 0xCA, 0x12, 0xDD, 0xC0, 0x93, 0x42, 0x91, 0x53, 0x57 };
-    _serverEncrypt.Init(Trinity::Crypto::HMAC_SHA1::GetDigestOf(ServerEncryptionKey, K));
-    uint8 ServerDecryptionKey[] = { 0xC2, 0xB3, 0x72, 0x3C, 0xC6, 0xAE, 0xD9, 0xB5, 0x34, 0x3C, 0x53, 0xEE, 0x2F, 0x43, 0x67, 0xCE };
-    _clientDecrypt.Init(Trinity::Crypto::HMAC_SHA1::GetDigestOf(ServerDecryptionKey, K));
+    static constexpr std::array<uint8, 16> ServerEncryptionKey = { 0xCC, 0x98, 0xAE, 0x04, 0xE8, 0x97, 0xEA, 0xCA, 0x12, 0xDD, 0xC0, 0x93, 0x42, 0x91, 0x53, 0x57 };
+    static constexpr std::array<uint8, 16> ServerDecryptionKey = { 0xC2, 0xB3, 0x72, 0x3C, 0xC6, 0xAE, 0xD9, 0xB5, 0x34, 0x3C, 0x53, 0xEE, 0x2F, 0x43, 0x67, 0xCE };
+
+    Init(K, ServerEncryptionKey, ServerDecryptionKey);
+}
+
+void WorldPacketCrypt::Init(SessionKey const& K, std::span<uint8 const, 16> serverKey, std::span<uint8 const, 16> clientKey)
+{
+    _serverEncrypt.Init(Trinity::Crypto::HMAC_SHA1::GetDigestOf(serverKey, K));
+    _clientDecrypt.Init(Trinity::Crypto::HMAC_SHA1::GetDigestOf(clientKey, K));
 
     // Drop first 1024 bytes, as WoW uses ARC4-drop1024.
     std::array<uint8, 1024> syncBuf;

src/common/Cryptography/Authentication/WorldPacketCrypt.h

@@ -20,13 +20,15 @@
 
 #include "ARC4.h"
 #include "AuthDefines.h"
+#include <span>
 
 class TC_COMMON_API WorldPacketCrypt
 {
 public:
     WorldPacketCrypt();
 
     void Init(SessionKey const& K);
+    void Init(SessionKey const& K, std::span<uint8 const, 16> serverKey, std::span<uint8 const, 16> clientKey);
     void DecryptRecv(uint8* data, size_t len);
     void EncryptSend(uint8* data, size_t len);
 

src/server/game/Server/Packets/AllPackets.h

@@ -18,6 +18,7 @@
 #ifndef AllPackets_h__
 #define AllPackets_h__
 
+#include "AuthenticationPackets.h"
 #include "BankPackets.h"
 #include "BattlegroundPackets.h"
 #include "CalendarPackets.h"

src/server/game/Server/Packets/AuthenticationPackets.cpp

@@ -0,0 +1,30 @@
+/*
+* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation; either version 2 of the License, or (at your
+* option) any later version.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+* more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "AuthenticationPackets.h"
+
+namespace WorldPackets::Auth
+{
+WorldPacket const* AuthChallenge::Write()
+{
+    _worldPacket << uint32(DosZeroBits);
+    _worldPacket.append(Challenge.data(), Challenge.size());
+    _worldPacket.append(DosChallenge.data(), DosChallenge.size());
+
+    return &_worldPacket;
+}
+}

src/server/game/Server/Packets/AuthenticationPackets.h

@@ -0,0 +1,41 @@
+/*
+* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation; either version 2 of the License, or (at your
+* option) any later version.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+* more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef TRINITYCORE_AUTHENTICATION_PACKETS_H
+#define TRINITYCORE_AUTHENTICATION_PACKETS_H
+
+#include "Packet.h"
+
+namespace WorldPackets
+{
+    namespace Auth
+    {
+        class AuthChallenge final : public ServerPacket
+        {
+        public:
+            explicit AuthChallenge() : ServerPacket(SMSG_AUTH_CHALLENGE, 4 + 4 * 8 + 4) { }
+
+            WorldPacket const* Write() override;
+
+            std::array<uint8, 4> Challenge = { };
+            std::array<uint32, 8> DosChallenge = { };
+            uint32 DosZeroBits = 0;
+        };
+    }
+}
+
+#endif // TRINITYCORE_AUTHENTICATION_PACKETS_H

src/server/game/Server/Protocol/Opcodes.cpp

@@ -1421,12 +1421,12 @@ void OpcodeTable::Initialize()
     /*0x50A*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAMERA_SHAKE,              STATUS_NEVER);
     /*0x50B*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOCKET_GEMS_RESULT,        STATUS_NEVER);
     /*0x50C*/ DEFINE_HANDLER(CMSG_SET_CHARACTER_MODEL,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    /*0x50D*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_REDIRECT_CLIENT,           STATUS_NEVER);
-    /*0x50E*/ DEFINE_HANDLER(CMSG_REDIRECTION_FAILED,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    /*0x50D*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONNECT_TO,                STATUS_NEVER);
+    /*0x50E*/ DEFINE_HANDLER(CMSG_CONNECT_TO_FAILED,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     /*0x50F*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUSPEND_COMMS,             STATUS_NEVER);
     /*0x510*/ DEFINE_HANDLER(CMSG_SUSPEND_COMMS_ACK,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    /*0x511*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_SEND_QUEUED_PACKETS, STATUS_NEVER);
-    /*0x512*/ DEFINE_HANDLER(CMSG_REDIRECTION_AUTH_PROOF,                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    /*0x511*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_COMMS,              STATUS_NEVER);
+    /*0x512*/ DEFINE_HANDLER(CMSG_AUTH_CONTINUED_SESSION,                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     /*0x513*/ DEFINE_HANDLER(CMSG_DROP_NEW_CONNECTION,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     /*0x514*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_ALL_COMBAT_LOG,       STATUS_NEVER);
     /*0x515*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_LFG_DUNGEON_FINDER,   STATUS_NEVER);

src/server/game/Server/Protocol/Opcodes.h

@@ -1319,12 +1319,12 @@ enum Opcodes : uint16
     SMSG_CAMERA_SHAKE                               = 0x50A, // uint32 SpellEffectCameraShakes.dbc index, uint32
     SMSG_SOCKET_GEMS_RESULT                         = 0x50B,
     CMSG_SET_CHARACTER_MODEL                        = 0x50C,
-    SMSG_REDIRECT_CLIENT                            = 0x50D, // uint32 ip, uint16 port, uint32 unk, uint8[20] hash (ip + port, seed=sessionkey)
-    CMSG_REDIRECTION_FAILED                         = 0x50E, // something with networking
+    SMSG_CONNECT_TO                                 = 0x50D, // uint32 ip, uint16 port, uint32 unk, uint8[20] hash (ip + port, seed=sessionkey)
+    CMSG_CONNECT_TO_FAILED                          = 0x50E, // something with networking
     SMSG_SUSPEND_COMMS                              = 0x50F,
     CMSG_SUSPEND_COMMS_ACK                          = 0x510,
-    SMSG_FORCE_SEND_QUEUED_PACKETS                  = 0x511,
-    CMSG_REDIRECTION_AUTH_PROOF                     = 0x512,
+    SMSG_RESUME_COMMS                               = 0x511,
+    CMSG_AUTH_CONTINUED_SESSION                     = 0x512,
     CMSG_DROP_NEW_CONNECTION                        = 0x513,
     SMSG_SEND_ALL_COMBAT_LOG                        = 0x514,
     SMSG_OPEN_LFG_DUNGEON_FINDER                    = 0x515,

src/server/game/Server/WorldSocket.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "WorldSocket.h"
+#include "AuthenticationPackets.h"
 #include "BigNumber.h"
 #include "ClientBuildInfo.h"
 #include "DatabaseEnv.h"
@@ -35,7 +36,6 @@
 
 WorldSocket::WorldSocket(Trinity::Net::IoContextTcpSocket&& socket) : BaseSocket(std::move(socket)), _OverSpeedPings(0), _worldSession(nullptr), _authed(false), _sendBufferSize(4096)
 {
-    Trinity::Crypto::GetRandomBytes(_authSeed);
     _headerBuffer.Resize(sizeof(ClientPktHeader));
 }
 
@@ -122,13 +122,15 @@ bool WorldSocket::Update()
 
 void WorldSocket::SendAuthSession()
 {
-    WorldPacket packet(SMSG_AUTH_CHALLENGE, 40);
-    packet << uint32(1);                                    // 1...31
-    packet.append(_authSeed);
+    Trinity::Crypto::GetRandomBytes(_serverChallenge);
+    Trinity::Crypto::GetRandomBytes(_dosChallenge);
 
-    packet.append(Trinity::Crypto::GetRandomBytes<32>());               // new encryption seeds
+    WorldPackets::Auth::AuthChallenge challenge;
+    challenge.Challenge = _serverChallenge;
+    memcpy(challenge.DosChallenge.data(), _dosChallenge.data(), _dosChallenge.size());
+    challenge.DosZeroBits = 1;
 
-    SendPacketAndLogOpcode(packet);
+    SendPacketAndLogOpcode(*challenge.Write());
 }
 
 void WorldSocket::OnClose()
@@ -514,7 +516,7 @@ void WorldSocket::HandleAuthSessionCallback(std::shared_ptr<AuthSession> authSes
     sha.UpdateData(authSession->Account);
     sha.UpdateData(t);
     sha.UpdateData(authSession->LocalChallenge);
-    sha.UpdateData(_authSeed);
+    sha.UpdateData(_serverChallenge);
     sha.UpdateData(account.SessionKey);
     sha.Finalize();
 

src/server/game/Server/WorldSocket.h

@@ -116,7 +116,8 @@ class TC_GAME_API WorldSocket final : public Trinity::Net::Socket<>
 
     bool HandlePing(WorldPacket& recvPacket);
 
-    std::array<uint8, 4> _authSeed;
+    std::array<uint8, 4> _serverChallenge;
+    std::array<uint8, 32> _dosChallenge;
     WorldPacketCrypt _authCrypt;
 
     TimePoint _LastPingTime;