GithubStar/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2026-10-16 21:21:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #6202: Validate Yggdrasil access tokens on every login (#6209)

Browse Source
This commit is contained in:
lcxn123
2026-09-10 21:28:21 +08:00
committed by GitHub
parent e287f672fd
commit 9d9fc78384
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilAccount.java
+22 -30
View File
@@ -36,7 +36,6 @@ public abstract class YggdrasilAccount extends ClassicAccount {
protected final UUID profileID;
protected final String loginName;
private boolean authenticated = false;
private YggdrasilSession session;
protected YggdrasilAccount(AccountID accountID, YggdrasilService service, String loginName, YggdrasilSession session) {
@@ -72,7 +71,6 @@ public abstract class YggdrasilAccount extends ClassicAccount {
}
profileID = session.getSelectedProfile().getId();
authenticated = true;
addProfilePropertiesListener();
}
@@ -101,37 +99,33 @@ public abstract class YggdrasilAccount extends ClassicAccount {
return session.getSelectedProfile().getId();
}
/// Returns authentication information after validating the current token.
/// Refreshes the session if the profile name is missing or the token is invalid.
@Override
public synchronized AuthInfo logIn() throws AuthenticationException {
if (!authenticated || !session.hasProfileName()) {
if (session.hasProfileName() && service.validate(session.getAccessToken(), session.getClientToken())) {
authenticated = true;
} else {
YggdrasilSession acquiredSession;
try {
acquiredSession = service.refresh(session.getAccessToken(), session.getClientToken(), null);
} catch (RemoteAuthenticationException e) {
if ("ForbiddenOperationException".equals(e.getRemoteName())) {
throw new CredentialExpiredException(e);
} else {
throw e;
}
if (!session.hasProfileName() || !service.validate(session.getAccessToken(), session.getClientToken())) {
YggdrasilSession acquiredSession;
try {
acquiredSession = service.refresh(session.getAccessToken(), session.getClientToken(), null);
} catch (RemoteAuthenticationException e) {
if ("ForbiddenOperationException".equals(e.getRemoteName())) {
throw new CredentialExpiredException(e);
} else {
throw e;
}
if (acquiredSession.getSelectedProfile() == null ||
!acquiredSession.getSelectedProfile().getId().equals(profileID)) {
throw new ServerResponseMalformedException("Selected profile changed");
}
if (!acquiredSession.hasProfileName()) {
throw new ServerResponseMalformedException("Profile name is missing");
}
session = acquiredSession;
authenticated = true;
invalidate();
}
}
if (acquiredSession.getSelectedProfile() == null ||
!acquiredSession.getSelectedProfile().getId().equals(profileID)) {
throw new ServerResponseMalformedException("Selected profile changed");
}
if (!acquiredSession.hasProfileName()) {
throw new ServerResponseMalformedException("Profile name is missing");
}
session = acquiredSession;
invalidate();
}
return session.toAuthInfo();
}
@@ -161,7 +155,6 @@ public abstract class YggdrasilAccount extends ClassicAccount {
session = acquiredSession;
}
authenticated = true;
invalidate();
return session.toAuthInfo();
}
@@ -196,7 +189,6 @@ public abstract class YggdrasilAccount extends ClassicAccount {
@Override
public void clearCache() {
authenticated = false;
service.getProfileRepository().invalidate(profileID);
}