pyoaev 1.18.20__py3-none-any.whl → 2.0.1__py3-none-any.whl

pyoaev/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.18.20"
+__version__ = "2.0.1"
 
 from pyoaev._version import (  # noqa: F401
     __author__,

pyoaev/_version.py

@@ -3,4 +3,4 @@ __copyright__ = "Copyright 2025 Filigran"
 __email__ = "contact@filigran.io"
 __license__ = "Apache 2.0"
 __title__ = "python-openaev"
-__version__ = "1.18.20"
+__version__ = "2.0.1"

pyoaev/apis/endpoint.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict
 
 from pyoaev import exceptions as exc
+from pyoaev.apis.inputs.search import SearchPaginationInput
 from pyoaev.base import RESTManager, RESTObject
 from pyoaev.utils import RequiredOptional
 
@@ -36,3 +37,11 @@ class EndpointManager(RESTManager):
         path = f"{self.path}/agentless/upsert"
         result = self.openaev.http_post(path, post_data=endpoint, **kwargs)
         return result
+
+    @exc.on_http_error(exc.OpenAEVUpdateError)
+    def searchTargets(
+        self, input: SearchPaginationInput, **kwargs: Any
+    ) -> Dict[str, Any]:
+        path = f"{self.path}/targets"
+        result = self.openaev.http_post(path, post_data=input.to_dict(), **kwargs)
+        return result

pyoaev/apis/inject_expectation/inject_expectation.py

@@ -28,7 +28,13 @@ class InjectExpectationManager(ListMixin, UpdateMixin, RESTManager):
         result = self.openaev.http_get(
             path,
             query_data=(
-                {"expiration_time": expiration_time} if expiration_time else None
+                {"expiration_time": expiration_time}
+                if expiration_time
+                else {
+                    "expiration_time": 360
+                }  # 360 minutes (6 hours) - corresponds to the expiration time configured in the Expectations Expiration Manager.
+                # Expectations older than this duration will be automatically expired to prevent
+                # processing outdated data, particularly important when launching new collectors.
             ),
             **kwargs,
         )

pyoaev/contracts/contract_config.py

@@ -32,6 +32,11 @@ class ContractFieldType(str, Enum):
     Payload: str = "payload"
 
 
+class ContractFieldKey(str, Enum):
+    Asset: str = "assets"
+    AssetGroup: str = "asset_groups"
+
+
 class ContractOutputType(str, Enum):
     Text: str = "text"
     Number: str = "number"
@@ -270,6 +275,7 @@ class ContractSelect(ContractCardinalityElement):
 
 @dataclass
 class ContractAsset(ContractCardinalityElement):
+    key: str = field(default=ContractFieldKey.Asset.value, init=False)
 
     @property
     def get_type(self) -> str:
@@ -278,6 +284,7 @@ class ContractAsset(ContractCardinalityElement):
 
 @dataclass
 class ContractAssetGroup(ContractCardinalityElement):
+    key: str = field(default=ContractFieldKey.AssetGroup.value, init=False)
 
     @property
     def get_type(self) -> str:

{pyoaev-1.18.20.dist-info → pyoaev-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyoaev
-Version: 1.18.20
+Version: 2.0.1
 Summary: Python API client for OpenAEV.
 Author-email: Filigran <contact@filigran.io>
 Maintainer-email: Filigran <contact@filigran.io>

{pyoaev-1.18.20.dist-info → pyoaev-2.0.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 docs/conf.py,sha256=_030QD2TV3WgBr8WUpx8HMSSj7NMJMsRFWN7MZ06zI0,2159
-pyoaev/__init__.py,sha256=0fl-Jgp4pcrojfk_FCZ-BIn0KFdGvin9pg3nQ14_uZg,641
-pyoaev/_version.py,sha256=8iMS-Y9389dC7HtReHJGNnoDgyfNbA3m-V32pCvIaz8,185
+pyoaev/__init__.py,sha256=UHkFjk3BeBJEUxei_6ksCSh9p7ZAYgZhdyIYRunXKic,639
+pyoaev/_version.py,sha256=47x2aI-zSoUWYmxKkU0eF-7DS1qT_BKY9q8n1San-Cc,183
 pyoaev/base.py,sha256=nJh2Hg9Aw4UcjMrp0nklG5cqHHOKmMPJBRwV0UUNZO0,10756
 pyoaev/client.py,sha256=IEno-WRNQcqLyA_ex7SbnniB8OMuWOIsNZ1gJ7fb63M,22342
 pyoaev/exceptions.py,sha256=3LIn8wmgPlBuxqO-naOPaEi4-bs05IjFILW-J4n594M,7916
@@ -12,7 +12,7 @@ pyoaev/apis/attack_pattern.py,sha256=Qq0rz9C8xPZEde4B73O8tXwDNuymLv3pVPMVaHZC3Kc
 pyoaev/apis/collector.py,sha256=BW5gtwPuqFbmQ5sxFa2xJ50Rtab9IN6N8Z4SmaOsBLo,841
 pyoaev/apis/cve.py,sha256=aFubPmfY0MG__I-sZhM2WqOqL6BqRH0ZgkToKlUgjEw,471
 pyoaev/apis/document.py,sha256=KTwV7oMMsIy-MhY05GTORlRlBlOxxW4wEdMwPChwYtQ,851
-pyoaev/apis/endpoint.py,sha256=2gCCjDE9Hd2bDjl_1__bUCn3WSOm8yMGVLZMlm29eTE,1113
+pyoaev/apis/endpoint.py,sha256=JWnWyGumxPR2edeqkjqHy3wntG-vEWTEZSrUQ867j2U,1470
 pyoaev/apis/inject.py,sha256=cdSFXe-Gd6RZfTYCJ4ZnH0MDk5YfesMJjZIH9LQ98Ag,890
 pyoaev/apis/inject_expectation_trace.py,sha256=QeYbleKOky7Cvt-oIN9vMCgOYM-LwlmzgoTVa3X64Ms,1101
 pyoaev/apis/injector.py,sha256=tFcu2kcmlLpQUyG5CeNE3m5j7PLbao0paiY-MDFyuNo,722
@@ -26,7 +26,7 @@ pyoaev/apis/tag.py,sha256=r_UpNsBlVtzMqbfLxFtU5RDihlQVHo2qz8X5B_uhGhg,492
 pyoaev/apis/team.py,sha256=PZ1D4WHR6MLhAzClrFOaRuzpRq5IZNx3yCHipM-A6f4,788
 pyoaev/apis/user.py,sha256=Fr821Cu3V9B1U9p4oNKZ5u2feHeYe5669Oc55E3G_Og,893
 pyoaev/apis/inject_expectation/__init__.py,sha256=jPlnzxfT31MhmUgEvR4pBAuyG_ciX23-wMKYT5qX5Dc,53
-pyoaev/apis/inject_expectation/inject_expectation.py,sha256=if-OD0uVERQKPExi9mN2CBjlbeqh6T3tP49A4-9nqJU,4217
+pyoaev/apis/inject_expectation/inject_expectation.py,sha256=eT3NNIMS10zZIEcBQcTG2nWMBXGYd4AInpXqL4GMUUk,4615
 pyoaev/apis/inject_expectation/model/__init__.py,sha256=CloFGul64uYDxEdKJr6eZzlFr1eVPb95cqTnRPr0AEU,191
 pyoaev/apis/inject_expectation/model/expectation.py,sha256=Uq0pIdLpXJABX2WNwi3Vj9b4Ygs0D30Xrr2SR0vzdpA,6323
 pyoaev/apis/inputs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -39,7 +39,7 @@ pyoaev/configuration/configuration.py,sha256=i4DaCfCgKSz5DiQPCUIcw6N-BO8rYoKbWZc
 pyoaev/configuration/sources.py,sha256=09B4X3nUvlRIv1fcAZGZBP-ScV-AOyVrYuLGzMT1zWg,1459
 pyoaev/contracts/__init__.py,sha256=vt5JcjJquIEBt1Bwr1FfvTL9gJQHAO46eYPRG65ehzk,103
 pyoaev/contracts/contract_builder.py,sha256=nZ8E2TcvYq6f_diS4pjshdnldZNmljETnAYAS5G-oW8,1305
-pyoaev/contracts/contract_config.py,sha256=uthRpbvrNYJHVGj_ChSOm8C-aSKtn34gyrCeY_aILjA,7824
+pyoaev/contracts/contract_config.py,sha256=vi6_5dcOf-Z1TKV69K8Z9LIbqe4beHExiQb8dVO76V8,8071
 pyoaev/contracts/contract_utils.py,sha256=htaXoG9ndBOYhFsoBXrGludPU79d4aUOejc-I0SSiPU,451
 pyoaev/contracts/variable_helper.py,sha256=2YKCzs_qco0JBRhGYuiMh_aIB6sFJIIzj_CRkx-QLLo,4208
 pyoaev/daemons/__init__.py,sha256=IdR-AYxEjpMIst0Y1oqsmKw4-mc5RSOmGtpxVM4cLHY,127
@@ -49,10 +49,12 @@ pyoaev/signatures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 pyoaev/signatures/signature_match.py,sha256=EclhdT2QSf19rr76IxhcISgqXCSU9bvJHQ2Bt7Z-Uek,485
 pyoaev/signatures/signature_type.py,sha256=E-tn_Fhftssf7v-rQy0EbPvsUAvCTTIrlG7LbOsouDo,1684
 pyoaev/signatures/types.py,sha256=uDA_8u2t1qdHQdue8hiw2sO59yahbfL2uDKUoQhktx0,576
-pyoaev-1.18.20.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyoaev-2.0.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 scripts/release.py,sha256=2ZBVqpGqajYNLkDOiVAtRf3DvDe97umErVAgEav2EP4,4387
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+test/apis/endpoint/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+test/apis/endpoint/test_endpoint.py,sha256=79XJk5T6cpp6y0zdxjD7ZzKogbq9QVMm8jsWCjr474o,1566
 test/apis/expectation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/apis/expectation/test_expectation.py,sha256=BNdZpIjwsiuOCHsdCf0cGcf7Ck-tQ49yxvTXbS6n89w,11500
 test/apis/injector_contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,7 +68,7 @@ test/daemons/test_collector_daemon.py,sha256=Z2zzpzj1TVQuLXJY1cKptPihv0AGumraI4b
 test/signatures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/signatures/test_signature_match.py,sha256=2iT5M_EnUE2OKE8xe_Jl-Le6gsuQlW3VMAd1iaFGt04,793
 test/signatures/test_signature_type.py,sha256=EznFiGxzKyIiydpB9M6Ytj5P_5emgK3AMQ6lIbvxmZA,2413
-pyoaev-1.18.20.dist-info/METADATA,sha256=1I6gxH-_tZsOqiCm2kUwzvITJG013eSBa869_QU-DnE,5155
-pyoaev-1.18.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyoaev-1.18.20.dist-info/top_level.txt,sha256=je2hy1nZbVjTQzH55BQC6Lmduwyu9FOowXzx7NH7Ceg,25
-pyoaev-1.18.20.dist-info/RECORD,,
+pyoaev-2.0.1.dist-info/METADATA,sha256=qTJoHyi909P_d4cFc-YONxGvYiPmtv1WN0V97aqe5HQ,5153
+pyoaev-2.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyoaev-2.0.1.dist-info/top_level.txt,sha256=je2hy1nZbVjTQzH55BQC6Lmduwyu9FOowXzx7NH7Ceg,25
+pyoaev-2.0.1.dist-info/RECORD,,

test/apis/endpoint/test_endpoint.py

@@ -0,0 +1,57 @@
+from unittest import TestCase, main, mock
+from unittest.mock import ANY
+
+from pyoaev import OpenAEV
+from pyoaev.apis.inputs.search import Filter, FilterGroup, SearchPaginationInput
+
+
+def mock_response(**kwargs):
+    class MockResponse:
+        def __init__(self, json_data, status_code):
+            self.json_data = json_data
+            self.status_code = status_code
+            self.history = None
+            self.content = None
+            self.headers = {"Content-Type": "application/json"}
+
+        def json(self):
+            return self.json_data
+
+    return MockResponse(None, 200)
+
+
+class TestInjectorContract(TestCase):
+    @mock.patch("requests.Session.request", side_effect=mock_response)
+    def test_search_input_correctly_serialised(self, mock_request):
+        api_client = OpenAEV("url", "token")
+
+        search_input = SearchPaginationInput(
+            0,
+            20,
+            FilterGroup(
+                "or",
+                [Filter("targets", "and", "eq", ["target_1", "target_2", "target_3"])],
+            ),
+            None,
+            None,
+        )
+
+        expected_json = search_input.to_dict()
+        api_client.endpoint.searchTargets(search_input)
+
+        mock_request.assert_called_once_with(
+            method="post",
+            url="url/api/endpoints/targets",
+            params={},
+            data=None,
+            timeout=None,
+            stream=False,
+            verify=True,
+            json=expected_json,
+            headers=ANY,
+            auth=ANY,
+        )
+
+
+if __name__ == "__main__":
+    main()