diff --git a/src/db/migrations/0037-remove-leaked-webhooks.js b/src/db/migrations/0037-remove-leaked-webhooks.js
new file mode 100644
index 0000000..79fad16
--- /dev/null
+++ b/src/db/migrations/0037-remove-leaked-webhooks.js
@@ -0,0 +1,41 @@
+const {discord, db, from, select, sync} = require("../../passthrough")
+/** @type {import("../../discord/utils")} */
+const dUtils = sync.require("../../discord/utils")
+
+const ones = "₀₁₂₃₄₅₆₇₈₉"
+const tens = "0123456789"
+
+/* c8 ignore start */
+
+module.exports = async function(db) {
+ // added tolerance to https://discordstatus.com/incidents/4hpm4454hxtx
+ const OUTAGE_START = 1778263200000
+ const OUTAGE_END = 1778284800000
+
+ const startSnowflake = dUtils.timestampToSnowflakeInexact(OUTAGE_START)
+ const endSnowflake = dUtils.timestampToSnowflakeInexact(OUTAGE_END)
+
+ const affectedChannels = from("message_room").join("historical_channel_room", "historical_room_index")
+ .pluck("reference_channel_id").selectUnsafe("DISTINCT reference_channel_id")
+ .and("WHERE message_id >= ? AND message_id <= ? AND length(message_id) = ?").all(startSnowflake, endSnowflake, startSnowflake.length)
+ const affectedWebhooks = select("webhook", ["channel_id", "webhook_id", "webhook_token"], {channel_id: affectedChannels}).all()
+
+ if (affectedWebhooks.length) {
+ process.stdout.write(` revoking ${affectedWebhooks.length} possibly compromised webhooks... `)
+ for (let counter = 1; counter <= affectedWebhooks.length; counter++) {
+ const webhook = affectedWebhooks[counter-1]
+
+ await discord.snow.webhook.deleteWebhookToken(webhook.webhook_id, webhook.webhook_token, "Webhook token possibly compromised during 8th May 2026 outage").catch(e => {
+ if (e.message === `{"message": "Unknown Webhook", "code": 10015}`) {
+ // OK
+ } else {
+ throw e
+ }
+ })
+ db.prepare("DELETE FROM webhook WHERE channel_id = ?").run(webhook.channel_id)
+
+ process.stdout.write(String(counter).at(-1) === "0" ? tens[(counter/10)%10] : ones[counter%10])
+ }
+ process.stdout.write("\n")
+ }
+}
diff --git a/src/m2d/event-dispatcher.js b/src/m2d/event-dispatcher.js
index c11b696..0d1c529 100644
--- a/src/m2d/event-dispatcher.js
+++ b/src/m2d/event-dispatcher.js
@@ -94,6 +94,11 @@ function printError(type, source, e, payload) {
console.dir(payload, {depth: null})
}
+/** @param {string} stack */
+function cleanErrorStack(stack) {
+ return stack.replace(/(\/webhooks\/[0-9]+\/)[a-zA-Z0-9_-]+/g, "$1(redacted)")
+}
+
/**
* @param {string} roomID
* @param {"Discord" | "Matrix"} source
@@ -134,7 +139,7 @@ async function sendError(roomID, source, type, e, payload) {
builder.addLine(errorIntroLine)
// Where
- const stack = stringifyErrorStack(e)
+ const stack = cleanErrorStack(stringifyErrorStack(e))
builder.addLine(`Error trace:\n${stack}`, tag`Error trace
${stack}