You've already forked Arcturus-Morningstar-Extended
mirror of
https://github.com/duckietm/Arcturus-Morningstar-Extended.git
synced 2026-06-20 15:36:17 +00:00
fix(rooms): bound rights removal batches
This commit is contained in:
+9
@@ -3,8 +3,12 @@ package com.eu.habbo.messages.incoming.rooms.users;
|
|||||||
import com.eu.habbo.habbohotel.permissions.Permission;
|
import com.eu.habbo.habbohotel.permissions.Permission;
|
||||||
import com.eu.habbo.habbohotel.rooms.Room;
|
import com.eu.habbo.habbohotel.rooms.Room;
|
||||||
import com.eu.habbo.messages.incoming.MessageHandler;
|
import com.eu.habbo.messages.incoming.MessageHandler;
|
||||||
|
import com.eu.habbo.util.PacketGuard;
|
||||||
|
|
||||||
public class RoomUserRemoveRightsEvent extends MessageHandler {
|
public class RoomUserRemoveRightsEvent extends MessageHandler {
|
||||||
|
private static final int MAX_RIGHTS_REMOVALS = 100;
|
||||||
|
private static final int BYTES_PER_USER_ID = 4;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handle() throws Exception {
|
public void handle() throws Exception {
|
||||||
int amount = this.packet.readInt();
|
int amount = this.packet.readInt();
|
||||||
@@ -15,6 +19,11 @@ public class RoomUserRemoveRightsEvent extends MessageHandler {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (room.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) {
|
if (room.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) {
|
||||||
|
if (!PacketGuard.isCountInRange(amount, 1, MAX_RIGHTS_REMOVALS)
|
||||||
|
|| !PacketGuard.hasFixedWidthEntries(this.packet, amount, BYTES_PER_USER_ID)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < amount; i++) {
|
for (int i = 0; i < amount; i++) {
|
||||||
int userId = this.packet.readInt();
|
int userId = this.packet.readInt();
|
||||||
|
|
||||||
|
|||||||
+32
@@ -0,0 +1,32 @@
|
|||||||
|
package com.eu.habbo.messages.incoming.rooms.users;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
class RoomUserRemoveRightsContractTest {
|
||||||
|
private static final Path SOURCE = Path.of(
|
||||||
|
"src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserRemoveRightsEvent.java");
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void removeRightsBatchIsBoundedAndRequiresCompletePayload() throws IOException {
|
||||||
|
String source = Files.readString(SOURCE);
|
||||||
|
|
||||||
|
assertTrue(source.contains("private static final int MAX_RIGHTS_REMOVALS = 100;"));
|
||||||
|
assertTrue(source.contains("PacketGuard.isCountInRange(amount, 1, MAX_RIGHTS_REMOVALS)"));
|
||||||
|
assertTrue(source.contains("PacketGuard.hasFixedWidthEntries(this.packet, amount, BYTES_PER_USER_ID)"));
|
||||||
|
|
||||||
|
int guardIndex = source.indexOf("PacketGuard.isCountInRange(amount, 1, MAX_RIGHTS_REMOVALS)");
|
||||||
|
int payloadIndex = source.indexOf("PacketGuard.hasFixedWidthEntries(this.packet, amount, BYTES_PER_USER_ID)");
|
||||||
|
int readIndex = source.indexOf("int userId = this.packet.readInt();");
|
||||||
|
int removeIndex = source.indexOf("room.removeRights(userId);");
|
||||||
|
|
||||||
|
assertTrue(guardIndex < readIndex, "batch size should be validated before reading user ids");
|
||||||
|
assertTrue(payloadIndex < readIndex, "payload length should be validated before reading user ids");
|
||||||
|
assertTrue(readIndex < removeIndex, "rights should only be removed after reading a validated user id");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user