dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Service domain checker

Browse Source
This commit is contained in:
Andras Bacsai
2022-07-08 14:59:59 +02:00
parent b105e6fbf8
commit 18c2b2e38e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/api/src/routes/api/v1/services/handlers.ts
View File

@@ -237,18 +237,20 @@ export async function checkService(request: FastifyRequest) {
try { try {
const { id } = request.params; const { id } = request.params;
let { fqdn, exposePort, otherFqdns } = request.body; let { fqdn, exposePort, otherFqdns } = request.body;
if (fqdn) fqdn = fqdn.toLowerCase(); if (fqdn) fqdn = fqdn.toLowerCase();
if (otherFqdns && otherFqdns.length > 0) otherFqdns = otherFqdns.map((f) => f.toLowerCase()); if (otherFqdns && otherFqdns.length > 0) otherFqdns = otherFqdns.map((f) => f.toLowerCase());
if (exposePort) exposePort = Number(exposePort); if (exposePort) exposePort = Number(exposePort);
let found = await isDomainConfigured({ id, fqdn }); let found = await isDomainConfigured({ id, fqdn });
if (found) { if (found) {
throw `Domain already configured.` throw { status: 500, message: `Domain ${getDomain(fqdn).replace('www.', '')} is already in use!` }
} }
if (otherFqdns && otherFqdns.length > 0) { if (otherFqdns && otherFqdns.length > 0) {
for (const ofqdn of otherFqdns) { for (const ofqdn of otherFqdns) {
found = await isDomainConfigured({ id, fqdn: ofqdn, checkOwn: true }); found = await isDomainConfigured({ id, fqdn: ofqdn, checkOwn: true });
if (found) { if (found) {
throw "Domain already configured." throw { status: 500, message: `Domain ${getDomain(ofqdn).replace('www.', '')} is already in use!` }
} }
} }
} }
@@ -257,12 +259,12 @@ export async function checkService(request: FastifyRequest) {
exposePort = Number(exposePort); exposePort = Number(exposePort);
if (exposePort < 1024 || exposePort > 65535) { if (exposePort < 1024 || exposePort > 65535) {
throw `Exposed Port needs to be between 1024 and 65535.` throw { status: 500, message: `Exposed Port needs to be between 1024 and 65535.` }
} }
const publicPort = await getPort({ port: exposePort }); const publicPort = await getPort({ port: exposePort });
if (publicPort !== exposePort) { if (publicPort !== exposePort) {
throw `Port ${exposePort} is already in use.` throw { status: 500, message: `Port ${exposePort} is already in use.` }
} }
} }
return {} return {}