mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-02-05 16:44:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoiding crash when recorded AI server url is malformed

Browse Source
This commit is contained in:
huanghongxun 2019-11-08 11:10:28 +08:00
parent de7c2e4f07
commit 869f57cbf1
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorProvider.java
View File

@ -17,10 +17,11 @@
*/
package org.jackhuang.hmcl.auth.authlibinjector;
import org.jackhuang.hmcl.auth.AuthenticationException;
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilProvider;
import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
import org.jackhuang.hmcl.util.io.NetworkUtils;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.UUID;
@ -33,32 +34,40 @@ public class AuthlibInjectorProvider implements YggdrasilProvider {
}
@Override
public URL getAuthenticationURL() {
return NetworkUtils.toURL(apiRoot + "authserver/authenticate");
public URL getAuthenticationURL() throws AuthenticationException {
return toURL(apiRoot + "authserver/authenticate");
}
@Override
public URL getRefreshmentURL() {
return NetworkUtils.toURL(apiRoot + "authserver/refresh");
public URL getRefreshmentURL() throws AuthenticationException {
return toURL(apiRoot + "authserver/refresh");
}
@Override
public URL getValidationURL() {
return NetworkUtils.toURL(apiRoot + "authserver/validate");
public URL getValidationURL() throws AuthenticationException {
return toURL(apiRoot + "authserver/validate");
}
@Override
public URL getInvalidationURL() {
return NetworkUtils.toURL(apiRoot + "authserver/invalidate");
public URL getInvalidationURL() throws AuthenticationException {
return toURL(apiRoot + "authserver/invalidate");
}
@Override
public URL getProfilePropertiesURL(UUID uuid) {
return NetworkUtils.toURL(apiRoot + "sessionserver/session/minecraft/profile/" + UUIDTypeAdapter.fromUUID(uuid));
public URL getProfilePropertiesURL(UUID uuid) throws AuthenticationException {
return toURL(apiRoot + "sessionserver/session/minecraft/profile/" + UUIDTypeAdapter.fromUUID(uuid));
}
@Override
public String toString() {
return apiRoot;
}
private URL toURL(String url) throws AuthenticationException {
try {
return new URL(url);
} catch (MalformedURLException e) {
throw new AuthenticationException(e);
}
}
}

12
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilProvider.java
View File

@ -17,6 +17,8 @@
*/
package org.jackhuang.hmcl.auth.yggdrasil;
import org.jackhuang.hmcl.auth.AuthenticationException;
import java.net.URL;
import java.util.UUID;
@ -25,14 +27,14 @@ import java.util.UUID;
*/
public interface YggdrasilProvider {
URL getAuthenticationURL();
URL getAuthenticationURL() throws AuthenticationException;
URL getRefreshmentURL();
URL getRefreshmentURL() throws AuthenticationException;
URL getValidationURL();
URL getValidationURL() throws AuthenticationException;
URL getInvalidationURL();
URL getInvalidationURL() throws AuthenticationException;
URL getProfilePropertiesURL(UUID uuid);
URL getProfilePropertiesURL(UUID uuid) throws AuthenticationException;
}