From f34b9d62011ccc4d5787cb2384e9978301be8f65 Mon Sep 17 00:00:00 2001 From: he2ss <19668340+he2ss@users.noreply.github.com> Date: Mon, 29 Jun 2026 16:38:39 +0000 Subject: [PATCH] Update python SDK 1.132.3 --- crowdsec_service_api/__init__.py | 9 +- .../__pycache__/__init__.cpython-311.pyc | Bin 5024 -> 5171 bytes .../__pycache__/base_model.cpython-311.pyc | Bin 4378 -> 4378 bytes .../__pycache__/http_client.cpython-311.pyc | Bin 7768 -> 7768 bytes .../__pycache__/models.cpython-311.pyc | Bin 158635 -> 166507 bytes crowdsec_service_api/models.py | 408 +++++-- .../__pycache__/__init__.cpython-311.pyc | Bin 207 -> 207 bytes .../__pycache__/allowlists.cpython-311.pyc | Bin 12917 -> 12917 bytes .../__pycache__/blocklists.cpython-311.pyc | Bin 15121 -> 15121 bytes .../services/__pycache__/cves.cpython-311.pyc | Bin 12321 -> 12364 bytes .../__pycache__/decisions.cpython-311.pyc | Bin 4338 -> 7222 bytes .../__pycache__/fingerprints.cpython-311.pyc | Bin 12310 -> 12353 bytes .../services/__pycache__/hub.cpython-311.pyc | Bin 3277 -> 3277 bytes .../services/__pycache__/info.cpython-311.pyc | Bin 2035 -> 2035 bytes .../__pycache__/integrations.cpython-311.pyc | Bin 8075 -> 8075 bytes .../__pycache__/metrics.cpython-311.pyc | Bin 2607 -> 2607 bytes .../__pycache__/products.cpython-311.pyc | Bin 3782 -> 3782 bytes .../tracker_events.cpython-311.pyc | Bin 2914 -> 2914 bytes .../__pycache__/tracker_tags.cpython-311.pyc | Bin 5698 -> 5698 bytes .../__pycache__/vendors.cpython-311.pyc | Bin 10351 -> 10351 bytes crowdsec_service_api/services/allowlists.py | 2 +- crowdsec_service_api/services/blocklists.py | 2 +- crowdsec_service_api/services/cves.py | 3 +- crowdsec_service_api/services/decisions.py | 80 +- crowdsec_service_api/services/fingerprints.py | 3 +- crowdsec_service_api/services/hub.py | 2 +- crowdsec_service_api/services/info.py | 2 +- crowdsec_service_api/services/integrations.py | 2 +- crowdsec_service_api/services/metrics.py | 2 +- crowdsec_service_api/services/products.py | 2 +- .../services/tracker_events.py | 2 +- crowdsec_service_api/services/tracker_tags.py | 2 +- crowdsec_service_api/services/vendors.py | 2 +- doc/Blocklists.md | 8 +- doc/Cves.md | 6 +- doc/Decisions.md | 152 ++- doc/Fingerprints.md | 6 +- doc/Models.md | 104 +- doc/README.md | 16 +- public-openapi.json | 1079 ++++++++++++++--- pyproject.toml | 2 +- uv.lock | 20 +- 42 files changed, 1569 insertions(+), 347 deletions(-) diff --git a/crowdsec_service_api/__init__.py b/crowdsec_service_api/__init__.py index f2c57ce..d57f24c 100644 --- a/crowdsec_service_api/__init__.py +++ b/crowdsec_service_api/__init__.py @@ -33,6 +33,10 @@ class Server(Enum): 'TrackerTags', 'Fingerprints', 'TrackerEvents', + 'AggregatedDecisionItem', + 'AggregatedDecisionsGetResponse', + 'AggregatedDecisionsGetResponsePage', + 'AggregatedDecisionsSortBy', 'AllowlistCreateRequest', 'AllowlistCreateResponse', 'AllowlistGetItemsResponse', @@ -84,6 +88,8 @@ class Server(Enum): 'CtiScenario', 'DecisionCreateRequest', 'DecisionCreateResponse', + 'DecisionMachineState', + 'DecisionMachineStateEnum', 'DecisionResponse', 'DecisionTargetModel', 'DecisionTargetType', @@ -138,7 +144,7 @@ class Server(Enum): 'Behavior', 'CVEEventOutput', 'CVEExploitationPhase', - 'CVEResponseBase', + 'CVEResponseDetailed', 'CVEsubscription', 'CWE', 'Classification', @@ -149,7 +155,6 @@ class Server(Enum): 'FacetBucket', 'FingerprintEventOutput', 'FingerprintRuleResponse', - 'FingerprintRuleSummary', 'FingerprintTimelineItem', 'GetCVEIPsResponsePage', 'GetCVEProtectRulesResponse', diff --git a/crowdsec_service_api/__pycache__/__init__.cpython-311.pyc b/crowdsec_service_api/__pycache__/__init__.cpython-311.pyc index 2db00239d7de4999aa3c5ce54bc923355cb316a5..cbf2f52af6f40b6b8cab2dc4fac555870c13cea8 100644 GIT binary patch delta 249 zcmZ3WzFC8BIWI340}yn~cgo5Y-N?tm%(!i`IJ1jmdU{c6dSXdxic4y8W^rbIo@YsF z?kzb?@nZMXlAzS$g8aPV)LTjj`N^^zl2VcgKFplr;QXQzr^?L{%$+RyA}~?k#N>?3 zywudPHM{JgWT6Pujk2OWxTdoMktd} Ux}1rd=>r3TY+wh$A{n4x0soCwsQ>@~ delta 124 zcmdn2u|S<~IWI340|=CAW$h8!$j8CVxN)*Lv&-g7%xx^2J2);d3-CLKxdx>c7v$#^ zr#dATr%uk{xh5{=mYJ8HT2xS!nO722nv)t_nwy(gRJqxaH)C- diff --git a/crowdsec_service_api/__pycache__/http_client.cpython-311.pyc b/crowdsec_service_api/__pycache__/http_client.cpython-311.pyc index 1bc5815900c09dcc5d59b8b7d1636dda5e5ee5f9..5fd17b640708191eda6b48b60514de3994a36a47 100644 GIT binary patch delta 20 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 r=-x7~gM@1UYiPS -# timestamp: 2026-06-11T08:42:40+00:00 +# timestamp: 2026-06-29T16:38:32+00:00 from __future__ import annotations @@ -13,6 +13,27 @@ from .base_model import BaseModelSdk, RootModelSdk +class Total(RootModelSdk[int]): + root: Annotated[int, Field(ge=0, title='Total')] + + +class Page(RootModelSdk[int]): + root: Annotated[int, Field(ge=1, title='Page')] + + +class Size(RootModelSdk[int]): + root: Annotated[int, Field(ge=1, title='Size')] + + +class Pages(RootModelSdk[int]): + root: Annotated[int, Field(ge=0, title='Pages')] + + +class AggregatedDecisionsSortBy(StrEnum): + FIRST_CREATED_AT = 'first_created_at' + FIRST_EXPIRATION = 'first_expiration' + + class AllowlistCreateRequest(BaseModelSdk): model_config = ConfigDict( extra='forbid', @@ -76,22 +97,6 @@ class AllowlistCreateResponse(BaseModelSdk): ] -class Total(RootModelSdk[int]): - root: Annotated[int, Field(ge=0, title='Total')] - - -class Page(RootModelSdk[int]): - root: Annotated[int, Field(ge=1, title='Page')] - - -class Size(RootModelSdk[int]): - root: Annotated[int, Field(ge=1, title='Size')] - - -class Pages(RootModelSdk[int]): - root: Annotated[int, Field(ge=0, title='Pages')] - - class AllowlistItemUpdateRequest(BaseModelSdk): model_config = ConfigDict( extra='forbid', @@ -420,6 +425,12 @@ class DecisionCreateResponse(BaseModelSdk): ] +class DecisionMachineStateEnum(StrEnum): + PENDING_CREATE = 'PENDING_CREATE' + PENDING_DELETE = 'PENDING_DELETE' + APPLIED = 'APPLIED' + + class DecisionTargetType(StrEnum): ORG = 'org' TAG = 'tag' @@ -1380,7 +1391,7 @@ class BlocklistsUploadBlocklistContentQueryParameters(BaseModelSdk): Optional[datetime], Field( description='Blocklist expiration', - examples=['2026-06-11T08:40:13.370581+00:00'], + examples=['2026-06-29T16:36:00.442507+00:00'], title='Expiration', ), ] = None @@ -1587,6 +1598,12 @@ class IntegrationsGetIntegrationContentStreamPathParameters(BaseModelSdk): class DecisionsGetDecisionsQueryParameters(BaseModelSdk): + page: Annotated[ + Optional[int], Field(description='Page number', ge=1, title='Page') + ] = 1 + size: Annotated[ + Optional[int], Field(description='Page size', ge=1, le=100, title='Size') + ] = 50 instance_ids: Annotated[ Optional[List[str]], Field( @@ -1619,6 +1636,30 @@ class DecisionsGetDecisionsQueryParameters(BaseModelSdk): title='Ips', ), ] = [] + alert_ids: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by associated alert IDs', + examples=[['alert-abc123', 'alert-def456']], + title='Alert Ids', + ), + ] = [] + decision_ids: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by decision IDs', + examples=[['dec-abc123', 'dec-def456']], + title='Decision Ids', + ), + ] = [] + created_at_from: Annotated[ + Optional[datetime], + Field( + description='Filter decisions created after this date (inclusive)', + examples=['2023-01-01T00:00:00Z'], + title='Created At From', + ), + ] = None sort_by: Annotated[ Optional[DecisionsSortBy], Field( @@ -1635,15 +1676,99 @@ class DecisionsGetDecisionsQueryParameters(BaseModelSdk): title='Sort Order', ), ] = 'desc' + + +class DecisionsDeleteDecisionPathParameters(BaseModelSdk): + decision_id: Annotated[str, Field(title='Decision Id')] + + +class DecisionsGetAggregatedDecisionsQueryParameters(BaseModelSdk): page: Annotated[ Optional[int], Field(description='Page number', ge=1, title='Page') ] = 1 size: Annotated[ Optional[int], Field(description='Page size', ge=1, le=100, title='Size') ] = 50 + instance_ids: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by instance IDs', + examples=[['inst-abc123', 'inst-def456']], + title='Instance Ids', + ), + ] = [] + tag_ids: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by tag IDs', + examples=[['tag-001', 'tag-002']], + title='Tag Ids', + ), + ] = [] + remediation_types: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by remediation types', + examples=[['ban', 'captcha']], + title='Remediation Types', + ), + ] = [] + ips: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by IPs (only for IP decisions)', + examples=[['203.0.113.7', '198.51.100.42']], + title='Ips', + ), + ] = [] + alert_ids: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by associated alert IDs', + examples=[['alert-abc123', 'alert-def456']], + title='Alert Ids', + ), + ] = [] + decision_ids: Annotated[ + Optional[List[str]], + Field( + description='Filter decisions by decision IDs', + examples=[['dec-abc123', 'dec-def456']], + title='Decision Ids', + ), + ] = [] + created_at_from: Annotated[ + Optional[datetime], + Field( + description='Filter decisions created after this date (inclusive)', + examples=['2023-01-01T00:00:00Z'], + title='Created At From', + ), + ] = None + sort_by: Annotated[ + Optional[AggregatedDecisionsSortBy], + Field( + description='Field to sort by (e.g., created_at, duration)', + examples=['created_at'], + title='Sort By', + ), + ] = 'first_created_at' + sort_order: Annotated[ + Optional[DecisionsSortOrder], + Field( + description="Sort order: 'asc' for ascending, 'desc' for descending", + examples=['desc'], + title='Sort Order', + ), + ] = 'desc' -class DecisionsDeleteDecisionPathParameters(BaseModelSdk): +class DecisionsDeleteAggregatedDecisionsPathParameters(BaseModelSdk): + aggregated_id: Annotated[str, Field(title='Aggregated Id')] + + +class DecisionsDeleteAggregatedDecisionItemPathParameters(BaseModelSdk): + aggregated_id: Annotated[str, Field(title='Aggregated Id')] decision_id: Annotated[str, Field(title='Decision Id')] @@ -1749,6 +1874,14 @@ class CvesGetCvesQueryParameters(BaseModelSdk): title='Exploitation Phase', ), ] = None + detailed: Annotated[ + Optional[bool], + Field( + description='Include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE in the list. Defaults to false to keep the response lightweight.', + examples=[True], + title='Detailed', + ), + ] = False page: Annotated[ Optional[int], Field(description='Page number', ge=1, title='Page') ] = 1 @@ -2177,6 +2310,14 @@ class FingerprintsGetFingerprintRulesQueryParameters(BaseModelSdk): title='Sort Order', ), ] = 'desc' + detailed: Annotated[ + Optional[bool], + Field( + description='Include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each fingerprint rule in the list. Defaults to false to keep the response lightweight.', + examples=[True], + title='Detailed', + ), + ] = False page: Annotated[ Optional[int], Field(description='Page number', ge=1, title='Page') ] = 1 @@ -2647,6 +2788,16 @@ class BlocklistSubscriptionRequest(BaseModelSdk): ] = None +class DecisionMachineState(BaseModelSdk): + timestamp: Annotated[ + datetime, + Field(description='Date of when the state has been set', title='Timestamp'), + ] + state: Annotated[ + DecisionMachineStateEnum, Field(description='State of the decision') + ] + + class DecisionTargetModel(BaseModelSdk): type: Annotated[ DecisionTargetType, Field(description='Type of the decision target') @@ -3728,7 +3879,7 @@ class ScenarioIndex(BaseModelSdk): ] = None -class CVEResponseBase(BaseModelSdk): +class CVEResponseDetailed(BaseModelSdk): id: Annotated[str, Field(description='ID of the CVE', title='Id')] name: Annotated[str, Field(description='Name of the CVE', title='Name')] title: Annotated[str, Field(description='Title of the CVE', title='Title')] @@ -3808,6 +3959,29 @@ class CVEResponseBase(BaseModelSdk): description='Threat context (attacker/defender countries, industries, objectives)' ), ] = None + tags: Annotated[ + Optional[List[str]], + Field(description='Tags associated with the CVE', title='Tags'), + ] = None + references: Annotated[ + Optional[List[str]], + Field(description='List of references for the CVE', title='References'), + ] = None + description: Annotated[ + Optional[str], Field(description='Description of the CVE', title='Description') + ] = None + crowdsec_analysis: Annotated[ + Optional[str], + Field(description='CrowdSec analysis of the CVE', title='Crowdsec Analysis'), + ] = None + cwes: Annotated[ + Optional[List[CWE]], + Field(description='List of CWEs associated with the CVE', title='Cwes'), + ] = None + events: Annotated[ + Optional[List[CVEEventOutput]], + Field(description='List of events related to the CVE', title='Events'), + ] = None class FingerprintRuleResponse(BaseModelSdk): @@ -3892,61 +4066,6 @@ class FingerprintRuleResponse(BaseModelSdk): ] = None -class FingerprintRuleSummary(BaseModelSdk): - id: Annotated[str, Field(description='Fingerprint rule identifier', title='Id')] - name: Annotated[str, Field(description='Fingerprint rule name', title='Name')] - title: Annotated[str, Field(description='Fingerprint rule title', title='Title')] - affected_components: Annotated[ - List[AffectedComponent], - Field(description='List of affected components', title='Affected Components'), - ] - crowdsec_score: Annotated[ - int, - Field( - description='Live Exploit Tracker score for the fingerprint rule', - ge=0, - le=10, - title='Crowdsec Score', - ), - ] - opportunity_score: Annotated[ - Optional[int], - Field(description='Opportunity score', ge=0, le=5, title='Opportunity Score'), - ] = 0 - momentum_score: Annotated[ - Optional[int], - Field(description='Momentum score', ge=0, le=5, title='Momentum Score'), - ] = 0 - first_seen: Annotated[ - Optional[datetime], Field(description='First seen date', title='First Seen') - ] = None - last_seen: Annotated[ - Optional[datetime], Field(description='Last seen date', title='Last Seen') - ] = None - nb_ips: Annotated[ - int, Field(description='Number of unique IPs observed', ge=0, title='Nb Ips') - ] - rule_release_date: Annotated[ - Optional[datetime], - Field( - description='Release date of the fingerprint rule', - title='Rule Release Date', - ), - ] = None - exploitation_phase: Annotated[ - ExploitationPhase, Field(description='Current exploitation phase') - ] - adjustment_score: Annotated[ - Optional[AdjustmentScore], Field(description='Score adjustment details') - ] = None - threat_context: Annotated[ - Optional[ThreatContext], - Field( - description='Threat context (attacker/defender countries, industries, objectives)' - ), - ] = None - - class GetCVEResponse(BaseModelSdk): id: Annotated[str, Field(description='ID of the CVE', title='Id')] name: Annotated[str, Field(description='Name of the CVE', title='Name')] @@ -4062,7 +4181,7 @@ class GetCVESubscribedIntegrationsResponsePage(BaseModelSdk): class GetCVEsResponsePage(BaseModelSdk): - items: Annotated[List[CVEResponseBase], Field(title='Items')] + items: Annotated[List[CVEResponseDetailed], Field(title='Items')] total: Annotated[int, Field(ge=0, title='Total')] page: Annotated[int, Field(ge=1, title='Page')] size: Annotated[int, Field(ge=1, title='Size')] @@ -4071,7 +4190,7 @@ class GetCVEsResponsePage(BaseModelSdk): class GetFingerprintRulesResponsePage(BaseModelSdk): - items: Annotated[List[FingerprintRuleSummary], Field(title='Items')] + items: Annotated[List[FingerprintRuleResponse], Field(title='Items')] total: Annotated[int, Field(ge=0, title='Total')] page: Annotated[int, Field(ge=1, title='Page')] size: Annotated[int, Field(ge=1, title='Size')] @@ -4398,6 +4517,141 @@ class ProtectRule(BaseModelSdk): ] = None +class AggregatedDecisionItem(BaseModelSdk): + id: Annotated[ + str, Field(description='ID of the decision aggregated item', title='Id') + ] + first_created_at: Annotated[ + datetime, + Field( + description='Creation date of the first decision in the group', + title='First Created At', + ), + ] + last_created_at: Annotated[ + datetime, + Field( + description='Creation date of the last decision in the group', + title='Last Created At', + ), + ] + origin: Annotated[str, Field(description='Origin of the decision', title='Origin')] + scenario: Annotated[ + str, Field(description='Scenario of the decision', title='Scenario') + ] + min_duration: Annotated[ + str, + Field( + description='Min duration in the group of decisions', title='Min Duration' + ), + ] + max_duration: Annotated[ + str, + Field( + description='Max durations in the group of decisions', title='Max Duration' + ), + ] + first_expiration: Annotated[ + datetime, + Field( + description='First expiration date in the group of decisions', + title='First Expiration', + ), + ] + last_expiration: Annotated[ + datetime, + Field( + description='Last expiration date in the group of decisions', + title='Last Expiration', + ), + ] + count: Annotated[ + int, Field(description='Number of decisions in the group', title='Count') + ] + machines: Annotated[ + Dict[str, DecisionMachineState], + Field( + description='Machines object (the instance ID is the key) with the decision status and timestamp', + title='Machines', + ), + ] + target: Annotated[DecisionTargetModel, Field(description='Target of the decision')] + + +class AggregatedDecisionsGetResponse(BaseModelSdk): + id: Annotated[ + str, Field(description='ID of the decision aggregated item', title='Id') + ] + scope: Annotated[str, Field(description='Scope of the decision', title='Scope')] + type: Annotated[str, Field(description='Type of the decision', title='Type')] + value: Annotated[str, Field(description='Value of the decision', title='Value')] + country: Annotated[ + Optional[str], + Field(description='Country associated with the decision', title='Country'), + ] = None + as_name: Annotated[ + Optional[str], + Field(description='AS name associated with the decision', title='As Name'), + ] = None + as_num: Annotated[ + Optional[int], + Field(description='AS number associated with the decision', title='As Num'), + ] = None + city: Annotated[ + Optional[str], + Field(description='City associated with the decision', title='City'), + ] = None + latitude: Annotated[ + Optional[float], + Field(description='Latitude associated with the decision', title='Latitude'), + ] = None + longitude: Annotated[ + Optional[float], + Field(description='Longitude associated with the decision', title='Longitude'), + ] = None + first_created_at: Annotated[ + Optional[datetime], + Field( + description='Creation date of the first decision in the group', + title='First Created At', + ), + ] = None + last_created_at: Annotated[ + Optional[datetime], + Field( + description='Creation date of the last decision in the group', + title='Last Created At', + ), + ] = None + first_expiration: Annotated[ + Optional[datetime], + Field( + description='Expiration date of the first decision in the group', + title='First Expiration', + ), + ] = None + last_expiration: Annotated[ + Optional[datetime], + Field( + description='Expiration date of the last decision in the group', + title='Last Expiration', + ), + ] = None + decisions: Annotated[ + List[AggregatedDecisionItem], + Field(description='List of decisions in the group', title='Decisions'), + ] + + +class AggregatedDecisionsGetResponsePage(BaseModelSdk): + items: Annotated[List[AggregatedDecisionsGetResponse], Field(title='Items')] + total: Annotated[Optional[Total], Field(title='Total')] = None + page: Annotated[Optional[Page], Field(title='Page')] = None + size: Annotated[Optional[Size], Field(title='Size')] = None + pages: Annotated[Optional[Pages], Field(title='Pages')] = None + links: Links + + class AllowlistGetItemsResponse(BaseModelSdk): id: Annotated[ str, diff --git a/crowdsec_service_api/services/__pycache__/__init__.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/__init__.cpython-311.pyc index 03cc6cd2b678c4bb7fde146020819a3126108035..d97ec50b871abe2688b5c7442c2de37760c434ba 100644 GIT binary patch delta 19 ZcmX@lc%G4aIWI340}$lTcbdq31OPG>1t$Oi delta 19 ZcmX@lc%G4aIWI340}wnd(VED81OPLl1zG?A diff --git a/crowdsec_service_api/services/__pycache__/allowlists.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/allowlists.cpython-311.pyc index 43c12d0fa29acc733d3ff5413d13fc4bbf224419..5d5a4b8e2825ee48e9a3d0f731732002c03956d3 100644 GIT binary patch delta 30 kcmeyG@->BfIWI340}yn~ciPCEz|3N7q-VT2pP5Y`0Fzb-H2?qr delta 30 jcmeyG@->BfIWI340|=CAZRAd1W-+qRGuWKZ%%%?jhFb@1 diff --git a/crowdsec_service_api/services/__pycache__/blocklists.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/blocklists.cpython-311.pyc index d87cdb1bac7f4880ebeb44a85f3d6e4d5ffdd4cb..2f66b491648ca5c8e87a8ccee3a704e905557c16 100644 GIT binary patch delta 30 kcmbPOHnEI*IWI340}yn~ciPDPfSJYENY8llduAnb0EpfQwEzGB delta 30 jcmbPOHnEI*IWI340|=CAZRCEy%wlArXR!G_vywRgd*cV~ diff --git a/crowdsec_service_api/services/__pycache__/cves.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/cves.cpython-311.pyc index 7d05d919d947b7bbc0e723946bb4f0ca957ad427..cede642d8047210fa0e388a4f26e82e70aa6c197 100644 GIT binary patch delta 2165 zcma)8U1(cn7(QQm^4oLr*Zej~n>K0l(=~Pdv9@&^w8ciWj;#f^;=0v-Uq(vWgwt%S znp(ucdZA_VU2N)wR!|WIDREwSG4R3*L1aiTMi5ucRqd2a9ZUpnPKnfc zRh+W?$F0C!z-_=+&_M))8w_@%fFIhfI(nZ-YDb_UWulEB-~ivqp1vY;rgYQ?J}xz4 zRQ1}4;7%E+AMSd3X@Gh0CZx~=DKx5%%_&-su2@ zYlUz@)icCepr`DN z>!dRQT5mZ!x3xB${_u|00UfP4Pm#BaBd*n_Dd~ZyPuCAAmlC|<3Gy+oWn1qxZ(mH+ zd#bX&_fC@!i{8dT&9Ny6H>s%IJP*s5R_Vl^;A~Z=Oq~IBTGSrvclG$X|0o{S5Iis0 z#eB@9G~zxCq^Q~KS9nREn_0?aXDG~+HgJY~TbvHa|LgH?t!vGFsMTB2QI=tO7Bg1W zR3V0v`>BCQ#p&kOV3Pb&JR2O<=&IAhAGeQ)UlOI8-)~KmfB0mm&%Vbq@=+*O?RqQ! zB;??~hb)8Di2}{-lGP+an8e&6nMA^)1#xEIXOYr{V3UETO%?OYt5u%gr5^SG-Mk9nQNBSJ~## zj*_x~xMgwQtb2F4tW`}q!QObYbJG?r>s4+LoPj%m&P_+6Y*Y;DUAJFKiewlv-v4K{zf!&X*8xsS0OI}&$i2p+ delta 2187 zcma)6TWlLe6rFL_Z*SIi>^M&RO6=I)Je+5n<|#;`rYJmAT8glsB+8Ddi<7u(rwY_j zS`mpL@t%*C9}pjRPn*wafoiqp77;uN9Zzr_f>j4mUBl2}1Wof4)Qd~7{sP^`p6 z1n+JfLW+%XLlqYpH&*d_#?4h+A{NEYZh=@+^@?LdpR_4XA}}td1f^j^NY?LiiE$U> z_FXQd)&<4Q91b&rpAz8|u@byI(9d~*@n$9w<31Z{QG%=_AMsbZu2`&39|=@A69_SZAm7_c zLVUfoYTcl;vHWeDXcZ^*;S)%X)3Lg*h5jRnUd=4HF%9ZRMIk%?94QL9^owM{NYCm0 z*hu@VEqYTLt(oa1(Y;?|%pqC9A7U`@pOmjw;zlQ~=34m?}MUzT$+2y4i$%%~8tHvSh z)V??VfPFH=bOQ7-kWFeo*aHBA^p-hbJq+d$z!8cqEx`#eM*v0vYK7D>I%?^{vUbMu z%K^EwwvL+IS8X9YNx!lk!{eGHUO!;>&-Ky9s>)a;MIldC^XepRmnOvH%#nMA!9`Ru z(M$fI_J-uswN{$#h1z+?=9-ST9I^rO7Tf5y!$l>hL?y{gW6ofLH~t9hivq*|_L)Q8 zIfIGzh4b}l+4~hiE6%mn-R`nMHz-bc?K^3Y)82)?K#8#i^)16u{* z9y;L-(YV)+57S}qAaC`&w_oOh|EtSw?`iyw*4sRy8-I#rJgIWs)6A6hY8QL(^H)BJ z{HXAg#m8W*8T>V0-}JvPv?yekb9vdKHbVx;rt*^ZYQJdA&cBdZo>$oU+x9lmLH`3- z(^mYV?%wlVEBbEm(0E1EppXp76WLsr<%$Yu?qvUQb23@K4%Hk=Lp! zn2M_zwpGSO+sX7I$)uOaLwT~OE-`0L#~>6^eUSScy%bB}2Kq^C(0PBM^v_s~)fb3I zp}ww~!K}dceFx*AZ^q;JZ~9sM*XY9#9Rg@&AY&CAvaZ_os2rhNa(1#Vy_8pnA#@zz zL4YZMqX07ivjE2d9tSuD@Fc*~0MF2kj)-9a%ro@kj?Ta$n0W?8+llnj0(mT(PqS~K zx(faa^skNq`~>anJiqR8-*PpUB#(X?mk{7>$#bRd)wPnIy9~(Le5HHG5ic1zHzBwG zroVf~l_;6H!-D+nH`|AId?O_*ci52REQ#E#2eX{oj?BK2gL}D3S*wH$+|{oQcAeGX z0s3Czg3Q0W@Xc2p0Pu=bKLEVFJEpP4Wo0EpCe*j+RL}L<839kS%J+V34*gbM{bQdX GF7OX*Z?ZH1 diff --git a/crowdsec_service_api/services/__pycache__/decisions.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/decisions.cpython-311.pyc index d705642e1226909db262b964ed97acbc6e614089..f67f3f6314af5539b8873cd0a594d57187615f9e 100644 GIT binary patch literal 7222 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 diff --git a/crowdsec_service_api/services/__pycache__/fingerprints.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/fingerprints.cpython-311.pyc index 43a3794d6559f7bed7b0eeec2036e4ad35245093..99d213fb30a48c1d19397cf54f655691f91ac11a 100644 GIT binary patch delta 2250 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 diff --git a/crowdsec_service_api/services/__pycache__/hub.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/hub.cpython-311.pyc index 9c5bafe5e48a74bcc5b7523b7ea994a416066e27..67fd5642c38d0775a08cfb82ae7f91cbea8c361d 100644 GIT binary patch delta 30 kcmX>rc~+8pIWI340}yn~ciPBZ&BS7Cq-VUji^-V_0DIL3n*aa+ delta 30 jcmX>rc~+8pIWI340|=CAZRDmdrX#lIWI340}yn~ciPDPh>6A6NY8llN2aUX0D`m#_5c6? delta 30 jcmX>mdrX#lIWI340|=CAZRCE$#A0NjXR!Gr(^YN&b-4&G diff --git a/crowdsec_service_api/services/__pycache__/tracker_events.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/tracker_events.cpython-311.pyc index 80c82367ed26d1b3aa8f4a8bc76f0c16126bf6b6..211d52b662e61639cbdc230427ca5b000a26831a 100644 GIT binary patch delta 30 kcmaDP_DGC-IWI340}yn~ciPB(o{7cSNY8llJ*E~80EMpzrT_o{ delta 30 jcmaDP_DGC-IWI340|=CAZR9@B#A0NjXR!GmQws+Gc(e!J diff --git a/crowdsec_service_api/services/__pycache__/tracker_tags.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/tracker_tags.cpython-311.pyc index 7aeca28cde4a0ff40e041360eb356d7d52e08cab..4fbbe8c851122f4a14415e8c0fa00e2f62f39fc3 100644 GIT binary patch delta 30 kcmX@4b4Z7KIWI340}yn~ciPBZ&dg$Lq-VUjjd_m{0DeaZCIA2c delta 30 jcmX@4b4Z7KIWI340|=CAZR9RzW-+qRGuYh5yhjKCaZCqZ diff --git a/crowdsec_service_api/services/__pycache__/vendors.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/vendors.cpython-311.pyc index d4f743a50282e1bb623c56cac65a0e44cf40b373..53fb4551f69a2220cc235c0bd4b65b9975495b9d 100644 GIT binary patch delta 30 kcmaDK@IHWhIWI340}yn~ciPB(l9|QWNY8ll4d&@80F^-rSpWb4 delta 30 jcmaDK@IHWhIWI340|=CAZR9@5%wlArXR!GO^K=yeh(-vJ diff --git a/crowdsec_service_api/services/allowlists.py b/crowdsec_service_api/services/allowlists.py index 057a909..c487927 100644 --- a/crowdsec_service_api/services/allowlists.py +++ b/crowdsec_service_api/services/allowlists.py @@ -11,7 +11,7 @@ class Allowlists(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def list_allowlists( self, diff --git a/crowdsec_service_api/services/blocklists.py b/crowdsec_service_api/services/blocklists.py index ac2cad5..183d5f3 100644 --- a/crowdsec_service_api/services/blocklists.py +++ b/crowdsec_service_api/services/blocklists.py @@ -11,7 +11,7 @@ class Blocklists(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_blocklists( self, diff --git a/crowdsec_service_api/services/cves.py b/crowdsec_service_api/services/cves.py index 6d90155..f162d95 100644 --- a/crowdsec_service_api/services/cves.py +++ b/crowdsec_service_api/services/cves.py @@ -11,7 +11,7 @@ class Cves(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_cves( self, @@ -19,6 +19,7 @@ def get_cves( sort_by: Optional[GetCVEsSortBy] = GetCVEsSortBy("rule_release_date"), sort_order: Optional[GetCVEsSortOrder] = GetCVEsSortOrder("desc"), exploitation_phase: Optional[CVEExploitationPhase] = None, + detailed: bool = False, page: int = 1, size: int = 50, )-> GetCVEsResponsePage: diff --git a/crowdsec_service_api/services/decisions.py b/crowdsec_service_api/services/decisions.py index 7468e0a..e3a4734 100644 --- a/crowdsec_service_api/services/decisions.py +++ b/crowdsec_service_api/services/decisions.py @@ -11,18 +11,21 @@ class Decisions(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_decisions( self, + page: int = 1, + size: int = 50, instance_ids: list[str] = [], tag_ids: list[str] = [], remediation_types: list[str] = [], ips: list[str] = [], + alert_ids: list[str] = [], + decision_ids: list[str] = [], + created_at_from: Optional[str] = None, sort_by: Optional[DecisionsSortBy] = DecisionsSortBy("created_at"), sort_order: Optional[DecisionsSortOrder] = DecisionsSortOrder("desc"), - page: int = 1, - size: int = 50, )-> DecisionsGetResponsePage: endpoint_url = "/decisions" loc = locals() @@ -80,4 +83,75 @@ def delete_decision( ) return None + + def get_aggregated_decisions( + self, + page: int = 1, + size: int = 50, + instance_ids: list[str] = [], + tag_ids: list[str] = [], + remediation_types: list[str] = [], + ips: list[str] = [], + alert_ids: list[str] = [], + decision_ids: list[str] = [], + created_at_from: Optional[str] = None, + sort_by: Optional[AggregatedDecisionsSortBy] = AggregatedDecisionsSortBy("first_created_at"), + sort_order: Optional[DecisionsSortOrder] = DecisionsSortOrder("desc"), + )-> AggregatedDecisionsGetResponsePage: + endpoint_url = "/decisions/aggregated" + loc = locals() + headers = {} + params = json.loads( + DecisionsGetAggregatedDecisionsQueryParameters(**loc).model_dump_json( + exclude_none=True + ) + ) + path_params = {} + + response = self.http_client.get( + url=endpoint_url, path_params=path_params, params=params, headers=headers + ) + + return AggregatedDecisionsGetResponsePage(_client=self, **response.json()) + + def delete_aggregated_decisions( + self, + aggregated_id: str, + ): + endpoint_url = "/decisions/aggregated/{aggregated_id}" + loc = locals() + headers = {} + params = {} + path_params = json.loads( + DecisionsDeleteAggregatedDecisionsPathParameters(**loc).model_dump_json( + exclude_none=True + ) + ) + + response = self.http_client.delete( + url=endpoint_url, path_params=path_params, params=params, headers=headers + ) + + return None + + def delete_aggregated_decision_item( + self, + aggregated_id: str, + decision_id: str, + ): + endpoint_url = "/decisions/aggregated/{aggregated_id}/items/{decision_id}" + loc = locals() + headers = {} + params = {} + path_params = json.loads( + DecisionsDeleteAggregatedDecisionItemPathParameters(**loc).model_dump_json( + exclude_none=True + ) + ) + + response = self.http_client.delete( + url=endpoint_url, path_params=path_params, params=params, headers=headers + ) + + return None \ No newline at end of file diff --git a/crowdsec_service_api/services/fingerprints.py b/crowdsec_service_api/services/fingerprints.py index 1bc0b40..8f5b6ab 100644 --- a/crowdsec_service_api/services/fingerprints.py +++ b/crowdsec_service_api/services/fingerprints.py @@ -11,13 +11,14 @@ class Fingerprints(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_fingerprint_rules( self, query: Optional[str] = None, sort_by: Optional[GetCVEsSortBy] = GetCVEsSortBy("rule_release_date"), sort_order: Optional[GetCVEsSortOrder] = GetCVEsSortOrder("desc"), + detailed: bool = False, page: int = 1, size: int = 50, )-> GetFingerprintRulesResponsePage: diff --git a/crowdsec_service_api/services/hub.py b/crowdsec_service_api/services/hub.py index 3a1546e..32bbabc 100644 --- a/crowdsec_service_api/services/hub.py +++ b/crowdsec_service_api/services/hub.py @@ -11,7 +11,7 @@ class Hub(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_index( self, diff --git a/crowdsec_service_api/services/info.py b/crowdsec_service_api/services/info.py index c5b2050..645578f 100644 --- a/crowdsec_service_api/services/info.py +++ b/crowdsec_service_api/services/info.py @@ -11,7 +11,7 @@ class Info(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_info( self, diff --git a/crowdsec_service_api/services/integrations.py b/crowdsec_service_api/services/integrations.py index 73f5656..21c1646 100644 --- a/crowdsec_service_api/services/integrations.py +++ b/crowdsec_service_api/services/integrations.py @@ -11,7 +11,7 @@ class Integrations(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_integrations( self, diff --git a/crowdsec_service_api/services/metrics.py b/crowdsec_service_api/services/metrics.py index 322c7c5..ed48df6 100644 --- a/crowdsec_service_api/services/metrics.py +++ b/crowdsec_service_api/services/metrics.py @@ -11,7 +11,7 @@ class Metrics(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_metrics_remediation( self, diff --git a/crowdsec_service_api/services/products.py b/crowdsec_service_api/services/products.py index 5d173fc..4900ea8 100644 --- a/crowdsec_service_api/services/products.py +++ b/crowdsec_service_api/services/products.py @@ -11,7 +11,7 @@ class Products(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_products( self, diff --git a/crowdsec_service_api/services/tracker_events.py b/crowdsec_service_api/services/tracker_events.py index fa41f55..7f84f95 100644 --- a/crowdsec_service_api/services/tracker_events.py +++ b/crowdsec_service_api/services/tracker_events.py @@ -11,7 +11,7 @@ class TrackerEvents(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_exploitation_phase_change_events( self, diff --git a/crowdsec_service_api/services/tracker_tags.py b/crowdsec_service_api/services/tracker_tags.py index 270d8f4..0e8f6d1 100644 --- a/crowdsec_service_api/services/tracker_tags.py +++ b/crowdsec_service_api/services/tracker_tags.py @@ -11,7 +11,7 @@ class TrackerTags(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_tags( self, diff --git a/crowdsec_service_api/services/vendors.py b/crowdsec_service_api/services/vendors.py index dab3932..d481dde 100644 --- a/crowdsec_service_api/services/vendors.py +++ b/crowdsec_service_api/services/vendors.py @@ -11,7 +11,7 @@ class Vendors(Service): def __init__(self, auth: Auth, base_url: str = "https://admin.api.crowdsec.net/v1") -> None: - super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.128.0") + super().__init__(base_url=base_url, auth=auth, user_agent="crowdsec_service_api/1.132.3") def get_vendors( self, diff --git a/doc/Blocklists.md b/doc/Blocklists.md index 78168f1..fd190ed 100644 --- a/doc/Blocklists.md +++ b/doc/Blocklists.md @@ -80,7 +80,7 @@ except HTTPStatusError as e: ### Errors: | Code | Description | | ---- | ----------- | -| 409 | Blocklist already exists | +| 409 | Already exists | | 422 | Validation Error | ### Usage @@ -178,7 +178,7 @@ except HTTPStatusError as e: ### Errors: | Code | Description | | ---- | ----------- | -| 404 | Blocklist not found | +| 404 | Not found | | 422 | Validation Error | ### Usage @@ -251,8 +251,8 @@ except HTTPStatusError as e: ### Errors: | Code | Description | | ---- | ----------- | -| 403 | Blocklist is read-only | -| 404 | Blocklist not found | +| 403 | Read-only | +| 404 | Not found | | 500 | Internal server error | | 422 | Validation Error | ### Usage diff --git a/doc/Cves.md b/doc/Cves.md index 9b8a39b..a0e497f 100644 --- a/doc/Cves.md +++ b/doc/Cves.md @@ -3,7 +3,7 @@ # Cves Methods | Method | Description | | ------ | ----------- | -| [get_cves](#get_cves) | Get a paginated list of CVEs that CrowdSec is tracking | +| [get_cves](#get_cves) | Get a paginated list of CVEs that CrowdSec is tracking. Pass detailed=true to also include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE; they are omitted by default to keep the list light. | | [get_cve](#get_cve) | Get information about a specific CVE ID | | [get_cve_protect_rules](#get_cve_protect_rules) | Get protection/detection rules associated with a specific CVE ID | | [download_cve_ips](#download_cve_ips) | Download the list of IPs exploiting a specific CVE ID in raw format | @@ -16,7 +16,7 @@ | [get_cve_timeline](#get_cve_timeline) | Get timeline data of occurrences for a specific CVE ID | ## **get_cves** -### Get a paginated list of CVEs that CrowdSec is tracking +### Get a paginated list of CVEs that CrowdSec is tracking. Pass detailed=true to also include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE; they are omitted by default to keep the list light. - Endpoint: `/cves` - Method: `GET` @@ -27,6 +27,7 @@ | sort_by | Optional[GetCVEsSortBy] | Field to sort by | False | GetCVEsSortBy("rule_release_date") | | sort_order | Optional[GetCVEsSortOrder] | Sort order: ascending or descending | False | GetCVEsSortOrder("desc") | | exploitation_phase | Optional[CVEExploitationPhase] | Filter by exploitation phase | False | None | +| detailed | bool | Include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE in the list. Defaults to false to keep the response lightweight. | False | False | | page | int | Page number | False | 1 | | size | int | Page size | False | 50 | ### Returns: @@ -51,6 +52,7 @@ try: sort_by=rule_release_date, sort_order=desc, exploitation_phase=None, + detailed=True, page=1, size=50, ) diff --git a/doc/Decisions.md b/doc/Decisions.md index d4b739b..1a9c134 100644 --- a/doc/Decisions.md +++ b/doc/Decisions.md @@ -6,6 +6,9 @@ | [get_decisions](#get_decisions) | Get decisions | | [create_decision](#create_decision) | Create a new decision. | | [delete_decision](#delete_decision) | Delete a decision by its UUID. | +| [get_aggregated_decisions](#get_aggregated_decisions) | None | +| [delete_aggregated_decisions](#delete_aggregated_decisions) | Delete one decision by ID | +| [delete_aggregated_decision_item](#delete_aggregated_decision_item) | Delete one decision by ID | ## **get_decisions** ### Get decisions @@ -15,21 +18,23 @@ ### Parameters: | Parameter | Type | Description | Required | Default | | --------- | ---- | ----------- | -------- | ------- | +| page | int | Page number | False | 1 | +| size | int | Page size | False | 50 | | instance_ids | list[str] | Filter decisions by instance IDs | False | [] | | tag_ids | list[str] | Filter decisions by tag IDs | False | [] | | remediation_types | list[str] | Filter decisions by remediation types | False | [] | | ips | list[str] | Filter decisions by IPs (only for IP decisions) | False | [] | +| alert_ids | list[str] | Filter decisions by associated alert IDs | False | [] | +| decision_ids | list[str] | Filter decisions by decision IDs | False | [] | +| created_at_from | Optional[str] | Filter decisions created after this date (inclusive) | False | None | | sort_by | Optional[DecisionsSortBy] | Field to sort by (e.g., created_at, duration) | False | DecisionsSortBy("created_at") | | sort_order | Optional[DecisionsSortOrder] | Sort order: 'asc' for ascending, 'desc' for descending | False | DecisionsSortOrder("desc") | -| page | int | Page number | False | 1 | -| size | int | Page size | False | 50 | ### Returns: [DecisionsGetResponsePage](./Models.md#decisionsgetresponsepage) ### Errors: | Code | Description | | ---- | ----------- | | 404 | Not found | -| 500 | Internal server error | | 422 | Validation Error | ### Usage @@ -43,14 +48,17 @@ auth = ApiKeyAuth(api_key='your_api_key') client = Decisions(auth=auth) try: response = client.get_decisions( + page=1, + size=50, instance_ids=['sample-item'], tag_ids=['sample-item'], remediation_types=['sample-item'], ips=['sample-item'], + alert_ids=['sample-item'], + decision_ids=['sample-item'], + created_at_from=None, sort_by=created_at, sort_order=desc, - page=1, - size=50, ) print(response) except HTTPStatusError as e: @@ -72,7 +80,7 @@ except HTTPStatusError as e: ### Errors: | Code | Description | | ---- | ----------- | -| 409 | Conflict: Decision value is in allowlists; cannot create decision. | +| 409 | Already exists | | 422 | Validation Error | ### Usage @@ -125,7 +133,9 @@ except HTTPStatusError as e: ### Errors: | Code | Description | | ---- | ----------- | -| 422 | Validation Error | +| 422 | Unprocessable entity | +| 404 | Not found | +| 500 | Internal server error | ### Usage ```python @@ -145,3 +155,131 @@ except HTTPStatusError as e: print(f"An error occurred: {e.response.status_code} - {e.response.text}") ``` + +## **get_aggregated_decisions** +### None +- Endpoint: `/decisions/aggregated` +- Method: `GET` + +### Parameters: +| Parameter | Type | Description | Required | Default | +| --------- | ---- | ----------- | -------- | ------- | +| page | int | Page number | False | 1 | +| size | int | Page size | False | 50 | +| instance_ids | list[str] | Filter decisions by instance IDs | False | [] | +| tag_ids | list[str] | Filter decisions by tag IDs | False | [] | +| remediation_types | list[str] | Filter decisions by remediation types | False | [] | +| ips | list[str] | Filter decisions by IPs (only for IP decisions) | False | [] | +| alert_ids | list[str] | Filter decisions by associated alert IDs | False | [] | +| decision_ids | list[str] | Filter decisions by decision IDs | False | [] | +| created_at_from | Optional[str] | Filter decisions created after this date (inclusive) | False | None | +| sort_by | Optional[AggregatedDecisionsSortBy] | Field to sort by (e.g., created_at, duration) | False | AggregatedDecisionsSortBy("first_created_at") | +| sort_order | Optional[DecisionsSortOrder] | Sort order: 'asc' for ascending, 'desc' for descending | False | DecisionsSortOrder("desc") | +### Returns: +[AggregatedDecisionsGetResponsePage](./Models.md#aggregateddecisionsgetresponsepage) +### Errors: +| Code | Description | +| ---- | ----------- | +| 404 | Not found | +| 422 | Validation Error | +### Usage + +```python +from crowdsec_service_api import ( + Decisions, + ApiKeyAuth, +) +from httpx import HTTPStatusError +auth = ApiKeyAuth(api_key='your_api_key') +client = Decisions(auth=auth) +try: + response = client.get_aggregated_decisions( + page=1, + size=50, + instance_ids=['sample-item'], + tag_ids=['sample-item'], + remediation_types=['sample-item'], + ips=['sample-item'], + alert_ids=['sample-item'], + decision_ids=['sample-item'], + created_at_from=None, + sort_by=first_created_at, + sort_order=desc, + ) + print(response) +except HTTPStatusError as e: + print(f"An error occurred: {e.response.status_code} - {e.response.text}") +``` + + +## **delete_aggregated_decisions** +### Delete one decision by ID +- Endpoint: `/decisions/aggregated/{aggregated_id}` +- Method: `DELETE` + +### Parameters: +| Parameter | Type | Description | Required | Default | +| --------- | ---- | ----------- | -------- | ------- | +| aggregated_id | str | | True | | +### Errors: +| Code | Description | +| ---- | ----------- | +| 422 | Unprocessable entity | +| 404 | Not found | +| 500 | Internal server error | +### Usage + +```python +from crowdsec_service_api import ( + Decisions, + ApiKeyAuth, +) +from httpx import HTTPStatusError +auth = ApiKeyAuth(api_key='your_api_key') +client = Decisions(auth=auth) +try: + response = client.delete_aggregated_decisions( + aggregated_id='aggregated_id', + ) + print(response) +except HTTPStatusError as e: + print(f"An error occurred: {e.response.status_code} - {e.response.text}") +``` + + +## **delete_aggregated_decision_item** +### Delete one decision by ID +- Endpoint: `/decisions/aggregated/{aggregated_id}/items/{decision_id}` +- Method: `DELETE` + +### Parameters: +| Parameter | Type | Description | Required | Default | +| --------- | ---- | ----------- | -------- | ------- | +| aggregated_id | str | | True | | +| decision_id | str | | True | | +### Errors: +| Code | Description | +| ---- | ----------- | +| 422 | Unprocessable entity | +| 404 | Not found | +| 500 | Internal server error | +### Usage + +```python +from crowdsec_service_api import ( + Decisions, + ApiKeyAuth, +) +from httpx import HTTPStatusError +auth = ApiKeyAuth(api_key='your_api_key') +client = Decisions(auth=auth) +try: + response = client.delete_aggregated_decision_item( + aggregated_id='aggregated_id', + decision_id='decision_id', + ) + print(response) +except HTTPStatusError as e: + print(f"An error occurred: {e.response.status_code} - {e.response.text}") +``` + diff --git a/doc/Fingerprints.md b/doc/Fingerprints.md index addb9a3..c804f4b 100644 --- a/doc/Fingerprints.md +++ b/doc/Fingerprints.md @@ -3,7 +3,7 @@ # Fingerprints Methods | Method | Description | | ------ | ----------- | -| [get_fingerprint_rules](#get_fingerprint_rules) | Get a paginated list of fingerprint rules | +| [get_fingerprint_rules](#get_fingerprint_rules) | Get a paginated list of fingerprint rules. Pass detailed=true to also include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each rule; they are omitted by default to keep the list light. | | [download_fingerprint_ips](#download_fingerprint_ips) | Download the list of IPs exploiting a specific fingerprint rule in raw format | | [get_fingerprint_ips_details](#get_fingerprint_ips_details) | Get detailed information about IPs exploiting a specific fingerprint rule | | [get_fingerprint_ips_details_stats](#get_fingerprint_ips_details_stats) | Get aggregated statistics about IPs exploiting a specific fingerprint rule | @@ -15,7 +15,7 @@ | [get_fingerprint_rule](#get_fingerprint_rule) | Get information about a specific fingerprint rule | ## **get_fingerprint_rules** -### Get a paginated list of fingerprint rules +### Get a paginated list of fingerprint rules. Pass detailed=true to also include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each rule; they are omitted by default to keep the list light. - Endpoint: `/fingerprints` - Method: `GET` @@ -25,6 +25,7 @@ | query | Optional[str] | Search query for fingerprint rules | False | None | | sort_by | Optional[GetCVEsSortBy] | Field to sort by | False | GetCVEsSortBy("rule_release_date") | | sort_order | Optional[GetCVEsSortOrder] | Sort order: ascending or descending | False | GetCVEsSortOrder("desc") | +| detailed | bool | Include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each fingerprint rule in the list. Defaults to false to keep the response lightweight. | False | False | | page | int | Page number | False | 1 | | size | int | Page size | False | 50 | ### Returns: @@ -48,6 +49,7 @@ try: query=None, sort_by=rule_release_date, sort_order=desc, + detailed=True, page=1, size=50, ) diff --git a/doc/Models.md b/doc/Models.md index b6ab9c0..1b552a0 100644 --- a/doc/Models.md +++ b/doc/Models.md @@ -1,5 +1,63 @@ +# **AggregatedDecisionItem** +## Required: +id, first_created_at, last_created_at, origin, scenario, min_duration, max_duration, first_expiration, last_expiration, count, machines, target +## Properties +| Property | Type | Description | Example | +|----------|------|-------------|---------| +| id | str | ID of the decision aggregated item || +| first_created_at | str | Creation date of the first decision in the group || +| last_created_at | str | Creation date of the last decision in the group || +| origin | str | Origin of the decision || +| scenario | str | Scenario of the decision || +| min_duration | str | Min duration in the group of decisions || +| max_duration | str | Max durations in the group of decisions || +| first_expiration | str | First expiration date in the group of decisions || +| last_expiration | str | Last expiration date in the group of decisions || +| count | int | Number of decisions in the group || +| machines | Machines | Machines object (the instance ID is the key) with the decision status and timestamp || +| target | DecisionTargetModel | None || + +# **AggregatedDecisionsGetResponse** +## Required: +id, scope, type, value, decisions +## Properties +| Property | Type | Description | Example | +|----------|------|-------------|---------| +| id | str | ID of the decision aggregated item || +| scope | str | Scope of the decision || +| type | str | Type of the decision || +| value | str | Value of the decision || +| country | Optional[str] | Country associated with the decision || +| as_name | Optional[str] | AS name associated with the decision || +| as_num | Optional[int] | AS number associated with the decision || +| city | Optional[str] | City associated with the decision || +| latitude | Optional[float] | Latitude associated with the decision || +| longitude | Optional[float] | Longitude associated with the decision || +| first_created_at | str | Creation date of the first decision in the group || +| last_created_at | str | Creation date of the last decision in the group || +| first_expiration | str | Expiration date of the first decision in the group || +| last_expiration | str | Expiration date of the last decision in the group || +| decisions | list[AggregatedDecisionItem] | List of decisions in the group || + +# **AggregatedDecisionsGetResponsePage** +## Required: +items, page, size, links +## Properties +| Property | Type | Description | Example | +|----------|------|-------------|---------| +| items | list[AggregatedDecisionsGetResponse] | None || +| total | Optional[int] | None || +| page | Optional[int] | None || +| size | Optional[int] | None || +| pages | Optional[int] | None || +| links | Links | None || + +# **AggregatedDecisionsSortBy** +## Enum: +FIRST_CREATED_AT, FIRST_EXPIRATION + # **AllowlistCreateRequest** ## Required: name @@ -553,6 +611,19 @@ uuid |----------|------|-------------|---------| | uuid | str | UUID of the created decision || +# **DecisionMachineState** +## Required: +timestamp, state +## Properties +| Property | Type | Description | Example | +|----------|------|-------------|---------| +| timestamp | str | Date of when the state has been set || +| state | DecisionMachineStateEnum | None || + +# **DecisionMachineStateEnum** +## Enum: +PENDING_CREATE, PENDING_DELETE, APPLIED + # **DecisionResponse** ## Required: uuid, id, duration, origin, scenario, scope, type, value, target @@ -1107,7 +1178,7 @@ name, date, description, label, sorting_priority ## Enum: INSUFFICIENT_DATA, EARLY_EXPLOITATION, FRESH_AND_POPULAR, TARGETED_EXPLOITATION, MASS_EXPLOITATION, BACKGROUND_NOISE, UNPOPULAR, WEARING_OUT, UNCLASSIFIED -# **CVEResponseBase** +# **CVEResponseDetailed** ## Required: id, name, title, affected_components, crowdsec_score, nb_ips, published_date, has_public_exploit, exploitation_phase ## Properties @@ -1130,6 +1201,12 @@ id, name, title, affected_components, crowdsec_score, nb_ips, published_date, ha | exploitation_phase | ExploitationPhase | None || | adjustment_score | Optional[AdjustmentScore] | Score adjustments applied to the CVE score based on various factors || | threat_context | Optional[ThreatContext] | Threat context (attacker/defender countries, industries, objectives) || +| tags | list[str] | Tags associated with the CVE || +| references | list[str] | List of references for the CVE || +| description | Optional[str] | Description of the CVE || +| crowdsec_analysis | Optional[str] | CrowdSec analysis of the CVE || +| cwes | list[CWE] | List of CWEs associated with the CVE || +| events | list[CVEEventOutput] | List of events related to the CVE || # **CVEsubscription** ## Required: @@ -1249,27 +1326,6 @@ id, name, title, affected_components, crowdsec_score, nb_ips, exploitation_phase | crowdsec_analysis | Optional[str] | CrowdSec analysis for this fingerprint rule || | events | list[FingerprintEventOutput] | List of events related to the fingerprint rule || -# **FingerprintRuleSummary** -## Required: -id, name, title, affected_components, crowdsec_score, nb_ips, exploitation_phase -## Properties -| Property | Type | Description | Example | -|----------|------|-------------|---------| -| id | str | Fingerprint rule identifier || -| name | str | Fingerprint rule name || -| title | str | Fingerprint rule title || -| affected_components | list[AffectedComponent] | List of affected components || -| crowdsec_score | int | Live Exploit Tracker score for the fingerprint rule || -| opportunity_score | int | Opportunity score || -| momentum_score | int | Momentum score || -| first_seen | Optional[str] | First seen date || -| last_seen | Optional[str] | Last seen date || -| nb_ips | int | Number of unique IPs observed || -| rule_release_date | Optional[str] | Release date of the fingerprint rule || -| exploitation_phase | ExploitationPhase | None || -| adjustment_score | Optional[AdjustmentScore] | Score adjustment details || -| threat_context | Optional[ThreatContext] | Threat context (attacker/defender countries, industries, objectives) || - # **FingerprintTimelineItem** ## Required: timestamp, count @@ -1347,7 +1403,7 @@ items, total, page, size, pages, links ## Properties | Property | Type | Description | Example | |----------|------|-------------|---------| -| items | list[CVEResponseBase] | None || +| items | list[CVEResponseDetailed] | None || | total | int | None || | page | int | None || | size | int | None || @@ -1381,7 +1437,7 @@ items, total, page, size, pages, links ## Properties | Property | Type | Description | Example | |----------|------|-------------|---------| -| items | list[FingerprintRuleSummary] | None || +| items | list[FingerprintRuleResponse] | None || | total | int | None || | page | int | None || | size | int | None || diff --git a/doc/README.md b/doc/README.md index 445188f..0ce498f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -39,6 +39,14 @@ You can find a Quickstart about this SDK, following this [documentation](https:/ ## API Endpoint models +[AggregatedDecisionItem](./Models.md#aggregateddecisionitem) + +[AggregatedDecisionsGetResponse](./Models.md#aggregateddecisionsgetresponse) + +[AggregatedDecisionsGetResponsePage](./Models.md#aggregateddecisionsgetresponsepage) + +[AggregatedDecisionsSortBy](./Models.md#aggregateddecisionssortby) + [AllowlistCreateRequest](./Models.md#allowlistcreaterequest) [AllowlistCreateResponse](./Models.md#allowlistcreateresponse) @@ -141,6 +149,10 @@ You can find a Quickstart about this SDK, following this [documentation](https:/ [DecisionCreateResponse](./Models.md#decisioncreateresponse) +[DecisionMachineState](./Models.md#decisionmachinestate) + +[DecisionMachineStateEnum](./Models.md#decisionmachinestateenum) + [DecisionResponse](./Models.md#decisionresponse) [DecisionTargetModel](./Models.md#decisiontargetmodel) @@ -249,7 +261,7 @@ You can find a Quickstart about this SDK, following this [documentation](https:/ [CVEExploitationPhase](./Models.md#cveexploitationphase) -[CVEResponseBase](./Models.md#cveresponsebase) +[CVEResponseDetailed](./Models.md#cveresponsedetailed) [CVEsubscription](./Models.md#cvesubscription) @@ -271,8 +283,6 @@ You can find a Quickstart about this SDK, following this [documentation](https:/ [FingerprintRuleResponse](./Models.md#fingerprintruleresponse) -[FingerprintRuleSummary](./Models.md#fingerprintrulesummary) - [FingerprintTimelineItem](./Models.md#fingerprinttimelineitem) [GetCVEIPsResponsePage](./Models.md#getcveipsresponsepage) diff --git a/public-openapi.json b/public-openapi.json index 2e5d94e..2274ba1 100644 --- a/public-openapi.json +++ b/public-openapi.json @@ -3,7 +3,7 @@ "info": { "title": "Service API", "description": "This is the API to manage Crowdsec services", - "version": "1.70.29", + "version": "1.70.42", "contact": { "name": "CrowdSec", "url": "https://crowdsec.net", @@ -820,7 +820,7 @@ } }, "409": { - "description": "Blocklist already exists" + "description": "Already exists" }, "422": { "description": "Validation Error", @@ -1097,7 +1097,7 @@ } }, "404": { - "description": "Blocklist not found" + "description": "Not found" }, "422": { "description": "Validation Error", @@ -1155,10 +1155,10 @@ } }, "403": { - "description": "Blocklist is read-only" + "description": "Read-only" }, "404": { - "description": "Blocklist not found" + "description": "Not found" }, "500": { "description": "Internal server error" @@ -1270,7 +1270,7 @@ ], "description": "Blocklist expiration", "examples": [ - "2026-06-11T08:40:13.370581+00:00" + "2026-06-29T16:36:00.442507+00:00" ], "title": "Expiration" }, @@ -2445,6 +2445,33 @@ "description": "Get decisions", "operationId": "getDecisions", "parameters": [ + { + "name": "page", + "in": "query", + "required": false, + "schema": { + "type": "integer", + "minimum": 1, + "description": "Page number", + "default": 1, + "title": "Page" + }, + "description": "Page number" + }, + { + "name": "size", + "in": "query", + "required": false, + "schema": { + "type": "integer", + "maximum": 100, + "minimum": 1, + "description": "Page size", + "default": 50, + "title": "Size" + }, + "description": "Page size" + }, { "name": "instance_ids", "in": "query", @@ -2529,6 +2556,70 @@ }, "description": "Filter decisions by IPs (only for IP decisions)" }, + { + "name": "alert_ids", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by associated alert IDs", + "examples": [ + [ + "alert-abc123", + "alert-def456" + ] + ], + "default": [], + "title": "Alert Ids" + }, + "description": "Filter decisions by associated alert IDs" + }, + { + "name": "decision_ids", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by decision IDs", + "examples": [ + [ + "dec-abc123", + "dec-def456" + ] + ], + "default": [], + "title": "Decision Ids" + }, + "description": "Filter decisions by decision IDs" + }, + { + "name": "created_at_from", + "in": "query", + "required": false, + "schema": { + "anyOf": [ + { + "type": "string", + "format": "date-time" + }, + { + "type": "null" + } + ], + "description": "Filter decisions created after this date (inclusive)", + "examples": [ + "2023-01-01T00:00:00Z" + ], + "title": "Created At From" + }, + "description": "Filter decisions created after this date (inclusive)" + }, { "name": "sort_by", "in": "query", @@ -2572,33 +2663,6 @@ "title": "Sort Order" }, "description": "Sort order: 'asc' for ascending, 'desc' for descending" - }, - { - "name": "page", - "in": "query", - "required": false, - "schema": { - "type": "integer", - "minimum": 1, - "description": "Page number", - "default": 1, - "title": "Page" - }, - "description": "Page number" - }, - { - "name": "size", - "in": "query", - "required": false, - "schema": { - "type": "integer", - "maximum": 100, - "minimum": 1, - "description": "Page size", - "default": 50, - "title": "Size" - }, - "description": "Page size" } ], "responses": { @@ -2615,9 +2679,6 @@ "404": { "description": "Not found" }, - "500": { - "description": "Internal server error" - }, "422": { "description": "Validation Error", "content": { @@ -2659,7 +2720,7 @@ } }, "409": { - "description": "Conflict: Decision value is in allowlists; cannot create decision." + "description": "Already exists" }, "422": { "description": "Validation Error", @@ -2695,17 +2756,350 @@ ], "responses": { "204": { - "description": "Successful Response" + "description": "No Content" + }, + "422": { + "description": "Unprocessable entity" + }, + "404": { + "description": "Not found" + }, + "500": { + "description": "Internal server error" + } + } + } + }, + "/decisions/aggregated": { + "get": { + "tags": [ + "Decisions" + ], + "summary": "Get Aggregated Decisions", + "operationId": "getAggregatedDecisions", + "parameters": [ + { + "name": "page", + "in": "query", + "required": false, + "schema": { + "type": "integer", + "minimum": 1, + "description": "Page number", + "default": 1, + "title": "Page" + }, + "description": "Page number" + }, + { + "name": "size", + "in": "query", + "required": false, + "schema": { + "type": "integer", + "maximum": 100, + "minimum": 1, + "description": "Page size", + "default": 50, + "title": "Size" + }, + "description": "Page size" + }, + { + "name": "instance_ids", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by instance IDs", + "examples": [ + [ + "inst-abc123", + "inst-def456" + ] + ], + "default": [], + "title": "Instance Ids" + }, + "description": "Filter decisions by instance IDs" + }, + { + "name": "tag_ids", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by tag IDs", + "examples": [ + [ + "tag-001", + "tag-002" + ] + ], + "default": [], + "title": "Tag Ids" + }, + "description": "Filter decisions by tag IDs" + }, + { + "name": "remediation_types", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by remediation types", + "examples": [ + [ + "ban", + "captcha" + ] + ], + "default": [], + "title": "Remediation Types" + }, + "description": "Filter decisions by remediation types" + }, + { + "name": "ips", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by IPs (only for IP decisions)", + "examples": [ + [ + "203.0.113.7", + "198.51.100.42" + ] + ], + "default": [], + "title": "Ips" + }, + "description": "Filter decisions by IPs (only for IP decisions)" + }, + { + "name": "alert_ids", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by associated alert IDs", + "examples": [ + [ + "alert-abc123", + "alert-def456" + ] + ], + "default": [], + "title": "Alert Ids" + }, + "description": "Filter decisions by associated alert IDs" + }, + { + "name": "decision_ids", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Filter decisions by decision IDs", + "examples": [ + [ + "dec-abc123", + "dec-def456" + ] + ], + "default": [], + "title": "Decision Ids" + }, + "description": "Filter decisions by decision IDs" + }, + { + "name": "created_at_from", + "in": "query", + "required": false, + "schema": { + "anyOf": [ + { + "type": "string", + "format": "date-time" + }, + { + "type": "null" + } + ], + "description": "Filter decisions created after this date (inclusive)", + "examples": [ + "2023-01-01T00:00:00Z" + ], + "title": "Created At From" + }, + "description": "Filter decisions created after this date (inclusive)" + }, + { + "name": "sort_by", + "in": "query", + "required": false, + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/AggregatedDecisionsSortBy" + }, + { + "type": "null" + } + ], + "description": "Field to sort by (e.g., created_at, duration)", + "examples": [ + "created_at" + ], + "default": "first_created_at", + "title": "Sort By" + }, + "description": "Field to sort by (e.g., created_at, duration)" + }, + { + "name": "sort_order", + "in": "query", + "required": false, + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/DecisionsSortOrder" + }, + { + "type": "null" + } + ], + "description": "Sort order: 'asc' for ascending, 'desc' for descending", + "examples": [ + "desc" + ], + "default": "desc", + "title": "Sort Order" + }, + "description": "Sort order: 'asc' for ascending, 'desc' for descending" + } + ], + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AggregatedDecisionsGetResponsePage" + } + } + } + }, + "404": { + "description": "Not found" + }, + "422": { + "description": "Validation Error", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HTTPValidationError" + } + } + } + } + } + } + }, + "/decisions/aggregated/{aggregated_id}": { + "delete": { + "tags": [ + "Decisions" + ], + "summary": "Delete Aggregated Decision", + "description": "Delete one decision by ID", + "operationId": "deleteAggregatedDecisions", + "parameters": [ + { + "name": "aggregated_id", + "in": "path", + "required": true, + "schema": { + "type": "string", + "title": "Aggregated Id" + } + } + ], + "responses": { + "204": { + "description": "No Content" + }, + "422": { + "description": "Unprocessable entity" + }, + "404": { + "description": "Not found" + }, + "500": { + "description": "Internal server error" + } + } + } + }, + "/decisions/aggregated/{aggregated_id}/items/{decision_id}": { + "delete": { + "tags": [ + "Decisions" + ], + "summary": "Delete Aggregated Decision Item", + "description": "Delete one decision by ID", + "operationId": "deleteAggregatedDecisionItem", + "parameters": [ + { + "name": "aggregated_id", + "in": "path", + "required": true, + "schema": { + "type": "string", + "title": "Aggregated Id" + } + }, + { + "name": "decision_id", + "in": "path", + "required": true, + "schema": { + "type": "string", + "title": "Decision Id" + } + } + ], + "responses": { + "204": { + "description": "No Content" }, "422": { - "description": "Validation Error", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HTTPValidationError" - } - } - } + "description": "Unprocessable entity" + }, + "404": { + "description": "Not found" + }, + "500": { + "description": "Internal server error" } } } @@ -3110,7 +3504,7 @@ "Cves" ], "summary": "Get list of CVEs CrowdSec is tracking", - "description": "Get a paginated list of CVEs that CrowdSec is tracking", + "description": "Get a paginated list of CVEs that CrowdSec is tracking. Pass detailed=true to also include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE; they are omitted by default to keep the list light.", "operationId": "getCves", "parameters": [ { @@ -3199,6 +3593,21 @@ }, "description": "Filter by exploitation phase" }, + { + "name": "detailed", + "in": "query", + "required": false, + "schema": { + "type": "boolean", + "description": "Include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE in the list. Defaults to false to keep the response lightweight.", + "examples": [ + true + ], + "default": false, + "title": "Detailed" + }, + "description": "Include the heavy detail fields (description, crowdsec_analysis, cwes, references, events, tags) for each CVE in the list. Defaults to false to keep the response lightweight." + }, { "name": "page", "in": "query", @@ -5139,7 +5548,7 @@ "Fingerprints" ], "summary": "Get list of fingerprint rules", - "description": "Get a paginated list of fingerprint rules", + "description": "Get a paginated list of fingerprint rules. Pass detailed=true to also include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each rule; they are omitted by default to keep the list light.", "operationId": "getFingerprintRules", "parameters": [ { @@ -5207,6 +5616,21 @@ }, "description": "Sort order: ascending or descending" }, + { + "name": "detailed", + "in": "query", + "required": false, + "schema": { + "type": "boolean", + "description": "Include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each fingerprint rule in the list. Defaults to false to keep the response lightweight.", + "examples": [ + true + ], + "default": false, + "title": "Detailed" + }, + "description": "Include the heavy detail fields (description, crowdsec_analysis, references, events, tags) for each fingerprint rule in the list. Defaults to false to keep the response lightweight." + }, { "name": "page", "in": "query", @@ -5988,24 +6412,326 @@ "$ref": "#/components/schemas/ExploitationPhaseChangeEventsResponsePage" } } - } + } + }, + "422": { + "description": "Validation Error", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HTTPValidationError" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "AggregatedDecisionItem": { + "properties": { + "id": { + "type": "string", + "title": "Id", + "description": "ID of the decision aggregated item" + }, + "first_created_at": { + "type": "string", + "format": "date-time", + "title": "First Created At", + "description": "Creation date of the first decision in the group" + }, + "last_created_at": { + "type": "string", + "format": "date-time", + "title": "Last Created At", + "description": "Creation date of the last decision in the group" + }, + "origin": { + "type": "string", + "title": "Origin", + "description": "Origin of the decision" + }, + "scenario": { + "type": "string", + "title": "Scenario", + "description": "Scenario of the decision" + }, + "min_duration": { + "type": "string", + "title": "Min Duration", + "description": "Min duration in the group of decisions" + }, + "max_duration": { + "type": "string", + "title": "Max Duration", + "description": "Max durations in the group of decisions" + }, + "first_expiration": { + "type": "string", + "format": "date-time", + "title": "First Expiration", + "description": "First expiration date in the group of decisions" + }, + "last_expiration": { + "type": "string", + "format": "date-time", + "title": "Last Expiration", + "description": "Last expiration date in the group of decisions" + }, + "count": { + "type": "integer", + "title": "Count", + "description": "Number of decisions in the group" + }, + "machines": { + "additionalProperties": { + "$ref": "#/components/schemas/DecisionMachineState" + }, + "type": "object", + "title": "Machines", + "description": "Machines object (the instance ID is the key) with the decision status and timestamp" + }, + "target": { + "$ref": "#/components/schemas/DecisionTargetModel", + "description": "Target of the decision" + } + }, + "type": "object", + "required": [ + "id", + "first_created_at", + "last_created_at", + "origin", + "scenario", + "min_duration", + "max_duration", + "first_expiration", + "last_expiration", + "count", + "machines", + "target" + ], + "title": "AggregatedDecisionItem" + }, + "AggregatedDecisionsGetResponse": { + "properties": { + "id": { + "type": "string", + "title": "Id", + "description": "ID of the decision aggregated item" + }, + "scope": { + "type": "string", + "title": "Scope", + "description": "Scope of the decision" + }, + "type": { + "type": "string", + "title": "Type", + "description": "Type of the decision" + }, + "value": { + "type": "string", + "title": "Value", + "description": "Value of the decision" + }, + "country": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Country", + "description": "Country associated with the decision" + }, + "as_name": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "As Name", + "description": "AS name associated with the decision" + }, + "as_num": { + "anyOf": [ + { + "type": "integer" + }, + { + "type": "null" + } + ], + "title": "As Num", + "description": "AS number associated with the decision" + }, + "city": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "City", + "description": "City associated with the decision" + }, + "latitude": { + "anyOf": [ + { + "type": "number" + }, + { + "type": "null" + } + ], + "title": "Latitude", + "description": "Latitude associated with the decision" + }, + "longitude": { + "anyOf": [ + { + "type": "number" + }, + { + "type": "null" + } + ], + "title": "Longitude", + "description": "Longitude associated with the decision" + }, + "first_created_at": { + "type": "string", + "format": "date-time", + "title": "First Created At", + "description": "Creation date of the first decision in the group" + }, + "last_created_at": { + "type": "string", + "format": "date-time", + "title": "Last Created At", + "description": "Creation date of the last decision in the group" + }, + "first_expiration": { + "type": "string", + "format": "date-time", + "title": "First Expiration", + "description": "Expiration date of the first decision in the group" + }, + "last_expiration": { + "type": "string", + "format": "date-time", + "title": "Last Expiration", + "description": "Expiration date of the last decision in the group" + }, + "decisions": { + "items": { + "$ref": "#/components/schemas/AggregatedDecisionItem" + }, + "type": "array", + "title": "Decisions", + "description": "List of decisions in the group" + } + }, + "type": "object", + "required": [ + "id", + "scope", + "type", + "value", + "decisions" + ], + "title": "AggregatedDecisionsGetResponse" + }, + "AggregatedDecisionsGetResponsePage": { + "properties": { + "items": { + "items": { + "$ref": "#/components/schemas/AggregatedDecisionsGetResponse" + }, + "type": "array", + "title": "Items" + }, + "total": { + "anyOf": [ + { + "type": "integer", + "minimum": 0.0 + }, + { + "type": "null" + } + ], + "title": "Total" + }, + "page": { + "anyOf": [ + { + "type": "integer", + "minimum": 1.0 + }, + { + "type": "null" + } + ], + "title": "Page" + }, + "size": { + "anyOf": [ + { + "type": "integer", + "minimum": 1.0 + }, + { + "type": "null" + } + ], + "title": "Size" }, - "422": { - "description": "Validation Error", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HTTPValidationError" - } + "pages": { + "anyOf": [ + { + "type": "integer", + "minimum": 0.0 + }, + { + "type": "null" } - } + ], + "title": "Pages" + }, + "links": { + "$ref": "#/components/schemas/Links", + "readOnly": true } - } - } - } - }, - "components": { - "schemas": { + }, + "type": "object", + "required": [ + "items", + "page", + "size", + "links" + ], + "title": "AggregatedDecisionsGetResponsePage" + }, + "AggregatedDecisionsSortBy": { + "type": "string", + "enum": [ + "first_created_at", + "first_expiration" + ], + "title": "AggregatedDecisionsSortBy" + }, "AllowlistCreateRequest": { "properties": { "name": { @@ -8247,6 +8973,35 @@ ], "title": "DecisionCreateResponse" }, + "DecisionMachineState": { + "properties": { + "timestamp": { + "type": "string", + "format": "date-time", + "title": "Timestamp", + "description": "Date of when the state has been set" + }, + "state": { + "$ref": "#/components/schemas/DecisionMachineStateEnum", + "description": "State of the decision" + } + }, + "type": "object", + "required": [ + "timestamp", + "state" + ], + "title": "DecisionMachineState" + }, + "DecisionMachineStateEnum": { + "type": "string", + "enum": [ + "PENDING_CREATE", + "PENDING_DELETE", + "APPLIED" + ], + "title": "DecisionMachineStateEnum" + }, "DecisionResponse": { "properties": { "created_at": { @@ -11278,7 +12033,7 @@ ], "title": "CVEExploitationPhase" }, - "CVEResponseBase": { + "CVEResponseDetailed": { "properties": { "id": { "type": "string", @@ -11421,6 +12176,62 @@ } ], "description": "Threat context (attacker/defender countries, industries, objectives)" + }, + "tags": { + "items": { + "type": "string" + }, + "type": "array", + "title": "Tags", + "description": "Tags associated with the CVE" + }, + "references": { + "items": { + "type": "string" + }, + "type": "array", + "title": "References", + "description": "List of references for the CVE" + }, + "description": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Description", + "description": "Description of the CVE" + }, + "crowdsec_analysis": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Crowdsec Analysis", + "description": "CrowdSec analysis of the CVE" + }, + "cwes": { + "items": { + "$ref": "#/components/schemas/CWE" + }, + "type": "array", + "title": "Cwes", + "description": "List of CWEs associated with the CVE" + }, + "events": { + "items": { + "$ref": "#/components/schemas/CVEEventOutput" + }, + "type": "array", + "title": "Events", + "description": "List of events related to the CVE" } }, "type": "object", @@ -11435,8 +12246,8 @@ "has_public_exploit", "exploitation_phase" ], - "title": "CVEResponseBase", - "description": "GET CVE ID Response" + "title": "CVEResponseDetailed", + "description": "List item able to carry the heavy detail fields.\n\nThe list endpoint only populates these when ``detailed=true`` is passed;\notherwise they are left unset and stripped from the response via\n``response_model_exclude_unset``. All fields are therefore optional so a\nlean list item stays valid. Values are served straight from the cache\n(same source as the detail endpoint)." }, "CVEsubscription": { "properties": { @@ -11876,138 +12687,6 @@ ], "title": "FingerprintRuleResponse" }, - "FingerprintRuleSummary": { - "properties": { - "id": { - "type": "string", - "title": "Id", - "description": "Fingerprint rule identifier" - }, - "name": { - "type": "string", - "title": "Name", - "description": "Fingerprint rule name" - }, - "title": { - "type": "string", - "title": "Title", - "description": "Fingerprint rule title" - }, - "affected_components": { - "items": { - "$ref": "#/components/schemas/AffectedComponent" - }, - "type": "array", - "title": "Affected Components", - "description": "List of affected components" - }, - "crowdsec_score": { - "type": "integer", - "maximum": 10.0, - "minimum": 0.0, - "title": "Crowdsec Score", - "description": "Live Exploit Tracker score for the fingerprint rule" - }, - "opportunity_score": { - "type": "integer", - "maximum": 5.0, - "minimum": 0.0, - "title": "Opportunity Score", - "description": "Opportunity score", - "default": 0 - }, - "momentum_score": { - "type": "integer", - "maximum": 5.0, - "minimum": 0.0, - "title": "Momentum Score", - "description": "Momentum score", - "default": 0 - }, - "first_seen": { - "anyOf": [ - { - "type": "string", - "format": "date-time" - }, - { - "type": "null" - } - ], - "title": "First Seen", - "description": "First seen date" - }, - "last_seen": { - "anyOf": [ - { - "type": "string", - "format": "date-time" - }, - { - "type": "null" - } - ], - "title": "Last Seen", - "description": "Last seen date" - }, - "nb_ips": { - "type": "integer", - "minimum": 0.0, - "title": "Nb Ips", - "description": "Number of unique IPs observed" - }, - "rule_release_date": { - "anyOf": [ - { - "type": "string", - "format": "date-time" - }, - { - "type": "null" - } - ], - "title": "Rule Release Date", - "description": "Release date of the fingerprint rule" - }, - "exploitation_phase": { - "$ref": "#/components/schemas/ExploitationPhase", - "description": "Current exploitation phase" - }, - "adjustment_score": { - "anyOf": [ - { - "$ref": "#/components/schemas/AdjustmentScore" - }, - { - "type": "null" - } - ], - "description": "Score adjustment details" - }, - "threat_context": { - "anyOf": [ - { - "$ref": "#/components/schemas/ThreatContext" - }, - { - "type": "null" - } - ], - "description": "Threat context (attacker/defender countries, industries, objectives)" - } - }, - "type": "object", - "required": [ - "id", - "name", - "title", - "affected_components", - "crowdsec_score", - "nb_ips", - "exploitation_phase" - ], - "title": "FingerprintRuleSummary" - }, "FingerprintTimelineItem": { "properties": { "timestamp": { @@ -12350,7 +13029,7 @@ "properties": { "items": { "items": { - "$ref": "#/components/schemas/CVEResponseBase" + "$ref": "#/components/schemas/CVEResponseDetailed" }, "type": "array", "title": "Items" @@ -12459,7 +13138,7 @@ "properties": { "items": { "items": { - "$ref": "#/components/schemas/FingerprintRuleSummary" + "$ref": "#/components/schemas/FingerprintRuleResponse" }, "type": "array", "title": "Items" diff --git a/pyproject.toml b/pyproject.toml index 3475644..77eefd6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "crowdsec_service_api" -version = "1.128.0" +version = "1.132.3" license = { text = "MIT" } authors = [ { name="crowdsec", email="info@crowdsec.net" } diff --git a/uv.lock b/uv.lock index 2dd3cda..0b581bd 100644 --- a/uv.lock +++ b/uv.lock @@ -13,43 +13,43 @@ wheels = [ [[package]] name = "anyio" -version = "4.13.0" +version = "4.14.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "idna" }, { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" } +sdist = { url = "https://files.pythonhosted.org/packages/3b/72/5562aabb8dd7181e8e860622a38bea08d17842b99ecd4c91f84ac95251b0/anyio-4.14.1.tar.gz", hash = "sha256:8d648a3544c1a700e3ff78615cd679e4c5c3f149904287e73687b2596963629e", size = 254831, upload-time = "2026-06-24T20:56:06.017Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" }, + { url = "https://files.pythonhosted.org/packages/b0/7b/90df4a0a816d98d6ea26f559d87836d494a2cf1fcf063be67df50a7bcc30/anyio-4.14.1-py3-none-any.whl", hash = "sha256:4e5533c5b8ff0a24f5d7a176cbe6877129cd183893f66b537f8f227d10527d72", size = 124875, upload-time = "2026-06-24T20:56:04.413Z" }, ] [[package]] name = "botocore" -version = "1.43.27" +version = "1.43.36" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "jmespath" }, { name = "python-dateutil" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/fa/4e/db50ef135f1d9ffc85e209a124004a5829d8f12f4a7a0afdf380cb19866d/botocore-1.43.27.tar.gz", hash = "sha256:2093c316c24214e50e18640b1869513b759bb8cc48b95b004a8306cb9f0d6703", size = 15504242, upload-time = "2026-06-10T19:38:25.389Z" } +sdist = { url = "https://files.pythonhosted.org/packages/7c/37/da9e7f6ca73ac73afd7f0bb7f238aa5daba35c081e98d7f48a7c399599c0/botocore-1.43.36.tar.gz", hash = "sha256:4cae47d1b2d426316b85a0087d9e69e048f13bc003b5177d74639fe9dfd28205", size = 15625488, upload-time = "2026-06-23T02:47:03.192Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2d/46/05b227b34e434b54867c2c942b0bfbbe2fe41789c18bb15ef787d03e9a56/botocore-1.43.27-py3-none-any.whl", hash = "sha256:4976544e652d5a1d8eca135da019f8e1c2d749efa2f9a31a8fb8c76f1895a40b", size = 15190293, upload-time = "2026-06-10T19:38:22.298Z" }, + { url = "https://files.pythonhosted.org/packages/5c/19/934f81592527a3f7f9b943c893e334c721a4644948642bc33885d584e9ec/botocore-1.43.36-py3-none-any.whl", hash = "sha256:3c65fdc39ed01d8dfde1e961b34038aed03c459f8ddf80717a12ac006475e49d", size = 15313630, upload-time = "2026-06-23T02:46:59.327Z" }, ] [[package]] name = "certifi" -version = "2026.5.20" +version = "2026.6.17" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f3/ce/ee2ecad540810a79593028e88299baeae54d346cc7a0d94b6199988b89b1/certifi-2026.5.20.tar.gz", hash = "sha256:69dea482ab64caa7b9f6aba1c6bf48bb6a5448d1c0f1b17ab42ad8c763a5344d", size = 135422, upload-time = "2026-05-20T11:46:50.073Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c9/c7/424b75da314c1045981bd9777432fad05a9e0c69daa4ed7e308bbaffe405/certifi-2026.6.17.tar.gz", hash = "sha256:024c88eeec92ca068db80f02b8b07c9cef7b9fe261d1d535abfd5abd6f6af432", size = 134594, upload-time = "2026-06-17T10:31:07.894Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/59/8c/57e832b7af6d7c5abe66eb3fbe3a3a32f4d11ea23a1aa7131371035be991/certifi-2026.5.20-py3-none-any.whl", hash = "sha256:3c52e209ba0a4ad7aebe60436a4ab349c39e1e602e8c134221e546902ad25897", size = 134134, upload-time = "2026-05-20T11:46:48.578Z" }, + { url = "https://files.pythonhosted.org/packages/ef/2f/c5464532e965badff2f4c4c1a3a83f5697f0d7c407ed0cda44aaa99bb451/certifi-2026.6.17-py3-none-any.whl", hash = "sha256:2227dcbaafe0d2f59279d1762ddddc37783ed4354594f194ffc31d20f41fc3db", size = 133289, upload-time = "2026-06-17T10:31:06.348Z" }, ] [[package]] name = "crowdsec-service-api" -version = "1.128.0" +version = "1.132.3" source = { editable = "." } dependencies = [ { name = "botocore" },