diff options
| author |  arl <[email protected]> | 2022-10-14 08:33:59 -0400 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2022-10-14 15:33:59 +0300 |
| commit | cdb9183a8934a9a2030c4062caab46c5e8983c11 (patch) | |
| tree | e0cfb683e75601d81b0500fbd7bd6ccf077ec4c2 | |
| parent | `REPO_TOKEN` is no more. (#2289) (diff) | |
enhancement(filters): use a stricter bot token regex (#2006)
Use a stricter bot token regex
Co-authored-by: wookie184 <[email protected]>
Co-authored-by: Hassan Abouelela <[email protected]>
| -rw-r--r-- | bot/exts/filters/token_remover.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bot/exts/filters/token_remover.py b/bot/exts/filters/token_remover.py index a0d5aa7b6..29f80671d 100644 --- a/bot/exts/filters/token_remover.py +++ b/bot/exts/filters/token_remover.py @@ -29,7 +29,7 @@ DELETION_MESSAGE_TEMPLATE = ( "token in your message and have removed your message. " "This means that your token has been **compromised**. " "Please change your token **immediately** at: " - "<https://discordapp.com/developers/applications/me>\n\n" + "<https://discord.com/developers/applications>\n\n" "Feel free to re-post it with the token removed. " "If you believe this was a mistake, please let us know!" ) @@ -39,8 +39,8 @@ TOKEN_EPOCH = 1_293_840_000 # Three parts delimited by dots: user ID, creation timestamp, HMAC. # The HMAC isn't parsed further, but it's in the regex to ensure it at least exists in the string. # Each part only matches base64 URL-safe characters. -# Padding has never been observed, but the padding character '=' is matched just in case. -TOKEN_RE = re.compile(r"([\w\-=]+)\.([\w\-=]+)\.([\w\-=]+)", re.ASCII) +# These regexes were taken from discord-developers, which are used by the client itself. +TOKEN_RE = re.compile(r"([\w-]{10,})\.([\w-]{5,})\.([\w-]{10,})") class Token(t.NamedTuple): @@ -52,7 +52,7 @@ class Token(t.NamedTuple): class TokenRemover(Cog): - """Scans messages for potential discord.py bot tokens and removes them.""" + """Scans messages for potential discord client tokens and removes them.""" def __init__(self, bot: Bot): self.bot = bot @@ -166,7 +166,7 @@ class TokenRemover(Cog): return token # No matching substring - return + return None @staticmethod def extract_user_id(b64_content: str) -> t.Optional[int]: |