misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hbot discord crash exploit but also crashes chomens discord & lint DiscordPlugin a bit

Browse Source
This commit is contained in:
ChomeNS
2025-05-07 17:51:32 +07:00
parent cea28ffd50
commit dc38ef86c6
1 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
View File

@@ -33,16 +33,21 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Matcher;
public class DiscordPlugin {
private static final int MAX_ANSI_MESSAGE_LENGTH = 2_000 - ("""
```ansi
```"""
).length(); // kinda sus
private static final int LOG_DELAY = 2 * 1000;
public JDA jda;
public Configuration.Discord options;
public final Configuration.Discord options;
public final Map<String, String> servers;
public final String prefix;
public final Component messagePrefix;
public final String discordUrl;
public DiscordPlugin (final Configuration config) {
@@ -91,7 +96,7 @@ public class DiscordPlugin {
bot.listener.addListener(new Listener() {
@Override
public boolean onSystemMessageReceived (final Component component, final String string, final String _ansi) {
if (string.length() > 2000 - 12) {
if (string.length() > MAX_ANSI_MESSAGE_LENGTH) {
sendMessage(CodeBlockUtilities.escape(string), channelId);
} else {
final String ansi = ComponentUtilities.stringifyDiscordAnsi(component);
@@ -219,39 +224,39 @@ public class DiscordPlugin {
&& currentTime - data.nextLogTime.get() < (5 * 1000)
) continue;
final long logDelay = 2000;
data.nextLogTime.set(currentTime + logDelay);
data.nextLogTime.set(currentTime + LOG_DELAY);
final String message;
final StringBuilder logMessages = data.logMessages;
final Matcher inviteMatcher = Message.INVITE_PATTERN.matcher(logMessages.toString());
final StringBuilder messageBuilder;
final StringBuilder messageBuilder = new StringBuilder();
if (logMessages.length() < 4096) { // we obviously don't want to use regex on big strings, or it will take 69 years
messageBuilder = new StringBuilder();
while (inviteMatcher.find()) {
inviteMatcher.appendReplacement(
messageBuilder,
Matcher.quoteReplacement(
inviteMatcher.group()
// fixes discord.gg (and some more discord urls) showing invite
.replace(".", "\u200b.")
)
);
final Matcher inviteMatcher = Message.INVITE_PATTERN.matcher(logMessages.toString());
while (inviteMatcher.find()) {
inviteMatcher.appendReplacement(
messageBuilder,
Matcher.quoteReplacement(
inviteMatcher.group()
// fixes discord.gg (and some more discord urls) showing invite
.replace(".", "\u200b.")
)
);
}
inviteMatcher.appendTail(messageBuilder);
message = messageBuilder.substring(0, Math.min(messageBuilder.length(), MAX_ANSI_MESSAGE_LENGTH));
} else {
message = logMessages.toString()
.replace(".", "\u200b.")
.substring(0, Math.min(logMessages.length(), MAX_ANSI_MESSAGE_LENGTH));
}
inviteMatcher.appendTail(messageBuilder);
final int maxLength = 2_000 - ("""
```ansi
```"""
).length(); // kinda sus
message = messageBuilder.substring(0, Math.min(messageBuilder.length(), maxLength));
logMessages.setLength(0);
if (message.trim().isBlank()) continue;