Fix error message, missing the *.cloud*
TheGreench
parent
8c9f70df10
commit
9cc21aba44
|
|
@ -1,222 +1,222 @@
|
||||||
import fs, { writeFile, unlink } from 'fs-extra';
|
import fs, { writeFile, unlink } from 'fs-extra';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { randomBytes } from 'crypto';
|
import { randomBytes } from 'crypto';
|
||||||
import { Message } from 'eris';
|
import { Message } from 'eris';
|
||||||
import { AccountInterface } from '../models';
|
import { AccountInterface } from '../models';
|
||||||
import { Client, Command, RichEmbed } from '../class';
|
import { Client, Command, RichEmbed } from '../class';
|
||||||
import { parseCertificate } from '../functions';
|
import { parseCertificate } from '../functions';
|
||||||
|
|
||||||
export default class CWG_Create extends Command {
|
export default class CWG_Create extends Command {
|
||||||
public urlRegex: RegExp;
|
public urlRegex: RegExp;
|
||||||
|
|
||||||
constructor(client: Client) {
|
constructor(client: Client) {
|
||||||
super(client);
|
super(client);
|
||||||
this.name = 'create';
|
this.name = 'create';
|
||||||
this.description = 'Bind a domain to the CWG';
|
this.description = 'Bind a domain to the CWG';
|
||||||
this.usage = `${this.client.config.prefix}cwg create [User ID | Username] [Domain] [Port] <Cert Chain> <Private Key> || Use snippets raw URL`;
|
this.usage = `${this.client.config.prefix}cwg create [User ID | Username] [Domain] [Port] <Cert Chain> <Private Key> || Use snippets raw URL`;
|
||||||
this.permissions = { roles: ['662163685439045632', '701454780828221450'] };
|
this.permissions = { roles: ['662163685439045632', '701454780828221450'] };
|
||||||
this.aliases = ['bind'];
|
this.aliases = ['bind'];
|
||||||
this.enabled = true;
|
this.enabled = true;
|
||||||
this.urlRegex = /^[a-zA-Z0-9\-._~:/?#[\]@!$&'()*+,;=]+$/;
|
this.urlRegex = /^[a-zA-Z0-9\-._~:/?#[\]@!$&'()*+,;=]+$/;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async run(message: Message, args: string[]) {
|
public async run(message: Message, args: string[]) {
|
||||||
/*
|
/*
|
||||||
args[0] should be the user's ID OR account username; required
|
args[0] should be the user's ID OR account username; required
|
||||||
args[1] should be the domain; required
|
args[1] should be the domain; required
|
||||||
args[2] should be the port; required
|
args[2] should be the port; required
|
||||||
args[3] should be the path to the x509 certificate; not required
|
args[3] should be the path to the x509 certificate; not required
|
||||||
args[4] should be the path to the x509 key; not required
|
args[4] should be the path to the x509 key; not required
|
||||||
*/
|
*/
|
||||||
try {
|
try {
|
||||||
if (!args[2]) return this.client.commands.get('help').run(message, ['cwg', this.name]);
|
if (!args[2]) return this.client.commands.get('help').run(message, ['cwg', this.name]);
|
||||||
|
|
||||||
if (!this.urlRegex.test(args[1])) return this.error(message.channel, 'Invalid URL supplied.');
|
if (!this.urlRegex.test(args[1])) return this.error(message.channel, 'Invalid URL supplied.');
|
||||||
if (Number(args[2]) <= 1024 || Number(args[2]) >= 65535) return this.error(message.channel, 'Port must be greater than 1024 and less than 65535.');
|
if (Number(args[2]) <= 1024 || Number(args[2]) >= 65535) return this.error(message.channel, 'Port must be greater than 1024 and less than 65535.');
|
||||||
if (!args[1].endsWith('.cloud.libraryofcode.org') && !args[4]) return this.error(message.channel, 'Certificate Chain and Private Key are required for custom domains.');
|
if (!args[1].endsWith('.cloud.libraryofcode.org') && !args[4]) return this.error(message.channel, 'Certificate Chain and Private Key are required for custom domains.');
|
||||||
|
|
||||||
const account = await this.client.db.Account.findOne({ $or: [{ username: args[0] }, { userID: args[0] }] });
|
const account = await this.client.db.Account.findOne({ $or: [{ username: args[0] }, { userID: args[0] }] });
|
||||||
if (!account) return this.error(message.channel, 'Cannot locate account.');
|
if (!account) return this.error(message.channel, 'Cannot locate account.');
|
||||||
|
|
||||||
if (await this.client.db.Domain.exists({ domain: args[1] })) return this.error(message.channel, 'This domain already exists.');
|
if (await this.client.db.Domain.exists({ domain: args[1] })) return this.error(message.channel, 'This domain already exists.');
|
||||||
|
|
||||||
if (await this.client.db.Domain.exists({ port: Number(args[2]) })) {
|
if (await this.client.db.Domain.exists({ port: Number(args[2]) })) {
|
||||||
let answer: Message;
|
let answer: Message;
|
||||||
try {
|
try {
|
||||||
answer = await this.client.util.messageCollector(
|
answer = await this.client.util.messageCollector(
|
||||||
message,
|
message,
|
||||||
`***${this.client.stores.emojis.error} This port is already binded to a domain. Do you wish to continue? (y/n)***`,
|
`***${this.client.stores.emojis.error} This port is already binded to a domain. Do you wish to continue? (y/n)***`,
|
||||||
30000, true, ['y', 'n'], (msg) => msg.author.id === message.author.id && msg.channel.id === message.channel.id,
|
30000, true, ['y', 'n'], (msg) => msg.author.id === message.author.id && msg.channel.id === message.channel.id,
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return this.error(message.channel, 'Bind request cancelled.');
|
return this.error(message.channel, 'Bind request cancelled.');
|
||||||
}
|
}
|
||||||
if (answer.content === 'n') return this.error(message.channel, 'Bind request cancelled.');
|
if (answer.content === 'n') return this.error(message.channel, 'Bind request cancelled.');
|
||||||
}
|
}
|
||||||
|
|
||||||
const edit = await this.loading(message.channel, 'Binding domain...');
|
const edit = await this.loading(message.channel, 'Binding domain...');
|
||||||
|
|
||||||
let certs: { cert?: string, key?: string } = {};
|
let certs: { cert?: string, key?: string } = {};
|
||||||
if (!args[1].endsWith('.cloud.libraryofcode.org')) {
|
if (!args[1].endsWith('.cloud.libraryofcode.org')) {
|
||||||
const urls = args.slice(3, 5);
|
const urls = args.slice(3, 5);
|
||||||
if (urls.some((l) => !l.includes('snippets.cloud.libraryofcode.org/raw/'))) return this.error(message.channel, 'Invalid snippets URL. Make sure to use https://snippets.libraryofcode.org/raw/*.');
|
if (urls.some((l) => !l.includes('snippets.cloud.libraryofcode.org/raw/'))) return this.error(message.channel, 'Invalid snippets URL. Make sure to use https://snippets.cloud.libraryofcode.org/raw/*.');
|
||||||
|
|
||||||
const tasks = urls.map((l) => axios({ method: 'GET', url: l }));
|
const tasks = urls.map((l) => axios({ method: 'GET', url: l }));
|
||||||
const response = await Promise.all(tasks);
|
const response = await Promise.all(tasks);
|
||||||
const certAndPrivateKey: string[] = response.map((r) => r.data);
|
const certAndPrivateKey: string[] = response.map((r) => r.data);
|
||||||
|
|
||||||
if (!this.isValidCertificateChain(certAndPrivateKey[0])) return this.error(message.channel, 'The certificate chain provided is invalid.');
|
if (!this.isValidCertificateChain(certAndPrivateKey[0])) return this.error(message.channel, 'The certificate chain provided is invalid.');
|
||||||
if (!this.isValidPrivateKey(certAndPrivateKey[1])) return this.error(message.channel, 'The private key provided is invalid.');
|
if (!this.isValidPrivateKey(certAndPrivateKey[1])) return this.error(message.channel, 'The private key provided is invalid.');
|
||||||
|
|
||||||
certs = { cert: certAndPrivateKey[0], key: certAndPrivateKey[1] };
|
certs = { cert: certAndPrivateKey[0], key: certAndPrivateKey[1] };
|
||||||
} else {
|
} else {
|
||||||
certs.cert = await fs.readFile('/etc/ssl/private/cloud-libraryofcode-org.chain.crt', { encoding: 'utf8' });
|
certs.cert = await fs.readFile('/etc/ssl/private/cloud-libraryofcode-org.chain.crt', { encoding: 'utf8' });
|
||||||
certs.key = await fs.readFile('/etc/ssl/private/cloud-libraryofcode-org.key', { encoding: 'utf8' });
|
certs.key = await fs.readFile('/etc/ssl/private/cloud-libraryofcode-org.key', { encoding: 'utf8' });
|
||||||
}
|
}
|
||||||
|
|
||||||
const domain = await this.createDomain(account, args[1], Number(args[2]), certs);
|
const domain = await this.createDomain(account, args[1], Number(args[2]), certs);
|
||||||
|
|
||||||
const tasks = [message.delete(), this.client.util.exec('systemctl reload nginx')];
|
const tasks = [message.delete(), this.client.util.exec('systemctl reload nginx')];
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
await Promise.all(tasks);
|
await Promise.all(tasks);
|
||||||
|
|
||||||
const embed = new RichEmbed()
|
const embed = new RichEmbed()
|
||||||
.setTitle('Domain Creation')
|
.setTitle('Domain Creation')
|
||||||
.setColor(3066993)
|
.setColor(3066993)
|
||||||
.addField('Account Username', `${account.username} | <@${account.userID}>`, true)
|
.addField('Account Username', `${account.username} | <@${account.userID}>`, true)
|
||||||
.addField('Account ID', account.id, true)
|
.addField('Account ID', account.id, true)
|
||||||
.addField('Technician', `<@${message.author.id}>`, true)
|
.addField('Technician', `<@${message.author.id}>`, true)
|
||||||
.addField('Domain', domain.domain, true)
|
.addField('Domain', domain.domain, true)
|
||||||
.addField('Port', String(domain.port), true);
|
.addField('Port', String(domain.port), true);
|
||||||
|
|
||||||
const certPath = `/opt/CloudServices/temp/${randomBytes(5).toString('hex')}`;
|
const certPath = `/opt/CloudServices/temp/${randomBytes(5).toString('hex')}`;
|
||||||
await writeFile(certPath, certs.cert, { encoding: 'utf8' });
|
await writeFile(certPath, certs.cert, { encoding: 'utf8' });
|
||||||
const cert = await parseCertificate(this.client, certPath);
|
const cert = await parseCertificate(this.client, certPath);
|
||||||
|
|
||||||
embed.addField('Certificate Issuer', cert.issuer.organizationName, true)
|
embed.addField('Certificate Issuer', cert.issuer.organizationName, true)
|
||||||
.addField('Certificate Subject', cert.subject.commonName, true)
|
.addField('Certificate Subject', cert.subject.commonName, true)
|
||||||
.setFooter(this.client.user.username, this.client.user.avatarURL)
|
.setFooter(this.client.user.username, this.client.user.avatarURL)
|
||||||
.setTimestamp(new Date(message.timestamp));
|
.setTimestamp(new Date(message.timestamp));
|
||||||
|
|
||||||
const completed = [
|
const completed = [
|
||||||
edit.edit(`***${this.client.stores.emojis.success} Successfully binded ${domain.domain} to port ${domain.port} for ${account.username}.***`),
|
edit.edit(`***${this.client.stores.emojis.success} Successfully binded ${domain.domain} to port ${domain.port} for ${account.username}.***`),
|
||||||
this.client.createMessage('580950455581147146', { embed }),
|
this.client.createMessage('580950455581147146', { embed }),
|
||||||
this.client.getDMChannel(account.userID).then((r) => r.createMessage({ embed })),
|
this.client.getDMChannel(account.userID).then((r) => r.createMessage({ embed })),
|
||||||
this.client.util.transport.sendMail({
|
this.client.util.transport.sendMail({
|
||||||
to: account.emailAddress,
|
to: account.emailAddress,
|
||||||
from: 'Library of Code sp-us | Support Team <help@libraryofcode.org>',
|
from: 'Library of Code sp-us | Support Team <help@libraryofcode.org>',
|
||||||
subject: 'Your domain has been binded',
|
subject: 'Your domain has been binded',
|
||||||
html: `
|
html: `
|
||||||
<h1>Library of Code sp-us | Cloud Services</h1>
|
<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.
|
<p>Hello, this is an email informing you that a new domain under your account has been binded.
|
||||||
Information is below.</p>
|
Information is below.</p>
|
||||||
<b>Domain:</b> ${domain.domain}<br>
|
<b>Domain:</b> ${domain.domain}<br>
|
||||||
<b>Port:</b> ${domain.port}<br>
|
<b>Port:</b> ${domain.port}<br>
|
||||||
<b>Certificate Issuer:</b> ${cert.issuer.organizationName}<br>
|
<b>Certificate Issuer:</b> ${cert.issuer.organizationName}<br>
|
||||||
<b>Certificate Subject:</b> ${cert.subject.commonName}<br>
|
<b>Certificate Subject:</b> ${cert.subject.commonName}<br>
|
||||||
<b>Responsible Engineer:</b> ${message.author.username}#${message.author.discriminator}<br><br>
|
<b>Responsible Engineer:</b> ${message.author.username}#${message.author.discriminator}<br><br>
|
||||||
|
|
||||||
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>
|
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>
|
||||||
|
|
||||||
<b><i>Library of Code sp-us | Support Team</i></b>
|
<b><i>Library of Code sp-us | Support Team</i></b>
|
||||||
`,
|
`,
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!domain.domain.includes('cloud.libraryofcode.org')) {
|
if (!domain.domain.includes('cloud.libraryofcode.org')) {
|
||||||
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.`;
|
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.`;
|
||||||
completed.push(this.client.getDMChannel(account.userID).then((r) => r.createMessage(content)));
|
completed.push(this.client.getDMChannel(account.userID).then((r) => r.createMessage(content)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.all(completed);
|
return Promise.all(completed);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.client.util.handleError(err, message, this);
|
this.client.util.handleError(err, message, this);
|
||||||
const tasks = [fs.unlink(`/etc/nginx/sites-enabled/${args[1]}`), fs.unlink(`/etc/nginx/sites-available/${args[1]}`), this.client.db.Domain.deleteMany({ domain: args[1] })];
|
const tasks = [fs.unlink(`/etc/nginx/sites-enabled/${args[1]}`), fs.unlink(`/etc/nginx/sites-available/${args[1]}`), this.client.db.Domain.deleteMany({ domain: args[1] })];
|
||||||
return Promise.allSettled(tasks);
|
return Promise.allSettled(tasks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This function binds a domain to a port on the CWG.
|
* This function binds a domain to a port on the CWG.
|
||||||
* @param account The account of the user.
|
* @param account The account of the user.
|
||||||
* @param subdomain The domain to use. `mydomain.cloud.libraryofcode.org`
|
* @param subdomain The domain to use. `mydomain.cloud.libraryofcode.org`
|
||||||
* @param port The port to use, must be between 1024 and 65535.
|
* @param port The port to use, must be between 1024 and 65535.
|
||||||
* @param x509Certificate The contents the certificate and key files.
|
* @param x509Certificate The contents the certificate and key files.
|
||||||
* @example await CWG.createDomain(account, 'mydomain.cloud.libraryofcode.org', 6781);
|
* @example await CWG.createDomain(account, 'mydomain.cloud.libraryofcode.org', 6781);
|
||||||
*/
|
*/
|
||||||
public async createDomain(account: AccountInterface, domain: string, port: number, x509Certificate: { cert?: string, key?: string }) {
|
public async createDomain(account: AccountInterface, domain: string, port: number, x509Certificate: { cert?: string, key?: string }) {
|
||||||
try {
|
try {
|
||||||
if (port <= 1024 || port >= 65535) throw new RangeError(`Port range must be between 1024 and 65535, received ${port}.`);
|
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.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}.`);
|
if (!await this.client.db.Account.exists({ userID: account.userID })) throw new Error(`Cannot find account ${account.userID}.`);
|
||||||
let x509: { cert: string, key: string };
|
let x509: { cert: string, key: string };
|
||||||
if (x509Certificate) {
|
if (x509Certificate) {
|
||||||
x509 = await this.createCertAndPrivateKey(domain, x509Certificate.cert, x509Certificate.key);
|
x509 = await this.createCertAndPrivateKey(domain, x509Certificate.cert, x509Certificate.key);
|
||||||
} else {
|
} else {
|
||||||
x509 = {
|
x509 = {
|
||||||
cert: '/etc/ssl/private/cloud-libraryofcode-org.chain.crt',
|
cert: '/etc/ssl/private/cloud-libraryofcode-org.chain.crt',
|
||||||
key: '/etc/ssl/private/cloud-libraryofcode-org.key',
|
key: '/etc/ssl/private/cloud-libraryofcode-org.key',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
let cfg = await fs.readFile('/opt/CloudServices/src/static/nginx.conf', { encoding: 'utf8' });
|
let cfg = await fs.readFile('/opt/CloudServices/src/static/nginx.conf', { encoding: 'utf8' });
|
||||||
cfg = cfg.replace(/\[DOMAIN]/g, domain);
|
cfg = cfg.replace(/\[DOMAIN]/g, domain);
|
||||||
cfg = cfg.replace(/\[PORT]/g, String(port));
|
cfg = cfg.replace(/\[PORT]/g, String(port));
|
||||||
cfg = cfg.replace(/\[CERTIFICATE]/g, x509.cert);
|
cfg = cfg.replace(/\[CERTIFICATE]/g, x509.cert);
|
||||||
cfg = cfg.replace(/\[KEY]/g, x509.key);
|
cfg = cfg.replace(/\[KEY]/g, x509.key);
|
||||||
await fs.writeFile(`/etc/nginx/sites-available/${domain}`, cfg, { encoding: 'utf8' });
|
await fs.writeFile(`/etc/nginx/sites-available/${domain}`, cfg, { encoding: 'utf8' });
|
||||||
await fs.symlink(`/etc/nginx/sites-available/${domain}`, `/etc/nginx/sites-enabled/${domain}`);
|
await fs.symlink(`/etc/nginx/sites-available/${domain}`, `/etc/nginx/sites-enabled/${domain}`);
|
||||||
const entry = new this.client.db.Domain({
|
const entry = new this.client.db.Domain({
|
||||||
account,
|
account,
|
||||||
domain,
|
domain,
|
||||||
port,
|
port,
|
||||||
x509,
|
x509,
|
||||||
enabled: true,
|
enabled: true,
|
||||||
});
|
});
|
||||||
return entry.save();
|
return entry.save();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const tasks = [fs.unlink(`/etc/nginx/sites-enabled/${domain}`), fs.unlink(`/etc/nginx/sites-available/${domain}`), this.client.db.Domain.deleteMany({ domain })];
|
const tasks = [fs.unlink(`/etc/nginx/sites-enabled/${domain}`), fs.unlink(`/etc/nginx/sites-available/${domain}`), this.client.db.Domain.deleteMany({ domain })];
|
||||||
await Promise.allSettled(tasks);
|
await Promise.allSettled(tasks);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async createCertAndPrivateKey(domain: string, certChain: string, privateKey: string) {
|
public async createCertAndPrivateKey(domain: string, certChain: string, privateKey: string) {
|
||||||
if (!this.isValidCertificateChain(certChain)) throw new Error('Invalid Certificate Chain');
|
if (!this.isValidCertificateChain(certChain)) throw new Error('Invalid Certificate Chain');
|
||||||
// if (!this.isValidPrivateKey(privateKey)) throw new Error('Invalid Private Key');
|
// if (!this.isValidPrivateKey(privateKey)) throw new Error('Invalid Private Key');
|
||||||
const path = `/opt/CloudServices/temp/${domain}`;
|
const path = `/opt/CloudServices/temp/${domain}`;
|
||||||
await Promise.all([writeFile(`${path}.chain.crt`, certChain), writeFile(`${path}.key.pem`, privateKey)]);
|
await Promise.all([writeFile(`${path}.chain.crt`, certChain), writeFile(`${path}.key.pem`, privateKey)]);
|
||||||
if (!this.isMatchingPair(`${path}.chain.crt`, `${path}.key.pem`)) {
|
if (!this.isMatchingPair(`${path}.chain.crt`, `${path}.key.pem`)) {
|
||||||
await Promise.all([unlink(`${path}.chain.crt`), unlink(`${path}.key.pem`)]);
|
await Promise.all([unlink(`${path}.chain.crt`), unlink(`${path}.key.pem`)]);
|
||||||
throw new Error('Certificate and Private Key do not match');
|
throw new Error('Certificate and Private Key do not match');
|
||||||
}
|
}
|
||||||
|
|
||||||
await Promise.all([writeFile(`/etc/ssl/certs/cwg/${domain}.chain.crt`, certChain), writeFile(`/etc/ssl/private/cwg/${domain}.key.pem`, privateKey)]);
|
await Promise.all([writeFile(`/etc/ssl/certs/cwg/${domain}.chain.crt`, certChain), writeFile(`/etc/ssl/private/cwg/${domain}.key.pem`, privateKey)]);
|
||||||
return { cert: `/etc/ssl/certs/cwg/${domain}.chain.crt`, key: `/etc/ssl/private/cwg/${domain}.key.pem` };
|
return { cert: `/etc/ssl/certs/cwg/${domain}.chain.crt`, key: `/etc/ssl/private/cwg/${domain}.key.pem` };
|
||||||
}
|
}
|
||||||
|
|
||||||
public checkOccurance(text: string, query: string) {
|
public checkOccurance(text: string, query: string) {
|
||||||
return (text.match(new RegExp(query, 'g')) || []).length;
|
return (text.match(new RegExp(query, 'g')) || []).length;
|
||||||
}
|
}
|
||||||
|
|
||||||
public isValidCertificateChain(cert: string) {
|
public isValidCertificateChain(cert: string) {
|
||||||
if (!cert.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN CERTIFICATE-----')) return false;
|
if (!cert.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN CERTIFICATE-----')) return false;
|
||||||
if (!cert.replace(/^\s+|\s+$/g, '').endsWith('-----END 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, ''), '-----BEGIN CERTIFICATE-----') !== 2) return false;
|
||||||
if (this.checkOccurance(cert.replace(/^\s+|\s+$/g, ''), '-----END CERTIFICATE-----') !== 2) return false;
|
if (this.checkOccurance(cert.replace(/^\s+|\s+$/g, ''), '-----END CERTIFICATE-----') !== 2) return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public isValidPrivateKey(key: string) {
|
public isValidPrivateKey(key: string) {
|
||||||
if (!key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN RSA PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN ECC PRIVATE KEY-----')) return false;
|
if (!key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN RSA PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').startsWith('-----BEGIN ECC PRIVATE KEY-----')) return false;
|
||||||
if (!key.replace(/^\s+|\s+$/g, '').endsWith('-----END PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').endsWith('-----END RSA PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').endsWith('-----END ECC PRIVATE KEY-----')) return false;
|
if (!key.replace(/^\s+|\s+$/g, '').endsWith('-----END PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').endsWith('-----END RSA PRIVATE KEY-----') && !key.replace(/^\s+|\s+$/g, '').endsWith('-----END ECC PRIVATE KEY-----')) return false;
|
||||||
if ((this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN RSA PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN ECC PRIVATE KEY-----') !== 1)) return false;
|
if ((this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN RSA PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----BEGIN ECC PRIVATE KEY-----') !== 1)) return false;
|
||||||
if ((this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END RSA PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END ECC PRIVATE KEY-----') !== 1)) return false;
|
if ((this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END RSA PRIVATE KEY-----') !== 1) && (this.checkOccurance(key.replace(/^\s+|\s+$/g, ''), '-----END ECC PRIVATE KEY-----') !== 1)) return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async isMatchingPair(cert: string, privateKey: string) {
|
public async isMatchingPair(cert: string, privateKey: string) {
|
||||||
const result: string = await this.client.util.exec(`${__dirname}/../bin/checkCertSignatures ${cert} ${privateKey}`);
|
const result: string = await this.client.util.exec(`${__dirname}/../bin/checkCertSignatures ${cert} ${privateKey}`);
|
||||||
const { ok }: { ok: boolean } = JSON.parse(result);
|
const { ok }: { ok: boolean } = JSON.parse(result);
|
||||||
return ok;
|
return ok;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue