Giving up on encryption

and life

src/client.js

@@ -6,7 +6,6 @@ const I18n = require('@eartharoid/i18n');
 const fs = require('fs');
 const { join } = require('path');
 const YAML = require('yaml');
-const middleware = require('./lib/prisma');
 
 module.exports = class Client extends FrameworkClient {
 	constructor(config, log) {
@@ -37,7 +36,6 @@ module.exports = class Client extends FrameworkClient {
 	async login(token) {
 		/** @type {PrismaClient} */
 		this.prisma = new PrismaClient();
-		this.prisma.$use(middleware(this.log));
 		this.keyv = new Keyv();
 		return super.login(token);
 	}

src/lib/logging.js

@@ -1,4 +1,7 @@
-const { EmbedBuilder } = require('discord.js');
+const {
+	cleanCodeBlockContent,
+	EmbedBuilder,
+} = require('discord.js');
 const { diff: getDiff } = require('object-diffy');
 
 function makeDiff({
@@ -8,12 +11,12 @@ function makeDiff({
 	const fields = [];
 	for (const key in diff) {
 		if (key === 'createdAt') continue; // object-diffy doesn't like dates
-		const from = diff[key].from === null ? '' : `- ${diff[key].from}\n`;
-		const to = diff[key].to === null ? '' : `+ ${diff[key].to}\n`;
+		const from = diff[key].from === null ? '' : `- ${diff[key].from.toString().replace(/\n/g, '\\n')}\n`;
+		const to = diff[key].to === null ? '' : `+ ${diff[key].to.toString().replace(/\n/g, '\\n')}\n`;
 		fields.push({
 			inline: true,
 			name: key,
-			value: `\`\`\`diff\n${from + to}\n\`\`\``,
+			value: `\`\`\`diff\n${cleanCodeBlockContent(from + to)}\n\`\`\``,
 		});
 	}
 	return fields;

src/lib/prisma.js

@@ -1,69 +0,0 @@
-const Cryptr = require('cryptr');
-const cryptr = new Cryptr(process.env.ENCRYPTION_KEY);
-const fields = [
-	'name',
-	'content',
-	'username',
-	'displayName',
-	// 'channelName',
-	'openingMessage',
-	'description',
-	'value',
-	'placeholder',
-	'closedReason',
-	'topic',
-	'comment',
-	'label',
-	'regex',
-];
-const shouldEncrypt = ['create', 'createMany', 'update', 'updateMany', 'upsert'];
-// const shouldDecrypt = ['findUnique', 'findFirst', 'findMany'];
-
-
-
-
-module.exports = log => {
-	const encrypt = obj => {
-		for (const prop in obj) {
-			if (obj.hasOwnProperty(prop)) {
-				if (typeof obj[prop] === 'object') {
-					obj[prop] = encrypt(obj[prop]);
-				} else if (typeof obj[prop] === 'string' && obj[prop].length !== 0 && fields.includes(prop)) {
-					try {
-						obj[prop] = cryptr.encrypt(obj[prop]);
-					} catch (error) {
-						log.warn(`Failed to encrypt ${prop}`);
-						log.debug(error);
-					}
-				}
-			}
-		}
-		return obj;
-	};
-
-	const decrypt = obj => {
-		for (const prop in obj) {
-			if (obj.hasOwnProperty(prop)) {
-				if (typeof obj[prop] === 'object') {
-					obj[prop] = decrypt(obj[prop]);
-				} else if (typeof obj[prop] === 'string' && obj[prop].length !== 0 && fields.includes(prop)) {
-					try {
-						obj[prop] = cryptr.decrypt(obj[prop]);
-					} catch (error) {
-						log.warn(`Failed to decrypt ${prop}`);
-						log.debug(error);
-					}
-				}
-			}
-		}
-		return obj;
-	};
-
-	return async (params, next) => {
-		if (params.args.data && shouldEncrypt.includes(params.action)) params.args = encrypt(params.args);
-		let result = await next(params);
-		// if (result && shouldDecrypt.includes(params.action)) result = decrypt(result);
-		if (result) result = decrypt(result);
-		return result;
-	};
-};

src/routes/api/admin/guilds/[guild]/categories/[category].js

@@ -1,10 +1,14 @@
 const { logAdminEvent } = require('../../../../../../lib/logging');
+const { randomUUID } = require('crypto');
 
 module.exports.delete = fastify => ({
 	handler: async (req, res) => {
 		/** @type {import('client')} */
 		const client = res.context.config.client;
+		const guildId = req.params.guild;
 		const categoryId = Number(req.params.category);
+		const original = req.params.category && await client.prisma.category.findUnique({ where: { id: categoryId } });
+		if (!original || original.guildId !== guildId) return res.status(404).send(new Error('Not Found'));
 		const category = await client.prisma.category.delete({ where: { id: categoryId } });
 
 		logAdminEvent(client, {
@@ -27,12 +31,13 @@ module.exports.get = fastify => ({
 	handler: async (req, res) => {
 		/** @type {import('client')} */
 		const client = res.context.config.client;
+		const guildId = req.params.guild;
 		const categoryId = Number(req.params.category);
 		const category = await client.prisma.category.findUnique({
 			include: {
 				questions: {
 					select: {
-						createdAt: true,
+						// createdAt: true,
 						id: true,
 						label: true,
 						maxLength: true,
@@ -45,9 +50,11 @@ module.exports.get = fastify => ({
 					},
 				},
 			},
-			where: { id: categoryId  },
+			where: { id: categoryId },
 		});
 
+		if (!category || category.guildId !== guildId) return res.status(404).send(new Error('Not Found'));
+
 		return category;
 	},
 	onRequest: [fastify.authenticate, fastify.isAdmin],
@@ -57,11 +64,13 @@ module.exports.patch = fastify => ({
 	handler: async (req, res) => {
 		/** @type {import('client')} */
 		const client = res.context.config.client;
+		const guildId = req.params.guild;
 		const categoryId = Number(req.params.category);
 		const guild = client.guilds.cache.get(req.params.guild);
 		const data = req.body;
 		const original = req.params.category && await client.prisma.category.findUnique({ where: { id: categoryId } });
-		if (!original) return res.status(404);
+		if (!original || original.guildId !== guildId) return res.status(404).send(new Error('Not Found'));
+
 
 		if (data.hasOwnProperty('id')) delete data.id;
 		if (data.hasOwnProperty('createdAt')) delete data.createdAt;
@@ -70,11 +79,14 @@ module.exports.patch = fastify => ({
 			data: {
 				...data,
 				questions: {
-					upsert: data.questions?.map(q => ({
-						create: q,
-						update: q,
-						where: { id: q.id },
-					})),
+					upsert: data.questions?.map(q => {
+						if (!q.id) q.id = randomUUID();
+						return {
+							create: q,
+							update: q,
+							where: { id: q.id },
+						};
+					}),
 				},
 			},
 			where: { id: categoryId },

src/routes/api/admin/guilds/[guild]/categories/index.js

@@ -8,29 +8,27 @@ module.exports.get = fastify => ({
 		const client = res.context.config.client;
 
 		const { categories } = await client.prisma.guild.findUnique({
-			select: {
-				categories: {
-					include: {
-						questions: {
-							select: {
-								createdAt: true,
-								id: true,
-								label: true,
-								maxLength: true,
-								minLength: true,
-								order: true,
-								placeholder: true,
-								required: true,
-								style: true,
-								value: true,
-							},
-						},
-					},
-				},
-			},
+			select: { categories: true },
 			where: { id: req.params.guild },
 		});
 
+		// include: {
+		// 	questions: {
+		// 		select: {
+		// 			createdAt: true,
+		// 			id: true,
+		// 			label: true,
+		// 			maxLength: true,
+		// 			minLength: true,
+		// 			order: true,
+		// 			placeholder: true,
+		// 			required: true,
+		// 			style: true,
+		// 			value: true,
+		// 		},
+		// 	},
+		// },
+
 		return categories;
 	},
 	onRequest: [fastify.authenticate, fastify.isAdmin],

src/routes/api/admin/guilds/[guild]/problems.js

@@ -0,0 +1,32 @@
+module.exports.get = fastify => ({
+	handler: async (req, res) => {
+		/** @type {import('client')} */
+		const client = res.context.config.client;
+		const id = req.params.guild;
+		const guild = client.guilds.cache.get(id);
+		const settings = await client.prisma.guild.findUnique({ where: { id } }) ??
+			await client.prisma.guild.create({ data: { id } });
+		const problems = [];
+
+		if (settings.logChannel) {
+			const permissions = guild.members.me.permissionsIn(settings.logChannel);
+
+			if (!permissions.has('SendMessages')) {
+				problems.push({
+					id: 'logChannelMissingPermission',
+					permission: 'SendMessages',
+				});
+			}
+
+			if (!permissions.has('EmbedLinks')) {
+				problems.push({
+					id: 'logChannelMissingPermission',
+					permission: 'EmbedLinks',
+				});
+			}
+		}
+
+		return problems;
+	},
+	onRequest: [fastify.authenticate, fastify.isAdmin],
+});