5.2.18

- Fix void `a` SPF mechanism lookup output

Author: seanthegeek

.vscode/launch.json

@@ -226,6 +226,18 @@
             "console": "integratedTerminal",
             "justMyCode": true
         },
+        {
+            "name": "checkdmarc --skip-tls python.org",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "checkdmarc._cli",
+            "args": [
+                "--skip-tls",
+                "python.org"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": true
+        },
         {
             "name": "checkdmarc --skip-tls  kickbox.com",
             "type": "debugpy",

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.2.18
+
+- Fix void `a` SPF mechanism lookup output
+
 ## 5.12.17
 
 - Fix crash on DNS retry

checkdmarc/_constants.py

@@ -19,7 +19,7 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-__version__ = "5.12.17"
+__version__ = "5.12.18"
 
 OS = platform.system()
 OS_RELEASE = platform.release()

checkdmarc/spf.py

@@ -758,14 +758,22 @@ def parse_spf_record(
             if isinstance(warning, (_SPFMissingRecords, DNSExceptionNXDOMAIN)):
                 mechanism_void_dns_lookups += 1
                 total_void_dns_lookups += 1
+                mechanism = OrderedDict([
+                    ("mechanism", mechanism),
+                    ("value", value),
+                    ("record", None),
+                    ("dns_lookups", 1),
+                    ("void_dns_lookups", 1),
+                ])
+                parsed["mechanisms"].append(mechanism)
                 if total_void_dns_lookups > 2:
                     raise SPFTooManyVoidDNSLookups(
                         "Parsing the SPF record has "
                         f"{total_void_dns_lookups}/2 maximum void DNS "
                         "lookups (RFC 7208 § 4.6.4)",
                         void_dns_lookups=total_void_dns_lookups,
                     )
-            warnings.append(str(warning))
+            warnings.append(f"{value}: {str(warning)}")
 
     if error:
         result = OrderedDict(
@@ -819,11 +827,20 @@ def get_spf_record(
     """
     domain = normalize_domain(domain)
     record = query_spf_record(
-        domain, nameservers=nameservers, resolver=resolver, timeout=timeout
+        domain,
+        nameservers=nameservers,
+        resolver=resolver,
+        timeout=timeout,
+        timeout_retries=timeout_retries,
     )
     record = record["record"]
     parsed_record = parse_spf_record(
-        record, domain, nameservers=nameservers, resolver=resolver, timeout=timeout
+        record,
+        domain,
+        nameservers=nameservers,
+        resolver=resolver,
+        timeout=timeout,
+        timeout_retries=timeout_retries,
     )
     parsed_record["record"] = record
     return parsed_record