helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(KeyUtils.cs): Replace Newtonsoft.Json with JSONData

Browse source
This commit is contained in:
oldkingOK 2024-02-20 20:31:22 +08:00
parent 9a147b57e5
commit f749840d89
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
MinecraftClient/Protocol/ProfileKey/KeyUtils.cs
View file

@ -5,7 +5,6 @@ using System.Text;
using MinecraftClient.Protocol.Handlers; using MinecraftClient.Protocol.Handlers;
using MinecraftClient.Protocol.Message; using MinecraftClient.Protocol.Message;
using static MinecraftClient.Protocol.Message.LastSeenMessageList; using static MinecraftClient.Protocol.Message.LastSeenMessageList;
using Newtonsoft.Json.Linq;
namespace MinecraftClient.Protocol.ProfileKey namespace MinecraftClient.Protocol.ProfileKey
{ {
@ -20,7 +19,8 @@ namespace MinecraftClient.Protocol.ProfileKey
ProxiedWebRequest.Response? response = null; ProxiedWebRequest.Response? response = null;
try try
{ {
if (!isYggdrasil) { if (!isYggdrasil)
{
var request = new ProxiedWebRequest(certificates) var request = new ProxiedWebRequest(certificates)
{ {
Accept = "application/json" Accept = "application/json"
@ -37,8 +37,7 @@ namespace MinecraftClient.Protocol.ProfileKey
// see https://github.com/yushijinhun/authlib-injector/blob/da910956eaa30d2f6c2c457222d188aeb53b0d1f/src/main/java/moe/yushi/authlibinjector/httpd/ProfileKeyFilter.java#L49 // see https://github.com/yushijinhun/authlib-injector/blob/da910956eaa30d2f6c2c457222d188aeb53b0d1f/src/main/java/moe/yushi/authlibinjector/httpd/ProfileKeyFilter.java#L49
// POST to "https://api.minecraftservices.com/player/certificates" with authlib-injector will get a dummy response // POST to "https://api.minecraftservices.com/player/certificates" with authlib-injector will get a dummy response
string jsonString = isYggdrasil ? MakeDummyResponse() : response!.Body; Json.JSONData json = isYggdrasil ? MakeDummyResponse() : Json.ParseJson(response!.Body);
Json.JSONData json = Json.ParseJson(jsonString);
// Error here // Error here
PublicKey publicKey = new(pemKey: json.Properties["keyPair"].Properties["publicKey"].StringValue, PublicKey publicKey = new(pemKey: json.Properties["keyPair"].Properties["publicKey"].StringValue,
sig: json.Properties["publicKeySignature"].StringValue, sig: json.Properties["publicKeySignature"].StringValue,
@ -236,7 +235,7 @@ namespace MinecraftClient.Protocol.ProfileKey
return sb.ToString(); return sb.ToString();
} }
public static string MakeDummyResponse() public static Json.JSONData MakeDummyResponse()
{ {
RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(2048); RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(2048);
var mimePublicKey = Convert.ToBase64String(rsa.ExportSubjectPublicKeyInfo()); var mimePublicKey = Convert.ToBase64String(rsa.ExportSubjectPublicKeyInfo());
@ -246,19 +245,19 @@ namespace MinecraftClient.Protocol.ProfileKey
DateTime now = DateTime.UtcNow; DateTime now = DateTime.UtcNow;
DateTime expiresAt = now.AddHours(48); DateTime expiresAt = now.AddHours(48);
DateTime refreshedAfter = now.AddHours(36); DateTime refreshedAfter = now.AddHours(36);
JObject response = new JObject(); Json.JSONData response = new(Json.JSONData.DataType.Object);
JObject keyPairObj = new JObject Json.JSONData keyPairObj = new(Json.JSONData.DataType.Object);
{ keyPairObj.Properties["privateKey"] = new(Json.JSONData.DataType.String){ StringValue = privateKeyPEM };
{ "privateKey", privateKeyPEM }, keyPairObj.Properties["publicKey"] = new(Json.JSONData.DataType.String){ StringValue = publicKeyPEM };
{ "publicKey", publicKeyPEM }
}; response.Properties["keyPair"] = keyPairObj;
response.Add("keyPair", keyPairObj); response.Properties["publicKeySignature"] = new(Json.JSONData.DataType.String){ StringValue = "AA==" };
response.Add("publicKeySignature", "AA=="); response.Properties["publicKeySignatureV2"] = new(Json.JSONData.DataType.String){ StringValue = "AA==" };
response.Add("publicKeySignatureV2", "AA==");
string format = "yyyy-MM-ddTHH:mm:ss.ffffffZ"; string format = "yyyy-MM-ddTHH:mm:ss.ffffffZ";
response.Add("expiresAt", expiresAt.ToString(format)); response.Properties["expiresAt"] = new(Json.JSONData.DataType.String){ StringValue = expiresAt.ToString(format) };
response.Add("refreshedAfter", refreshedAfter.ToString(format)); response.Properties["refreshedAfter"] = new(Json.JSONData.DataType.String){ StringValue = refreshedAfter.ToString(format) };
return response.ToString();
return response;
} }
} }
} }