Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

KelvinTegelaar · Nov 21, 2021 · eea72a8 · eea72a8
2 parents c2e9185 + 66a1406
commit eea72a8
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/CheckDomain.html b/CheckDomain.html
@@ -55,6 +55,11 @@ <h1 class="page-header-title">
  <p id="dnssecindicator" class="bg-dark text-light text-center">DNSSEC</p>
  </div>
  </div>
+ <div class = "row">
+ <div class="col-12">
+ <p id="domainResultsDiv" class="bg-danger text-white px-2"></p>
+ </div>
+ </div>
  </div>
  </div>
  <!-- Submit buttons-->

diff --git a/DomainAnalyserList.html b/DomainAnalyserList.html
@@ -33,6 +33,7 @@ <h1 class="page-header-title">
  <thead>
  <tr>
  <th>Domain</th>
+ <th>Tenant</th>
  <th>Security Score</th>
  <th>Mail Provider</th>
  <th>SPF Pass Test</th>
@@ -50,6 +51,7 @@ <h1 class="page-header-title">
  <tfoot>
  <tr>
  <th>Domain</th>
+ <th>Tenant</th>
  <th>Security Score</th>
  <th>Mail Provider</th>
  <th>SPF Pass Test</th>
@@ -92,4 +94,4 @@ <h5 class="modal-title" id="exampleModalLabel">Results</h5>
  </div>
  </div>
 
- </html>
+ </html>
diff --git a/js/DomainFormChecker.js b/js/DomainFormChecker.js
@@ -80,11 +80,33 @@ function ExecuteDomainAPICall() {
  var arrMXPasses = data[0].MXResults.ValidationPasses.join("<br />");
 
  console.log(data[0]);
- $('#domainResultsMXRecord').html(data[0].MXResults.Records.Hostname);
+ // Firstly, lets count how many records we have
+ let newarray = [];
+
+ console.log(data[0].MXResults.Records.length);
+ console.log(data[0].MXResults.Records.Priority);
+ console.log(data[0].MXResults.Records.Hostname);
+
+ if (data[0].MXResults.Records instanceof Array) {
+ if (data[0].MXResults.Records.length > 0) { data[0].MXResults.Records.forEach(item => newarray.push(item.Priority + ' ' + item.Hostname + '<br />')); }
+ }
+ else {
+ newarray = data[0].MXResults.Records.Priority + ' ' + data[0].MXResults.Records.Hostname;
+ }
+
+ $('#domainResultsMXRecord').html(newarray);
+
  $('#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>');
+
+ if (data[0].MXResults.MailProvider.Name == null) {
+ $('#domainResultsMXMailProvider').html('<h4><span class="badge bg-primary">Mail Provider: Unknown</span></h4>');
+ }
+ else
+ {
+ $('#domainResultsMXMailProvider').html('<h4><span class="badge bg-primary">Mail Provider: ' + data[0].MXResults.MailProvider.Name + '</span></h4>');
+ }
 
 
 
@@ -125,11 +147,14 @@ function ExecuteDomainAPICall() {
  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));
 
+ var DKIMFinal = ""
+ if (data[0].DKIMResults.Records.length === 0) { DKIMFinal = "" } else { DKIMFinal = data[0].DKIMResults.Records[0].Record }
+ $('#domainResultsDKIMRecord').html(DKIMFinal);
+
  },
  'error': function (xhr, ajaxOptions, thrownError) {
  $('#domainResultsDiv').html('Failed to connect to API: ' + thrownError);

diff --git a/js/datatables/datatablesDomainAnalyser.js b/js/datatables/datatablesDomainAnalyser.js
@@ -32,7 +32,7 @@ $(document).ready(function () {
  { extend: 'copyHtml5', className: 'btn btn-primary btn-sm' },
  { extend: 'excelHtml5', className: 'btn btn-primary btn-sm', title: 'Domain Analyser - ' + todayDate, exportOptions: { orthogonal: "export" } },
  { extend: 'csvHtml5', className: 'btn btn-primary btn-sm', title: 'Domain Analyser - ' + todayDate, exportOptions: { orthogonal: "export" } },
- { extend: 'pdfHtml5', className: 'btn btn-primary btn-sm', pageSize: 'A2', orientation: 'landscape', title: 'Domain Analyser - ' + todayDate, exportOptions: { columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], orthogonal: "export" } },
+ { extend: 'pdfHtml5', className: 'btn btn-primary btn-sm', pageSize: 'A2', orientation: 'landscape', title: 'Domain Analyser - ' + todayDate, exportOptions: { columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], orthogonal: "export" } },
  {
  text: 'Force Refresh All Data',
  className: 'btn btn-primary btn-sm',
@@ -45,6 +45,7 @@ $(document).ready(function () {
  ],
  "columns": [
  { "data": "Domain" },
+ { "data": "Tenant" },
  {
  "data": "Score",
  "render": function (data, type, row) {
@@ -250,8 +251,12 @@ $(document).ready(function () {
  ],
  'columnDefs': [
  {
- "targets": [1, 2, 3, 4, 5, 6, 7, 8, 9], // your case first column
+ "targets": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], // your case first column
  "className": "text-center align-middle"
+ },
+ {
+ "targets": [ 1 ],
+ "visible": false
  }
  ],
  "order": [[0, "asc"]],