Merge branch 'feat/minor-onboarding' of github.com:minvws/nl-kat-coor…

…dination into feat/minor-onboarding
minvws · Jan 3, 2025 · 23c0c52 · 23c0c52
2 parents a563e75 + 859ed98
commit 23c0c52
Show file tree

Hide file tree

Showing 33 changed files with 6,552 additions and 6,227 deletions.
diff --git a/.github/workflows/sonar-cloud.yml b/.github/workflows/sonar-cloud.yml
@@ -89,6 +89,6 @@ jobs:
           pattern: "*-coverage-unit-fixed"
 
       - name: SonarCloud
-        uses: SonarSource/sonarcloud-github-action@v3.1.0
+        uses: SonarSource/sonarcloud-github-action@v4.0.0
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -109,6 +109,8 @@ debian12-build-image:
 ubuntu22.04-build-image:
 	docker build -t kat-ubuntu22.04-build-image packaging/ubuntu22.04
 
+CHECKSUM_CMD = $(if $(filter $(UNAME), Darwin), shasum -a 256, sha256sum --quiet)
+
 docs:
 	$(call build-settings-doc,keiko,keiko.settings,keiko,Keiko)
 	$(call build-settings-doc,octopoes,octopoes.config.settings,octopoes,Octopoes)
@@ -118,8 +120,9 @@ docs:
 
 	curl -sL -o - https://registry.npmjs.org/d3/-/d3-7.9.0.tgz | tar -Oxzf - package/dist/d3.min.js > docs/source/_static/d3.min.js
 	curl -sL -o - https://registry.npmjs.org/mermaid/-/mermaid-11.3.0.tgz | tar -Oxzf - package/dist/mermaid.min.js > docs/source/_static/mermaid.min.js
-	echo "f2094bbf6141b359722c4fe454eb6c4b0f0e42cc10cc7af921fc158fceb86539  docs/source/_static/d3.min.js" | sha256sum --quiet --check || exit 1
-	echo "0d2b6f2361e7e0ce466a6ed458e03daa5584b42ef6926c3beb62eb64670ca261  docs/source/_static/mermaid.min.js" | sha256sum --quiet --check || exit 1
+
+	echo "f2094bbf6141b359722c4fe454eb6c4b0f0e42cc10cc7af921fc158fceb86539  docs/source/_static/d3.min.js" | $(CHECKSUM_CMD) --check || exit 1
+	echo "0d2b6f2361e7e0ce466a6ed458e03daa5584b42ef6926c3beb62eb64670ca261  docs/source/_static/mermaid.min.js" | $(CHECKSUM_CMD) --check || exit 1
 
 	PYTHONPATH=$(PYTHONPATH):boefjes/:bytes/:keiko/:mula/:octopoes/ sphinx-build -b html --fail-on-warning docs/source docs/_build
 

diff --git a/boefjes/poetry.lock b/boefjes/poetry.lock
diff --git a/boefjes/pyproject.toml b/boefjes/pyproject.toml
@@ -18,12 +18,12 @@ pynacl = "^1.5.0"
 sqlalchemy = "^1.4.48"
 python-dateutil = "^2.8.2"
 pydantic-settings = "^2.2.1"
-opentelemetry-sdk = "^1.28.2"
-opentelemetry-exporter-otlp-proto-grpc = "^1.28.2"
-opentelemetry-instrumentation-fastapi = "^0.49b2"
-opentelemetry-instrumentation-psycopg2 = "^0.49b2"
-opentelemetry-instrumentation-requests = "^0.49b2"
-opentelemetry-instrumentation = "^0.49b2"
+opentelemetry-sdk = "^1.29.0"
+opentelemetry-exporter-otlp-proto-grpc = "^1.29.0"
+opentelemetry-instrumentation-fastapi = "^0.50b0"
+opentelemetry-instrumentation-psycopg2 = "^0.50b0"
+opentelemetry-instrumentation-requests = "^0.50b0"
+opentelemetry-instrumentation = "^0.50b0"
 # required by kat_snyk, kat_crt_sh, kat_crt_sh boefjes
 requests = "^2.32.1"
 # required by kat_binaryedge boefje
@@ -63,18 +63,18 @@ defusedxml = "^0.7.1"
 # required by kat_webpage_analysis/check_images normalizer
 pillow = "^10.3.0"
 httpx = "^0.27.0"
-opentelemetry-api = "^1.28.2"
-opentelemetry-exporter-otlp-proto-common = "^1.28.2"
-opentelemetry-instrumentation-asgi = "^0.49b2"
-opentelemetry-instrumentation-dbapi = "^0.49b2"
-opentelemetry-proto = "^1.28.2"
-opentelemetry-semantic-conventions = "^0.49b2"
-opentelemetry-util-http = "^0.49b2"
+opentelemetry-api = "^1.29.0"
+opentelemetry-exporter-otlp-proto-common = "^1.29.0"
+opentelemetry-instrumentation-asgi = "^0.50b0"
+opentelemetry-instrumentation-dbapi = "^0.50b0"
+opentelemetry-proto = "^1.29.0"
+opentelemetry-semantic-conventions = "^0.50b0"
+opentelemetry-util-http = "^0.50b0"
 fastapi-slim = "^0.115.2"
 structlog = "^24.2.0"
 # required by kat_maxmind_geoip
 maxminddb = "^2.6.2"
-croniter = "^5.0.1"
+croniter = "^6.0.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.0"

diff --git a/boefjes/requirements-dev.txt b/boefjes/requirements-dev.txt
diff --git a/boefjes/requirements.txt b/boefjes/requirements.txt
diff --git a/boefjes/tests/plugins/test_manual.py b/boefjes/tests/plugins/test_manual.py
@@ -1,6 +1,7 @@
+from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 
-from pydantic_core import Url
+from pydantic import AnyUrl
 
 from boefjes.job_models import NormalizerMeta, NormalizerResults
 from boefjes.local import LocalNormalizerJobRunner
@@ -96,7 +97,7 @@ def test_parse_manual_ip_csv(normalizer_runner):
     meta, output, runner = check_network_created(normalizer_runner, 2)
     assert len(output.declarations) == 6
     assert output.declarations[1].ooi.model_dump() == {
-        "address": "1.1.1.1",
+        "address": IPv4Address("1.1.1.1"),
         "netblock": None,
         "network": Reference("Network|internet"),
         "object_type": "IPAddressV4",
@@ -107,7 +108,7 @@ def test_parse_manual_ip_csv(normalizer_runner):
 
     meta, output, runner = check_network_created(normalizer_runner, 3)
     assert output.declarations[1].ooi.model_dump() == {
-        "address": "fe80:cd00:0:cde:1257:0:211e:729c",
+        "address": IPv6Address("fe80:cd00:0:cde:1257:0:211e:729c"),
         "netblock": None,
         "network": Reference("Network|internet"),
         "object_type": "IPAddressV6",
@@ -125,7 +126,7 @@ def test_parse_url_csv(normalizer_runner):
         "network": Reference("Network|internet"),
         "object_type": "URL",
         "primary_key": "URL|internet|https://example.com/",
-        "raw": Url("https://example.com/"),
+        "raw": AnyUrl("https://example.com/"),
         "scan_profile": None,
         "user_id": None,
         "web_url": None,
@@ -137,7 +138,7 @@ def test_parse_url_csv(normalizer_runner):
         "network": Reference("Network|internet"),
         "object_type": "URL",
         "primary_key": "URL|internet|https://example.com/",
-        "raw": Url("https://example.com/"),
+        "raw": AnyUrl("https://example.com/"),
         "scan_profile": None,
         "user_id": None,
         "web_url": None,