diff --git a/Source/Contents/Party/LoadMyPartyAsyncWork.cpp b/Source/Contents/Party/LoadMyPartyAsyncWork.cpp index c47ef107f..cfbcee770 100644 --- a/Source/Contents/Party/LoadMyPartyAsyncWork.cpp +++ b/Source/Contents/Party/LoadMyPartyAsyncWork.cpp @@ -2,6 +2,8 @@ #include "Contents/Party/LoadMyPartyAsyncWork.h" #include "Network/Http/CURLPostHander.h" #include "Network/TextEncoding.h" +#include "Utility/Cipher/XorBytes.h" +#include "Utility/Text/FormatString.h" #include #include @@ -11,16 +13,55 @@ namespace { constexpr char sourceFile[] = "C:\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\AdventurerAgency\\CLoadMyPartyAsyncWork.cpp"; // INLINED - AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { + __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { std::string message = text; return AsyncDiagnostic(&success, &message, sourceFile, &line); } + + template + class EncryptedName { + public: + // INLINED + explicit EncryptedName(const std::uint8_t (&source)[Length]) : m_encrypted(true) { + for (std::uint64_t index = 0; index < Length; ++index) { + this->m_text[index] = source[index]; + } + } + + // INLINED + ~EncryptedName() { + for (std::uint64_t index = 0; index < Length; ++index) { + this->m_text[index] = 0; + } + } + + // INLINED + const char* Text() { + if (this->m_encrypted) { + utility::XorBytes(this->m_text, Length, Key); + this->m_encrypted = false; + } + + return reinterpret_cast(this->m_text); + } + + private: + /* 0000 */ std::uint8_t m_text[Length]; + bool m_encrypted; + }; + + // INLINED + template + const char* DecryptName(const std::uint8_t (&source)[Length]) { + thread_local EncryptedName name(source); + return name.Text(); + } } // OFFSET: 0x005CF1B0 // FUNCTION: fn_03685 CLoadMyPartyAsyncWork::CLoadMyPartyAsyncWork() - : NAsyncWork("MyParty_Load"), m_accountId(0), m_characterId(0), m_diagnostic(Diagnostic(false, "unknwon", 28)), m_windows(nullptr) { + : NAsyncWork("MyParty_Load"), m_accountId(0), m_characterId(0), m_diagnostic(Diagnostic(false, DecryptName<0x2FF3C5036D070127ULL>({0x52, 0x6F, 0x6C, 0x03, 0x74, 0xAA, 0x9D, 0x2F}), 28)), m_windows(nullptr) { } // INLINED @@ -43,7 +84,7 @@ void CLoadMyPartyAsyncWork::Bind( this->m_world = world; this->m_url = url; this->m_token = token; - AsyncDiagnostic diagnostic = Diagnostic(false, "unknwon", 49); + AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17}), 49); this->m_diagnostic.MoveFrom(diagnostic); this->m_windows = &windows; } @@ -53,21 +94,21 @@ void CLoadMyPartyAsyncWork::Bind( bool CLoadMyPartyAsyncWork::Execute() { char account[64] = {}; char character[64] = {}; - _snprintf_s(account, sizeof(account), _TRUNCATE, "%lu", static_cast(this->m_accountId)); - _snprintf_s(character, sizeof(character), _TRUNCATE, "%lu", static_cast(this->m_characterId)); + StringFormat(account, sizeof(account), _TRUNCATE, "%lu", this->m_accountId); + StringFormat(character, sizeof(character), _TRUNCATE, "%lu", this->m_characterId); const std::string world = ToUtf8(this->m_world); CCURLPostHander handler(this->m_url); - handler.AddField("AID", account, 4); - handler.AddField("GID", character, 4); - handler.AddField("WorldName", world, 4); - handler.AddField("AuthToken", this->m_token, 4); + handler.AddField(DecryptName<0x3375B1C7DBB5FD55ULL>({0x14, 0xB4, 0xF1, 0xDB}), account, 4); + handler.AddField(DecryptName<0x1D6D75EDE7CD311FULL>({0x58, 0x78, 0x89, 0xE7}), character, 4); + handler.AddField(DecryptName<0x59278F63D79F3DA1ULL>({0xF6, 0x52, 0xED, 0xBB, 0x07, 0xC1, 0x46, 0x34, 0xC4, 0x3D}), world, 4); + handler.AddField(DecryptName<0x812BE72BCD5707B7ULL>({0xF6, 0x72, 0x23, 0xA5, 0x7F, 0x88, 0x40, 0xE4, 0xD9, 0x07}), this->m_token, 4); if (handler.Perform() != 0) { - AsyncDiagnostic diagnostic = Diagnostic(false, "fail", 92); + AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0xD3755DD95F47A909ULL>({0x6F, 0xC8, 0x2E, 0x33, 0xD9}), 92); this->m_diagnostic.MoveFrom(diagnostic); } else { this->m_response = FromUtf8(handler.Response()); - AsyncDiagnostic diagnostic = Diagnostic(true, "success", 101); + AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x31D7C1EDA345E36DULL>({0x1E, 0x96, 0x26, 0xC0, 0x88, 0xB2, 0xA4, 0x31}), 101); this->m_diagnostic.MoveFrom(diagnostic); }