lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 411 Length Required when POST live.com.

Browse Source
This commit is contained in:
huanghongxun
2021-09-09 17:11:09 +08:00
parent 336d7ba221
commit 108df2293b
7 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/microsoft/MicrosoftService.java
View File

@@ -129,6 +129,25 @@ public class MicrosoftService {
}
}
private String getUhs(XBoxLiveAuthenticationResponse response, String existingUhs) throws AuthenticationException {
if (response.errorCode != 0) {
throw new XboxAuthorizationException(response.errorCode, response.redirectUrl);
}
if (response.displayClaims == null || response.displayClaims.xui == null || response.displayClaims.xui.size() == 0 || !response.displayClaims.xui.get(0).containsKey("uhs")) {
LOG.log(Level.WARNING, "Unrecognized xbox authorization response " + GSON.toJson(response));
throw new ServerResponseMalformedException();
}
String uhs = (String) response.displayClaims.xui.get(0).get("uhs");
if (existingUhs != null) {
if (!Objects.equals(uhs, existingUhs)) {
throw new ServerResponseMalformedException("uhs mismatched");
}
}
return uhs;
}
private MicrosoftSession authenticateViaLiveAccessToken(String liveAccessToken, String liveRefreshToken) throws IOException, JsonParseException, AuthenticationException {
// Authenticate with XBox Live
XBoxLiveAuthenticationResponse xboxResponse = HttpRequest
@@ -140,11 +159,7 @@ public class MicrosoftService {
pair("RelyingParty", "http://auth.xboxlive.com"), pair("TokenType", "JWT")))
.accept("application/json").getJson(XBoxLiveAuthenticationResponse.class);
if (xboxResponse.errorCode != 0) {
throw new XboxAuthorizationException(xboxResponse.errorCode);
}
String uhs = (String) xboxResponse.displayClaims.xui.get(0).get("uhs");
String uhs = getUhs(xboxResponse, null);
// Authenticate Minecraft with XSTS
XBoxLiveAuthenticationResponse minecraftXstsResponse = HttpRequest
@@ -156,14 +171,7 @@ public class MicrosoftService {
pair("RelyingParty", "rp://api.minecraftservices.com/"), pair("TokenType", "JWT")))
.getJson(XBoxLiveAuthenticationResponse.class);
if (xboxResponse.errorCode != 0) {
throw new XboxAuthorizationException(xboxResponse.errorCode);
}
String minecraftXstsUhs = (String) minecraftXstsResponse.displayClaims.xui.get(0).get("uhs");
if (!Objects.equals(uhs, minecraftXstsUhs)) {
throw new ServerResponseMalformedException("uhs mismatched");
}
getUhs(minecraftXstsResponse, uhs);
// Authenticate XBox with XSTS
XBoxLiveAuthenticationResponse xboxXstsResponse = HttpRequest
@@ -175,14 +183,7 @@ public class MicrosoftService {
pair("RelyingParty", "http://xboxlive.com"), pair("TokenType", "JWT")))
.getJson(XBoxLiveAuthenticationResponse.class);
if (xboxXstsResponse.errorCode != 0) {
throw new XboxAuthorizationException(xboxXstsResponse.errorCode);
}
String xboxXstsUhs = (String) xboxXstsResponse.displayClaims.xui.get(0).get("uhs");
if (!Objects.equals(uhs, xboxXstsUhs)) {
throw new ServerResponseMalformedException("uhs mismatched");
}
getUhs(xboxXstsResponse, uhs);
getXBoxProfile(uhs, xboxXstsResponse.token);
@@ -307,16 +308,23 @@ public class MicrosoftService {
public static class XboxAuthorizationException extends AuthenticationException {
private final long errorCode;
private final String redirect;
public XboxAuthorizationException(long errorCode) {
public XboxAuthorizationException(long errorCode, String redirect) {
this.errorCode = errorCode;
this.redirect = redirect;
}
public long getErrorCode() {
return errorCode;
}
public String getRedirect() {
return redirect;
}
public static final long MISSING_XBOX_ACCOUNT = 2148916233L;
public static final long COUNTRY_UNAVAILABLE = 2148916235L;
public static final long ADD_FAMILY = 2148916238L;
}

7
HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/HttpRequest.java
View File

@@ -149,6 +149,10 @@ public abstract class HttpRequest {
HttpURLConnection con = createConnection();
con.setDoOutput(true);
try (OutputStream os = con.getOutputStream()) {
os.write(bytes);
}
if (responseCodeTester != null) {
responseCodeTester.accept(new URL(url), con.getResponseCode());
} else {
@@ -157,9 +161,6 @@ public abstract class HttpRequest {
}
}
try (OutputStream os = con.getOutputStream()) {
os.write(bytes);
}
return NetworkUtils.readData(con);
}
}