feat: fix CWE-20

aqued-dev · Jul 16, 2023 · 63dc99a · 63dc99a
1 parent 8c93f5f
commit 63dc99a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/src/messages/globalChat.ts b/src/messages/globalChat.ts
@@ -21,13 +21,18 @@ export default async function (message: Message) {
 			message.react('❌');
 			return;
 		}
+		const LowerCaseContent = message.cleanContent.toLowerCase();
+
+		const discordRegex = /(https?:\/\/)?(www\.)?(discord\.(gg|com|net)|discordapp\.(com|net)\/invite)\/[\dA-Za-z]+/g;
+		const disboardRegex = /disboard\.org/g;
+		const discopartyRegex = /discoparty\.jp/g;
+		const dissokuRegex = /dissoku\.net/g;
+
 		if (
-			/(https?:\/\/)?(www\.)?(discord\.(gg|com|net)|discordapp\.(com|net)\/invite)\/[\dA-Za-z]+/g.test(
-				message.cleanContent.toLowerCase(),
-			) ||
-			message.cleanContent.toLowerCase().includes('disboard.org') ||
-			message.cleanContent.toLowerCase().includes('discoparty.jp') ||
-			message.cleanContent.toLowerCase().includes('dissoku.net')
+			discordRegex.test(LowerCaseContent) ||
+			disboardRegex.test(LowerCaseContent) ||
+			discopartyRegex.test(LowerCaseContent) ||
+			dissokuRegex.test(LowerCaseContent)
 		)
 			return message.react('❌');
 		const registers = await message.client.botData.globalChat.register.keys();

diff --git a/src/messages/superGlobalChat.ts b/src/messages/superGlobalChat.ts
@@ -10,13 +10,18 @@ export default async function (message: Message) {
 		if (!(await channelDB.get(message.channelId))) return;
 		if (message.author.bot || message.author.system || message.author.discriminator === '0000') return;
 		if (message.channel.type !== ChannelType.GuildText) return;
+		const LowerCaseContent = message.cleanContent.toLowerCase();
+
+		const discordRegex = /(https?:\/\/)?(www\.)?(discord\.(gg|com|net)|discordapp\.(com|net)\/invite)\/[\dA-Za-z]+/g;
+		const disboardRegex = /disboard\.org/g;
+		const discopartyRegex = /discoparty\.jp/g;
+		const dissokuRegex = /dissoku\.net/g;
+
 		if (
-			/(https?:\/\/)?(www\.)?(discord\.(gg|com|net)|discordapp\.(com|net)\/invite)\/[\dA-Za-z]+/g.test(
-				message.cleanContent.toLowerCase(),
-			) ||
-			message.cleanContent.toLowerCase().includes('disboard.org') ||
-			message.cleanContent.toLowerCase().includes('discoparty.jp') ||
-			message.cleanContent.toLowerCase().includes('dissoku.net')
+			discordRegex.test(LowerCaseContent) ||
+			disboardRegex.test(LowerCaseContent) ||
+			discopartyRegex.test(LowerCaseContent) ||
+			dissokuRegex.test(LowerCaseContent)
 		)
 			return message.react('❌');
 		const channels = await channelDB.keys();