Skip to content

Improve discord webhook anonymization #249

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
NonSwag merged 1 commit into from
Sep 27, 2026
Merged

Improve discord webhook anonymization #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions core/src/main/java/dev/faststats/ErrorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,15 @@ private static List<Map.Entry<Pattern, String>> defaultAnonymizationEntries() {
Map.entry(ipv4Pattern(), "[IP hidden]"),
Map.entry(ipv6Pattern(), "[IP hidden]"),
Map.entry(userHomePathPattern(), "$1$2$3[username hidden]"),
Map.entry(discordWebhookPattern(), "$1[token hidden]"),
Map.entry(discordWebhookPattern(), "$1[id hidden]/[token hidden]"),
Map.entry(jdbcUrlPattern(), "$1[password hidden]$2")
));
usernamePattern().ifPresent(pattern -> entries.add(Map.entry(pattern, "[username hidden]")));
return entries;
}

private static Pattern discordWebhookPattern() {
return Pattern.compile("(https://discord\\.com/api/webhooks/\\d+/)[\\w-]+");
return Pattern.compile("(https://(?:discord\\.com|canary\\.discord\\.com|ptb\\.discord\\.com|discordapp\\.com)/api/(?:v\\d+/)?webhooks/)\\d+/[\\w-]+(?:\\?\\S*)?");
}

private static Pattern ipv4Pattern() {
Expand Down
18 changes: 14 additions & 4 deletions core/src/test/java/dev/faststats/AnonymizationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.google.gson.JsonObject;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import java.util.regex.Pattern;

Expand Down Expand Up @@ -64,10 +66,18 @@ public void usernameAnonymizationIsCaseInsensitive() {
assertEquals("Error for [username hidden]", getErrorMessage());
}

@Test
public void discordWebhookAnonymization() {
tracker.trackError("Webhook failed: https://discord.com/api/webhooks/1234567890987654321/aAaAaAaa0AAaAAaaaAAAAa_0AAAAAAAaaaAaaAaaAAAA0aA00AAA0AAA0aAAaA0a0a0A");
assertEquals("Webhook failed: https://discord.com/api/webhooks/1234567890987654321/[token hidden]", getErrorMessage());
@ParameterizedTest
@ValueSource(strings = {
"https://discord.com/api/webhooks",
"https://discord.com/api/v10/webhooks",
"https://canary.discord.com/api/webhooks",
"https://ptb.discord.com/api/webhooks",
"https://discordapp.com/api/webhooks"
})
public void discordWebhookAnonymization(final String webhookBaseUrl) {
final var webhookUrl = webhookBaseUrl + "/1234567890987654321/aAaAaAaa0AAaAAaaaAAAAa_0AAAAAAAaaaAaaAaaAAAA0aA00AAA0AAA0aAAaA0a0a0A";
tracker.trackError("Webhook failed: " + webhookUrl + "?wait=true");
assertEquals("Webhook failed: " + webhookBaseUrl + "/[id hidden]/[token hidden]", getErrorMessage());
}

@Test
Expand Down
Loading