Merge branch 'main' into feat/spf-qualifiers

.pre-commit-config.yaml

@@ -27,6 +27,10 @@ repos:
       - id: fix-byte-order-marker
       - id: pretty-format-json
         args: ["--autofix", "--no-ensure-ascii", "--no-sort-keys"]
+        exclude: |
+          (?x)(
+          ^boefjes/boefjes/plugins/kat_wappalyzer/technologies.json |
+          )
 
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.23
@@ -122,6 +126,7 @@ repos:
           requirements-.*.txt$ |
           retirejs.json$ |
           ^boefjes/boefjes/plugins/kat_fierce/lists |
+          ^boefjes/boefjes/plugins/kat_wappalyzer/data/.*.json |
           ^boefjes/tests/examples/inputs/cve-result-without-cvss.json |
           ^boefjes/tests/examples |
           ^keiko/glossaries |

boefjes/Dockerfile

@@ -20,11 +20,9 @@ RUN --mount=type=cache,target=/root/.cache \
     pip install --upgrade pip \
     && if [ "$ENVIRONMENT" = "dev" ]; \
     then \
-    grep -v git+https:// requirements-dev.txt | pip install -r /dev/stdin && \
-    grep git+https:// requirements-dev.txt | pip install -r /dev/stdin ; \
+    pip install -r requirements-dev.txt; \
     else \
-    grep -v git+https:// requirements.txt | pip install -r /dev/stdin && \
-    grep git+https:// requirements.txt | pip install -r /dev/stdin ; \
+    pip install -r requirements.txt; \
     fi
 
 FROM dev

boefjes/boefjes/plugins/kat_dns/main.py

@@ -85,6 +85,8 @@ def get_parent_zone_soa(resolver: dns.resolver.Resolver, name: Name) -> Answer:
 def get_email_security_records(resolver: dns.resolver.Resolver, hostname: str, record_subdomain: str) -> str:
     try:
         answer = resolver.resolve(f"{record_subdomain}.{hostname}", "TXT", raise_on_no_answer=False)
+        if answer.rrset is None:
+            return "NXDOMAIN"
         return answer.response.to_text()
     except dns.resolver.NoNameservers as error:
         # no servers responded happily, we'll check the response from the first