Merge 6e31277 into 7a766db

dnstwister · Mar 23, 2019 · 424959d · 424959d
2 parents 7a766db + 6e31277
commit 424959d
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 5 deletions.
diff --git a/dnstwister/static/search.min.js b/dnstwister/static/search.min.js
diff --git a/dnstwister/static/sources/search-ui.js b/dnstwister/static/sources/search-ui.js
@@ -70,6 +70,7 @@ var ui = (function () {
   var reportRowElem = function (domain, idnaEncodedDomain, encodedDomain) {
     var rowElem = document.createElement('tr')
     var domainCellElem = document.createElement('td')
+    var mxCellElem = document.createElement('td')
     var ipCellElem = document.createElement('td')
     var toolsCellElem = document.createElement('td')
 
@@ -86,6 +87,7 @@ var ui = (function () {
 
     rowElem.appendChild(domainCellElem)
     rowElem.appendChild(ipCellElem)
+    rowElem.appendChild(mxCellElem)
     rowElem.appendChild(toolsCellElem)
     rowElem.className = 'domain-row resolved'
 
@@ -108,6 +110,12 @@ var ui = (function () {
     td.appendChild(document.createTextNode(ipText))
   }
 
+  var addMxRecord = function (domain) {
+    var row = rowMap[domain]
+    var td = row.childNodes[2]
+    td.insertAdjacentHTML('afterbegin', '&#10004;')
+  }
+
   var addUnresolvedARecord = function (domain) {
     var row = rowMap[domain]
     var td = row.childNodes[1]
@@ -121,5 +129,6 @@ var ui = (function () {
     addResolvedRow: addResolvedRow,
     addARecordInfo: addARecordInfo,
     addUnresolvedARecord: addUnresolvedARecord,
+    addMxRecord: addMxRecord
   }
 })()
diff --git a/dnstwister/static/sources/search.js b/dnstwister/static/sources/search.js
@@ -34,6 +34,28 @@ var search = (function () {
     }
   }
 
+  var resolveMx = function (idnaEncodedDomain, callback) {
+    var request = new XMLHttpRequest()
+    var url = 'https://dnstwister.report/api/mx?pd=' + idnaEncodedDomain
+    request.open('GET', url)
+    request.send()
+    request.onreadystatechange = (e) => {
+      if (request.readyState === 4) {
+        if (request.status === 200) {
+          var responseText = request.responseText
+          var response = JSON.parse(responseText)
+          if (response.mx === undefined) {
+            callback(null)
+          } else {
+            callback(response.mx)
+          }
+        } else {
+          callback(null)
+        }
+      }
+    }
+  }
+
   var runSearch = function (domain) {
     var identified = []
     var allIdentified = false
@@ -86,8 +108,21 @@ var search = (function () {
           ui.addARecordInfo(nextDomain, ip)
         }
 
-        ui.updateProgress(identifiedCount, checkedCount, resolvedCount, allIdentified)
-        resolveMomentarily()
+        resolveMx(idnaEncodedDomain, function (mxExists) {
+          if (mxExists === true) {
+            if (ip === null || ip === false) {
+              resolvedCount += 1
+              ui.addResolvedRow(reportElem, nextDomain, idnaEncodedDomain, hexEncodedDomain)
+              ui.addUnresolvedARecord(nextDomain)
+            }
+            ui.addMxRecord(nextDomain)
+          } else if (mxExists === null && ip !== null) {
+            erroredA.push([nextDomain, idnaEncodedDomain])
+          }
+
+          ui.updateProgress(identifiedCount, checkedCount, resolvedCount, allIdentified)
+          resolveMomentarily()
+        })
       })
     }
 

diff --git a/dnstwister/templates/www/search.html b/dnstwister/templates/www/search.html
@@ -45,7 +45,7 @@ <h6 class="search_result">
                     <span id="resolved_count" class="result_highlight counter">None</span>
                     domains
                     <span class="wip_text">have</span>
-                    resolved to an IP address.
+                    resolved to an IP address or MX record.
                     <span id="error_summary">
                         <br />
                         There was an unexpected error resolving
@@ -69,6 +69,7 @@ <h6 class="search_result">
                     <tr>
                         <th>Domain</th>
                         <th>IP Address / A record</th>
+                        <th>MX record exists?</th>
                         <th></th>
                     </tr>
                 </thead>