Update packages (#3990)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
minvws · Dec 27, 2024 · 8730e18 · 8730e18
1 parent c00fe8a
commit 8730e18
Show file tree

Hide file tree

Showing 28 changed files with 6,496 additions and 6,173 deletions.
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,13 +63,13 @@ 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

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,

diff --git a/bytes/poetry.lock b/bytes/poetry.lock
diff --git a/bytes/requirements-dev.txt b/bytes/requirements-dev.txt
diff --git a/bytes/requirements.txt b/bytes/requirements.txt
diff --git a/cveapi/poetry.lock b/cveapi/poetry.lock
diff --git a/cveapi/requirements.txt b/cveapi/requirements.txt
@@ -1,9 +1,9 @@
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \
     --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6
-certifi==2024.8.30 ; python_version >= "3.11" and python_version < "4.0" \
-    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
-    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
+certifi==2024.12.14 ; python_version >= "3.11" and python_version < "4.0" \
+    --hash=sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56 \
+    --hash=sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db
 h11==0.14.0 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761