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

Improve debug output for HTTPS requests

Browse source 
For diagnosing session errors in #450 and #451
This commit is contained in:
ORelio 2018-05-23 19:07:31 +02:00
parent 79aaa04775
commit 1cecf2d788
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/ChatBots/ScriptScheduler.cs
View file

@ -189,7 +189,7 @@ namespace MinecraftClient.ChatBots
private static string Task2String(TaskDesc task) private static string Task2String(TaskDesc task)
{ {
return String.Format( return String.Format(
"triggeronfirstlogin = {0}\n triggeronlogin = {1}\n triggerontime = {2}\n " " triggeronfirstlogin = {0}\n triggeronlogin = {1}\n triggerontime = {2}\n "
+ "triggeroninterval = {3}\n timevalue = {4}\n timeinterval = {5}\n script = {6}", + "triggeroninterval = {3}\n timevalue = {4}\n timeinterval = {5}\n script = {6}",
task.triggerOnFirstLogin, task.triggerOnFirstLogin,
task.triggerOnLogin, task.triggerOnLogin,

21
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -223,13 +223,8 @@ namespace MinecraftClient.Protocol
try try
{ {
string result = ""; string result = "";
string json_request = "{\"agent\": { \"name\": \"Minecraft\", \"version\": 1 }, \"username\": \"" + JsonEncode(user) + "\", \"password\": \"" + JsonEncode(pass) + "\", \"clientToken\": \"" + JsonEncode(session.ClientID) + "\" }"; string json_request = "{\"agent\": { \"name\": \"Minecraft\", \"version\": 1 }, \"username\": \"" + JsonEncode(user) + "\", \"password\": \"" + JsonEncode(pass) + "\", \"clientToken\": \"" + JsonEncode(session.ClientID) + "\" }";
if (Settings.DebugMessages)
ConsoleIO.WriteLineFormatted("§8Debug: Login Request: " + json_request);
int code = DoHTTPSPost("authserver.mojang.com", "/authenticate", json_request, ref result); int code = DoHTTPSPost("authserver.mojang.com", "/authenticate", json_request, ref result);
if (Settings.DebugMessages)
ConsoleIO.WriteLineFormatted("§8Debug: Login Response: " + result);
if (code == 200) if (code == 200)
{ {
if (result.Contains("availableProfiles\":[]}")) if (result.Contains("availableProfiles\":[]}"))
@ -456,12 +451,28 @@ namespace MinecraftClient.Protocol
{ {
try try
{ {
if (Settings.DebugMessages)
ConsoleIO.WriteLineFormatted("§8Performing request to " + host);
TcpClient client = ProxyHandler.newTcpClient(host, 443, true); TcpClient client = ProxyHandler.newTcpClient(host, 443, true);
SslStream stream = new SslStream(client.GetStream()); SslStream stream = new SslStream(client.GetStream());
stream.AuthenticateAsClient(host); stream.AuthenticateAsClient(host);
if (Settings.DebugMessages)
foreach (string line in headers)
ConsoleIO.WriteLineFormatted("§8> " + line);
stream.Write(Encoding.ASCII.GetBytes(String.Join("\r\n", headers.ToArray()))); stream.Write(Encoding.ASCII.GetBytes(String.Join("\r\n", headers.ToArray())));
System.IO.StreamReader sr = new System.IO.StreamReader(stream); System.IO.StreamReader sr = new System.IO.StreamReader(stream);
string raw_result = sr.ReadToEnd(); string raw_result = sr.ReadToEnd();
if (Settings.DebugMessages)
{
ConsoleIO.WriteLine("");
foreach (string line in raw_result.Split('\n'))
ConsoleIO.WriteLineFormatted("§8< " + line);
}
if (raw_result.StartsWith("HTTP/1.1")) if (raw_result.StartsWith("HTTP/1.1"))
{ {
postResult = raw_result.Substring(raw_result.IndexOf("\r\n\r\n") + 4); postResult = raw_result.Substring(raw_result.IndexOf("\r\n\r\n") + 4);