iamthefij/cloudron-e2e-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolveTxt returns a 2d array

Browse Source
This commit is contained in:
Girish Ramakrishnan 2015-09-28 20:36:11 -07:00
parent 5417ef9e82
commit 73cfcb6a52
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cloudron.js
View File

@ -256,11 +256,12 @@ Cloudron.prototype.reboot = function () {
}; };
Cloudron.prototype.checkSPF = function (callback) { Cloudron.prototype.checkSPF = function (callback) {
var that = this;
dns.resolveTxt(this._box.domain, function (error, records) { dns.resolveTxt(this._box.domain, function (error, records) {
if (error) return callback(error); if (error) return callback(error);
if (records.length !== 1) return callback(new Error('Got ' + records.length + ' TXT records. Expecting 1')); if (records.length !== 1 || records[0].length !== 1) return callback(new Error('Got ' + JSON.stringify(records) + ' TXT records. Expecting 1 length 2d array'));
if (records[0].search(new RegExp('^v=spf1 ip4:' + this._box.ip + ' ~all$')) !== 0) return callback(new Error('Bad SPF record. ' + records[0])); if (records[0][0].search(new RegExp('^v=spf1 ip4:' + that._box.ip + ' ~all$')) !== 0) return callback(new Error('Bad SPF record. ' + records[0]));
callback(); callback();
}); });
@ -269,9 +270,9 @@ Cloudron.prototype.checkSPF = function (callback) {
Cloudron.prototype.checkDKIM = function (callback) { Cloudron.prototype.checkDKIM = function (callback) {
dns.resolveTxt('mail._domainkey.' + this._box.domain, function (error, records) { dns.resolveTxt('mail._domainkey.' + this._box.domain, function (error, records) {
if (error) return callback(error); if (error) return callback(error);
if (records.length !== 1) return callback(new Error('Got ' + records.length + ' TXT records. Expecting 1')); if (records.length !== 1 || records[0].length !== 1) return callback(new Error('Got ' + JSON.stringify(records) + ' TXT records. Expecting 1 length 2d array'));
if (records[0].search(/^"v=DKIM1; t=s; p=.*"$/) !== 0) return callback(new Error('Bad DKIM record. ' + records[0])); if (records[0][0].search(/^"v=DKIM1; t=s; p=.*"$/) !== 0) return callback(new Error('Bad DKIM record. ' + records[0]));
callback(); callback();
}); });
@ -280,9 +281,9 @@ Cloudron.prototype.checkDKIM = function (callback) {
Cloudron.prototype.checkDMARC = function (callback) { Cloudron.prototype.checkDMARC = function (callback) {
dns.resolveTxt('_dmarc.' + this._box.domain, function (error, records) { dns.resolveTxt('_dmarc.' + this._box.domain, function (error, records) {
if (error) return callback(error); if (error) return callback(error);
if (records.length !== 1) return callback(new Error('Got ' + records.length + ' TXT records. Expecting 1')); if (records.length !== 1 || records[0].length !== 1) return callback(new Error('Got ' + JSON.stringify(records) + ' TXT records. Expecting 1 length 2d array'));
if (records[0].search(/^"v=DMARC1; p=none; pct=100; rua=mailto:.*; ruf=.*"$/) !== 0) return callback(new Error('Bad DMARC record. ' + records[0])); if (records[0][0].search(/^"v=DMARC1; p=none; pct=100; rua=mailto:.*; ruf=.*"$/) !== 0) return callback(new Error('Bad DMARC record. ' + records[0]));
callback(); callback();
}); });