duckietm/Arcturus-Morningstar-Extended
1
0
Fork 0
mirror of https://github.com/duckietm/Arcturus-Morningstar-Extended.git synced 2026-06-19 06:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(login): don't reject login when the machine fingerprint arrives after the SSO ticket

Browse Source 
The Nitro renderer sends the UniqueID (machine fingerprint) packet right AFTER the SSOTicket, so Habbo.connect() ran before the machineId was set and returned false on the empty machineId — silently disposing the client (WS closed with Netty's default "Bye"), so login never completed and no SecureLoginOK was sent.

- Habbo.connect(): only set machineID + run the MAC-ban check when the fingerprint is already present; never reject the login solely for a missing machineId (also drop a duplicated MAC/IP-ban block).

- MachineIDEvent: enforce the MAC ban when the fingerprint arrives after login, preserving the ban check that connect() now defers.
This commit is contained in:
simoleo89
2026-06-09 20:50:12 +02:00
parent 61ea33ac28
commit d984461cc0
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java
+11 -19
View File
@@ -146,31 +146,23 @@ public class Habbo implements Runnable {
this.habboInfo.setIpLogin(ip);
}
if (this.client.getMachineId() == null || this.client.getMachineId().length() == 0) {
return false;
}
// The Nitro client sends the UniqueID (machine fingerprint) packet right
// AFTER the SSO ticket, so client.getMachineId() may still be null here.
// Do NOT reject the login for a missing machineId — MachineIDEvent sets it
// and enforces the MAC ban as soon as the UniqueID packet arrives. Only
// MAC-ban check here when the fingerprint is already available.
String machineId = this.client.getMachineId();
if (machineId != null && !machineId.isEmpty()) {
this.habboInfo.setMachineID(machineId);
this.habboInfo.setMachineID(this.client.getMachineId());
if (Emulator.getGameEnvironment().getModToolManager().hasMACBan(this.client)) {
return false;
if (Emulator.getGameEnvironment().getModToolManager().hasMACBan(this.client)) {
return false;
}
}
if (Emulator.getGameEnvironment().getModToolManager().hasIPBan(this.habboInfo.getIpLogin())) {
return false;
}
this.habboInfo.setMachineID(this.client.getMachineId());
if (Emulator.getGameEnvironment().getModToolManager().hasMACBan(this.client)) {
return false;
}
if (Emulator.getGameEnvironment().getModToolManager().hasIPBan(this.habboInfo.getIpLogin())) {
return false;
}
this.habboInfo.setMachineID(this.client.getMachineId());
this.isOnline(true);
this.messenger.connectionChanged(this, true, false);
Emulator/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java
+7
View File
@@ -32,6 +32,13 @@ public class MachineIDEvent extends MessageHandler {
if (!storedMachineId.isEmpty() && this.client.getHabbo() != null && this.client.getHabbo().getHabboInfo() != null) {
this.client.getHabbo().getHabboInfo().setMachineID(storedMachineId);
Emulator.getThreading().run(this.client.getHabbo());
// The fingerprint can arrive AFTER login (UniqueID is sent right after the
// SSO ticket), so Habbo.connect() may have skipped the MAC-ban check for
// lack of a machineId. Enforce it now that the fingerprint is known.
if (Emulator.getGameEnvironment().getModToolManager().hasMACBan(this.client)) {
Emulator.getGameServer().getGameClientManager().disposeClient(this.client);
}
}
LOGGER.debug("Setting client MachineId to {}", storedMachineId);