Skip to content

Commit

Permalink
Merge pull request #264 from gavsto/dev
Browse files Browse the repository at this point in the history 
FIX: Form submission + warn highlight in Domain check
  • Loading branch information
@gavsto
gavsto authored Nov 19, 2021
2 parents 34526c9 + 77ff3ea commit 69116f4
Showing 1 changed file with 118 additions and 110 deletions.
228 changes: 118 additions & 110 deletions js/DomainFormChecker.js
View file
Original file line number Diff line number Diff line change
@@ -1,143 +1,151 @@
// block default form and execute API call instead
$(document).ready(function () {
$('#DomainForm').submit(function (e) {
e.preventDefault();
ExecuteDomainAPICall();
});
});

function ExecuteDomainAPICall() {
var form = $('#DomainForm');
var postdata = getFormData(form); //ThisCreatesANiceSpinnerWhileWeWait
var loaderspinelement = document.getElementById("loaderspin");
loaderspinelement.classList.remove("invisible");
$.ajax({
'async': true,
'global': false,
'url': "api/ListDomainTests",
'type': "post",
'data': JSON.stringify(postdata),
'contentType': "application/json",
'success': function (data) {
var form = $('#DomainForm');
var postdata = getFormData(form); //ThisCreatesANiceSpinnerWhileWeWait
var loaderspinelement = document.getElementById("loaderspin");
loaderspinelement.classList.remove("invisible");
$.ajax({
'async': true,
'global': false,
'url': "api/ListDomainTests",
'type': "post",
'data': JSON.stringify(postdata),
'contentType': "application/json",
'success': function (data) {

var loaderspinelement = document.getElementById("loaderspin");
loaderspinelement.classList.add("invisible");
var loaderspinelement = document.getElementById("loaderspin");
loaderspinelement.classList.add("invisible");

// Clear existing data
ClearExistingClasses();
// Clear existing data
ClearExistingClasses();

// Get the Background Colour for SPF
GenerateHTMLColour('spfCard', data[0].SPFFinalState)
// Get the Background Colour for SPF
GenerateHTMLColour('spfCard', data[0].SPFFinalState)

// Get the Background Colour for SPF Indicator
GenerateHTMLColour('spfindicator', data[0].SPFFinalState)
// Get the Background Colour for SPF Indicator
GenerateHTMLColour('spfindicator', data[0].SPFFinalState)

// Get the Background Font Colour for SPF
GenerateHTMLHeaderColour('spfHeader', data[0].SPFFinalState)
// Get the Background Font Colour for SPF
GenerateHTMLHeaderColour('spfHeader', data[0].SPFFinalState)

// Link the arrays with a break
var arrSPFFails = data[0].SPFResults.ValidationFails.join("<br />");
var arrSPFWarns = data[0].SPFResults.ValidationWarns.join("<br />");
var arrSPFPasses = data[0].SPFResults.ValidationPasses.join("<br />");
// Link the arrays with a break
var arrSPFFails = data[0].SPFResults.ValidationFails.join("<br />");
var arrSPFWarns = data[0].SPFResults.ValidationWarns.join("<br />");
var arrSPFPasses = data[0].SPFResults.ValidationPasses.join("<br />");

// Set the HTML for the SPF Records
$('#domainResultsSPFRecord').html(data[0].SPFResults.Record);
$('#domainResultsSPFPasses').html(GenerateHTMLResult(arrSPFPasses));
$('#domainResultsSPFWarns').html(GenerateHTMLResult(arrSPFWarns));
$('#domainResultsSPFFails').html(GenerateHTMLResult(arrSPFFails));
// Set the HTML for the SPF Records
$('#domainResultsSPFRecord').html(data[0].SPFResults.Record);
$('#domainResultsSPFPasses').html(GenerateHTMLResult(arrSPFPasses));
$('#domainResultsSPFWarns').html(GenerateHTMLResult(arrSPFWarns));
$('#domainResultsSPFFails').html(GenerateHTMLResult(arrSPFFails));

// Get the Background Colour for DMARC
GenerateHTMLColour('dmarcCard', data[0].DMARCFinalState)
// Get the Background Colour for DMARC
GenerateHTMLColour('dmarcCard', data[0].DMARCFinalState)

// Get the Background Colour for DMARC Indicator
GenerateHTMLColour('dmarcindicator', data[0].DMARCFinalState)
// Get the Background Colour for DMARC Indicator
GenerateHTMLColour('dmarcindicator', data[0].DMARCFinalState)

// Get the Background Font Colour for DMARC
console.log(data[0].DMARCFinalState)
GenerateHTMLHeaderColour('dmarcHeader', data[0].DMARCFinalState)
// Get the Background Font Colour for DMARC
console.log(data[0].DMARCFinalState)
GenerateHTMLHeaderColour('dmarcHeader', data[0].DMARCFinalState)

var arrDMARCFails = data[0].DMARCResults.ValidationFails.join("<br />");
var arrDMARCWarns = data[0].DMARCResults.ValidationWarns.join("<br />");
var arrDMARCPasses = data[0].DMARCResults.ValidationPasses.join("<br />");
var arrDMARCFails = data[0].DMARCResults.ValidationFails.join("<br />");
var arrDMARCWarns = data[0].DMARCResults.ValidationWarns.join("<br />");
var arrDMARCPasses = data[0].DMARCResults.ValidationPasses.join("<br />");

$('#domainResultsDMARCRecord').html(data[0].DMARCResults.Record);
$('#domainResultsDMARCPasses').html(GenerateHTMLResult(arrDMARCPasses));
$('#domainResultsDMARCWarns').html(GenerateHTMLResult(arrDMARCWarns));
$('#domainResultsDMARCFails').html(GenerateHTMLResult(arrDMARCFails));
$('#domainResultsDMARCRecord').html(data[0].DMARCResults.Record);
$('#domainResultsDMARCPasses').html(GenerateHTMLResult(arrDMARCPasses));
$('#domainResultsDMARCWarns').html(GenerateHTMLResult(arrDMARCWarns));
$('#domainResultsDMARCFails').html(GenerateHTMLResult(arrDMARCFails));

// Get the Background Colour for MX
GenerateHTMLColour('mxCard', data[0].MXFinalState)
// Get the Background Colour for MX
GenerateHTMLColour('mxCard', data[0].MXFinalState)

// Get the Background Colour for MX Indicator
GenerateHTMLColour('mxindicator', data[0].MXFinalState)
// Get the Background Colour for MX Indicator
GenerateHTMLColour('mxindicator', data[0].MXFinalState)

// Get the Background Font Colour for MX
console.log(data[0].MXFinalState)
GenerateHTMLHeaderColour('mxHeader', data[0].MXFinalState)
// Get the Background Font Colour for MX
console.log(data[0].MXFinalState)
GenerateHTMLHeaderColour('mxHeader', data[0].MXFinalState)

var arrMXFails = data[0].MXResults.ValidationFails.join("<br />");
var arrMXWarns = data[0].MXResults.ValidationWarns.join("<br />");
var arrMXPasses = data[0].MXResults.ValidationPasses.join("<br />");
var arrMXFails = data[0].MXResults.ValidationFails.join("<br />");
var arrMXWarns = data[0].MXResults.ValidationWarns.join("<br />");
var arrMXPasses = data[0].MXResults.ValidationPasses.join("<br />");

console.log(data[0]);
$('#domainResultsMXRecord').html(data[0].MXResults.Records.Hostname);
$('#domainResultsMXRecordPasses').html(GenerateHTMLResult(arrMXPasses));
$('#domainResultsMXRecordFails').html(GenerateHTMLResult(arrMXFails));
$('#domainResultsMXRecordWarns').html(GenerateHTMLResult(arrMXWarns));
$('#domainResultsMXMailProvider').html('<h4><span class="badge bg-primary">Mail Provider: ' + data[0].MXResults.MailProvider.Name + '</span></h4>');
console.log(data[0]);
$('#domainResultsMXRecord').html(data[0].MXResults.Records.Hostname);
$('#domainResultsMXRecordPasses').html(GenerateHTMLResult(arrMXPasses));
$('#domainResultsMXRecordFails').html(GenerateHTMLResult(arrMXFails));
$('#domainResultsMXRecordWarns').html(GenerateHTMLResult(arrMXWarns));
$('#domainResultsMXMailProvider').html('<h4><span class="badge bg-primary">Mail Provider: ' + data[0].MXResults.MailProvider.Name + '</span></h4>');



// Get the Background Colour for DNSSEC
GenerateHTMLColour('dnssecCard', data[0].DNSSECFinalState)
// Get the Background Colour for DNSSEC
GenerateHTMLColour('dnssecCard', data[0].DNSSECFinalState)

// Get the Background Colour for DNSSEC Indicator
GenerateHTMLColour('dnssecindicator', data[0].DNSSECFinalState)
// Get the Background Colour for DNSSEC Indicator
GenerateHTMLColour('dnssecindicator', data[0].DNSSECFinalState)

// Get the Background Font Colour for DNSSEC
console.log(data[0].DNSSECFinalState)
GenerateHTMLHeaderColour('dnssecHeader', data[0].DNSSECFinalState)
// Get the Background Font Colour for DNSSEC
console.log(data[0].DNSSECFinalState)
GenerateHTMLHeaderColour('dnssecHeader', data[0].DNSSECFinalState)

var arrDNSSECFails = data[0].DNSSECResults.ValidationFails.join("<br />");
var arrDNSSECWarns = data[0].DNSSECResults.ValidationWarns.join("<br />");
var arrDNSSECPasses = data[0].DNSSECResults.ValidationPasses.join("<br />");
var arrDNSSECKeys = data[0].DNSSECResults.Keys.join("<br />");
var arrDNSSECFails = data[0].DNSSECResults.ValidationFails.join("<br />");
var arrDNSSECWarns = data[0].DNSSECResults.ValidationWarns.join("<br />");
var arrDNSSECPasses = data[0].DNSSECResults.ValidationPasses.join("<br />");
var arrDNSSECKeys = data[0].DNSSECResults.Keys.join("<br />");

console.log(data[0]);
$('#domainResultsDNSSECRecord').html(arrDNSSECKeys);
$('#domainResultsDNSSECRecordPasses').html(GenerateHTMLResult(arrDNSSECPasses));
$('#domainResultsDNSSECRecordFails').html(GenerateHTMLResult(arrDNSSECFails));
$('#domainResultsDNSSECRecordWarns').html(GenerateHTMLResult(arrDNSSECWarns));
console.log(data[0]);
$('#domainResultsDNSSECRecord').html(arrDNSSECKeys);
$('#domainResultsDNSSECRecordPasses').html(GenerateHTMLResult(arrDNSSECPasses));
$('#domainResultsDNSSECRecordFails').html(GenerateHTMLResult(arrDNSSECFails));
$('#domainResultsDNSSECRecordWarns').html(GenerateHTMLResult(arrDNSSECWarns));



// Get the Background Colour for DKIM
GenerateHTMLColour('dkimCard', data[0].DKIMFinalState)
// Get the Background Colour for DKIM
GenerateHTMLColour('dkimCard', data[0].DKIMFinalState)

// Get the Background Colour for DKIM Indicator
GenerateHTMLColour('dkimindicator', data[0].DKIMFinalState)
// Get the Background Colour for DKIM Indicator
GenerateHTMLColour('dkimindicator', data[0].DKIMFinalState)

// Get the Background Font Colour for DKIM
console.log(data[0].DKIMFinalState)
GenerateHTMLHeaderColour('dkimHeader', data[0].DNSSECFinalState)
// Get the Background Font Colour for DKIM
console.log(data[0].DKIMFinalState)
GenerateHTMLHeaderColour('dkimHeader', data[0].DNSSECFinalState)

var arrDKIMFails = data[0].DKIMResults.ValidationFails.join("<br />");
var arrDKIMWarns = data[0].DKIMResults.ValidationWarns.join("<br />");
var arrDKIMPasses = data[0].DKIMResults.ValidationPasses.join("<br />");
var arrDKIMFails = data[0].DKIMResults.ValidationFails.join("<br />");
var arrDKIMWarns = data[0].DKIMResults.ValidationWarns.join("<br />");
var arrDKIMPasses = data[0].DKIMResults.ValidationPasses.join("<br />");

$('#domainResultsDKIMRecord').html(data[0].DKIMResults.Records[0].Record);
$('#domainResultsDKIMRecordPasses').html(GenerateHTMLResult(arrDKIMPasses));
$('#domainResultsDKIMRecordFails').html(GenerateHTMLResult(arrDKIMFails));
$('#domainResultsDKIMRecordWarns').html(GenerateHTMLResult(arrDKIMWarns));
$('#domainResultsDKIMRecord').html(data[0].DKIMResults.Records[0].Record);
$('#domainResultsDKIMRecordPasses').html(GenerateHTMLResult(arrDKIMPasses));
$('#domainResultsDKIMRecordFails').html(GenerateHTMLResult(arrDKIMFails));
$('#domainResultsDKIMRecordWarns').html(GenerateHTMLResult(arrDKIMWarns));

},
'error': function (xhr, ajaxOptions, thrownError) {
$('#domainResultsDiv').html('Failed to connect to API: ' + thrownError);
}
});
}
},
'error': function (xhr, ajaxOptions, thrownError) {
$('#domainResultsDiv').html('Failed to connect to API: ' + thrownError);
}
});
}
function GenerateHTMLResult(result) {
if(result.includes('PASS')) {
if (result.includes('PASS')) {
var final = result.replace(/PASS:/g, '<i class="fas fa-check-circle text-success" style="font-size:1.3rem;"></i>')
return final
}
if(result.includes('WARN')) {
if (result.includes('WARN')) {
var final = result.replace(/WARN:/g, '<i class="fas fa-exclamation-circle text-warning" style="font-size:1.3rem;"></i>')
return final
}
if(result.includes('FAIL')) {
if (result.includes('FAIL')) {
var final = result.replace(/FAIL:/g, '<i class="fas fa-times-circle text-danger" style="font-size:1.3rem;"></i>')
return final
}
Expand All @@ -150,21 +158,21 @@ function ClearExistingClasses() {
$('#domainResultsSPFWarns').html('');
$('#domainResultsSPFFails').html('');
var spfelement = document.getElementById("spfCard");
spfelement.classList.remove("bg-success", "bg-warn", "bg-danger");
spfelement.classList.remove("bg-success", "bg-warning", "bg-danger");

var spfindicator = document.getElementById("spfindicator");
spfindicator.classList.remove("bg-success", "bg-warn", "bg-danger", "bg-dark");
spfindicator.classList.remove("bg-success", "bg-warning", "bg-danger", "bg-dark");

// DMARC Clear
$('#domainResultsDMARCRecord').html('');
$('#domainResultsDMARCPasses').html('');
$('#domainResultsDMARCWarns').html('');
$('#domainResultsDMARCFails').html('');
var dmarcelement = document.getElementById("dmarcCard");
dmarcelement.classList.remove("bg-success", "bg-warn", "bg-danger");
dmarcelement.classList.remove("bg-success", "bg-warning", "bg-danger");

var dmarcindicator = document.getElementById("dmarcindicator");
dmarcindicator.classList.remove("bg-success", "bg-warn", "bg-danger", "bg-dark");
dmarcindicator.classList.remove("bg-success", "bg-warning", "bg-danger", "bg-dark");

// MX Clear
$('#domainResultsMXRecord').html('');
Expand All @@ -173,32 +181,32 @@ function ClearExistingClasses() {
$('#domainResultsMXRecordWarns').html('');
$('#domainResultsMXMailProvider').html('');
var mxelement = document.getElementById("mxCard");
mxelement.classList.remove("bg-success", "bg-warn", "bg-danger");
mxelement.classList.remove("bg-success", "bg-warning", "bg-danger");

var mxindicator = document.getElementById("mxindicator");
mxindicator.classList.remove("bg-success", "bg-warn", "bg-danger", "bg-dark");
mxindicator.classList.remove("bg-success", "bg-warning", "bg-danger", "bg-dark");

// DNSSEC Clear
$('#domainResultsDNSSECRecord').html('');
$('#domainResultsDNSSECRecordPasses').html('');
$('#domainResultsDNSSECRecordFails').html('');
$('#domainResultsDNSSECRecordWarns').html('');
var dnssecelement = document.getElementById("dnssecCard");
dnssecelement.classList.remove("bg-success", "bg-warn", "bg-danger");
dnssecelement.classList.remove("bg-success", "bg-warning", "bg-danger");

var dnssecindicator = document.getElementById("dnssecindicator");
dnssecindicator.classList.remove("bg-success", "bg-warn", "bg-danger", "bg-dark");
dnssecindicator.classList.remove("bg-success", "bg-warning", "bg-danger", "bg-dark");

// DKIM Clear
$('#domainResultsDKIMRecord').html('');
$('#domainResultsDKIMRecordPasses').html('');
$('#domainResultsDKIMRecordFails').html('');
$('#domainResultsDKIMRecordWarns').html('');
var dkimelement = document.getElementById("dkimCard");
dkimelement.classList.remove("bg-success", "bg-warn", "bg-danger");
dkimelement.classList.remove("bg-success", "bg-warning", "bg-danger");

var dkimindicator = document.getElementById("dkimindicator");
dkimindicator.classList.remove("bg-success", "bg-warn", "bg-danger", "bg-dark");
dkimindicator.classList.remove("bg-success", "bg-warning", "bg-danger", "bg-dark");
}

function GenerateHTMLColour(id, data) {
Expand Down

0 comments on commit 69116f4

Please sign in to comment.