DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced insecure Minecraft account authentication with server join technique

Browse Source
This commit is contained in:
CrushedPixel
2015-05-27 13:35:44 +02:00
parent f0f0f1aa86
commit 2744e7cf6c
6 changed files with 75 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/eu/crushedpixel/replaymod/api/ApiClient.java
View File

@@ -4,12 +4,15 @@ import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
import com.mojang.authlib.exceptions.AuthenticationException;
import eu.crushedpixel.replaymod.api.mojang.MojangApiMethods;
import eu.crushedpixel.replaymod.api.mojang.holders.Profile;
import eu.crushedpixel.replaymod.api.replay.ReplayModApiMethods;
import eu.crushedpixel.replaymod.api.replay.SearchQuery;
import eu.crushedpixel.replaymod.api.replay.holders.*;
import eu.crushedpixel.replaymod.online.authentication.AuthenticationHash;
import eu.crushedpixel.replaymod.utils.StreamTools;
import net.minecraft.client.Minecraft;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -24,6 +27,7 @@ import java.util.UUID;
public class ApiClient {
private static final Minecraft mc = Minecraft.getMinecraft();
private static final Gson gson = new Gson();
private static final JsonParser jsonParser = new JsonParser();
@@ -36,18 +40,32 @@ public class ApiClient {
return auth;
}
public AuthKey register(String username, String mail, String password, String uuid, String accessToken)
throws IOException, ApiException {
public AuthKey register(String username, String mail, String password, String uuid)
throws IOException, ApiException, AuthenticationException {
AuthenticationHash authenticationHash = sessionserverJoin();
QueryBuilder builder = new QueryBuilder(ReplayModApiMethods.register);
builder.put("username", username);
builder.put("email", mail);
builder.put("password", password);
builder.put("uuid", uuid);
builder.put("accesstoken", accessToken);
builder.put("mcusername", authenticationHash.username);
builder.put("timelong", authenticationHash.currentTime);
builder.put("randomlong", authenticationHash.randomLong);
AuthKey auth = invokeAndReturn(builder, AuthKey.class);
return auth;
}
private AuthenticationHash sessionserverJoin() throws AuthenticationException {
AuthenticationHash hash = new AuthenticationHash();
mc.getSessionService().joinServer(
mc.getSession().getProfile(), mc.getSession().getToken(), hash.hash);
return hash;
}
public AuthConfirmation checkAuthkey(String auth) {
try {
QueryBuilder builder = new QueryBuilder(ReplayModApiMethods.check_authkey);

1
src/main/java/eu/crushedpixel/replaymod/api/mojang/MojangApiMethods.java
View File

@@ -3,5 +3,6 @@ package eu.crushedpixel.replaymod.api.mojang;
public class MojangApiMethods {
public static final String userprofile = "https://sessionserver.mojang.com/session/minecraft/profile/";
public static final String joinServer = "https://sessionserver.mojang.com/session/minecraft/join";
}