From 3c97193b70db578acae843980ea8a4e91339a60e Mon Sep 17 00:00:00 2001 From: Polaris_Light <995905922@qq.com> Date: Sun, 12 Nov 2023 21:04:20 +0800 Subject: [PATCH] AddYggdrasilLogin --- MinecraftClient/Program.cs | 4 +- .../Protocol/Handlers/Protocol16.cs | 7 +- .../Protocol/Handlers/Protocol18.cs | 7 +- MinecraftClient/Protocol/ProtocolHandler.cs | 128 ++++++++++++++++-- .../Protocol/Session/SessionToken.cs | 7 +- MinecraftClient/Settings.cs | 28 +++- 6 files changed, 156 insertions(+), 25 deletions(-) diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index a3919751..f36e3055 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -416,7 +416,7 @@ namespace MinecraftClient else { // Validate cached session or login new session. - if (Config.Main.Advanced.SessionCache != CacheType.none && SessionCache.Contains(loginLower)) + if (Config.Main.Advanced.SessionCache != CacheType.none && SessionCache.Contains(loginLower) && Config.Main.General.AccountType != LoginType.Yggdrasil) { session = SessionCache.Get(loginLower); result = ProtocolHandler.GetTokenValidation(session); @@ -455,7 +455,7 @@ namespace MinecraftClient SessionCache.Store(loginLower, session); if (result == ProtocolHandler.LoginResult.Success) - session.SessionPreCheckTask = Task.Factory.StartNew(() => session.SessionPreCheck()); + session.SessionPreCheckTask = Task.Factory.StartNew(() => session.SessionPreCheck(Config.Main.General.AccountType)); } if (result == ProtocolHandler.LoginResult.Success) diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs index 53813e14..aa4322fc 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol16.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol16.cs @@ -15,6 +15,7 @@ using MinecraftClient.Protocol.Session; using MinecraftClient.Proxy; using MinecraftClient.Scripting; using static MinecraftClient.Settings; +using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; namespace MinecraftClient.Protocol.Handlers { @@ -504,7 +505,7 @@ namespace MinecraftClient.Protocol.Handlers else if (Settings.Config.Logging.DebugMessages) ConsoleIO.WriteLineFormatted("§8" + string.Format(Translations.mcc_handshake, serverID)); - return StartEncryption(uuid, username, sessionID, token, serverID, PublicServerkey, session); + return StartEncryption(uuid, username, sessionID, Config.Main.General.AccountType, token, serverID, PublicServerkey, session); } else { @@ -513,7 +514,7 @@ namespace MinecraftClient.Protocol.Handlers } } - private bool StartEncryption(string uuid, string username, string sessionID, byte[] token, string serverIDhash, byte[] serverPublicKey, SessionToken session) + private bool StartEncryption(string uuid, string username, string sessionID, LoginType type, byte[] token, string serverIDhash, byte[] serverPublicKey, SessionToken session) { RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverPublicKey)!; byte[] secretKey = CryptoHandler.ClientAESPrivateKey ?? CryptoHandler.GenerateAESPrivateKey(); @@ -537,7 +538,7 @@ namespace MinecraftClient.Protocol.Handlers if (needCheckSession) { - if (ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) + if ((type == LoginType.mojang && ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) || (type == LoginType.Yggdrasil && ProtocolHandler.YggdrasilSessionCheck(uuid, sessionID, serverHash))) { session.ServerIDhash = serverIDhash; session.ServerPublicKey = serverPublicKey; diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index f96affae..0262a0f7 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -26,6 +26,7 @@ using MinecraftClient.Proxy; using MinecraftClient.Scripting; using Newtonsoft.Json; using static MinecraftClient.Settings; +using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; namespace MinecraftClient.Protocol.Handlers { @@ -2562,7 +2563,7 @@ namespace MinecraftClient.Protocol.Handlers string serverID = dataTypes.ReadNextString(packetData); byte[] serverPublicKey = dataTypes.ReadNextByteArray(packetData); byte[] token = dataTypes.ReadNextByteArray(packetData); - return StartEncryption(handler.GetUserUuidStr(), handler.GetSessionID(), token, serverID, + return StartEncryption(handler.GetUserUuidStr(), handler.GetSessionID(), Config.Main.General.AccountType, token, serverID, serverPublicKey, playerKeyPair, session); } else if (packetID == 0x02) //Login successful @@ -2587,7 +2588,7 @@ namespace MinecraftClient.Protocol.Handlers /// Start network encryption. Automatically called by Login() if the server requests encryption. /// /// True if encryption was successful - private bool StartEncryption(string uuid, string sessionID, byte[] token, string serverIDhash, + private bool StartEncryption(string uuid, string sessionID, LoginType type, byte[] token, string serverIDhash, byte[] serverPublicKey, PlayerKeyPair? playerKeyPair, SessionToken session) { RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverPublicKey)!; @@ -2613,7 +2614,7 @@ namespace MinecraftClient.Protocol.Handlers { string serverHash = CryptoHandler.GetServerHash(serverIDhash, serverPublicKey, secretKey); - if (ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) + if ((type == LoginType.mojang && ProtocolHandler.SessionCheck(uuid, sessionID, serverHash) )|| (type == LoginType.Yggdrasil && ProtocolHandler.YggdrasilSessionCheck(uuid, sessionID, serverHash))) { session.ServerIDhash = serverIDhash; session.ServerPublicKey = serverPublicKey; diff --git a/MinecraftClient/Protocol/ProtocolHandler.cs b/MinecraftClient/Protocol/ProtocolHandler.cs index de7c104a..159169f4 100644 --- a/MinecraftClient/Protocol/ProtocolHandler.cs +++ b/MinecraftClient/Protocol/ProtocolHandler.cs @@ -134,7 +134,7 @@ namespace MinecraftClient.Protocol if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1) return new Protocol16Handler(Client, ProtocolVersion, Handler); - int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210, 315, 316, 335, 338, 340, 393, 401, 404, 477, 480, 485, 490, 498, 573, 575, 578, 735, 736, 751, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763 }; + int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210, 315, 316, 335, 338, 340, 393, 401, 404, 477, 480, 485, 490, 498, 573, 575, 578, 735, 736, 751, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763}; if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1) return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo); @@ -446,7 +446,11 @@ namespace MinecraftClient.Protocol { return MojangLogin(user, pass, out session); } - else throw new InvalidOperationException("Account type must be Mojang or Microsoft"); + else if (type == LoginType.Yggdrasil) + { + return YggdrasiLogin(user, pass, out session); + } + else throw new InvalidOperationException("Account type must be Mojang or Microsoft or valid authlib 3rd Servers!"); } /// @@ -464,7 +468,7 @@ namespace MinecraftClient.Protocol { string result = ""; string json_request = "{\"agent\": { \"name\": \"Minecraft\", \"version\": 1 }, \"username\": \"" + JsonEncode(user) + "\", \"password\": \"" + JsonEncode(pass) + "\", \"clientToken\": \"" + JsonEncode(session.ClientID) + "\" }"; - int code = DoHTTPSPost("authserver.mojang.com", "/authenticate", json_request, ref result); + int code = DoHTTPSPost("authserver.mojang.com",443, "/authenticate", json_request, ref result); if (code == 200) { if (result.Contains("availableProfiles\":[]}")) @@ -534,7 +538,84 @@ namespace MinecraftClient.Protocol return LoginResult.OtherError; } } + private static LoginResult YggdrasiLogin(string user, string pass, out SessionToken session) + { + session = new SessionToken() { ClientID = Guid.NewGuid().ToString().Replace("-", "") }; + try + { + string result = ""; + string json_request = "{\"agent\": { \"name\": \"Minecraft\", \"version\": 1 }, \"username\": \"" + JsonEncode(user) + "\", \"password\": \"" + JsonEncode(pass) + "\", \"clientToken\": \"" + JsonEncode(session.ClientID) + "\" }"; + int code = DoHTTPSPost(Config.Main.General.AuthServer.Host,Config.Main.General.AuthServer.Port, "/api/yggdrasil/authserver/authenticate", json_request, ref result); + if (code == 200) + { + if (result.Contains("availableProfiles\":[]}")) + { + return LoginResult.NotPremium; + } + else + { + Json.JSONData loginResponse = Json.ParseJson(result); + if (loginResponse.Properties.ContainsKey("accessToken") + && loginResponse.Properties.ContainsKey("selectedProfile") + && loginResponse.Properties["selectedProfile"].Properties.ContainsKey("id") + && loginResponse.Properties["selectedProfile"].Properties.ContainsKey("name")) + { + session.ID = loginResponse.Properties["accessToken"].StringValue; + session.PlayerID = loginResponse.Properties["selectedProfile"].Properties["id"].StringValue; + session.PlayerName = loginResponse.Properties["selectedProfile"].Properties["name"].StringValue; + return LoginResult.Success; + } + else return LoginResult.InvalidResponse; + } + } + else if (code == 403) + { + if (result.Contains("UserMigratedException")) + { + return LoginResult.AccountMigrated; + } + else return LoginResult.WrongPassword; + } + else if (code == 503) + { + return LoginResult.ServiceUnavailable; + } + else + { + ConsoleIO.WriteLineFormatted("§8" + string.Format(Translations.error_http_code, code)); + return LoginResult.OtherError; + } + } + catch (System.Security.Authentication.AuthenticationException e) + { + if (Settings.Config.Logging.DebugMessages) + { + ConsoleIO.WriteLineFormatted("§8" + e.ToString()); + } + return LoginResult.SSLError; + } + catch (System.IO.IOException e) + { + if (Settings.Config.Logging.DebugMessages) + { + ConsoleIO.WriteLineFormatted("§8" + e.ToString()); + } + if (e.Message.Contains("authentication")) + { + return LoginResult.SSLError; + } + else return LoginResult.OtherError; + } + catch (Exception e) + { + if (Settings.Config.Logging.DebugMessages) + { + ConsoleIO.WriteLineFormatted("§8" + e.ToString()); + } + return LoginResult.OtherError; + } + } /// /// Sign-in to Microsoft Account without using browser. Only works if 2FA is disabled. /// Might not work well in some rare cases. @@ -675,7 +756,7 @@ namespace MinecraftClient.Protocol { string result = ""; string json_request = "{ \"accessToken\": \"" + JsonEncode(currentsession.ID) + "\", \"clientToken\": \"" + JsonEncode(currentsession.ClientID) + "\", \"selectedProfile\": { \"id\": \"" + JsonEncode(currentsession.PlayerID) + "\", \"name\": \"" + JsonEncode(currentsession.PlayerName) + "\" } }"; - int code = DoHTTPSPost("authserver.mojang.com", "/refresh", json_request, ref result); + int code = DoHTTPSPost("authserver.mojang.com",443, "/refresh", json_request, ref result); if (code == 200) { if (result == null) @@ -727,7 +808,19 @@ namespace MinecraftClient.Protocol { string result = ""; string json_request = "{\"accessToken\":\"" + accesstoken + "\",\"selectedProfile\":\"" + uuid + "\",\"serverId\":\"" + serverhash + "\"}"; - int code = DoHTTPSPost("sessionserver.mojang.com", "/session/minecraft/join", json_request, ref result); + int code = DoHTTPSPost("sessionserver.mojang.com",443, "/session/minecraft/join", json_request, ref result); + return (code >= 200 && code < 300); + } + catch { return false; } + } + + public static bool YggdrasilSessionCheck(string uuid, string accesstoken, string serverhash) + { + try + { + string result = ""; + string json_request = "{\"accessToken\":\"" + accesstoken + "\",\"selectedProfile\":\"" + uuid + "\",\"serverId\":\"" + serverhash + "\"}"; + int code = DoHTTPSPost(Config.Main.General.AuthServer.Host, Config.Main.General.AuthServer.Port, "/api/yggdrasil/sessionserver/session/minecraft/join", json_request, ref result); return (code >= 200 && code < 300); } catch { return false; } @@ -747,7 +840,7 @@ namespace MinecraftClient.Protocol { string result = ""; string cookies = String.Format("sid=token:{0}:{1};user={2};version={3}", accesstoken, uuid, username, Program.MCHighestVersion); - DoHTTPSGet("pc.realms.minecraft.net", "/worlds", cookies, ref result); + DoHTTPSGet("pc.realms.minecraft.net", 443,"/worlds", cookies, ref result); Json.JSONData realmsWorlds = Json.ParseJson(result); if (realmsWorlds.Properties.ContainsKey("servers") && realmsWorlds.Properties["servers"].Type == Json.JSONData.DataType.Array @@ -808,7 +901,7 @@ namespace MinecraftClient.Protocol { string result = ""; string cookies = String.Format("sid=token:{0}:{1};user={2};version={3}", accesstoken, uuid, username, Program.MCHighestVersion); - int statusCode = DoHTTPSGet("pc.realms.minecraft.net", "/worlds/v1/" + worldId + "/join/pc", cookies, ref result); + int statusCode = DoHTTPSGet("pc.realms.minecraft.net",443, "/worlds/v1/" + worldId + "/join/pc", cookies, ref result); if (statusCode == 200) { Json.JSONData serverAddress = Json.ParseJson(result); @@ -845,7 +938,7 @@ namespace MinecraftClient.Protocol /// Cookies for making the request /// Request result /// HTTP Status code - private static int DoHTTPSGet(string host, string endpoint, string cookies, ref string result) + private static int DoHTTPSGet(string host,int port, string endpoint, string cookies, ref string result) { List http_request = new() { @@ -860,7 +953,7 @@ namespace MinecraftClient.Protocol "", "" }; - return DoHTTPSRequest(http_request, host, ref result); + return DoHTTPSRequest(http_request, host,port, ref result); } /// @@ -871,7 +964,7 @@ namespace MinecraftClient.Protocol /// Request payload /// Request result /// HTTP Status code - private static int DoHTTPSPost(string host, string endpoint, string request, ref string result) + private static int DoHTTPSPost(string host, int port, string endpoint, string request, ref string result) { List http_request = new() { @@ -884,7 +977,7 @@ namespace MinecraftClient.Protocol "", request }; - return DoHTTPSRequest(http_request, host, ref result); + return DoHTTPSRequest(http_request, host,port, ref result); } /// @@ -895,7 +988,7 @@ namespace MinecraftClient.Protocol /// Host to connect to /// Request result /// HTTP Status code - private static int DoHTTPSRequest(List headers, string host, ref string result) + private static int DoHTTPSRequest(List headers, string host,int port, ref string result) { string? postResult = null; int statusCode = 520; @@ -907,7 +1000,7 @@ namespace MinecraftClient.Protocol if (Settings.Config.Logging.DebugMessages) ConsoleIO.WriteLineFormatted("§8" + string.Format(Translations.debug_request, host)); - TcpClient client = ProxyHandler.NewTcpClient(host, 443, true); + TcpClient client = ProxyHandler.NewTcpClient(host, port, true); SslStream stream = new(client.GetStream()); stream.AuthenticateAsClient(host, null, SslProtocols.Tls12, true); // Enable TLS 1.2. Hotfix for #1780 @@ -928,8 +1021,15 @@ namespace MinecraftClient.Protocol if (raw_result.StartsWith("HTTP/1.1")) { - postResult = raw_result[(raw_result.IndexOf("\r\n\r\n") + 4)..]; statusCode = int.Parse(raw_result.Split(' ')[1], NumberStyles.Any, CultureInfo.CurrentCulture); + if (statusCode != 204) + { + postResult = raw_result[(raw_result.IndexOf("\r\n\r\n") + 4)..].Split("\r\n")[1]; + } + else + { + postResult = "No Content"; + } } else statusCode = 520; //Web server is returning an unknown error } diff --git a/MinecraftClient/Protocol/Session/SessionToken.cs b/MinecraftClient/Protocol/Session/SessionToken.cs index c3c0aee9..ffdeb14e 100644 --- a/MinecraftClient/Protocol/Session/SessionToken.cs +++ b/MinecraftClient/Protocol/Session/SessionToken.cs @@ -3,6 +3,7 @@ using System.IO; using System.Text.RegularExpressions; using System.Threading.Tasks; using MinecraftClient.Scripting; +using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; namespace MinecraftClient.Protocol.Session { @@ -32,13 +33,15 @@ namespace MinecraftClient.Protocol.Session ServerPublicKey = null; } - public bool SessionPreCheck() + public bool SessionPreCheck(LoginType type) { if (ID == string.Empty || PlayerID == String.Empty || ServerPublicKey == null) return false; Crypto.CryptoHandler.ClientAESPrivateKey ??= Crypto.CryptoHandler.GenerateAESPrivateKey(); string serverHash = Crypto.CryptoHandler.GetServerHash(ServerIDhash, ServerPublicKey, Crypto.CryptoHandler.ClientAESPrivateKey); - if (ProtocolHandler.SessionCheck(PlayerID, ID, serverHash)) + if (type == LoginType.mojang && ProtocolHandler.SessionCheck(PlayerID, ID, serverHash)) + return true; + if (type == LoginType.Yggdrasil && ProtocolHandler.YggdrasilSessionCheck(PlayerID, ID, serverHash)) return true; return false; } diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index c0d51028..17e32afe 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -494,8 +494,11 @@ namespace MinecraftClient [TomlInlineComment("$Main.General.method$")] public LoginMethod Method = LoginMethod.mcc; + [TomlInlineComment("$Main.General.AuthlibServer$")] + public AuthlibServer AuthServer = new(string.Empty); + - public enum LoginType { mojang, microsoft }; + public enum LoginType { mojang, microsoft,Yggdrasil }; public enum LoginMethod { mcc, browser }; } @@ -688,6 +691,29 @@ namespace MinecraftClient this.Port = Port; } } + public struct AuthlibServer + { + public string Host = string.Empty; + public int Port = 443; + + public AuthlibServer(string Host) + { + string[] sip = Host.Split(new[] { ":", "：" }, StringSplitOptions.None); + this.Host = sip[0]; + + if (sip.Length > 1) + { + try { this.Port = Convert.ToUInt16(sip[1]); } + catch (FormatException) { } + } + } + + public AuthlibServer(string Host, ushort Port) + { + this.Host = Host.Split(new[] { ":", "：" }, StringSplitOptions.None)[0]; + this.Port = Port; + } + } } }