Relax postmaster checks #51

catalyst · Oct 17, 2024 · bb81024 · bb81024
1 parent 015e4f2
commit bb81024
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 10 deletions.
diff --git a/classes/check/dnsmx.php b/classes/check/dnsmx.php
@@ -78,9 +78,7 @@ public function get_result(): result {
             $status = result::WARNING;
             $summary = "MX DNS record missing";
         } else {
-            $allmxdomains = join('<br>', array_map(function ($x) {
-                return $x['target'] . ' (' . $x['pri'] . ')';
-            }, $mxdomains));
+            $allmxdomains = $dns->format_mx_records($mxdomains);
             $details .= "<p>MX record found on domain <code>$noreplydomain</code> pointing to<br><code>$allmxdomains</code></p>";
             $status = result::OK;
             $summary = "MX record points to " . $mxdomains[0]['target'];

diff --git a/classes/check/dnspostmastertools.php b/classes/check/dnspostmastertools.php
@@ -56,9 +56,6 @@ public function get_action_link(): ?\action_link {
     public function get_result(): result {
         global $DB, $CFG;
 
-        $url = new \moodle_url($CFG->wwwroot);
-        $domain = $url->get_host();
-
         $details = '<table class="admintable generaltable table-sm w-auto">';
         $details .= '<tr><th>Vendor</th><th>Token</th><th>Confirmed</th><th>Url</th></tr>';
         $status = result::INFO;
@@ -76,28 +73,53 @@ public function get_result(): result {
         $vendornames = join(', ', $vendors);
         $summary = "Post master tools setup for $vendornames ";
 
+        // Check the most common user domains.
+        $userdomains = $dns->get_user_domains(5);
+        $domaintable = '';
+        $targets = [];
+        if (!empty($userdomains)) {
+            $domaintable .= '<table class="admintable generaltable table-sm w-auto">';
+            $domaintable .= '<tr><th>Top user domains</th><th>Users</th><th>MX records</th></tr>';
+
+            foreach ($userdomains as $domain) {
+                $targets = array_merge($targets, array_column($mxrecords, 'target'));
+                $mxrecords = $dns->get_mx_record($domain->domain);
+                $allmxdomains = $dns->format_mx_records($mxrecords);
+                $domaintable .= "<tr><td>$domain->domain</td><td>$domain->count</td><td><code>$allmxdomains</code></td></tr>";
+            }
+            $domaintable .= "</table>";
+        }
+
         $status = result::INFO;
 
         foreach ($vendors as $vendor) {
             $token = get_config('tool_emailutils', 'postmaster' . $vendor . 'token');
             $record = $dns->get_matching_dns_record($noreplydomain, $token);
+            $usevendor = !empty(array_filter($targets, function($target) use ($vendor) {
+                return strpos($target, $vendor) !== false;
+            }));
 
-            if (empty($token)) {
+            if (empty($token) && !$usevendor) {
+                $summary = "Post master tools not required for $vendor";
+                $status = result::NA;
+                $confirmed = 'N/A';
+            } else if (empty($token)) {
                 $summary = "Post master tools not setup with $vendor";
-                $status = result::WARNING;
+                $status = result::INFO;
                 $confirmed = 'N/A';
             } else if (empty($record)) {
                 $confirmed = 'No';
                 $details .= "<p>$token was not found in TXT records</p>";
-                $status = result::ERROR;
+                $status = result::WARNING;
                 $summary = "Post master tools not verified with $vendor";
             } else {
                 $confirmed = 'Yes';
                 $status = result::OK;
             }
-            $details .= "<tr><td>$vendor</td><td>$token</td><td>$confirmed</td></tr>";
+            $details .= "<tr><td>$vendor</td><td>$token</td><td>$confirmed</td><td></td></tr>";
         }
         $details .= '</table>';
+        $details .= $domaintable;
 
         return new result($status, $summary, $details);
     }

diff --git a/classes/dns_util.php b/classes/dns_util.php
@@ -96,6 +96,26 @@ public function get_subdomains($domain) {
         return rtrim(strstr($domain, $primarydomain, true), '.');
     }
 
+    /**
+     * Gets the most common user email domains from the database.
+     * @param int $number limits the number of domains
+     * @return array
+     */
+    public function get_user_domains(int $number = 0): array {
+        global $DB;
+
+        $domainsql = $DB->sql_substr('LOWER(email)', $DB->sql_position("'@'", 'email') . ' + 1');
+        $sql = "SELECT $domainsql AS domain, count(*) AS count
+                  FROM {user}
+                 WHERE email LIKE '%@%.%' AND suspended = 0 AND deleted = 0
+              GROUP BY $domainsql
+              ORDER BY count DESC";
+        if (!empty($number)) {
+            $sql .= " LIMIT $number";
+        }
+        return $DB->get_records_sql($sql);
+    }
+
     /**
      * Get spf txt record contents
      * @param string $domain specify a different domain
@@ -235,6 +255,17 @@ public function get_mx_record($domain) {
         return $records;
     }
 
+    /**
+     * Formats MX records to display in checks
+     * @param array $mxrecords
+     * @return string
+     */
+    public function format_mx_records(array $mxrecords): string {
+        return join('<br>', array_map(function ($x) {
+            return $x['target'] . ' (' . $x['pri'] . ')';
+        }, $mxrecords));
+    }
+
     /**
      * Get matching record contents
      * @param string $domain domain to check