From 2e41a8aa3e5392f199735ea699c139e935f0fcff Mon Sep 17 00:00:00 2001 From: Tyler True <944067+sirocyl@users.noreply.github.com> Date: Thu, 21 Feb 2019 02:03:35 -0500 Subject: [PATCH 1/2] Add sha256 verification to welcome processing. Works the same as the md5 "not using the right process." codepath. Could surely be optimized to be checked alongside md5 and return the same message. --- cogs/verification.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cogs/verification.py b/cogs/verification.py index 943d494..ea0fd17 100644 --- a/cogs/verification.py +++ b/cogs/verification.py @@ -186,6 +186,8 @@ class Verification: for name in allowed_names] md5_allow = [hashlib.md5(name.encode('utf-8')).hexdigest() for name in allowed_names] + sha256_allow = [hashlib.sha256(name.encode('utf-8')).hexdigest() + for name in allowed_names] sha1_close = [hashlib.sha1(name.encode('utf-8')).hexdigest() for name in close_names] @@ -197,6 +199,8 @@ class Verification: await chan.send(f"{message.author.mention} :no_entry: Close, but incorrect. You got the process right, but you're not doing it on your name and discriminator properly. Please re-read the rules carefully and look up any terms you are not familiar with.") elif any(allow in mcl for allow in md5_allow): await chan.send(f"{message.author.mention} :no_entry: Close, but incorrect. You're processing your name and discriminator properly, but you're not using the right process. Please re-read the rules carefully and look up any terms you are not familiar with.") + elif any(allow in mcl for allow in sha256_allow): + await chan.send(f"{message.author.mention} :no_entry: Close, but incorrect. You're processing your name and discriminator properly, but you're not using the right process. Please re-read the rules carefully and look up any terms you are not familiar with.") elif full_name in message.content or str(member.id) in message.content or member.name in message.content or discrim in message.content: await chan.send(f"{message.author.mention} :no_entry: Incorrect. You need to do something *specific* with your name and discriminator instead of just posting it. Please re-read the rules carefully and look up any terms you are not familiar with.") From 46fa205d938fd37a5c33fb37e0eb40d3dae0a960 Mon Sep 17 00:00:00 2001 From: Tyler True <944067+sirocyl@users.noreply.github.com> Date: Thu, 21 Feb 2019 02:22:11 -0500 Subject: [PATCH 2/2] Add windows newlines to allowed/close names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and Mac OS Classic? Who knows, someone might be using it still. [ ͡° ͜ᔦ ͡°] --- cogs/verification.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cogs/verification.py b/cogs/verification.py index ea0fd17..29eeb44 100644 --- a/cogs/verification.py +++ b/cogs/verification.py @@ -180,6 +180,10 @@ class Verification: # Now add the same things but with newlines at the end of them allowed_names += [(an + '\n') for an in allowed_names] close_names += [(cn + '\n') for cn in close_names] + allowed_names += [(an + '\r\n') for an in allowed_names] + close_names += [(cn + '\r\n') for cn in close_names] + allowed_names += [(an + '\r') for an in allowed_names] # [ ͡° ͜ᔦ ͡°] 𝐖𝐞𝐥𝐜𝐨𝐦𝐞 𝐭𝐨 𝐌𝐚𝐜 𝐎𝐒 𝟗. + close_names += [(cn + '\r') for cn in close_names] # Finally, hash the stuff so that we can access them later :) sha1_allow = [hashlib.sha1(name.encode('utf-8')).hexdigest()