helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MSA: Disable refresh token for MCC signin method (#1925)

Browse source 
* MSA: Change classes to static class

* MSA: Disable refresh token for MCC sign method
This commit is contained in:
ReinforceZwei 2022-02-05 13:07:15 +08:00 • committed by GitHub
parent ed452cf632
commit cc75db7070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
MinecraftClient/Protocol/MicrosoftAuthentication.cs
View file

@ -108,28 +108,28 @@ namespace MinecraftClient.Protocol
} }
} }
class XboxLive static class XboxLive
{ {
private readonly string authorize = "https://login.live.com/oauth20_authorize.srf?client_id=000000004C12AE6F&redirect_uri=https://login.live.com/oauth20_desktop.srf&scope=service::user.auth.xboxlive.com::MBI_SSL&display=touch&response_type=token&locale=en"; private static string authorize = "https://login.live.com/oauth20_authorize.srf?client_id=000000004C12AE6F&redirect_uri=https://login.live.com/oauth20_desktop.srf&scope=service::user.auth.xboxlive.com::MBI_SSL&display=touch&response_type=token&locale=en";
private readonly string xbl = "https://user.auth.xboxlive.com/user/authenticate"; private static string xbl = "https://user.auth.xboxlive.com/user/authenticate";
private readonly string xsts = "https://xsts.auth.xboxlive.com/xsts/authorize"; private static string xsts = "https://xsts.auth.xboxlive.com/xsts/authorize";
private readonly string userAgent = "Mozilla/5.0 (XboxReplay; XboxLiveAuth/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"; private static string userAgent = "Mozilla/5.0 (XboxReplay; XboxLiveAuth/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36";
private Regex ppft = new Regex("sFTTag:'.*value=\"(.*)\"\\/>'"); private static Regex ppft = new Regex("sFTTag:'.*value=\"(.*)\"\\/>'");
private Regex urlPost = new Regex("urlPost:'(.+?(?=\'))"); private static Regex urlPost = new Regex("urlPost:'(.+?(?=\'))");
private Regex confirm = new Regex("identity\\/confirm"); private static Regex confirm = new Regex("identity\\/confirm");
private Regex invalidAccount = new Regex("Sign in to", RegexOptions.IgnoreCase); private static Regex invalidAccount = new Regex("Sign in to", RegexOptions.IgnoreCase);
private Regex twoFA = new Regex("Help us protect your account", RegexOptions.IgnoreCase); private static Regex twoFA = new Regex("Help us protect your account", RegexOptions.IgnoreCase);
public string SignInUrl { get { return authorize; } } public static string SignInUrl { get { return authorize; } }
/// <summary> /// <summary>
/// Pre-authentication /// Pre-authentication
/// </summary> /// </summary>
/// <remarks>This step is to get the login page for later use</remarks> /// <remarks>This step is to get the login page for later use</remarks>
/// <returns></returns> /// <returns></returns>
public PreAuthResponse PreAuth() public static PreAuthResponse PreAuth()
{ {
var request = new ProxiedWebRequest(authorize); var request = new ProxiedWebRequest(authorize);
request.UserAgent = userAgent; request.UserAgent = userAgent;
@ -138,7 +138,7 @@ namespace MinecraftClient.Protocol
string html = response.Body; string html = response.Body;
string PPFT = ppft.Match(html).Groups[1].Value; string PPFT = ppft.Match(html).Groups[1].Value;
string urlPost = this.urlPost.Match(html).Groups[1].Value; string urlPost = XboxLive.urlPost.Match(html).Groups[1].Value;
if (string.IsNullOrEmpty(PPFT) || string.IsNullOrEmpty(urlPost)) if (string.IsNullOrEmpty(PPFT) || string.IsNullOrEmpty(urlPost))
{ {
@ -164,7 +164,7 @@ namespace MinecraftClient.Protocol
/// <param name="password">Account password</param> /// <param name="password">Account password</param>
/// <param name="preAuth"></param> /// <param name="preAuth"></param>
/// <returns></returns> /// <returns></returns>
public Microsoft.LoginResponse UserLogin(string email, string password, PreAuthResponse preAuth) public static Microsoft.LoginResponse UserLogin(string email, string password, PreAuthResponse preAuth)
{ {
var request = new ProxiedWebRequest(preAuth.UrlPost, preAuth.Cookie); var request = new ProxiedWebRequest(preAuth.UrlPost, preAuth.Cookie);
request.UserAgent = userAgent; request.UserAgent = userAgent;
@ -233,7 +233,7 @@ namespace MinecraftClient.Protocol
/// </summary> /// </summary>
/// <param name="loginResponse"></param> /// <param name="loginResponse"></param>
/// <returns></returns> /// <returns></returns>
public XblAuthenticateResponse XblAuthenticate(Microsoft.LoginResponse loginResponse) public static XblAuthenticateResponse XblAuthenticate(Microsoft.LoginResponse loginResponse)
{ {
var request = new ProxiedWebRequest(xbl); var request = new ProxiedWebRequest(xbl);
request.UserAgent = userAgent; request.UserAgent = userAgent;
@ -288,7 +288,7 @@ namespace MinecraftClient.Protocol
/// <remarks>(Don't ask me what is XSTS, I DONT KNOW)</remarks> /// <remarks>(Don't ask me what is XSTS, I DONT KNOW)</remarks>
/// <param name="xblResponse"></param> /// <param name="xblResponse"></param>
/// <returns></returns> /// <returns></returns>
public XSTSAuthenticateResponse XSTSAuthenticate(XblAuthenticateResponse xblResponse) public static XSTSAuthenticateResponse XSTSAuthenticate(XblAuthenticateResponse xblResponse)
{ {
var request = new ProxiedWebRequest(xsts); var request = new ProxiedWebRequest(xsts);
request.UserAgent = userAgent; request.UserAgent = userAgent;
@ -364,11 +364,11 @@ namespace MinecraftClient.Protocol
} }
} }
class MinecraftWithXbox static class MinecraftWithXbox
{ {
private readonly string loginWithXbox = "https://api.minecraftservices.com/authentication/login_with_xbox"; private static string loginWithXbox = "https://api.minecraftservices.com/authentication/login_with_xbox";
private readonly string ownership = "https://api.minecraftservices.com/entitlements/mcstore"; private static string ownership = "https://api.minecraftservices.com/entitlements/mcstore";
private readonly string profile = "https://api.minecraftservices.com/minecraft/profile"; private static string profile = "https://api.minecraftservices.com/minecraft/profile";
/// <summary> /// <summary>
/// Login to Minecraft using the XSTS token and user hash obtained before /// Login to Minecraft using the XSTS token and user hash obtained before
@ -376,7 +376,7 @@ namespace MinecraftClient.Protocol
/// <param name="userHash"></param> /// <param name="userHash"></param>
/// <param name="xstsToken"></param> /// <param name="xstsToken"></param>
/// <returns></returns> /// <returns></returns>
public string LoginWithXbox(string userHash, string xstsToken) public static string LoginWithXbox(string userHash, string xstsToken)
{ {
var request = new ProxiedWebRequest(loginWithXbox); var request = new ProxiedWebRequest(loginWithXbox);
request.Accept = "application/json"; request.Accept = "application/json";
@ -399,7 +399,7 @@ namespace MinecraftClient.Protocol
/// </summary> /// </summary>
/// <param name="accessToken"></param> /// <param name="accessToken"></param>
/// <returns>True if the user own the game</returns> /// <returns>True if the user own the game</returns>
public bool UserHasGame(string accessToken) public static bool UserHasGame(string accessToken)
{ {
var request = new ProxiedWebRequest(ownership); var request = new ProxiedWebRequest(ownership);
request.Headers.Add("Authorization", string.Format("Bearer {0}", accessToken)); request.Headers.Add("Authorization", string.Format("Bearer {0}", accessToken));
@ -415,7 +415,7 @@ namespace MinecraftClient.Protocol
return json.Properties["items"].DataArray.Count > 0; return json.Properties["items"].DataArray.Count > 0;
} }
public UserProfile GetUserProfile(string accessToken) public static UserProfile GetUserProfile(string accessToken)
{ {
var request = new ProxiedWebRequest(profile); var request = new ProxiedWebRequest(profile);
request.Headers.Add("Authorization", string.Format("Bearer {0}", accessToken)); request.Headers.Add("Authorization", string.Format("Bearer {0}", accessToken));

17
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -463,10 +463,11 @@ namespace MinecraftClient.Protocol
/// <returns></returns> /// <returns></returns>
private static LoginResult MicrosoftMCCLogin(string email, string password, out SessionToken session) private static LoginResult MicrosoftMCCLogin(string email, string password, out SessionToken session)
{ {
var ms = new XboxLive();
try try
{ {
var msaResponse = ms.UserLogin(email, password, ms.PreAuth()); var msaResponse = XboxLive.UserLogin(email, password, XboxLive.PreAuth());
// Remove refresh token for MCC sign method
msaResponse.RefreshToken = string.Empty;
return MicrosoftLogin(msaResponse, out session); return MicrosoftLogin(msaResponse, out session);
} }
catch (Exception e) catch (Exception e)
@ -516,19 +517,17 @@ namespace MinecraftClient.Protocol
private static LoginResult MicrosoftLogin(Microsoft.LoginResponse msaResponse, out SessionToken session) private static LoginResult MicrosoftLogin(Microsoft.LoginResponse msaResponse, out SessionToken session)
{ {
session = new SessionToken() { ClientID = Guid.NewGuid().ToString().Replace("-", "") }; session = new SessionToken() { ClientID = Guid.NewGuid().ToString().Replace("-", "") };
var ms = new XboxLive();
var mc = new MinecraftWithXbox();
try try
{ {
var xblResponse = ms.XblAuthenticate(msaResponse); var xblResponse = XboxLive.XblAuthenticate(msaResponse);
var xsts = ms.XSTSAuthenticate(xblResponse); // Might throw even password correct var xsts = XboxLive.XSTSAuthenticate(xblResponse); // Might throw even password correct
string accessToken = mc.LoginWithXbox(xsts.UserHash, xsts.Token); string accessToken = MinecraftWithXbox.LoginWithXbox(xsts.UserHash, xsts.Token);
bool hasGame = mc.UserHasGame(accessToken); bool hasGame = MinecraftWithXbox.UserHasGame(accessToken);
if (hasGame) if (hasGame)
{ {
var profile = mc.GetUserProfile(accessToken); var profile = MinecraftWithXbox.GetUserProfile(accessToken);
session.PlayerName = profile.UserName; session.PlayerName = profile.UserName;
session.PlayerID = profile.UUID; session.PlayerID = profile.UUID;
session.ID = accessToken; session.ID = accessToken;