mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
4f2352361a
The old Windows64 port had no real player identity — it used hardcoded fake XUIDs, so anyone could impersonate anyone. This replaces that with proper auth supporting Mojang, Ely.by, and offline accounts. MCAuth library (new, MCAuth/): Mojang auth via MSA device code flow (XBL, SISU, MC services), Ely.by via Yggdrasil with 2FA, offline UUID generation matching Java Edition (MD5 v3 from "OfflinePlayer:<name>"). Multi-account manager with background token refresh, per-slot sessions, and on-disk token persistence. Server-side session verification via Mojang/Ely.by hasJoined API. Skin fetching and PNG validation from texture servers. Network protocol (version bumped to 80): Three new packets (AuthScheme, AuthResponse, AuthResult) implement a server-driven auth handshake before login completes. Player identity migrated from 64-bit XUID to 128-bit GameUUID backed by two uint64 fields (hi/lo). readPlayerUID/writePlayerUID now serialize 16 bytes on the wire. Old and new clients cannot connect to each other — version mismatch is rejected at PreLogin. Save migration: Map data mappings auto-migrate from old format: the old 64-bit XUID is placed in hi, lo is set to 0 as a sentinel. On first access by the real player, the sentinel entry is upgraded in-place to the full 128-bit UUID. Format detection is by file size (2080, 2112, or 4160 bytes). Player .dat filenames inside saveData.ms change from decimal XUID to dashed UUID — old saves need manual entry renaming in the archive. UI: NativeUIRenderer: immediate-mode drawing system (quads, text, 9-slice panels, scrollbars, focus lists) for rendering auth screens without Flash/Scaleform. UIScene_MSAuth handles device code display, Ely.by credential input with 2FA, per-account skin head preview, and multi-account add/remove/switch. Server: online-mode and auth-provider (mojang/elyby) in server.properties. Whitelist and ban checks validate against the server-verified UUID. Incompatible auth scheme logs which provider the server expects vs what the client is using. Also fixes a pre-existing exploit where any client could send a DebugOptionsPacket to grant themselves CraftAnything and other debug privileges on any server — now requires OP status server-side.
77 lines
2.1 KiB
C++
77 lines
2.1 KiB
C++
#include "stdafx.h"
|
|
#include "InputOutputStream.h"
|
|
#include "PacketListener.h"
|
|
#include "AuthResultPacket.h"
|
|
|
|
AuthResultPacket::AuthResultPacket()
|
|
{
|
|
success = false;
|
|
}
|
|
|
|
AuthResultPacket::AuthResultPacket(bool success, const wstring& assignedUuid, const wstring& assignedUsername,
|
|
const wstring& errorMessage, const wstring& skinKey,
|
|
std::vector<uint8_t> skinData)
|
|
{
|
|
this->success = success;
|
|
this->assignedUuid = assignedUuid;
|
|
this->assignedUsername = assignedUsername;
|
|
this->errorMessage = errorMessage;
|
|
this->skinKey = skinKey;
|
|
this->skinData = std::move(skinData);
|
|
}
|
|
|
|
void AuthResultPacket::read(DataInputStream *dis)
|
|
{
|
|
success = dis->readBoolean();
|
|
assignedUuid = readUtf(dis, 64);
|
|
assignedUsername = readUtf(dis, 64);
|
|
errorMessage = readUtf(dis, 256);
|
|
skinKey = readUtf(dis, 256);
|
|
|
|
// Read inline skin data (int length + raw bytes)
|
|
// Cap to 32KB — a valid 64x64 RGBA skin PNG is ~4KB compressed.
|
|
int skinSize = dis->readInt();
|
|
if (skinSize > 0 && skinSize <= 32768)
|
|
{
|
|
skinData.resize(static_cast<size_t>(skinSize));
|
|
for (int i = 0; i < skinSize; i++)
|
|
skinData[i] = dis->readByte();
|
|
}
|
|
else
|
|
{
|
|
skinData.clear();
|
|
// Consume declared bytes to keep stream synchronized (same fix as readUtf)
|
|
if (skinSize > 0)
|
|
{
|
|
for (int i = 0; i < skinSize; i++)
|
|
dis->readByte();
|
|
}
|
|
}
|
|
}
|
|
|
|
void AuthResultPacket::write(DataOutputStream *dos)
|
|
{
|
|
dos->writeBoolean(success);
|
|
writeUtf(assignedUuid, dos);
|
|
writeUtf(assignedUsername, dos);
|
|
writeUtf(errorMessage, dos);
|
|
writeUtf(skinKey, dos);
|
|
|
|
int skinSize = static_cast<int>(skinData.size());
|
|
dos->writeInt(skinSize);
|
|
for (int i = 0; i < skinSize; i++)
|
|
dos->writeByte(skinData[i]);
|
|
}
|
|
|
|
void AuthResultPacket::handle(PacketListener *listener)
|
|
{
|
|
listener->handleAuthResult(shared_from_this());
|
|
}
|
|
|
|
int AuthResultPacket::getEstimatedSize()
|
|
{
|
|
return static_cast<int>(sizeof(bool) + 4 * sizeof(short) +
|
|
(assignedUuid.length() + assignedUsername.length() + errorMessage.length() + skinKey.length()) * sizeof(wchar_t)
|
|
+ sizeof(int) + skinData.size());
|
|
}
|