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

🆙 Small security fix Forum Groups & better cache

Browse Source 
GuildChangeSettingsEvent 2000ms - Write
GuildForumPostThreadEvent 2000ms - Write
ModerateMessage/Thread 2000ms - Write
ThreadUpdate 2000ms -Write
UpdateSettings 2000ms- Write
MarkAsRead 2000ms - Write
Data/List/Threads/Messages - 500ms Read-only
This commit is contained in:
DuckieTM
2026-03-29 16:04:52 +02:00
parent 33a1a511ce
commit 0ebb303e0c
8 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java
+31 -10
View File
@@ -2,12 +2,14 @@ package com.eu.habbo.messages.incoming.guilds;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.guilds.Guild;
import com.eu.habbo.habbohotel.guilds.GuildMember;
import com.eu.habbo.habbohotel.guilds.GuildState;
import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.habbohotel.guilds.forums.ForumThread;
import com.eu.habbo.messages.incoming.guilds.forums.GuildForumListEvent;
import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer;
import com.eu.habbo.plugin.events.guilds.GuildChangedSettingsEvent;
import org.slf4j.Logger;
@@ -16,13 +18,18 @@ import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.concurrent.ConcurrentHashMap;
public class GuildChangeSettingsEvent extends MessageHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(GuildChangeSettingsEvent.class);
// Cooldown for forum toggle per guild: guildId -> last toggle timestamp
private static final ConcurrentHashMap<Integer, Long> forumToggleCooldown = new ConcurrentHashMap<>();
private static final long FORUM_TOGGLE_COOLDOWN_MS = 30_000; // 30 seconds
@Override
public int getRatelimit() {
return 500;
return 2000; // 2 seconds between settings saves
}
@Override
@@ -47,17 +54,27 @@ public class GuildChangeSettingsEvent extends MessageHandler {
boolean wasForumEnabled = guild.hasForum();
if (forumEnabled != wasForumEnabled) {
guild.setForum(forumEnabled);
// Enforce cooldown on forum toggle to prevent rapid enable/disable spam
Long lastToggle = forumToggleCooldown.get(guildId);
long now = System.currentTimeMillis();
if (!forumEnabled) {
// Delete all threads and comments for this guild
ForumThread.clearCacheForGuild(guildId);
deleteForumData(guildId);
if (lastToggle != null && (now - lastToggle) < FORUM_TOGGLE_COOLDOWN_MS) {
LOGGER.warn("Forum toggle cooldown for guild {} by user {}", guildId, this.client.getHabbo().getHabboInfo().getUsername());
} else {
forumToggleCooldown.put(guildId, now);
guild.setForum(forumEnabled);
if (!forumEnabled) {
// Delete all threads and comments for this guild
ForumThread.clearCacheForGuild(guildId);
deleteForumData(guildId);
}
// Invalidate caches
GuildForumDataComposer.invalidateUnreadCache(guildId);
GuildForumListEvent.invalidateActiveForumsCache();
GuildForumListEvent.invalidateMyForumsCache(this.client.getHabbo().getHabboInfo().getId());
}
// Invalidate caches
GuildForumDataComposer.invalidateUnreadCache(guildId);
GuildForumListEvent.invalidateActiveForumsCache();
}
Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId());
@@ -68,6 +85,10 @@ public class GuildChangeSettingsEvent extends MessageHandler {
guild.needsUpdate = true;
Emulator.getThreading().run(guild);
// Send updated group info back to client so hasForum flag refreshes immediately
GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo());
this.client.sendResponse(new GuildInfoComposer(guild, this.client, false, member));
}
}
}
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumMarkAsReadEvent.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class GuildForumMarkAsReadEvent extends MessageHandler {
@Override
public int getRatelimit() {
return 500;
return 2000;
}
@Override
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java
+1 -1
View File
@@ -18,7 +18,7 @@ import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
public class GuildForumModerateMessageEvent extends MessageHandler {
@Override
public int getRatelimit() {
return 500;
return 2000;
}
@Override
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateThreadEvent.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class GuildForumModerateThreadEvent extends MessageHandler {
@Override
public int getRatelimit() {
return 500;
return 2000;
}
@Override
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class GuildForumPostThreadEvent extends MessageHandler {
@Override
public int getRatelimit() {
return 1000;
return 2000;
}
@Override
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java
+1 -1
View File
@@ -17,7 +17,7 @@ import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
public class GuildForumThreadUpdateEvent extends MessageHandler {
@Override
public int getRatelimit() {
return 500;
return 2000;
}
@Override
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsEvent.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class GuildForumThreadsEvent extends MessageHandler {
Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId);
if (guild == null || !guild.hasForum()) {
if (guild == null) {
this.client.sendResponse(new ConnectionErrorComposer(404));
return;
}
Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumUpdateSettingsEvent.java
+1 -1
View File
@@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
public class GuildForumUpdateSettingsEvent extends MessageHandler {
@Override
public int getRatelimit() {
return 500;
return 2000;
}
@Override