Rework command
Bsian
parent
f25b118eff
commit
87fd47adce
|
|
@ -1,176 +1,176 @@
|
||||||
/* eslint-disable no-param-reassign */
|
/* eslint-disable no-param-reassign */
|
||||||
|
|
||||||
export default class RichEmbed {
|
export default class RichEmbed {
|
||||||
title?: string
|
title?: string
|
||||||
|
|
||||||
type?: string
|
type?: string
|
||||||
|
|
||||||
description?: string
|
description?: string
|
||||||
|
|
||||||
url?: string
|
url?: string
|
||||||
|
|
||||||
timestamp?: Date
|
timestamp?: Date
|
||||||
|
|
||||||
color?: number
|
color?: number
|
||||||
|
|
||||||
footer?: { text: string, icon_url?: string, proxy_icon_url?: string}
|
footer?: { text: string, icon_url?: string, proxy_icon_url?: string}
|
||||||
|
|
||||||
image?: { url?: string, proxy_url?: string, height?: number, width?: number }
|
image?: { url: string, proxy_url?: string, height?: number, width?: number }
|
||||||
|
|
||||||
thumbnail?: { url?: string, proxy_url?: string, height?: number, width?: number }
|
thumbnail?: { url?: string, proxy_url?: string, height?: number, width?: number }
|
||||||
|
|
||||||
video?: { url?: string, height?: number, width?: number }
|
video?: { url: string, height?: number, width?: number }
|
||||||
|
|
||||||
provider?: { name?: string, url?: string}
|
provider?: { name: string, url?: string}
|
||||||
|
|
||||||
author?: { name?: string, url?: string, proxy_icon_url?: string, icon_url?: string}
|
author?: { name: string, url?: string, proxy_icon_url?: string, icon_url?: string}
|
||||||
|
|
||||||
fields?: {name: string, value: string, inline?: boolean}[]
|
fields?: {name: string, value: string, inline?: boolean}[]
|
||||||
|
|
||||||
constructor(data: {
|
constructor(data: {
|
||||||
title?: string, type?: string, description?: string, url?: string, timestamp?: Date, color?: number, fields?: {name: string, value: string, inline?: boolean}[]
|
title?: string, type?: string, description?: string, url?: string, timestamp?: Date, color?: number, fields?: {name: string, value: string, inline?: boolean}[]
|
||||||
footer?: { text: string, icon_url?: string, proxy_icon_url?: string}, image?: { url?: string, proxy_url?: string, height?: number, width?: number },
|
footer?: { text: string, icon_url?: string, proxy_icon_url?: string}, image?: { url: string, proxy_url?: string, height?: number, width?: number },
|
||||||
thumbnail?: { url?: string, proxy_url?: string, height?: number, width?: number }, video?: { url?: string, height?: number, width?: number },
|
thumbnail?: { url: string, proxy_url?: string, height?: number, width?: number }, video?: { url: string, height?: number, width?: number },
|
||||||
provider?: { name?: string, url?: string}, author?: { name?: string, url?: string, proxy_icon_url?: string, icon_url?: string},
|
provider?: { name: string, url?: string}, author?: { name: string, url?: string, proxy_icon_url?: string, icon_url?: string},
|
||||||
} = {}) {
|
} = {}) {
|
||||||
/*
|
/*
|
||||||
let types: {
|
let types: {
|
||||||
title?: string, type?: string, description?: string, url?: string, timestamp?: Date, color?: number, fields?: {name: string, value: string, inline?: boolean}[]
|
title?: string, type?: string, description?: string, url?: string, timestamp?: Date, color?: number, fields?: {name: string, value: string, inline?: boolean}[]
|
||||||
footer?: { text: string, icon_url?: string, proxy_icon_url?: string}, image?: { url?: string, proxy_url?: string, height?: number, width?: number },
|
footer?: { text: string, icon_url?: string, proxy_icon_url?: string}, image?: { url?: string, proxy_url?: string, height?: number, width?: number },
|
||||||
thumbnail?: { url?: string, proxy_url?: string, height?: number, width?: number }, video?: { url?: string, height?: number, width?: number },
|
thumbnail?: { url?: string, proxy_url?: string, height?: number, width?: number }, video?: { url?: string, height?: number, width?: number },
|
||||||
provider?: { name?: string, url?: string}, author?: { name?: string, url?: string, proxy_icon_url?: string, icon_url?: string}
|
provider?: { name?: string, url?: string}, author?: { name?: string, url?: string, proxy_icon_url?: string, icon_url?: string}
|
||||||
};
|
};
|
||||||
*/
|
*/
|
||||||
this.title = data.title;
|
this.title = data.title;
|
||||||
this.description = data.description;
|
this.description = data.description;
|
||||||
this.url = data.url;
|
this.url = data.url;
|
||||||
this.color = data.color;
|
this.color = data.color;
|
||||||
this.author = data.author;
|
this.author = data.author;
|
||||||
this.timestamp = data.timestamp;
|
this.timestamp = data.timestamp;
|
||||||
this.fields = data.fields || [];
|
this.fields = data.fields || [];
|
||||||
this.thumbnail = data.thumbnail;
|
this.thumbnail = data.thumbnail;
|
||||||
this.image = data.image;
|
this.image = data.image;
|
||||||
this.footer = data.footer;
|
this.footer = data.footer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the title of this embed.
|
* Sets the title of this embed.
|
||||||
*/
|
*/
|
||||||
setTitle(title: string) {
|
setTitle(title: string) {
|
||||||
if (typeof title !== 'string') throw new TypeError('RichEmbed titles must be a string.');
|
if (typeof title !== 'string') throw new TypeError('RichEmbed titles must be a string.');
|
||||||
if (title.length > 256) throw new RangeError('RichEmbed titles may not exceed 256 characters.');
|
if (title.length > 256) throw new RangeError('RichEmbed titles may not exceed 256 characters.');
|
||||||
this.title = title;
|
this.title = title;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the description of this embed.
|
* Sets the description of this embed.
|
||||||
*/
|
*/
|
||||||
setDescription(description: string) {
|
setDescription(description: string) {
|
||||||
if (typeof description !== 'string') throw new TypeError('RichEmbed descriptions must be a string.');
|
if (typeof description !== 'string') throw new TypeError('RichEmbed descriptions must be a string.');
|
||||||
if (description.length > 2048) throw new RangeError('RichEmbed descriptions may not exceed 2048 characters.');
|
if (description.length > 2048) throw new RangeError('RichEmbed descriptions may not exceed 2048 characters.');
|
||||||
this.description = description;
|
this.description = description;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the URL of this embed.
|
* Sets the URL of this embed.
|
||||||
*/
|
*/
|
||||||
setURL(url: string) {
|
setURL(url: string) {
|
||||||
if (typeof url !== 'string') throw new TypeError('RichEmbed URLs must be a string.');
|
if (typeof url !== 'string') throw new TypeError('RichEmbed URLs must be a string.');
|
||||||
if (!url.startsWith('http://') || !url.startsWith('https://')) url = `https://${url}`;
|
if (!url.startsWith('http://') || !url.startsWith('https://')) url = `https://${url}`;
|
||||||
this.url = url;
|
this.url = url;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the color of this embed.
|
* Sets the color of this embed.
|
||||||
*/
|
*/
|
||||||
setColor(color: string | number) {
|
setColor(color: string | number) {
|
||||||
if (typeof color === 'string' || typeof color === 'number') {
|
if (typeof color === 'string' || typeof color === 'number') {
|
||||||
if (typeof color === 'string') {
|
if (typeof color === 'string') {
|
||||||
const regex = /[^a-f0-9]/gi;
|
const regex = /[^a-f0-9]/gi;
|
||||||
color = color.replace(/#/g, '');
|
color = color.replace(/#/g, '');
|
||||||
if (regex.test(color)) throw new RangeError('Hexadecimal colours must not contain characters other than 0-9 and a-f.');
|
if (regex.test(color)) throw new RangeError('Hexadecimal colours must not contain characters other than 0-9 and a-f.');
|
||||||
color = parseInt(color, 16);
|
color = parseInt(color, 16);
|
||||||
} else if (color < 0 || color > 16777215) throw new RangeError('Base 10 colours must not be less than 0 or greater than 16777215.');
|
} else if (color < 0 || color > 16777215) throw new RangeError('Base 10 colours must not be less than 0 or greater than 16777215.');
|
||||||
this.color = color;
|
this.color = color;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
throw new TypeError('RichEmbed colours must be hexadecimal as string or number.');
|
throw new TypeError('RichEmbed colours must be hexadecimal as string or number.');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the author of this embed.
|
* Sets the author of this embed.
|
||||||
*/
|
*/
|
||||||
setAuthor(name: string, icon_url?: string, url?: string) {
|
setAuthor(name: string, icon_url?: string, url?: string) {
|
||||||
if (typeof name !== 'string') throw new TypeError('RichEmbed Author names must be a string.');
|
if (typeof name !== 'string') throw new TypeError('RichEmbed Author names must be a string.');
|
||||||
if (url && typeof url !== 'string') throw new TypeError('RichEmbed Author URLs must be a string.');
|
if (url && typeof url !== 'string') throw new TypeError('RichEmbed Author URLs must be a string.');
|
||||||
if (icon_url && typeof icon_url !== 'string') throw new TypeError('RichEmbed Author icons must be a string.');
|
if (icon_url && typeof icon_url !== 'string') throw new TypeError('RichEmbed Author icons must be a string.');
|
||||||
this.author = { name, icon_url, url };
|
this.author = { name, icon_url, url };
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the timestamp of this embed.
|
* Sets the timestamp of this embed.
|
||||||
*/
|
*/
|
||||||
setTimestamp(timestamp = new Date()) {
|
setTimestamp(timestamp = new Date()) {
|
||||||
// eslint-disable-next-line no-restricted-globals
|
// eslint-disable-next-line no-restricted-globals
|
||||||
if (isNaN(timestamp.getTime())) throw new TypeError('Expecting ISO8601 (Date constructor)');
|
if (isNaN(timestamp.getTime())) throw new TypeError('Expecting ISO8601 (Date constructor)');
|
||||||
this.timestamp = timestamp;
|
this.timestamp = timestamp;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a field to the embed (max 25).
|
* Adds a field to the embed (max 25).
|
||||||
*/
|
*/
|
||||||
addField(name: string, value: string, inline = false) {
|
addField(name: string, value: string, inline = false) {
|
||||||
if (typeof name !== 'string') throw new TypeError('RichEmbed Field names must be a string.');
|
if (typeof name !== 'string') throw new TypeError('RichEmbed Field names must be a string.');
|
||||||
if (typeof value !== 'string') throw new TypeError('RichEmbed Field values must be a string.');
|
if (typeof value !== 'string') throw new TypeError('RichEmbed Field values must be a string.');
|
||||||
if (typeof inline !== 'boolean') throw new TypeError('RichEmbed Field inlines must be a boolean.');
|
if (typeof inline !== 'boolean') throw new TypeError('RichEmbed Field inlines must be a boolean.');
|
||||||
if (this.fields.length >= 25) throw new RangeError('RichEmbeds may not exceed 25 fields.');
|
if (this.fields.length >= 25) throw new RangeError('RichEmbeds may not exceed 25 fields.');
|
||||||
if (name.length > 256) throw new RangeError('RichEmbed field names may not exceed 256 characters.');
|
if (name.length > 256) throw new RangeError('RichEmbed field names may not exceed 256 characters.');
|
||||||
if (!/\S/.test(name)) throw new RangeError('RichEmbed field names may not be empty.');
|
if (!/\S/.test(name)) throw new RangeError('RichEmbed field names may not be empty.');
|
||||||
if (value.length > 1024) throw new RangeError('RichEmbed field values may not exceed 1024 characters.');
|
if (value.length > 1024) throw new RangeError('RichEmbed field values may not exceed 1024 characters.');
|
||||||
if (!/\S/.test(value)) throw new RangeError('RichEmbed field values may not be empty.');
|
if (!/\S/.test(value)) throw new RangeError('RichEmbed field values may not be empty.');
|
||||||
this.fields.push({ name, value, inline });
|
this.fields.push({ name, value, inline });
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convenience function for `<RichEmbed>.addField('\u200B', '\u200B', inline)`.
|
* Convenience function for `<RichEmbed>.addField('\u200B', '\u200B', inline)`.
|
||||||
*/
|
*/
|
||||||
addBlankField(inline = false) {
|
addBlankField(inline = false) {
|
||||||
return this.addField('\u200B', '\u200B', inline);
|
return this.addField('\u200B', '\u200B', inline);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the thumbnail of this embed.
|
* Set the thumbnail of this embed.
|
||||||
*/
|
*/
|
||||||
setThumbnail(url: string) {
|
setThumbnail(url: string) {
|
||||||
if (typeof url !== 'string') throw new TypeError('RichEmbed Thumbnail URLs must be a string.');
|
if (typeof url !== 'string') throw new TypeError('RichEmbed Thumbnail URLs must be a string.');
|
||||||
this.thumbnail = { url };
|
this.thumbnail = { url };
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the image of this embed.
|
* Set the image of this embed.
|
||||||
*/
|
*/
|
||||||
setImage(url: string) {
|
setImage(url: string) {
|
||||||
if (typeof url !== 'string') throw new TypeError('RichEmbed Image URLs must be a string.');
|
if (typeof url !== 'string') throw new TypeError('RichEmbed Image URLs must be a string.');
|
||||||
if (!url.startsWith('http://') || !url.startsWith('https://')) url = `https://${url}`;
|
if (!url.startsWith('http://') || !url.startsWith('https://')) url = `https://${url}`;
|
||||||
this.image = { url };
|
this.image = { url };
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the footer of this embed.
|
* Sets the footer of this embed.
|
||||||
*/
|
*/
|
||||||
setFooter(text: string, icon_url?: string) {
|
setFooter(text: string, icon_url?: string) {
|
||||||
if (typeof text !== 'string') throw new TypeError('RichEmbed Footers must be a string.');
|
if (typeof text !== 'string') throw new TypeError('RichEmbed Footers must be a string.');
|
||||||
if (icon_url && typeof icon_url !== 'string') throw new TypeError('RichEmbed Footer icon URLs must be a string.');
|
if (icon_url && typeof icon_url !== 'string') throw new TypeError('RichEmbed Footer icon URLs must be a string.');
|
||||||
if (text.length > 2048) throw new RangeError('RichEmbed footer text may not exceed 2048 characters.');
|
if (text.length > 2048) throw new RangeError('RichEmbed footer text may not exceed 2048 characters.');
|
||||||
this.footer = { text, icon_url };
|
this.footer = { text, icon_url };
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,253 +1,258 @@
|
||||||
/* eslint-disable no-param-reassign */
|
/* eslint-disable no-param-reassign */
|
||||||
import { promisify } from 'util';
|
import { promisify } from 'util';
|
||||||
import childProcess from 'child_process';
|
import childProcess from 'child_process';
|
||||||
import nodemailer from 'nodemailer';
|
import nodemailer from 'nodemailer';
|
||||||
import { Message, PrivateChannel, GroupChannel, Member, User } from 'eris';
|
import { Message, PrivateChannel, GroupChannel, Member, User } from 'eris';
|
||||||
import uuid from 'uuid/v4';
|
import uuid from 'uuid/v4';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import os from 'os';
|
import os from 'os';
|
||||||
import { Client } from '..';
|
import { Client } from '..';
|
||||||
import { Command, RichEmbed } from '.';
|
import { Command, RichEmbed } from '.';
|
||||||
import { ModerationInterface, AccountInterface } from '../models';
|
import { ModerationInterface, AccountInterface } from '../models';
|
||||||
|
|
||||||
export default class Util {
|
export default class Util {
|
||||||
public client: Client;
|
public client: Client;
|
||||||
|
|
||||||
public transport: nodemailer.Transporter;
|
public transport: nodemailer.Transporter;
|
||||||
|
|
||||||
constructor(client: Client) {
|
constructor(client: Client) {
|
||||||
this.client = client;
|
this.client = client;
|
||||||
this.transport = nodemailer.createTransport({
|
this.transport = nodemailer.createTransport({
|
||||||
host: 'staff.libraryofcode.org',
|
host: 'staff.libraryofcode.org',
|
||||||
auth: { user: 'support', pass: this.client.config.emailPass },
|
auth: { user: 'support', pass: this.client.config.emailPass },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes a terminal command async.
|
* Executes a terminal command async.
|
||||||
* @param command The command to execute
|
* @param command The command to execute
|
||||||
* @param options childProcess.ExecOptions
|
* @param options childProcess.ExecOptions
|
||||||
*/
|
*/
|
||||||
public async exec(command: string, options: childProcess.ExecOptions = {}): Promise<string> {
|
public async exec(command: string, options: childProcess.ExecOptions = {}): Promise<string> {
|
||||||
const ex = promisify(childProcess.exec);
|
const ex = promisify(childProcess.exec);
|
||||||
let result: string;
|
let result: string;
|
||||||
try {
|
try {
|
||||||
const res = await ex(command, options);
|
const res = await ex(command, options);
|
||||||
result = `${res.stdout}${res.stderr}`;
|
result = `${res.stdout}${res.stderr}`;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return Promise.reject(new Error(`Command failed: ${err.cmd}\n${err.stderr}${err.stdout}`));
|
return Promise.reject(new Error(`Command failed: ${err.cmd}\n${err.stderr}${err.stdout}`));
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resolves a command
|
* Resolves a command
|
||||||
* @param query Command input
|
* @param query Command input
|
||||||
* @param message Only used to check for errors
|
* @param message Only used to check for errors
|
||||||
*/
|
*/
|
||||||
public resolveCommand(query: string | string[], message?: Message): Promise<{cmd: Command, args: string[] }> {
|
public resolveCommand(query: string | string[], message?: Message): Promise<{cmd: Command, args: string[] }> {
|
||||||
try {
|
try {
|
||||||
let resolvedCommand: Command;
|
let resolvedCommand: Command;
|
||||||
if (typeof query === 'string') query = query.split(' ');
|
if (typeof query === 'string') query = query.split(' ');
|
||||||
const commands = this.client.commands.toArray();
|
const commands = this.client.commands.toArray();
|
||||||
resolvedCommand = commands.find((c) => c.name === query[0].toLowerCase() || c.aliases.includes(query[0].toLowerCase()));
|
resolvedCommand = commands.find((c) => c.name === query[0].toLowerCase() || c.aliases.includes(query[0].toLowerCase()));
|
||||||
|
|
||||||
if (!resolvedCommand) return Promise.resolve(null);
|
if (!resolvedCommand) return Promise.resolve(null);
|
||||||
query.shift();
|
query.shift();
|
||||||
while (resolvedCommand.subcommands.size && query.length) {
|
while (resolvedCommand.subcommands.size && query.length) {
|
||||||
const subCommands = resolvedCommand.subcommands.toArray();
|
const subCommands = resolvedCommand.subcommands.toArray();
|
||||||
const found = subCommands.find((c) => c.name === query[0].toLowerCase() || c.aliases.includes(query[0].toLowerCase()));
|
const found = subCommands.find((c) => c.name === query[0].toLowerCase() || c.aliases.includes(query[0].toLowerCase()));
|
||||||
if (!found) break;
|
if (!found) break;
|
||||||
resolvedCommand = found;
|
resolvedCommand = found;
|
||||||
query.shift();
|
query.shift();
|
||||||
}
|
}
|
||||||
return Promise.resolve({ cmd: resolvedCommand, args: query });
|
return Promise.resolve({ cmd: resolvedCommand, args: query });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (message) this.handleError(error, message);
|
if (message) this.handleError(error, message);
|
||||||
else this.handleError(error);
|
else this.handleError(error);
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async handleError(error: Error, message?: Message, command?: Command): Promise<void> {
|
public async handleError(error: Error, message?: Message, command?: Command): Promise<void> {
|
||||||
try {
|
try {
|
||||||
this.client.signale.error(error);
|
this.client.signale.error(error);
|
||||||
const info = { content: `\`\`\`js\n${error.stack}\n\`\`\``, embed: null };
|
const info = { content: `\`\`\`js\n${error.stack}\n\`\`\``, embed: null };
|
||||||
if (message) {
|
if (message) {
|
||||||
const embed = new RichEmbed();
|
const embed = new RichEmbed();
|
||||||
embed.setColor('FF0000');
|
embed.setColor('FF0000');
|
||||||
embed.setAuthor(`Error caused by ${message.author.username}#${message.author.discriminator}`, message.author.avatarURL);
|
embed.setAuthor(`Error caused by ${message.author.username}#${message.author.discriminator}`, message.author.avatarURL);
|
||||||
embed.setTitle('Message content');
|
embed.setTitle('Message content');
|
||||||
embed.setDescription(message.content);
|
embed.setDescription(message.content);
|
||||||
embed.addField('User', `${message.author.mention} (\`${message.author.id}\`)`, true);
|
embed.addField('User', `${message.author.mention} (\`${message.author.id}\`)`, true);
|
||||||
embed.addField('Channel', message.channel.mention, true);
|
embed.addField('Channel', message.channel.mention, true);
|
||||||
let guild: string;
|
let guild: string;
|
||||||
if (message.channel instanceof PrivateChannel || message.channel instanceof GroupChannel) guild = '@me';
|
if (message.channel instanceof PrivateChannel || message.channel instanceof GroupChannel) guild = '@me';
|
||||||
else guild = message.channel.guild.id;
|
else guild = message.channel.guild.id;
|
||||||
embed.addField('Message link', `[Click here](https://discordapp.com/channels/${guild}/${message.channel.id}/${message.id})`, true);
|
embed.addField('Message link', `[Click here](https://discordapp.com/channels/${guild}/${message.channel.id}/${message.id})`, true);
|
||||||
embed.setTimestamp(new Date(message.timestamp));
|
embed.setTimestamp(new Date(message.timestamp));
|
||||||
info.embed = embed;
|
info.embed = embed;
|
||||||
}
|
}
|
||||||
await this.client.createMessage('595788220764127272', info);
|
await this.client.createMessage('595788220764127272', info);
|
||||||
const msg = message.content.slice(this.client.config.prefix.length).trim().split(/ +/g);
|
const msg = message.content.slice(this.client.config.prefix.length).trim().split(/ +/g);
|
||||||
if (command) this.resolveCommand(msg).then((c) => { c.cmd.enabled = false; });
|
if (command) this.resolveCommand(msg).then((c) => { c.cmd.enabled = false; });
|
||||||
if (message) message.channel.createMessage(`***${this.client.stores.emojis.error} An unexpected error has occured - please contact a member of the Engineering Team.${command ? ' This command has been disabled.' : ''}***`);
|
if (message) message.channel.createMessage(`***${this.client.stores.emojis.error} An unexpected error has occured - please contact a member of the Engineering Team.${command ? ' This command has been disabled.' : ''}***`);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.client.signale.error(err);
|
this.client.signale.error(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public splitFields(fields: { name: string, value: string, inline?: boolean }[]): { name: string, value: string, inline?: boolean }[][] {
|
public splitFields(fields: { name: string, value: string, inline?: boolean }[]): { name: string, value: string, inline?: boolean }[][] {
|
||||||
let index = 0;
|
let index = 0;
|
||||||
const array: {name: string, value: string, inline?: boolean}[][] = [[]];
|
const array: {name: string, value: string, inline?: boolean}[][] = [[]];
|
||||||
while (fields.length) {
|
while (fields.length) {
|
||||||
if (array[index].length >= 25) { index += 1; array[index] = []; }
|
if (array[index].length >= 25) { index += 1; array[index] = []; }
|
||||||
array[index].push(fields[0]); fields.shift();
|
array[index].push(fields[0]); fields.shift();
|
||||||
}
|
}
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
|
|
||||||
public splitString(string: string, length: number): string[] {
|
public splitString(string: string, length: number): string[] {
|
||||||
if (!string) return [];
|
if (!string) return [];
|
||||||
if (Array.isArray(string)) string = string.join('\n');
|
if (Array.isArray(string)) string = string.join('\n');
|
||||||
if (string.length <= length) return [string];
|
if (string.length <= length) return [string];
|
||||||
const arrayString: string[] = [];
|
const arrayString: string[] = [];
|
||||||
let str: string = '';
|
let str: string = '';
|
||||||
let pos: number;
|
let pos: number;
|
||||||
while (string.length > 0) {
|
while (string.length > 0) {
|
||||||
pos = string.length > length ? string.lastIndexOf('\n', length) : string.length;
|
pos = string.length > length ? string.lastIndexOf('\n', length) : string.length;
|
||||||
if (pos > length) pos = length;
|
if (pos > length) pos = length;
|
||||||
str = string.substr(0, pos);
|
str = string.substr(0, pos);
|
||||||
string = string.substr(pos);
|
string = string.substr(pos);
|
||||||
arrayString.push(str);
|
arrayString.push(str);
|
||||||
}
|
}
|
||||||
return arrayString;
|
return arrayString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async createHash(password: string): Promise<string> {
|
public async createHash(password: string): Promise<string> {
|
||||||
const hashed = await this.exec(`mkpasswd -m sha-512 "${password}"`);
|
const hashed = await this.exec(`mkpasswd -m sha-512 "${password}"`);
|
||||||
return hashed;
|
return hashed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public isValidEmail(email: string): boolean {
|
public isValidEmail(email: string): boolean {
|
||||||
const checkAt = email.indexOf('@');
|
const checkAt = email.indexOf('@');
|
||||||
if (checkAt < 1) return false;
|
if (checkAt < 1) return false;
|
||||||
const checkDomain = email.indexOf('.', checkAt + 2);
|
const checkDomain = email.indexOf('.', checkAt + 2);
|
||||||
if (checkDomain < checkAt) return false;
|
if (checkDomain < checkAt) return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public randomPassword(): string {
|
public randomPassword(): string {
|
||||||
let tempPass = ''; const passChars = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'];
|
let tempPass = ''; const passChars = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'];
|
||||||
while (tempPass.length < 5) { tempPass += passChars[Math.floor(Math.random() * passChars.length)]; }
|
while (tempPass.length < 5) { tempPass += passChars[Math.floor(Math.random() * passChars.length)]; }
|
||||||
return tempPass;
|
return tempPass;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async createAccount(hash: string, etcPasswd: string, username: string, userID: string, emailAddress: string, moderatorID: string): Promise<AccountInterface> {
|
public async createAccount(hash: string, etcPasswd: string, username: string, userID: string, emailAddress: string, moderatorID: string): Promise<AccountInterface> {
|
||||||
await this.exec(`useradd -m -p ${hash} -c ${etcPasswd} -s /bin/zsh ${username}`);
|
await this.exec(`useradd -m -p ${hash} -c ${etcPasswd} -s /bin/zsh ${username}`);
|
||||||
await this.exec(`chage -d0 ${username}`);
|
await this.exec(`chage -d0 ${username}`);
|
||||||
|
|
||||||
const account = new this.client.db.Account({
|
const account = new this.client.db.Account({
|
||||||
username, userID, emailAddress, createdBy: moderatorID, createdAt: new Date(), locked: false, ssInit: false, homepath: `/home/${username}`,
|
username, userID, emailAddress, createdBy: moderatorID, createdAt: new Date(), locked: false, ssInit: false, homepath: `/home/${username}`,
|
||||||
});
|
});
|
||||||
return account.save();
|
return account.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async deleteAccount(username: string): Promise<void> {
|
public async deleteAccount(username: string): Promise<void> {
|
||||||
const account = await this.client.db.Account.findOne({ username });
|
const account = await this.client.db.Account.findOne({ username });
|
||||||
if (!account) throw new Error('Account not found');
|
if (!account) throw new Error('Account not found');
|
||||||
this.exec(`lock ${username}`);
|
this.exec(`lock ${username}`);
|
||||||
const tasks = [
|
const tasks = [
|
||||||
this.exec(`deluser ${username} --remove-home --backup-to /management/Archives && rm -rf -R ${account.homepath}`),
|
this.exec(`deluser ${username} --remove-home --backup-to /management/Archives && rm -rf -R ${account.homepath}`),
|
||||||
this.client.db.Account.deleteOne({ username }),
|
this.client.db.Account.deleteOne({ username }),
|
||||||
];
|
];
|
||||||
this.client.removeGuildMemberRole('446067825673633794', account.userID, '546457886440685578', 'Cloud Account Deleted').catch();
|
this.client.removeGuildMemberRole('446067825673633794', account.userID, '546457886440685578', 'Cloud Account Deleted').catch();
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
await Promise.all(tasks);
|
await Promise.all(tasks);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async messageCollector(message: Message, question: string, timeout: number, shouldDelete = false, choices: string[] = null, filter = (msg: Message): boolean|void => {}): Promise<Message> {
|
public async messageCollector(message: Message, question: string, timeout: number, shouldDelete = false, choices: string[] = null, filter = (msg: Message): boolean|void => {}): Promise<Message> {
|
||||||
const msg = await message.channel.createMessage(question);
|
const msg = await message.channel.createMessage(question);
|
||||||
return new Promise((res, rej) => {
|
return new Promise((res, rej) => {
|
||||||
setTimeout(() => { if (shouldDelete) msg.delete().catch(); rej(new Error('Did not supply a valid input in time')); }, timeout);
|
const func = (Msg: Message) => {
|
||||||
this.client.on('messageCreate', (Msg) => {
|
if (filter(Msg) === false) return;
|
||||||
if (filter(Msg) === false) return;
|
const verif = choices ? choices.includes(Msg.content) : Msg.content;
|
||||||
const verif = choices ? choices.includes(Msg.content) : Msg.content;
|
if (verif) { if (shouldDelete) msg.delete().catch(); res(Msg); }
|
||||||
if (verif) { if (shouldDelete) msg.delete().catch(); res(Msg); }
|
};
|
||||||
});
|
|
||||||
});
|
setTimeout(() => {
|
||||||
}
|
if (shouldDelete) msg.delete().catch(); rej(new Error('Did not supply a valid input in time'));
|
||||||
|
this.client.removeListener('messageCreate', func);
|
||||||
/**
|
}, timeout);
|
||||||
* @param type `0` - Create
|
this.client.on('messageCreate', func);
|
||||||
*
|
});
|
||||||
* `1` - Warn
|
}
|
||||||
*
|
|
||||||
* `2` - Lock
|
/**
|
||||||
*
|
* @param type `0` - Create
|
||||||
* `3` - Unlock
|
*
|
||||||
*
|
* `1` - Warn
|
||||||
* `4` - Delete
|
*
|
||||||
*/
|
* `2` - Lock
|
||||||
public async createModerationLog(user: string, moderator: Member|User, type: number, reason?: string, duration?: number): Promise<ModerationInterface> {
|
*
|
||||||
const moderatorID = moderator.id;
|
* `3` - Unlock
|
||||||
const account = await this.client.db.Account.findOne({ $or: [{ username: user }, { userID: user }] });
|
*
|
||||||
if (!account) return Promise.reject(new Error(`Account ${user} not found`));
|
* `4` - Delete
|
||||||
const { username, userID } = account;
|
*/
|
||||||
const logInput: { username: string, userID: string, logID: string, moderatorID: string, reason?: string, type: number, date: Date, expiration?: { date: Date, processed: boolean }} = {
|
public async createModerationLog(user: string, moderator: Member|User, type: number, reason?: string, duration?: number): Promise<ModerationInterface> {
|
||||||
username, userID, logID: uuid(), moderatorID, type, date: new Date(),
|
const moderatorID = moderator.id;
|
||||||
};
|
const account = await this.client.db.Account.findOne({ $or: [{ username: user }, { userID: user }] });
|
||||||
|
if (!account) return Promise.reject(new Error(`Account ${user} not found`));
|
||||||
const now: number = Date.now();
|
const { username, userID } = account;
|
||||||
let date: Date;
|
const logInput: { username: string, userID: string, logID: string, moderatorID: string, reason?: string, type: number, date: Date, expiration?: { date: Date, processed: boolean }} = {
|
||||||
let processed = true;
|
username, userID, logID: uuid(), moderatorID, type, date: new Date(),
|
||||||
if (reason) logInput.reason = reason;
|
};
|
||||||
if (type === 2) {
|
|
||||||
if (duration) {
|
const now: number = Date.now();
|
||||||
date = new Date(now + duration);
|
let date: Date;
|
||||||
processed = false;
|
let processed = true;
|
||||||
} else date = null;
|
if (reason) logInput.reason = reason;
|
||||||
}
|
if (type === 2) {
|
||||||
|
if (duration) {
|
||||||
const expiration = { date, processed };
|
date = new Date(now + duration);
|
||||||
|
processed = false;
|
||||||
logInput.expiration = expiration;
|
} else date = null;
|
||||||
const log = new this.client.db.Moderation(logInput);
|
}
|
||||||
await log.save();
|
|
||||||
|
const expiration = { date, processed };
|
||||||
let embedTitle: string;
|
|
||||||
let color: string;
|
logInput.expiration = expiration;
|
||||||
let archType: string;
|
const log = new this.client.db.Moderation(logInput);
|
||||||
switch (type) {
|
await log.save();
|
||||||
default: archType = 'Staff'; embedTitle = 'Cloud Account | Generic'; color = '0892e1'; break;
|
|
||||||
case 0: archType = 'Administrator'; embedTitle = 'Cloud Account | Create'; color = '00ff00'; break;
|
let embedTitle: string;
|
||||||
case 1: archType = 'Staff'; embedTitle = 'Account Warning | Warn'; color = 'ffff00'; break;
|
let color: string;
|
||||||
case 2: archType = 'Moderator'; embedTitle = 'Account Infraction | Lock'; color = 'ff6600'; break;
|
let archType: string;
|
||||||
case 3: archType = 'Moderator'; embedTitle = 'Account Reclaim | Unlock'; color = '0099ff'; break;
|
switch (type) {
|
||||||
case 4: archType = 'Administrator'; embedTitle = 'Cloud Account | Delete'; color = 'ff0000'; break;
|
default: archType = 'Staff'; embedTitle = 'Cloud Account | Generic'; color = '0892e1'; break;
|
||||||
}
|
case 0: archType = 'Administrator'; embedTitle = 'Cloud Account | Create'; color = '00ff00'; break;
|
||||||
const embed = new RichEmbed()
|
case 1: archType = 'Staff'; embedTitle = 'Account Warning | Warn'; color = 'ffff00'; break;
|
||||||
.setTitle(embedTitle)
|
case 2: archType = 'Moderator'; embedTitle = 'Account Infraction | Lock'; color = 'ff6600'; break;
|
||||||
.setColor(color)
|
case 3: archType = 'Moderator'; embedTitle = 'Account Reclaim | Unlock'; color = '0099ff'; break;
|
||||||
.addField('User', `${username} | <@${userID}>`, true)
|
case 4: archType = 'Administrator'; embedTitle = 'Cloud Account | Delete'; color = 'ff0000'; break;
|
||||||
.addField(archType, moderatorID === this.client.user.id ? 'SYSTEM' : `<@${moderatorID}>`, true)
|
}
|
||||||
.setFooter(this.client.user.username, this.client.user.avatarURL)
|
const embed = new RichEmbed()
|
||||||
.setTimestamp();
|
.setTitle(embedTitle)
|
||||||
if (reason) embed.addField('Reason', reason || 'Not specified');
|
.setColor(color)
|
||||||
if (type === 2) embed.addField('Lock Expiration', `${date ? moment(date).format('dddd, MMMM Do YYYY, h:mm:ss A') : 'Indefinitely'}`);
|
.addField('User', `${username} | <@${userID}>`, true)
|
||||||
// @ts-ignore
|
.addField(archType, moderatorID === this.client.user.id ? 'SYSTEM' : `<@${moderatorID}>`, true)
|
||||||
this.client.createMessage('580950455581147146', { embed }); this.client.getDMChannel(userID).then((channel) => channel.createMessage({ embed })).catch();
|
.setFooter(this.client.user.username, this.client.user.avatarURL)
|
||||||
|
.setTimestamp();
|
||||||
return Promise.resolve(log);
|
if (reason) embed.addField('Reason', reason || 'Not specified');
|
||||||
}
|
if (type === 2) embed.addField('Lock Expiration', `${date ? moment(date).format('dddd, MMMM Do YYYY, h:mm:ss A') : 'Indefinitely'}`);
|
||||||
|
// @ts-ignore
|
||||||
public getAcctHash(userpath: string) {
|
this.client.createMessage('580950455581147146', { embed }); this.client.getDMChannel(userID).then((channel) => channel.createMessage({ embed })).catch();
|
||||||
try {
|
|
||||||
return fs.readFileSync(`${userpath}/.securesign/auth`).toString();
|
return Promise.resolve(log);
|
||||||
} catch (error) {
|
}
|
||||||
return null;
|
|
||||||
}
|
public getAcctHash(userpath: string) {
|
||||||
}
|
try {
|
||||||
}
|
return fs.readFileSync(`${userpath}/.securesign/auth`).toString();
|
||||||
|
} catch (error) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,147 +1,227 @@
|
||||||
import fs from 'fs-extra';
|
import fs, { writeFile, unlink } from 'fs-extra';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import x509 from '@ghaiklor/x509';
|
import { Message } from 'eris';
|
||||||
import { Message } from 'eris';
|
import { AccountInterface } from '../models';
|
||||||
import { AccountInterface } from '../models';
|
import { Command, RichEmbed } from '../class';
|
||||||
import { Command, RichEmbed } from '../class';
|
import { Client } from '..';
|
||||||
import { Client } from '..';
|
import { parseCertificate } from '../functions';
|
||||||
|
|
||||||
export default class CWG_Create extends Command {
|
export default class CWG_Create extends Command {
|
||||||
constructor(client: Client) {
|
public urlRegex: RegExp;
|
||||||
super(client);
|
|
||||||
this.name = 'create';
|
constructor(client: Client) {
|
||||||
this.description = 'Bind a domain to the CWG';
|
super(client);
|
||||||
this.usage = `${this.client.config.prefix}cwg create [User ID | Username] [Domain] [Port] <Path to x509 cert> <Path to x509 key>`;
|
this.name = 'create';
|
||||||
this.permissions = { roles: ['525441307037007902'] };
|
this.description = 'Bind a domain to the CWG';
|
||||||
this.aliases = ['bind'];
|
this.usage = `${this.client.config.prefix}cwg create [User ID | Username] [Domain] [Port] <Cert Chain> <Private Key> || Use snippets raw URL`;
|
||||||
this.enabled = true;
|
this.permissions = { roles: ['525441307037007902'] };
|
||||||
}
|
this.aliases = ['bind'];
|
||||||
|
this.enabled = true;
|
||||||
public async run(message: Message, args: string[]) {
|
this.urlRegex = /^[a-zA-Z0-9\-._~:/?#[\]@!$&'()*+,;=]+$/;
|
||||||
/*
|
}
|
||||||
args[0] should be the user's ID OR account username; required
|
|
||||||
args[1] should be the domain; required
|
public async run(message: Message, args: string[]) {
|
||||||
args[2] should be the port; required
|
/*
|
||||||
args[3] should be the path to the x509 certificate; not required
|
args[0] should be the user's ID OR account username; required
|
||||||
args[4] should be the path to the x509 key; not required
|
args[1] should be the domain; required
|
||||||
*/
|
args[2] should be the port; required
|
||||||
try {
|
args[3] should be the path to the x509 certificate; not required
|
||||||
if (!args[2]) return this.client.commands.get('help').run(message, ['cwg', this.name]);
|
args[4] should be the path to the x509 key; not required
|
||||||
const edit = await message.channel.createMessage(`***${this.client.stores.emojis.loading} Binding domain...***`);
|
*/
|
||||||
const account = await this.client.db.Account.findOne({ $or: [{ username: args[0] }, { userID: args[0] }] });
|
try {
|
||||||
if (!account) return edit.edit(`${this.client.stores.emojis.error} Cannot locate account, please try again.`);
|
if (!args[2]) return this.client.commands.get('help').run(message, ['cwg', this.name]);
|
||||||
if (args[3] && !args[4]) return edit.edit(`${this.client.stores.emojis.error} x509 Certificate key required`);
|
|
||||||
let certs: { cert?: string, key?: string }; if (args[4]) certs = { cert: args[3], key: args[4] };
|
let certs: { cert: string, key: string };
|
||||||
if (await this.client.db.Domain.exists({ domain: args[1] })) return edit.edit(`***${this.client.stores.emojis.error} This domain already exists.***`);
|
|
||||||
if (await this.client.db.Domain.exists({ port: Number(args[2]) })) {
|
if (!this.urlRegex.test(args[1])) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Invalid URL***`);
|
||||||
// await edit.edit(`***${this.client.stores.emojis.error} This port is already binded to a domain. Do you wish to continue? (y/n)***`);
|
if (Number(args[2]) < 1024 || Number(args[2]) > 65535) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Port must be greater than 1024 and less than 65535***`);
|
||||||
let answer: Message;
|
if (!args[1].endsWith('.cloud.libraryofcode.org') && !args[4]) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Certificate Chain and Private Key are required for custom domains***`);
|
||||||
try {
|
|
||||||
answer = await this.client.util.messageCollector(message,
|
const account = await this.client.db.Account.findOne({ $or: [{ username: args[0] }, { userID: args[0] }] });
|
||||||
`***${this.client.stores.emojis.error} This port is already binded to a domain. Do you wish to continue? (y/n)***`,
|
if (!account) return message.channel.createMessage(`${this.client.stores.emojis.error} Cannot locate account, please try again.`);
|
||||||
30000, true, ['y', 'n'], (msg) => msg.author.id === message.author.id && msg.channel.id === message.channel.id);
|
|
||||||
} catch (error) {
|
if (await this.client.db.Domain.exists({ domain: args[1] })) return message.channel.createMessage(`${this.client.stores.emojis.error} ***This domain already exists***`);
|
||||||
return edit.edit(`***${this.client.stores.emojis.error} Bind request cancelled***`);
|
|
||||||
}
|
if (await this.client.db.Domain.exists({ port: Number(args[2]) })) {
|
||||||
if (answer.content === 'n') return edit.edit(`***${this.client.stores.emojis.error} Bind request cancelled***`);
|
let answer: Message;
|
||||||
}
|
try {
|
||||||
const domain = await this.createDomain(account, args[1], Number(args[2]), certs);
|
answer = await this.client.util.messageCollector(
|
||||||
const embed = new RichEmbed();
|
message,
|
||||||
embed.setTitle('Domain Creation');
|
`***${this.client.stores.emojis.error} ***This port is already binded to a domain. Do you wish to continue? (y/n)***`,
|
||||||
embed.setColor(3066993);
|
30000, true, ['y', 'n'], (msg) => msg.author.id === message.author.id && msg.channel.id === message.channel.id,
|
||||||
embed.addField('Account Username', account.username, true);
|
);
|
||||||
embed.addField('Account ID', account.id, true);
|
} catch (error) {
|
||||||
embed.addField('Engineer', `<@${message.author.id}>`, true);
|
return message.channel.createMessage(`${this.client.stores.emojis.error} ***Bind request cancelled***`);
|
||||||
embed.addField('Domain', domain.domain, true);
|
}
|
||||||
embed.addField('Port', String(domain.port), true);
|
if (answer.content === 'n') return message.channel.createMessage(`${this.client.stores.emojis.error} ***Bind request cancelled***`);
|
||||||
const cert = x509.parseCert(await fs.readFile(domain.x509.cert, { encoding: 'utf8' }));
|
}
|
||||||
embed.addField('Certificate Issuer', cert.issuer.organizationName, true);
|
|
||||||
embed.addField('Certificate Subject', cert.subject.commonName, true);
|
const edit = await message.channel.createMessage(`${this.client.stores.emojis.loading} ***Binding domain...***`);
|
||||||
embed.setFooter(this.client.user.username, this.client.user.avatarURL);
|
|
||||||
embed.setTimestamp(new Date(message.timestamp));
|
if (!args[1].endsWith('.cloud.libraryofcode.org')) {
|
||||||
message.delete();
|
const urls = args.slice(3, 5);
|
||||||
await this.client.util.exec('systemctl reload nginx');
|
if (urls.some((l) => !l.includes('snippets.cloud.libraryofcode.org/raw/'))) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Invalid snippets URL***`);
|
||||||
edit.edit(`***${this.client.stores.emojis.success} Successfully binded ${domain.domain} to port ${domain.port} for ${account.userID}.***`);
|
|
||||||
// @ts-ignore
|
const tasks = urls.map((l) => axios({ method: 'GET', url: l }));
|
||||||
this.client.createMessage('580950455581147146', { embed });
|
const response = await Promise.all(tasks);
|
||||||
// @ts-ignore
|
const certAndPrivateKey: string[] = response.map((r) => r.data);
|
||||||
this.client.getDMChannel(account.userID).then((r) => r.createMessage({ embed }));
|
|
||||||
await this.client.util.transport.sendMail({
|
if (!this.isValidCertificateChain(certAndPrivateKey[0])) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Invalid Certificate Chain***`);
|
||||||
to: account.emailAddress,
|
if (!this.isValidPrivateKey(certAndPrivateKey[1])) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Invalid Private Key***`);
|
||||||
from: 'Library of Code sp-us | Support Team <help@libraryofcode.org>',
|
|
||||||
subject: 'Your domain has been binded',
|
certs = { cert: certAndPrivateKey[0], key: certAndPrivateKey[1] };
|
||||||
html: `
|
}
|
||||||
<h1>Library of Code sp-us | Cloud Services</h1>
|
|
||||||
<p>Hello, this is an email informing you that a new domain under your account has been binded.
|
const domain = await this.createDomain(account, args[1], Number(args[2]), certs);
|
||||||
Information is below.</p>
|
|
||||||
<b>Domain:</b> ${domain.domain}<br>
|
const tasks = [message.delete(), this.client.util.exec('systemctl reload')];
|
||||||
<b>Port:</b> ${domain.port}<br>
|
// @ts-ignore
|
||||||
<b>Certificate Issuer:</b> ${cert.issuer.organizationName}<br>
|
await Promise.all(tasks);
|
||||||
<b>Certificate Subject:</b> ${cert.subject.commonName}<br>
|
|
||||||
<b>Responsible Engineer:</b> ${message.author.username}#${message.author.discriminator}<br><br>
|
const embed = new RichEmbed()
|
||||||
|
.setTitle('Domain Creation')
|
||||||
If you have any questions about additional setup, you can reply to this email or send a message in #cloud-support in our Discord server.<br>
|
.setColor(3066993)
|
||||||
|
.addField('Account Username', account.username, true)
|
||||||
<b><i>Library of Code sp-us | Support Team</i></b>
|
.addField('Account ID', account.id, true)
|
||||||
`,
|
.addField('Engineer', `<@${message.author.id}>`, true)
|
||||||
});
|
.addField('Domain', domain.domain, true)
|
||||||
if (!domain.domain.includes('cloud.libraryofcode.org')) {
|
.addField('Port', String(domain.port), true);
|
||||||
const content = `__**DNS Record Setup**__\nYou recently a binded a custom domain to your Library of Code sp-us Account. You'll have to update your DNS records. We've provided the records below.\n\n\`${domain.domain} IN CNAME cloud.libraryofcode.org AUTO/500\`\nThis basically means you need to make a CNAME record with the key/host of ${domain.domain} and the value/point to cloud.libraryofcode.org. If you have any questions, don't hesitate to ask us.`;
|
|
||||||
this.client.getDMChannel(account.userID).then((r) => r.createMessage(content));
|
const cert = await parseCertificate(this.client, domain.x509.cert);
|
||||||
}
|
|
||||||
return domain;
|
embed.addField('Certificate Issuer', cert.issuer.organizationName, true)
|
||||||
} catch (err) {
|
.addField('Certificate Subject', cert.subject.commonName, true)
|
||||||
await fs.unlink(`/etc/nginx/sites-available/${args[1]}`);
|
.setFooter(this.client.user.username, this.client.user.avatarURL)
|
||||||
await fs.unlink(`/etc/nginx/sites-enabled/${args[1]}`);
|
.setTimestamp(new Date(message.timestamp));
|
||||||
await this.client.db.Domain.deleteMany({ domain: args[1] });
|
|
||||||
return this.client.util.handleError(err, message, this);
|
const completed = [
|
||||||
}
|
edit.edit(`***${this.client.stores.emojis.success} Successfully binded ${domain.domain} to port ${domain.port} for ${account.userID}.***`),
|
||||||
}
|
this.client.createMessage('580950455581147146', { embed }),
|
||||||
|
this.client.getDMChannel(account.userID).then((r) => r.createMessage({ embed })),
|
||||||
/**
|
this.client.util.transport.sendMail({
|
||||||
* This function binds a domain to a port on the CWG.
|
to: account.emailAddress,
|
||||||
* @param account The account of the user.
|
from: 'Library of Code sp-us | Support Team <help@libraryofcode.org>',
|
||||||
* @param subdomain The domain to use. `mydomain.cloud.libraryofcode.org`
|
subject: 'Your domain has been binded',
|
||||||
* @param port The port to use, must be between 1024 and 65535.
|
html: `
|
||||||
* @param x509 The paths to the certificate and key files. Must be already existant.
|
<h1>Library of Code sp-us | Cloud Services</h1>
|
||||||
* @example await CWG.createDomain('mydomain.cloud.libraryofcode.org', 6781);
|
<p>Hello, this is an email informing you that a new domain under your account has been binded.
|
||||||
*/
|
Information is below.</p>
|
||||||
public async createDomain(account: AccountInterface, domain: string, port: number, x509Certificate: { cert?: string, key?: string } = { cert: '/etc/nginx/ssl/cloud-org.chain.crt', key: '/etc/nginx/ssl/cloud-org.key.pem' }) {
|
<b>Domain:</b> ${domain.domain}<br>
|
||||||
try {
|
<b>Port:</b> ${domain.port}<br>
|
||||||
if (port <= 1024 || port >= 65535) throw new RangeError(`Port range must be between 1024 and 65535, received ${port}.`);
|
<b>Certificate Issuer:</b> ${cert.issuer.organizationName}<br>
|
||||||
if (await this.client.db.Domain.exists({ domain })) throw new Error(`Domain ${domain} already exists in the database.`);
|
<b>Certificate Subject:</b> ${cert.subject.commonName}<br>
|
||||||
if (!await this.client.db.Account.exists({ userID: account.userID })) throw new Error(`Cannot find account ${account.userID}.`);
|
<b>Responsible Engineer:</b> ${message.author.username}#${message.author.discriminator}<br><br>
|
||||||
await fs.access(x509Certificate.cert, fs.constants.R_OK);
|
|
||||||
await fs.access(x509Certificate.key, fs.constants.R_OK);
|
If you have any questions about additional setup, you can reply to this email or send a message in #cloud-support in our Discord server.<br>
|
||||||
let cfg = await fs.readFile('/var/CloudServices/dist/static/nginx.conf', { encoding: 'utf8' });
|
|
||||||
cfg = cfg.replace(/\[DOMAIN]/g, domain);
|
<b><i>Library of Code sp-us | Support Team</i></b>
|
||||||
cfg = cfg.replace(/\[PORT]/g, String(port));
|
`,
|
||||||
cfg = cfg.replace(/\[CERTIFICATE]/g, x509Certificate.cert);
|
}),
|
||||||
cfg = cfg.replace(/\[KEY]/g, x509Certificate.key);
|
];
|
||||||
await fs.writeFile(`/etc/nginx/sites-available/${domain}`, cfg, { encoding: 'utf8' });
|
|
||||||
await fs.symlink(`/etc/nginx/sites-available/${domain}`, `/etc/nginx/sites-enabled/${domain}`);
|
if (!domain.domain.includes('cloud.libraryofcode.org')) {
|
||||||
const entry = new this.client.db.Domain({
|
const content = `__**DNS Record Setup**__\nYou recently a binded a custom domain to your Library of Code sp-us Account. You'll have to update your DNS records. We've provided the records below.\n\n\`${domain.domain} IN CNAME cloud.libraryofcode.org AUTO/500\`\nThis basically means you need to make a CNAME record with the key/host of ${domain.domain} and the value/point to cloud.libraryofcode.org. If you have any questions, don't hesitate to ask us.`;
|
||||||
account,
|
completed.push(this.client.getDMChannel(account.userID).then((r) => r.createMessage(content)));
|
||||||
domain,
|
}
|
||||||
port,
|
|
||||||
x509: x509Certificate,
|
return Promise.all(completed);
|
||||||
enabled: true,
|
} catch (err) {
|
||||||
});
|
await fs.unlink(`/etc/nginx/sites-available/${args[1]}`);
|
||||||
if (domain.includes('cloud.libraryofcode.org')) {
|
await fs.unlink(`/etc/nginx/sites-enabled/${args[1]}`);
|
||||||
const dmn = domain.split('.');
|
await this.client.db.Domain.deleteMany({ domain: args[1] });
|
||||||
await axios({
|
return this.client.util.handleError(err, message, this);
|
||||||
method: 'post',
|
}
|
||||||
url: 'https://api.cloudflare.com/client/v4/zones/5e82fc3111ed4fbf9f58caa34f7553a7/dns_records',
|
}
|
||||||
headers: { Authorization: `Bearer ${this.client.config.cloudflare}`, 'Content-Type': 'application/json' },
|
|
||||||
data: JSON.stringify({ type: 'CNAME', name: `${dmn[0]}.${dmn[1]}`, content: 'cloud.libraryofcode.org', proxied: false }),
|
/**
|
||||||
});
|
* This function binds a domain to a port on the CWG.
|
||||||
}
|
* @param account The account of the user.
|
||||||
return entry.save();
|
* @param subdomain The domain to use. `mydomain.cloud.libraryofcode.org`
|
||||||
} catch (error) {
|
* @param port The port to use, must be between 1024 and 65535.
|
||||||
await fs.unlink(`/etc/nginx/sites-enabled/${domain}`);
|
* @param x509Certificate The contents the certificate and key files.
|
||||||
await fs.unlink(`/etc/nginx/sites-available/${domain}`);
|
* @example await CWG.createDomain(account, 'mydomain.cloud.libraryofcode.org', 6781);
|
||||||
await this.client.db.Domain.deleteMany({ domain });
|
*/
|
||||||
throw error;
|
public async createDomain(account: AccountInterface, domain: string, port: number, x509Certificate: { cert?: string, key?: string }) {
|
||||||
}
|
try {
|
||||||
}
|
if (port <= 1024 || port >= 65535) throw new RangeError(`Port range must be between 1024 and 65535, received ${port}.`);
|
||||||
}
|
if (await this.client.db.Domain.exists({ domain })) throw new Error(`Domain ${domain} already exists in the database.`);
|
||||||
|
if (!await this.client.db.Account.exists({ userID: account.userID })) throw new Error(`Cannot find account ${account.userID}.`);
|
||||||
|
let x509: { cert: string, key: string };
|
||||||
|
if (x509Certificate) {
|
||||||
|
x509 = await this.createCertAndPrivateKey(domain, x509Certificate.cert, x509Certificate.key);
|
||||||
|
}
|
||||||
|
let cfg = await fs.readFile('/var/CloudServices/dist/static/nginx.conf', { encoding: 'utf8' });
|
||||||
|
cfg = cfg.replace(/\[DOMAIN]/g, domain);
|
||||||
|
cfg = cfg.replace(/\[PORT]/g, String(port));
|
||||||
|
cfg = cfg.replace(/\[CERTIFICATE]/g, x509.cert);
|
||||||
|
cfg = cfg.replace(/\[KEY]/g, x509.key);
|
||||||
|
await fs.writeFile(`/etc/nginx/sites-available/${domain}`, cfg, { encoding: 'utf8' });
|
||||||
|
await fs.symlink(`/etc/nginx/sites-available/${domain}`, `/etc/nginx/sites-enabled/${domain}`);
|
||||||
|
const entry = new this.client.db.Domain({
|
||||||
|
account,
|
||||||
|
domain,
|
||||||
|
port,
|
||||||
|
x509,
|
||||||
|
enabled: true,
|
||||||
|
});
|
||||||
|
if (domain.includes('cloud.libraryofcode.org')) {
|
||||||
|
const dmn = domain.split('.');
|
||||||
|
await axios({
|
||||||
|
method: 'post',
|
||||||
|
url: 'https://api.cloudflare.com/client/v4/zones/5e82fc3111ed4fbf9f58caa34f7553a7/dns_records',
|
||||||
|
headers: { Authorization: `Bearer ${this.client.config.cloudflare}`, 'Content-Type': 'application/json' },
|
||||||
|
data: JSON.stringify({ type: 'CNAME', name: `${dmn[0]}.${dmn[1]}`, content: 'cloud.libraryofcode.org', proxied: false }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return entry.save();
|
||||||
|
} catch (error) {
|
||||||
|
await fs.unlink(`/etc/nginx/sites-enabled/${domain}`);
|
||||||
|
await fs.unlink(`/etc/nginx/sites-available/${domain}`);
|
||||||
|
await this.client.db.Domain.deleteMany({ domain });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async createCertAndPrivateKey(domain: string, certChain: string, privateKey: string) {
|
||||||
|
if (!this.isValidCertificateChain(certChain)) throw new Error('Invalid Certificate Chain');
|
||||||
|
if (!this.isValidPrivateKey(privateKey)) throw new Error('Invalid Private Key');
|
||||||
|
const path = `/var/CloudServices/temp/${domain}`;
|
||||||
|
const temp = [writeFile(`${path}.chain.crt`, certChain), writeFile(`${path}.key.pem`, privateKey)];
|
||||||
|
const removeFiles = [unlink(`${path}.chain.crt`), unlink(`${path}.key.pem`)];
|
||||||
|
await Promise.all(temp);
|
||||||
|
if (!this.isMatchingPair(`${path}.chain.crt`, `${path}.key.pem`)) {
|
||||||
|
await Promise.all(removeFiles);
|
||||||
|
throw new Error('Certificate and Private Key do not match');
|
||||||
|
}
|
||||||
|
|
||||||
|
const tasks = [writeFile(`/etc/nginx/ssl/${domain}.chain.crt`, certChain), writeFile(`/etc/nginx/ssl/${domain}.key.pem`, privateKey)];
|
||||||
|
await Promise.all(tasks);
|
||||||
|
return { cert: `/etc/nginx/ssl/${domain}.chain.crt`, key: `/etc/nginx/ssl/${domain}.key.pem` };
|
||||||
|
}
|
||||||
|
|
||||||
|
public checkOccurance(text: string, query: string) {
|
||||||
|
return (text.match(new RegExp(query, 'g')) || []).length;
|
||||||
|
}
|
||||||
|
|
||||||
|
public isValidCertificateChain(cert: string) {
|
||||||
|
if (!cert.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN CERTIFICATE-----')) return false;
|
||||||
|
if (!cert.replace(/^\s+|\s+$/g, '').endsWith('-----END CERTIFICATE-----')) return false;
|
||||||
|
if (this.checkOccurance(cert.replace(/^\s+|\s+$/g, ''), '-----BEGIN CERTIFICATE-----') !== 2) return false;
|
||||||
|
if (this.checkOccurance(cert.replace(/^\s+|\s+$/g, ''), '-----END CERTIFICATE-----') !== 2) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public isValidPrivateKey(key: string) {
|
||||||
|
if (!key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN PRIVATE KEY-----')) return false;
|
||||||
|
if (!key.replace(/^\s+|\s+$/g, '').endsWith('-----END PRIVATE KEY-----')) return false;
|
||||||
|
if (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN PRIVATE KEY-----') !== 1) return false;
|
||||||
|
if (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END PRIVATE KEY-----') !== 1) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async isMatchingPair(cert: string, privateKey: string) {
|
||||||
|
const result: string = await this.client.util.exec(`${__dirname}/../bin/checkCertSignatures ${cert} ${privateKey}`);
|
||||||
|
const { ok }: { ok: boolean } = JSON.parse(result);
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
import { EmbedOptions } from 'eris';
|
||||||
|
import RichEmbed from '../src/class/RichEmbed';
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
namespace Eris {
|
||||||
|
type MessageContent = string | { content?: string; tts?: boolean; disableEveryone?: boolean; embed?: EmbedOptions | RichEmbed; flags?: number };
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue