mirror of
https://github.com/sirjonasxx/G-Earth.git
synced 2024-11-23 08:50:52 +01:00
Merge pull request #127 from dorving/client-handshake-checks
Wrapped RC4 table checks in try catch block (#106)
This commit is contained in:
commit
5ac1593dae
@ -3,25 +3,20 @@ package gearth.protocol.memory;
|
|||||||
import gearth.GEarth;
|
import gearth.GEarth;
|
||||||
import gearth.protocol.HConnection;
|
import gearth.protocol.HConnection;
|
||||||
import gearth.protocol.HMessage;
|
import gearth.protocol.HMessage;
|
||||||
import gearth.protocol.HPacket;
|
|
||||||
import gearth.protocol.crypto.RC4;
|
import gearth.protocol.crypto.RC4;
|
||||||
import gearth.protocol.memory.habboclient.HabboClient;
|
import gearth.protocol.memory.habboclient.HabboClient;
|
||||||
import gearth.protocol.memory.habboclient.HabboClientFactory;
|
import gearth.protocol.memory.habboclient.HabboClientFactory;
|
||||||
|
import gearth.protocol.packethandler.PayloadBuffer;
|
||||||
import gearth.protocol.packethandler.flash.BufferChangeListener;
|
import gearth.protocol.packethandler.flash.BufferChangeListener;
|
||||||
import gearth.protocol.packethandler.flash.FlashPacketHandler;
|
import gearth.protocol.packethandler.flash.FlashPacketHandler;
|
||||||
import gearth.protocol.packethandler.PayloadBuffer;
|
|
||||||
import gearth.ui.titlebar.TitleBarController;
|
import gearth.ui.titlebar.TitleBarController;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
import javafx.scene.control.ButtonType;
|
import javafx.scene.control.ButtonType;
|
||||||
import javafx.scene.control.Hyperlink;
|
import javafx.scene.control.Hyperlink;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.layout.FlowPane;
|
import javafx.scene.layout.FlowPane;
|
||||||
import javafx.scene.layout.Region;
|
import javafx.scene.layout.Region;
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
import javafx.scene.web.WebView;
|
|
||||||
import javafx.stage.Stage;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -31,17 +26,15 @@ public class Rc4Obtainer {
|
|||||||
|
|
||||||
public static final boolean DEBUG = false;
|
public static final boolean DEBUG = false;
|
||||||
|
|
||||||
private HabboClient client;
|
private final HabboClient client;
|
||||||
private List<FlashPacketHandler> flashPacketHandlers;
|
private List<FlashPacketHandler> flashPacketHandlers;
|
||||||
|
|
||||||
public Rc4Obtainer(HConnection hConnection) {
|
public Rc4Obtainer(HConnection hConnection) {
|
||||||
client = HabboClientFactory.get(hConnection);
|
client = HabboClientFactory.get(hConnection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void setFlashPacketHandlers(FlashPacketHandler... flashPacketHandlers) {
|
public void setFlashPacketHandlers(FlashPacketHandler... flashPacketHandlers) {
|
||||||
this.flashPacketHandlers = Arrays.asList(flashPacketHandlers);
|
this.flashPacketHandlers = Arrays.asList(flashPacketHandlers);
|
||||||
|
|
||||||
for (FlashPacketHandler handler : flashPacketHandlers) {
|
for (FlashPacketHandler handler : flashPacketHandlers) {
|
||||||
BufferChangeListener bufferChangeListener = new BufferChangeListener() {
|
BufferChangeListener bufferChangeListener = new BufferChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
@ -54,12 +47,8 @@ public class Rc4Obtainer {
|
|||||||
};
|
};
|
||||||
handler.getBufferChangeObservable().addListener(bufferChangeListener);
|
handler.getBufferChangeObservable().addListener(bufferChangeListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void onSendFirstEncryptedMessage(FlashPacketHandler flashPacketHandler) {
|
private void onSendFirstEncryptedMessage(FlashPacketHandler flashPacketHandler) {
|
||||||
if (!HConnection.DECRYPTPACKETS) return;
|
if (!HConnection.DECRYPTPACKETS) return;
|
||||||
|
|
||||||
@ -82,14 +71,13 @@ public class Rc4Obtainer {
|
|||||||
if (!worked) {
|
if (!worked) {
|
||||||
System.err.println("COULD NOT FIND RC4 TABLE");
|
System.err.println("COULD NOT FIND RC4 TABLE");
|
||||||
|
|
||||||
|
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
Alert alert = new Alert(Alert.AlertType.WARNING, "Something went wrong!", ButtonType.OK);
|
Alert alert = new Alert(Alert.AlertType.WARNING, "Something went wrong!", ButtonType.OK);
|
||||||
|
|
||||||
FlowPane fp = new FlowPane();
|
FlowPane fp = new FlowPane();
|
||||||
Label lbl = new Label("G-Earth has experienced an issue" + System.lineSeparator()+ System.lineSeparator() + "Head over to our Troubleshooting page to solve the problem:");
|
Label lbl = new Label("G-Earth has experienced an issue" + System.lineSeparator() + System.lineSeparator() + "Head over to our Troubleshooting page to solve the problem:");
|
||||||
Hyperlink link = new Hyperlink("https://github.com/sirjonasxx/G-Earth/wiki/Troubleshooting");
|
Hyperlink link = new Hyperlink("https://github.com/sirjonasxx/G-Earth/wiki/Troubleshooting");
|
||||||
fp.getChildren().addAll( lbl, link);
|
fp.getChildren().addAll(lbl, link);
|
||||||
link.setOnAction(event -> {
|
link.setOnAction(event -> {
|
||||||
GEarth.main.getHostServices().showDocument(link.getText());
|
GEarth.main.getHostServices().showDocument(link.getText());
|
||||||
event.consume();
|
event.consume();
|
||||||
@ -97,64 +85,73 @@ public class Rc4Obtainer {
|
|||||||
|
|
||||||
alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
|
alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
|
||||||
alert.getDialogPane().setContent(fp);
|
alert.getDialogPane().setContent(fp);
|
||||||
alert.setOnCloseRequest(event -> {
|
alert.setOnCloseRequest(event -> GEarth.main.getHostServices().showDocument(link.getText()));
|
||||||
GEarth.main.getHostServices().showDocument(link.getText());
|
|
||||||
});
|
|
||||||
try {
|
try {
|
||||||
TitleBarController.create(alert).showAlert();
|
TitleBarController.create(alert).showAlert();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
long endTime = System.currentTimeMillis();
|
final long endTime = System.currentTimeMillis();
|
||||||
if (DEBUG) {
|
if (DEBUG)
|
||||||
System.out.println("Cracked RC4 in " + (endTime - startTime) + "ms");
|
System.out.println("Cracked RC4 in " + (endTime - startTime) + "ms");
|
||||||
}
|
|
||||||
|
|
||||||
flashPacketHandlers.forEach(FlashPacketHandler::unblock);
|
flashPacketHandlers.forEach(FlashPacketHandler::unblock);
|
||||||
}).start();
|
}).start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean onSendFirstEncryptedMessage(FlashPacketHandler flashPacketHandler, List<byte[]> potentialRC4tables) {
|
private boolean onSendFirstEncryptedMessage(FlashPacketHandler flashPacketHandler, List<byte[]> potentialRC4tables) {
|
||||||
for (byte[] possible : potentialRC4tables) {
|
|
||||||
|
|
||||||
byte[] encBuffer = new byte[flashPacketHandler.getEncryptedBuffer().size()];
|
for (byte[] possible : potentialRC4tables)
|
||||||
for (int i = 0; i < encBuffer.length; i++) {
|
if (isCorrectRC4Table(flashPacketHandler, possible))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isCorrectRC4Table(FlashPacketHandler flashPacketHandler, byte[] possible) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
|
||||||
|
final byte[] encBuffer = new byte[flashPacketHandler.getEncryptedBuffer().size()];
|
||||||
|
|
||||||
|
for (int i = 0; i < encBuffer.length; i++)
|
||||||
encBuffer[i] = flashPacketHandler.getEncryptedBuffer().get(i);
|
encBuffer[i] = flashPacketHandler.getEncryptedBuffer().get(i);
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < 256; i++) {
|
for (int i = 0; i < 256; i++) {
|
||||||
for (int j = 0; j < 256; j++) {
|
for (int j = 0; j < 256; j++) {
|
||||||
byte[] keycpy = Arrays.copyOf(possible, possible.length);
|
|
||||||
RC4 rc4Tryout = new RC4(keycpy, i, j);
|
|
||||||
|
|
||||||
if (flashPacketHandler.getMessageSide() == HMessage.Direction.TOSERVER) rc4Tryout.undoRc4(encBuffer);
|
final byte[] keycpy = Arrays.copyOf(possible, possible.length);
|
||||||
|
final RC4 rc4Tryout = new RC4(keycpy, i, j);
|
||||||
|
|
||||||
|
if (flashPacketHandler.getMessageSide() == HMessage.Direction.TOSERVER)
|
||||||
|
rc4Tryout.undoRc4(encBuffer);
|
||||||
|
|
||||||
if (rc4Tryout.couldBeFresh()) {
|
if (rc4Tryout.couldBeFresh()) {
|
||||||
byte[] encDataCopy = Arrays.copyOf(encBuffer, encBuffer.length);
|
|
||||||
RC4 rc4TryCopy = rc4Tryout.deepCopy();
|
final byte[] encDataCopy = Arrays.copyOf(encBuffer, encBuffer.length);
|
||||||
|
final RC4 rc4TryCopy = rc4Tryout.deepCopy();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PayloadBuffer payloadBuffer = new PayloadBuffer();
|
final PayloadBuffer payloadBuffer = new PayloadBuffer();
|
||||||
byte[] decoded = rc4TryCopy.rc4(encDataCopy);
|
final byte[] decoded = rc4TryCopy.rc4(encDataCopy);
|
||||||
HPacket[] checker = payloadBuffer.pushAndReceive(decoded);
|
|
||||||
|
payloadBuffer.pushAndReceive(decoded);
|
||||||
|
|
||||||
if (payloadBuffer.peak().length == 0) {
|
if (payloadBuffer.peak().length == 0) {
|
||||||
flashPacketHandler.setRc4(rc4Tryout);
|
flashPacketHandler.setRc4(rc4Tryout);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user