[REV] Switch to use IDS over server names

This commit is contained in:
Dunemask 2023-12-22 14:45:49 -07:00
parent e94aca7c96
commit 91587f66b2
21 changed files with 196 additions and 221 deletions

View file

@ -8,33 +8,35 @@ import {
import { sendError } from "../util/ExpressClientError.js";
import { toggleServer } from "../k8s/k8s-server-control.js";
const dnsRegex = new RegExp(
`^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$`,
);
function payloadFilter(req, res) {
const serverSpec = req.body;
if (!serverSpec) return res.sendStatus(400);
const { name, host, version, serverType, memory } =
serverSpec;
const { name, host, version, serverType, memory } = serverSpec;
if (!name) return res.status(400).send("Server name is required!");
if (!host) return res.status(400).send("Server host is required!");
if (!dnsRegex.test(host)) return res.status(400).send("Hostname invalid!");
if (!version) return res.status(400).send("Server version is required!");
if (!serverType) return res.status(400).send("Server type is required!");
if (!memory) return res.status(400).send("Memory is required!");
return "filtered";
}
function checkServerHost(serverSpec) {
function checkServerId(serverSpec) {
if (!serverSpec) throw new ExpressClientError({ c: 400 });
if (!serverSpec.host)
throw new ExpressClientError({ c: 400, m: "Server name required!" });
if (!serverSpec.id)
throw new ExpressClientError({ c: 400, m: "Server id missing!" });
}
export async function createServer(req, res) {
if (payloadFilter(req, res) !== "filtered") return;
const serverSpec = req.body;
try {
const serverSpecs = await getServerEntry(serverSpec.id);
if (serverSpecs.length !== 0) throw Error("Server already exists in DB!");
await createServerResources(serverSpec);
await createServerEntry(serverSpec);
const serverEntry = await createServerEntry(serverSpec);
await createServerResources(serverEntry);
res.sendStatus(200);
} catch (e) {
sendError(res)(e);
@ -45,7 +47,7 @@ export async function deleteServer(req, res) {
// Ensure spec is safe
const serverSpec = req.body;
try {
checkServerHost(serverSpec);
checkServerId(serverSpec);
} catch (e) {
return sendError(res)(e);
}
@ -60,12 +62,12 @@ export async function startServer(req, res) {
// Ensure spec is safe
const serverSpec = req.body;
try {
checkServerHost(serverSpec);
checkServerId(serverSpec);
} catch (e) {
return sendError(res)(e);
}
const { name } = serverSpec;
toggleServer(name, true)
const { id } = serverSpec;
toggleServer(id, true)
.then(() => res.sendStatus(200))
.catch(sendError(res));
}
@ -74,12 +76,12 @@ export async function stopServer(req, res) {
// Ensure spec is safe
const serverSpec = req.body;
try {
checkServerHost(serverSpec);
checkServerId(serverSpec);
} catch (e) {
return sendError(res)(e);
}
const { name } = serverSpec;
toggleServer(name, false)
const { id } = serverSpec;
toggleServer(id, false)
.then(() => res.sendStatus(200))
.catch(sendError(res));
}