Skip to content

Fix Top-Helper message length exploit #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 21, 2022
Merged

Fix Top-Helper message length exploit #649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fae8ed
Fix Top-Helper message length exploit
Nxllpointer Oct 21, 2022
2bc7e18
Made RegEx more readable and added info
Nxllpointer Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...on/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
* {@link TopHelpersCommand} to pick them up.
*/
public final class TopHelpersMessageListener extends MessageReceiverAdapter {
/**
* Matches invisible control characters and unused code points
*
* @see <a href="https://www.regular-expressions.info/unicode.html#category">Unicode
* Categories</a>
*/
private static final String UNCOUNTED_CHARS = "\\P{C}";

private final Database database;

private final Predicate<String> isStagingChannelName;
Expand Down Expand Up @@ -65,13 +73,16 @@ private boolean isHelpThread(MessageReceivedEvent event) {
}

private void addMessageRecord(MessageReceivedEvent event) {
String messageContent = event.getMessage().getContentRaw();
long messageLength = messageContent.replaceAll(UNCOUNTED_CHARS, "").length();

database.write(context -> context.newRecord(HELP_CHANNEL_MESSAGES)
.setMessageId(event.getMessage().getIdLong())
.setGuildId(event.getGuild().getIdLong())
.setChannelId(event.getChannel().getIdLong())
.setAuthorId(event.getAuthor().getIdLong())
.setSentAt(event.getMessage().getTimeCreated().toInstant())
.setMessageLength((long) event.getMessage().getContentRaw().length())
.setMessageLength(messageLength)
.insert());
}
}