Compare commits

...

4 Commits

Author SHA1 Message Date
Andras Bacsai
c63237684a fix: Hostname issue 2022-07-06 20:04:16 +02:00
Andras Bacsai
792d51d93f fix: trustProxy for Fastify 2022-07-06 19:34:16 +02:00
Andras Bacsai
62bfb5dacc fix: Domain check 2022-07-06 19:04:54 +02:00
Andras Bacsai
d7fa80703d fix: Domain check 2022-07-06 19:04:40 +02:00
6 changed files with 12 additions and 11 deletions

View File

@@ -26,7 +26,8 @@ declare module 'fastify' {
const port = isDev ? 3001 : 3000;
const host = '0.0.0.0';
const fastify = Fastify({
logger: false
logger: false,
trustProxy: true
});
const schema = {
type: 'object',

View File

@@ -23,7 +23,7 @@ const customConfig: Config = {
length: 3
};
export const isDev = process.env.NODE_ENV === 'development';
export const version = '3.0.2';
export const version = '3.0.3';
export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
@@ -209,7 +209,7 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
resolves = await dns.resolve4(hostname);
}
} catch (error) {
throw `DNS not set correctly or propogated.<br>Please check your DNS settings.`
throw { status: 500, message: `Could not determine IP address for ${hostname}.` }
}
if (dualCerts) {
@@ -231,9 +231,9 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
}
}
if (ipDomainFound && ipDomainDualCertFound) return { status: 200 };
throw false;
throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
} catch (error) {
throw `DNS not set correctly or propogated.<br>Please check your DNS settings.`
throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
}
} else {
try {
@@ -245,9 +245,9 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
}
}
if (ipDomainFound) return { status: 200 };
throw false;
throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
} catch (error) {
throw `DNS not set correctly or propogated.<br>Please check your DNS settings.`
throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
}
}
}

View File

@@ -324,7 +324,7 @@ export async function checkDNS(request: FastifyRequest<CheckDNS>) {
}
}
if (isDNSCheckEnabled && !isDev && !forceSave) {
return await checkDomainsIsValidInDNS({ hostname: request.hostname, fqdn, dualCerts });
return await checkDomainsIsValidInDNS({ hostname: request.hostname.split(':')[0], fqdn, dualCerts });
}
return {}
} catch ({ status, message }) {

View File

@@ -67,7 +67,7 @@ export async function checkDomain(request: FastifyRequest, reply: FastifyReply)
throw "Domain already configured";
}
if (isDNSCheckEnabled && !forceSave) {
return await checkDomainsIsValidInDNS({ hostname: request.hostname, fqdn, dualCerts });
return await checkDomainsIsValidInDNS({ hostname: request.hostname.split(':')[0], fqdn, dualCerts });
}
return {};
} catch ({ status, message }) {

View File

@@ -18,7 +18,7 @@ interface AppSession {
}
export const loginEmail: Writable<string | undefined> = writable()
export const appSession: Writable<AppSession> = writable({
version: '3.0.2',
version: '3.0.3',
userId: null,
teamId: null,
permission: 'read',

View File

@@ -1,6 +1,6 @@
{
"name": "coolify",
"version": "3.0.2",
"version": "3.0.3",
"description": "An open-source & self-hostable Heroku / Netlify alternative.",
"license": "AGPL-3.0",
"scripts": {