Merge branch 'main' into fix/pydantic-warnings

minvws · Sep 23, 2024 · bdfc485 · bdfc485
2 parents d678df3 + 4463cbd
commit bdfc485
Show file tree

Hide file tree

Showing 32 changed files with 6,537 additions and 4,853 deletions.
diff --git a/boefjes/poetry.lock b/boefjes/poetry.lock
diff --git a/boefjes/pyproject.toml b/boefjes/pyproject.toml
@@ -34,6 +34,7 @@ beautifulsoup4 = "4.11.1"
 censys = "2.1.8"
 # required by kat_dicom boefje
 pynetdicom = "2.0.2"
+pydicom = "2.4.4"
 # required by kat_dns, kat_dns_zone boefjes
 dnspython = "^2.6.1"
 # required by kat_fierce

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
@@ -103,7 +103,7 @@ def test_parse_manual_ip_csv(normalizer_runner):
         "primary_key": "IPAddressV4|internet|1.1.1.1",
         "scan_profile": None,
         "user_id": None,
-    } == output.declarations[1].ooi.dict()
+    } == output.declarations[1].ooi.model_dump()
 
     meta, output, runner = check_network_created(normalizer_runner, 3)
     assert {
@@ -114,7 +114,7 @@ def test_parse_manual_ip_csv(normalizer_runner):
         "primary_key": "IPAddressV6|internet|fe80:cd00:0:cde:1257:0:211e:729c",
         "scan_profile": None,
         "user_id": None,
-    } == output.declarations[1].ooi.dict()
+    } == output.declarations[1].ooi.model_dump()
 
 
 def test_parse_url_csv(normalizer_runner):

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,18 +1,18 @@
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \
     --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6
-certifi==2024.7.4 ; python_version >= "3.11" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.11" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 h11==0.14.0 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.11" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.11" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0