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

we setup adminFqdn now in SPF

Browse Source
This commit is contained in:
Girish Ramakrishnan 2016-03-28 11:25:15 -07:00
parent 66562f32f8
commit 99842d4782
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloudron.js
View File

@ -19,6 +19,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
function Cloudron(box) { function Cloudron(box) {
this._box = box; this._box = box;
this._isCustomDomain = box.domain === process.env.CUSTOM_DOMAIN; this._isCustomDomain = box.domain === process.env.CUSTOM_DOMAIN;
this._adminFqdn = this._isCustomDomain ? 'my.' + box.domain : 'my-' + box.domain;
this._origin = this._isCustomDomain ? 'https://my.' + box.domain : 'https://my-' + box.domain; this._origin = this._isCustomDomain ? 'https://my.' + box.domain : 'https://my-' + box.domain;
this._credentials = { this._credentials = {
@ -310,7 +311,7 @@ Cloudron.prototype.checkSPF = function (callback) {
if (error) return callback(error); if (error) return callback(error);
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.length !== 1 || records[0].length !== 1) return callback(new Error('Got ' + JSON.stringify(records) + ' TXT records. Expecting 1 length 2d array'));
if (records[0][0].search(new RegExp('^v=spf1 a:' + that._box.domain + ' ~all$')) !== 0) return callback(new Error('Bad SPF record. ' + records[0][0])); if (records[0][0].search(new RegExp('^v=spf1 a:' + that._adminFqdn + ' ~all$')) !== 0) return callback(new Error('Bad SPF record. ' + records[0][0]));
callback(null, records); callback(null, records);
}); });