jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

relay check is always performed

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-03-06 19:48:18 -08:00
parent e329360daa
commit 7b56f102cc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mail.js
View File

@@ -458,8 +458,8 @@ function getStatus(domain, callback) {
// ensure we always have a valid toplevel properties for the api
var results = {
dns: {}, // { mx: { expected, value }, dmarc: { expected, value }, dkim: { expected, value }, spf: { expected, value }, ptr: { expected, value } }
rbl: {}, // { status, ip, servers: [{name,site,dns}]}
relay: {} // { status, value }
rbl: {}, // { status, ip, servers: [{name,site,dns}]} optional. only for cloudron-smtp
relay: {} // { status, value } always checked
};
function recordResult(what, func) {
@@ -524,7 +524,7 @@ function checkConfiguration(callback) {
const record = result.dns[type];
if (!record.status) message.push(`${type.toUpperCase()} DNS record did not match. Expected: \`${record.expected}\`. Actual: \`${record.value}\``);
});
if (result.relay && !result.relay.status) message.push(`Relay error: ${result.relay.value}`);
if (!result.relay.status) message.push(`Relay error: ${result.relay.value}`);
if (result.rbl && result.rbl.status === false) { // rbl field contents is optional
const servers = result.rbl.servers.map((bs) => `[${bs.name}](${bs.site})`); // in markdown
message.push(`This server's IP \`${result.rbl.ip}\` is blacklisted in the following servers - ${servers.join(', ')}`);