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.
57 lines
1.3 KiB
C++
57 lines
1.3 KiB
C++
#include "stdafx.h"
|
|
#include "InputOutputStream.h"
|
|
#include "PacketListener.h"
|
|
#include "AuthSchemePacket.h"
|
|
|
|
AuthSchemePacket::AuthSchemePacket()
|
|
{
|
|
}
|
|
|
|
AuthSchemePacket::AuthSchemePacket(const vector<wstring>& schemes, const wstring& serverId)
|
|
{
|
|
this->schemes = schemes;
|
|
this->serverId = serverId;
|
|
}
|
|
|
|
void AuthSchemePacket::read(DataInputStream *dis)
|
|
{
|
|
int count = dis->readInt();
|
|
if (count < 0 || count > 16) count = 0; // sane upper bound for auth schemes
|
|
schemes.clear();
|
|
schemes.reserve(static_cast<size_t>(count));
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
wstring scheme = readUtf(dis, 32);
|
|
// Only accept known scheme names; discard unknown/empty
|
|
if (scheme == L"mojang" || scheme == L"offline" || scheme == L"elyby")
|
|
schemes.push_back(std::move(scheme));
|
|
}
|
|
serverId = readUtf(dis, 64);
|
|
}
|
|
|
|
void AuthSchemePacket::write(DataOutputStream *dos)
|
|
{
|
|
dos->writeInt(static_cast<int>(schemes.size()));
|
|
for (auto& s : schemes)
|
|
{
|
|
writeUtf(s, dos);
|
|
}
|
|
writeUtf(serverId, dos);
|
|
}
|
|
|
|
void AuthSchemePacket::handle(PacketListener *listener)
|
|
{
|
|
listener->handleAuthScheme(shared_from_this());
|
|
}
|
|
|
|
int AuthSchemePacket::getEstimatedSize()
|
|
{
|
|
int size = sizeof(int);
|
|
for (auto& s : schemes)
|
|
{
|
|
size += sizeof(short) + static_cast<int>(s.length()) * sizeof(wchar_t);
|
|
}
|
|
size += sizeof(short) + static_cast<int>(serverId.length()) * sizeof(wchar_t);
|
|
return size;
|
|
}
|