aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Leon Sandøy <[email protected]>2019-10-11 23:24:49 +0200
committerGravatar GitHub <[email protected]>2019-10-11 23:24:49 +0200
commit4a3cebc06d4aa5a8b99a1f1be7096b48d3e7a36b (patch)
treeed503ba4aced9602ef178d2dcd5800a5e0c0fb4a
parentMerge pull request #509 from python-discord/moderation-tweaks (diff)
parentMerge branch 'master' into token-regex-tweak (diff)
Merge pull request #506 from python-discord/token-regex-tweak
Expand token detection regex character exclusion
-rw-r--r--bot/cogs/token_remover.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/bot/cogs/token_remover.py b/bot/cogs/token_remover.py
index 4a655d049..5a0d20e57 100644
--- a/bot/cogs/token_remover.py
+++ b/bot/cogs/token_remover.py
@@ -26,11 +26,11 @@ DELETION_MESSAGE_TEMPLATE = (
DISCORD_EPOCH_TIMESTAMP = datetime(2017, 1, 1)
TOKEN_EPOCH = 1_293_840_000
TOKEN_RE = re.compile(
- r"[^\s\.]+" # Matches token part 1: The user ID string, encoded as base64
- r"\." # Matches a literal dot between the token parts
- r"[^\s\.]+" # Matches token part 2: The creation timestamp, as an integer
- r"\." # Matches a literal dot between the token parts
- r"[^\s\.]+" # Matches token part 3: The HMAC, unused by us, but check that it isn't empty
+ r"[^\s\.()\"']+" # Matches token part 1: The user ID string, encoded as base64
+ r"\." # Matches a literal dot between the token parts
+ r"[^\s\.()\"']+" # Matches token part 2: The creation timestamp, as an integer
+ r"\." # Matches a literal dot between the token parts
+ r"[^\s\.()\"']+" # Matches token part 3: The HMAC, unused by us, but check that it isn't empty
)