Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-19 14:33:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

[ANY] Fixed bug named "Krivorukostb"

Browse source
This commit is contained in:
sq179 2019-04-11 21:17:53 +03:00
parent 04be213ed6
commit ab20eeb7b6
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java
View file

@ -9,36 +9,42 @@
public final class RequestAuthHandler extends CachedAuthHandler { public final class RequestAuthHandler extends CachedAuthHandler {
private String url; private String url;
private String SecretKey; private String secretKey;
@Override @Override
public void init() { public void init() {
if (url == null) LogHelper.error("[Verify][AuthHandler] url cannot be null"); if (url == null)
if (SecretKey == null) LogHelper.error("[Verify][AuthHandler] SecretKey cannot be null"); LogHelper.error("[Verify][AuthHandler] url cannot be null");
if (secretKey == null)
LogHelper.error("[Verify][AuthHandler] secretKey cannot be null");
} }
@Override @Override
protected Entry fetchEntry(UUID uuid) throws IOException { protected Entry fetchEntry(UUID uuid) throws IOException {
String username = IOHelper.request(new URL(url + "?type=GetUsername&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()))); String username = IOHelper.request(new URL(url + "?type=GetUsername&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString())));
String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()))); String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString())));
String serverID = IOHelper.request(new URL(url + "?type=GetServerID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()))); String serverID = IOHelper.request(new URL(url + "?type=GetServerID&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString())));
LogHelper.debug("[AuthHandler] Getted username: " + username); LogHelper.debug("[AuthHandler] Getted username: " + username);
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken); LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID); LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid); LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
return query(uuid, username, accessToken, serverID); return query(uuid, username, accessToken, serverID);
} }
@Override @Override
protected Entry fetchEntry(String username) throws IOException { protected Entry fetchEntry(String username) throws IOException {
String GettedUUID = IOHelper.request(new URL(url + "?type=GetUUID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&username=" + IOHelper.urlEncode(username))); String GettedUUID = IOHelper.request(new URL(url + "?type=GetUUID&secretKey=" + IOHelper.urlEncode(secretKey) + "&username=" + IOHelper.urlEncode(username)));
UUID uuid = UUID.fromString(GettedUUID); UUID uuid = UUID.fromString(GettedUUID);
String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&username=" + IOHelper.urlEncode(username))); String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&secretKey=" + IOHelper.urlEncode(secretKey) + "&username=" + IOHelper.urlEncode(username)));
String serverID = IOHelper.request(new URL(url + "?type=GetServerID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&username=" + IOHelper.urlEncode(username))); String serverID = IOHelper.request(new URL(url + "?type=GetServerID&secretKey=" + IOHelper.urlEncode(secretKey) + "&username=" + IOHelper.urlEncode(username)));
LogHelper.debug("[AuthHandler] Getted username: " + username); LogHelper.debug("[AuthHandler] Getted username: " + username);
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken); LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID); LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid); LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
return query(uuid, username, accessToken, serverID); return query(uuid, username, accessToken, serverID);
} }
@ -48,26 +54,24 @@ private Entry query(UUID uuid, String username, String accessToken, String serve
@Override @Override
protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException { protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException {
String response0 = IOHelper.request(new URL(url+ "?type=SetUUID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&username=" + IOHelper.urlEncode(username))); String response0 = IOHelper.request(new URL(url+ "?type=SetUUID&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&username=" + IOHelper.urlEncode(username)));
String response1 = IOHelper.request(new URL(url+ "?type=SetAccessToken&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&accessToken=" + IOHelper.urlEncode(accessToken) + "&username=" + IOHelper.urlEncode(username))); String response1 = IOHelper.request(new URL(url+ "?type=SetAccessToken&secretKey=" + IOHelper.urlEncode(secretKey) + "&accessToken=" + IOHelper.urlEncode(accessToken) + "&username=" + IOHelper.urlEncode(username)));
LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken); LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken);
LogHelper.debug("[AuthHandler] Set UUID: " + uuid); LogHelper.debug("[AuthHandler] Set UUID: " + uuid);
LogHelper.debug("[AuthHandler] For this username: " + username); LogHelper.debug("[AuthHandler] For this username: " + username);
if (response0 == "OK" && response1 == "OK") {
return true; return response0.equals("OK") && response1.equals("OK");
}
return false;
} }
@Override @Override
protected boolean updateServerID(UUID uuid, String serverID) throws IOException { protected boolean updateServerID(UUID uuid, String serverID) throws IOException {
String response = IOHelper.request(new URL(url + "?type=SetServerID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&serverID=" + IOHelper.urlEncode(serverID))); String response = IOHelper.request(new URL(url + "?type=SetServerID&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&serverID=" + IOHelper.urlEncode(serverID)));
LogHelper.debug("[AuthHandler] Set serverID: " + serverID); LogHelper.debug("[AuthHandler] Set serverID: " + serverID);
LogHelper.debug("[AuthHandler] For this UUID: " + uuid); LogHelper.debug("[AuthHandler] For this UUID: " + uuid);
if (response == "OK") {
return true; return response.equals("OK");
}
return false;
} }
@Override @Override