From 3171ac554acb5bae07605c61286e6118916d53eb Mon Sep 17 00:00:00 2001 From: AlteredCoder <64792091+AlteredCoder@users.noreply.github.com> Date: Wed, 15 Jul 2026 13:43:24 +0000 Subject: [PATCH] Update python SDK v0.17.1 --- crowdsec_service_api/__init__.py | 9 +- .../__pycache__/__init__.cpython-311.pyc | Bin 5024 -> 5163 bytes .../__pycache__/base_model.cpython-311.pyc | Bin 4378 -> 4370 bytes .../__pycache__/http_client.cpython-311.pyc | Bin 7768 -> 7760 bytes .../__pycache__/models.cpython-311.pyc | Bin 158635 -> 166867 bytes crowdsec_service_api/models.py | 420 +++++-- .../__pycache__/__init__.cpython-311.pyc | Bin 207 -> 199 bytes .../__pycache__/allowlists.cpython-311.pyc | Bin 12917 -> 12909 bytes .../__pycache__/blocklists.cpython-311.pyc | Bin 15121 -> 15113 bytes .../services/__pycache__/cves.cpython-311.pyc | Bin 12321 -> 12356 bytes .../__pycache__/decisions.cpython-311.pyc | Bin 4338 -> 7214 bytes .../__pycache__/fingerprints.cpython-311.pyc | Bin 12310 -> 12345 bytes .../services/__pycache__/hub.cpython-311.pyc | Bin 3277 -> 3269 bytes .../services/__pycache__/info.cpython-311.pyc | Bin 2035 -> 2027 bytes .../__pycache__/integrations.cpython-311.pyc | Bin 8075 -> 8067 bytes .../__pycache__/metrics.cpython-311.pyc | Bin 2607 -> 2599 bytes .../__pycache__/products.cpython-311.pyc | Bin 3782 -> 3774 bytes .../tracker_events.cpython-311.pyc | Bin 2914 -> 2906 bytes .../__pycache__/tracker_tags.cpython-311.pyc | Bin 5698 -> 5690 bytes .../__pycache__/vendors.cpython-311.pyc | Bin 10351 -> 10343 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 | 9 +- doc/Cves.md | 6 +- doc/Decisions.md | 152 ++- doc/Fingerprints.md | 6 +- doc/Models.md | 107 +- doc/README.md | 16 +- public-openapi.json | 1092 ++++++++++++++--- pyproject.toml | 2 +- uv.lock | 32 +- 42 files changed, 1600 insertions(+), 357 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..a3e99f0faa97da74676388f1b45d279d2a543616 100644 GIT binary patch delta 284 zcmZ3WzFLECIWI340}zz;g=gi8ZseIV z5<-5mEQh3&B!Uk!r#LvjsKlvqa|ClIi@pd<)Hg9XBQq~GxCChBEeUL*u6d=on;)=W zWEK&24s(Us=#pBJn3$7#skC Co@5FD delta 167 zcmZ3ju|S<~IWI340|=CAW$h8!$XCUr7O9_+pPQ;*RGOEUTBILeo?n!$pPZjpoS&1b zn^=$uWlvtll)<=hGC#A+=2OgVESnoRE-(x5JBPUjr4|77N<^5;khO*=9Zb4 zo?28;l$lo&RGO0-T$-DkSX8;$k~f!?@#5y?LYa)xMNHgG9~cm113L&7$p9S&05`@q ABme*a diff --git a/crowdsec_service_api/__pycache__/base_model.cpython-311.pyc b/crowdsec_service_api/__pycache__/base_model.cpython-311.pyc index 98b9f58568825bc4f734f1e579444f5920d5390c..5dd82f4fc7bb983038bd03ecb7b64e7b93cc80fa 100644 GIT binary patch delta 56 zcmbQGG)akjIWI340}!P5g>U3mW|j-q&&bbB)h{Z|%S$cNk1x+J%GNI`OVv#*$OO`x JLzs{80sz9c5w8FM delta 64 zcmbQFG)swlIWI340}wnd(b~wZ%&ZozpOK%Ns$W!^mzP?kA77qdl&znfpI4lpld79o NkO^gP_F+E83jlAr6*>R_ diff --git a/crowdsec_service_api/__pycache__/http_client.cpython-311.pyc b/crowdsec_service_api/__pycache__/http_client.cpython-311.pyc index 1bc5815900c09dcc5d59b8b7d1636dda5e5ee5f9..c82e576a769bdd15f0b8e493a1ceea4a79b0479c 100644 GIT binary patch delta 56 zcmca%bHRptIWI340}!P5g>U3O$0!$~pOK%Ns$W!^mzP?kA77qdl&xP>ma3arkO`zW J|7VPp0RRJc6I1{I delta 64 zcmca$bHj#vIWI340}wnd(b~v;j!`W}KO;XkRlle-FE6!7KfXM_C|f@{Kd(4HCsjAG NAQQ^o{GBmU1^~M}7T*8> diff --git a/crowdsec_service_api/__pycache__/models.cpython-311.pyc b/crowdsec_service_api/__pycache__/models.cpython-311.pyc index 6ec2ace3e093ffc22a4a8f92ab2f5aa7fa9fef13..8836c401a0a89642f14bab946a8b08e4b47ab7a7 100644 GIT binary patch delta 38450 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 z%0D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 delta 32722 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 -# timestamp: 2026-06-11T08:42:40+00:00 +# timestamp: 2026-07-15T13:43:18+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', @@ -244,6 +249,13 @@ class BlocklistCreateRequest(BaseModelSdk): tags: Annotated[ Optional[List[str]], Field(description='Classification tags', title='Tags') ] = [] + store_full_content_in_s3: Annotated[ + Optional[bool], + Field( + description='Whether to store the full blocklist content in S3 or not', + title='Store Full Content In S3', + ), + ] = False class BlocklistDeleteIPsRequest(BaseModelSdk): @@ -420,6 +432,12 @@ class DecisionCreateResponse(BaseModelSdk): ] +class DecisionMachineStateEnum(StrEnum): + PENDING_CREATE = 'PENDING_CREATE' + PENDING_DELETE = 'PENDING_DELETE' + APPLIED = 'APPLIED' + + class DecisionTargetType(StrEnum): ORG = 'org' TAG = 'tag' @@ -670,10 +688,13 @@ class CVEEventOutput(BaseModelSdk): class CVEExploitationPhase(StrEnum): INSUFFICIENT_DATA = 'insufficient_data' EARLY_EXPLOITATION = 'early_exploitation' + RAPID_ESCALATION = 'rapid_escalation' + ACTIVE_EXPLOITATION = 'active_exploitation' + BACKGROUND_NOISE = 'background_noise' + LIMITED_EXPLOITATION = 'limited_exploitation' FRESH_AND_POPULAR = 'fresh_and_popular' TARGETED_EXPLOITATION = 'targeted_exploitation' MASS_EXPLOITATION = 'mass_exploitation' - BACKGROUND_NOISE = 'background_noise' UNPOPULAR = 'unpopular' WEARING_OUT = 'wearing_out' UNCLASSIFIED = 'unclassified' @@ -1380,7 +1401,7 @@ class BlocklistsUploadBlocklistContentQueryParameters(BaseModelSdk): Optional[datetime], Field( description='Blocklist expiration', - examples=['2026-06-11T08:40:13.370581+00:00'], + examples=['2026-07-08T08:42:28.511313+00:00'], title='Expiration', ), ] = None @@ -1587,6 +1608,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 +1646,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 +1686,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 +1884,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 +2320,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 +2798,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 +3889,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 +3969,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 +4076,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 +4191,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 +4200,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 +4527,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..4c05abf16e77d326dd8c73498fe563e06032ae7e 100644 GIT binary patch delta 38 scmX@lc$|@YIWI340}!P5g-_%*WsI8WD9lwU4JWo9ok&@(jGGn|~y93&T`pOK%Ns$W!^mzP?kA77qd Vl&xP>ma3arkO`zWKWFaK0|3~Y7O(&S delta 76 zcmaEx@->BfIWI340|=CAZRCz+W;fI`G_ue$n4HfXq?V$ek)NBYUsRfxms+GBU!Gr- Yt)HBqSDc@ds+(Al31x4-&)la60AeE<1poj5 diff --git a/crowdsec_service_api/services/__pycache__/blocklists.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/blocklists.cpython-311.pyc index d87cdb1bac7f4880ebeb44a85f3d6e4d5ffdd4cb..b2d1d6c09f597ae9457d6e313cc352ed9d72cd5c 100644 GIT binary patch delta 68 zcmbPO)>+2AoR^o20SLKO;XkRlle-FE6!7KfXM_ VC|kd%ELAtLAQMP$PG?zV1_0Pj7O?;T delta 76 zcmeAyn^?xZoR^o20R&35Hgex(W;fI`G_ue$nEakONG(M_BR@A)zo;}XFSSTNzC6Du YTR%BJuQ)#^RX4F96UyEk&$7x40A#iq1^@s6 diff --git a/crowdsec_service_api/services/__pycache__/cves.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/cves.cpython-311.pyc index 7d05d919d947b7bbc0e723946bb4f0ca957ad427..786cb7d0f6d030c90b91c5ee28971258ac37e27a 100644 GIT binary patch delta 2202 zcma)8UrbwN6u)1&{mZ>AE&U5E6k6yXMmshT0kHz9=vNTE)1Y}9xVcs)qOG@Hu&vb0XkXgrj#9ecJ;~}*6Av}k$U5g(O-zaX;YjKl!@u=nAE}>5<@r}?cN|5x!<{@&h z__uO>myN$#TXCbxdmx9BTwrGl9Cy1#*cK%t#bMi^u4%KX4$M?5&AhF&YxWrF7PswD z!?WnoBUDFoLM!lP4x69BCDVGvr-5V5xKHG-gtG=$7ruS53eeWA59~OOey}AQq5bhY) zx;X*Mn4Y&|PjI#>Q>M*;HZ59@joW&B$=`vGst?|m+-xCc;dQtV192^zCly{Y<|h|2 zxk(B$r4O7S-xkLM>i>GYUF$+)7ix8u43uS9fyK-fHBE@2P5u$bLS2r>ydxilVwJ8pi%&vM@q5VDTbU@(+$dQ~B7{jy z?~+L*JV5>^X2S1p$zmWfgRw|SIhLMbnRJ%DP+&7W2gX?)KrqPt7?z9aNP;-U2a(Rl zC3-s&fhjabTe~*%+uEdgjIm3T7NSw|Kztg#?-)k!AVL#BjPPNx8mlEO;#w>}B)^u+ z!3PPxOuQFe4k8>z7(f_A7(#dnVFY0m;W)wxgi{FP;!Hejptwwn%kj2`EH38&O3G+D zJH?LV3u*Ye@ddOmic)+(nG)8v`DI_jEvM_2(_OZE^#i0VA>Ofhu2#LbRMu-IgXE~Y z+J4g>EgLm%l3alsf%couMA@tvEK;E5MoZ64e{Z>3GbmE6r>tsAt7LPOZQ8O1mlYL< zWcHV9(dw)yZo|%^dC#Zvu?i!-SUz;Z0tDaY!bIA>$`sE_Sb1 N?*6rd6AwV#e*qd-)QtcD delta 2178 zcma)6OH5l=5WUwtf1d4!vGIqGjSU9u$H$ICzL2CUphA>>6q5c>NojYe{ z-uSIe-kwxGR}?G3&qCLQ$ci#dn;n7@^5;*KkPpaB!pJz)$hbiZ^AsIjnlWiMW?@p} zW*i}!9k{8AE5OZFycW1z#U0G5)xlR{wwYSZdDS>>*IY~juFObU{Z(nac9T1RyMfnj za%pBs(mddB$^`$kc5&c)qM(X^YsRWIfIvOOc5E9fF*mf-2r(X!u~S4=H+jsI}#yZ!?*ldwC5i04LCHDX3Uc$&D;5u=^j=1 zkU5+v+F4r5W|HaL`2{^ytVw02^*99UF@#=#qD5!(Sty##D?s_O`LN_74M9HT^%WkN zzoUK?L%R_Y0IEgbk9Hrz0lqG`*bbq27~u$iC^rXBpxKWwfUs3hKgL(>UVhT*rD|c) z`r97)XYE~E@-N#%bPzI((&GiQvbx9Zd$pb3s_LMcqLgEoayq8)@;*nDo-Ukoj2K!g zP42^*MW^zXPS>0&J;d)jqkP?OLrKpT1WZ^Im(JhW>6i2s(*Ic!S(l4GkMi+ z%I1>rD$_5a{|bN5)kk0E;qJGW+@7D^-jc&-9Hu3L_>04LtLDSSl2N!!#MN}Gcf%Pi znFY5HPhdUJyWx(NWZ|%qK*xH=(G7op$tE0j;&7D|Vb-EqPF+W2f5|DlLZz%#A|~P5 zU+C$%V4!{cX6%Y8-k13L)}08rIeGvApWGwMvAK-4kYXqFkN7}*_0)(&2chzv|6M!$ MNBQ)xU4n$bzmi(Lp#T5? diff --git a/crowdsec_service_api/services/__pycache__/decisions.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/decisions.cpython-311.pyc index d705642e1226909db262b964ed97acbc6e614089..84851a7a3bfef92cedd119339a01fad4c73e7f0c 100644 GIT binary patch literal 7214 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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..1f4e8954224c89f6ea0e39972bed8660a7e72e48 100644 GIT binary patch delta 2287 zcma)6Z){Ul6u-B9ZC_ve+O_MSbz4Wrwr+2K+Wi4G28fff1dNE|kINv8!n=cFY3qI6 z7_d1$kZ9B($xVO{elRgg@K20XKj;UeUoKwNt52nQh01p zcT8J#Cy|L1Dmen`D(Kb<-37X>LU$9pUPBb!1Fu9J(=Oe6-ZJUbYl#H9G%e}A^U|bh zNBpO^347qN9Hsq>Jb-Ij(Ss1c4bIUOoh4EOH0!{}BSN+duQCPiw5*37$3F>Qzyh!RQ&Lxo$sW0mgGy*{zmN%)SQE!HGgh;sTRhHl= zA<|UVVgFj#zeXgKNCZf=0Ey-|&>Wszy9a4nfobNSY_q+wzQI@@`^!AubSQp2bCSgA zOgc?yeCkw&z7nUiq$iP0!atjlKE-2ft)+dvtdm?KnId{Y$|jDHf@CDmkfXNcCL+XT zGrSKJX#HiR;{_YLDK}W;BwDbut?exqYZA@N>|4hsivl(W%Qm#cZS#(KW#0aY^r3{% z$MBY(1!wNjD1kw@>Xvzw#Pd#ezrBl{w*HD$HeqWTr0uX;aFVp1%_P&gsTrCom{Xaf zG!AweaYTT!bLmz-9(|#@wa9GEFw{KwQ{Puo2 z1bRWrk-6M8nbz~gXE+RV*uXRXH2Br&h;nHG#vohrjN^&?R_`TK^r?m6 z3AX}~Ue@KW!5i3S|EQx(rI)?nZ)KnPeVVAu|0>Foe^z}J!W#Dg&Y_}{eW&=?l-HJj zGf;2Z@)B70Qo(CKh?<3V!=IR;(lm)ai|G)Rv{kk7Ufl?ci!v-_Ge%BRN`>KZR-cxF zEt@!<$|Q6cn}FjoW#;0jo|@BuA<`agb+SwG*fC2YETX z&txrifdyK(N!Kv#V;`+qz_(dPWW84$vHFY1L6?yBg^xW}u6m3G6kw1Jh+;hhlE82xYLAAl6Lx@h~_7+tky0};hT7&EzMUSwG z_@yiY&A8Z~4|E?i;Q?mE&en)lx;aS?hd%aqtPa1!g7I%ga%MbSL@VRP!TVz6&;MAb HVTkq*E!W@> delta 2219 zcma)6Z){Ul6u-B7eQjU+)<0{vb!$fpYuOuH+l`FD#$qOwK#a>6prn#O!@GrIY3q9( zATq}X48~|;auUEqq92Tgh#$1ZgfApS6ZMl2i7_Q6_{A@3QlsDSgZJFdwdK$7HT}JF z&OP^>-#zEtcm43i!|KPXst|k@hmXfUQ`59x6)GWreMCALUb3`dJkoJ8aea++qMdx^HO=GvJr9%V4m@r`XPF*d$6k%A6sA)ZSfE1h6T zW3gCdM)J_9lJQdVNU3O+3T!l6&acQ|N}od1x>1$N*`ur`nfWv9hzvLFensJZzC?7o zB*UJreyc4{mhA9y*G6iC@14_D2iFx??%xoU&njmfXYJRdk0e4q;s3_7Y zm4MgfyVM0)+W?%m`NIkBVT>Y-aH!c0W|lcMX1cfvU)l~(Pt|R|O+!QIGmMbppxKQv zl*bV^!#|EK(-SCeL73!FlPc_V<*ME2L(2@pHiRjJ_N2x%oKT*pL)EX9{g!AmPZC{4 zGDlmoa4Z5DH7H}k+BnPy`rw>bfh($8Zls6L)!~FlnZ^(?ggC+)43y48bbIx9=X1Y8C)NV#JjLmxU@CxAo(-g(O)4ok7#M^b0ly}S@xSVDKX6hl^RVVG9L|xt3vMZX zDEe&Gcf0#6GxOZK&k(%!b5XMzoA^u2PGgEhYsFNE;@R3dSMQxouZ~GgDwoWPrZmcf z(bgW5nys9DrBKT1d|noVW%_3I*I>Wp!MSWt7!Ex%(@ZGqtiUR)ts^gD-ZeXNihfw_ z3GcVajc!0}aEEl28Y#HGZi(K8$;gCH9JT#MycU^k3}{MB%aw>7evY`OR-5zRxkYCV zBZ=%2n8c$8==JJy^n(^A=`o$}(rC@QyQt@nWGf|OSEW*(&sL5ZIlf|AI7A{w2xI3t zoSBB%&H)I;9dL8dPk)0S2Omj49NX4diY(-BszE;V=KCDM|c`x7s76Y=Md%)_9EkyRLRy=V_fF-gEa{?s#jdZWSh(`1&r7-ti9A zZ9=z`K=@X8^o~DKcL;+*+`hU~h%OWxkvfTEsO}b45wsC{1yeq2_+Fs5ZsqT4dSs7< uj>E;os~$0YZY1bMNI^8&OW%g6rc~p{nIWI340}zz;g>U4pU}7&b&@(jGGo0MT6eJg_pOK%Ns$W!^mzP?kA77qd Vl&xP>ma3arkO`zWGclj$1OTDe6)FG# delta 76 zcmX>qc~+8pIWI340|=CAZRDU2zWnwQg&@(jGGn|~x6eJg>pOK%Ns$W!^mzP?kA77qd Vl&xP>ma3arkO`zW-)9nG1puas6+Qp} delta 76 zcmaFO|CyhAIWI340|=CAZR8GRVmH(?G_ue$n4HcOq!y>2k)NBYUsRfxms+GBU!Gr- Yt)HBqSDc@ds+(Al31x4-&LqML04d@ZlK=n! diff --git a/crowdsec_service_api/services/__pycache__/integrations.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/integrations.cpython-311.pyc index 53c1b9a9ec792af93fa36c27f740d87492cd99cb..48ec986fe8183d50e27df3d64b2ddaca2931a003 100644 GIT binary patch delta 68 zcmeCSZ?@-N&dbZi00d=y;TyTtnc2$>^bF1Q3@2MM2g$|hXXNLm>KB#f<)s$s$Cu|9 VW$PD}rRpXYWCH2U8<}rO0|0wC6)OM$ delta 76 zcmZp+@3!Y&&dbZi00O028@bh)*$wp!jV$yGCR;KGsio;>nG>u73b%q>LwOsLfM;FGT)L00QhkifB*mh diff --git a/crowdsec_service_api/services/__pycache__/metrics.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/metrics.cpython-311.pyc index 3dd88f559c910ce5387a7850a10836d8cccbb337..9643457c6a01f48fbe6fbce667aa05f3af670e1d 100644 GIT binary patch delta 68 zcmZ24vRs6FIWI340}zz;g>U4Z!Ngu>pl4{VXE=EkQ;=Mwenx(7s(w*vUS4XEetda; VQMP_jS*mVgK_-yiti;UA4gi`x6o>!- delta 76 zcmZ23vR;IHIWI340|=CAZRDQ8#BQi(Xk?*hFnJYIkXoXCMt*Lpeo<*&UTTqke0hFR YwtjMcUU7a-s%~OICX~HdikX)k03GcX-2eap diff --git a/crowdsec_service_api/services/__pycache__/products.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/products.cpython-311.pyc index 46ae2eb243d215432d14d619a14b512bbe5e3d54..c415600af374691e1f9d76338b96ecda59a046eb 100644 GIT binary patch delta 68 zcmX>myHA#TIWI340}zz;g>U4(&%|D4pl4{VXE^yIQ;=Mgenx(7s(w*vUS4XEetda; VQMP_jS*mVgK_-yioXH%^4FJV`74iT8 delta 76 zcmdlddrX#lIWI340|=CAZREbs#BQi(Xk?*hF!>`>kXn*{Mt*Lpeo<*&UTTqke0hFR YwtjMcUU7a-s%~OICX~H7kvWzd08gbDM*si- 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..0f2d05093be82655c4ce0d35b188d9a09fbf8dde 100644 GIT binary patch delta 54 zcmaDPc1w(VIWI340}zz;g>U3O!^B=@pl4{VXE^yDQxIdqWJ6|QuA;J3-Nb@S{i3qX IVaz-n0HHn)I{*Lx delta 62 zcmca5_DGC-IWI340|=CAZR9?~#BQi(Xk?*hF!>%+5M#zU38VP-Eg&@(jGGo0MU93&T~pOK%Ns$W!^mzP?kA77qd Vl&xP>ma3arkO`zW|6_I$0syG`6}tcc delta 76 zcmdm`b4Z7KIWI340|=CAZR9RtW;fI`G_ue$nB2x3q?V?ik)NBYUsRfxms+GBU!Gr- Yt)HBqSDc@ds+(Al31x5o#_S>l04-7&5C8xG diff --git a/crowdsec_service_api/services/__pycache__/vendors.cpython-311.pyc b/crowdsec_service_api/services/__pycache__/vendors.cpython-311.pyc index d4f743a50282e1bb623c56cac65a0e44cf40b373..2c03b865df815935da563b1f785603737b4220e1 100644 GIT binary patch delta 68 zcmaDK@H~KfIWI340}zz;g>U3O#>`%3pl4{VXE^x=bC6u5enx(7s(w*vUS4XEetda; VQMP_jS*mVgK_-yi9Ka&40s!m&7CZm| delta 76 zcmaDJ@IHWhIWI340|=CAZR9@2%xXk?*hF!=^^kXoXCMt*Lpeo<*&UTTqke0hFR YwtjMcUU7a-s%~OICX~I|gGF8i0D4{+kpKVy diff --git a/crowdsec_service_api/services/allowlists.py b/crowdsec_service_api/services/allowlists.py index 057a909..ed934f1 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/v0.17.1") def list_allowlists( self, diff --git a/crowdsec_service_api/services/blocklists.py b/crowdsec_service_api/services/blocklists.py index ac2cad5..6cfbcd3 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/v0.17.1") def get_blocklists( self, diff --git a/crowdsec_service_api/services/cves.py b/crowdsec_service_api/services/cves.py index 6d90155..58f1bfb 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/v0.17.1") 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..1b018e6 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/v0.17.1") 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..fbeb93a 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/v0.17.1") 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..d6e3ea6 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/v0.17.1") def get_index( self, diff --git a/crowdsec_service_api/services/info.py b/crowdsec_service_api/services/info.py index c5b2050..e0db44f 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/v0.17.1") def get_info( self, diff --git a/crowdsec_service_api/services/integrations.py b/crowdsec_service_api/services/integrations.py index 73f5656..0cc0477 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/v0.17.1") def get_integrations( self, diff --git a/crowdsec_service_api/services/metrics.py b/crowdsec_service_api/services/metrics.py index 322c7c5..9f1106e 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/v0.17.1") def get_metrics_remediation( self, diff --git a/crowdsec_service_api/services/products.py b/crowdsec_service_api/services/products.py index 5d173fc..83bdb91 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/v0.17.1") def get_products( self, diff --git a/crowdsec_service_api/services/tracker_events.py b/crowdsec_service_api/services/tracker_events.py index fa41f55..446ef69 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/v0.17.1") 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..5de006f 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/v0.17.1") def get_tags( self, diff --git a/crowdsec_service_api/services/vendors.py b/crowdsec_service_api/services/vendors.py index dab3932..9355556 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/v0.17.1") def get_vendors( self, diff --git a/doc/Blocklists.md b/doc/Blocklists.md index 78168f1..01e7143 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 @@ -99,6 +99,7 @@ request = BlocklistCreateRequest( description=None, references=None, tags=None, + store_full_content_in_s3=None, ) try: response = client.create_blocklist( @@ -178,7 +179,7 @@ except HTTPStatusError as e: ### Errors: | Code | Description | | ---- | ----------- | -| 404 | Blocklist not found | +| 404 | Not found | | 422 | Validation Error | ### Usage @@ -251,8 +252,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..24032b4 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 @@ -273,6 +331,7 @@ name, description | description | str | Blocklist description || | references | list[str] | Useful references on the list's origins || | tags | list[str] | Classification tags || +| store_full_content_in_s3 | bool | Whether to store the full blocklist content in S3 or not || # **BlocklistDeleteIPsRequest** ## Required: @@ -553,6 +612,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 @@ -1105,9 +1177,9 @@ name, date, description, label, sorting_priority # **CVEExploitationPhase** ## Enum: -INSUFFICIENT_DATA, EARLY_EXPLOITATION, FRESH_AND_POPULAR, TARGETED_EXPLOITATION, MASS_EXPLOITATION, BACKGROUND_NOISE, UNPOPULAR, WEARING_OUT, UNCLASSIFIED +INSUFFICIENT_DATA, EARLY_EXPLOITATION, RAPID_ESCALATION, ACTIVE_EXPLOITATION, BACKGROUND_NOISE, LIMITED_EXPLOITATION, FRESH_AND_POPULAR, TARGETED_EXPLOITATION, MASS_EXPLOITATION, 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 +1202,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 +1327,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 +1404,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 +1438,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..a08e29f 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.48", "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-07-08T08:42:28.511313+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": "Unprocessable entity" + }, + "404": { + "description": "Not found" }, - "422": { - "description": "Validation Error", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HTTPValidationError" - } - } - } + "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": { @@ -7210,6 +7936,12 @@ "title": "Tags", "description": "Classification tags", "default": [] + }, + "store_full_content_in_s3": { + "type": "boolean", + "title": "Store Full Content In S3", + "description": "Whether to store the full blocklist content in S3 or not", + "default": false } }, "additionalProperties": false, @@ -8247,6 +8979,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": { @@ -11268,17 +12029,20 @@ "enum": [ "insufficient_data", "early_exploitation", + "rapid_escalation", + "active_exploitation", + "background_noise", + "limited_exploitation", "fresh_and_popular", "targeted_exploitation", "mass_exploitation", - "background_noise", "unpopular", "wearing_out", "unclassified" ], "title": "CVEExploitationPhase" }, - "CVEResponseBase": { + "CVEResponseDetailed": { "properties": { "id": { "type": "string", @@ -11421,6 +12185,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 +12255,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 +12696,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 +13038,7 @@ "properties": { "items": { "items": { - "$ref": "#/components/schemas/CVEResponseBase" + "$ref": "#/components/schemas/CVEResponseDetailed" }, "type": "array", "title": "Items" @@ -12459,7 +13147,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..081189f 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 = "v0.17.1" license = { text = "MIT" } authors = [ { name="crowdsec", email="info@crowdsec.net" } diff --git a/uv.lock b/uv.lock index 2dd3cda..c7f8438 100644 --- a/uv.lock +++ b/uv.lock @@ -13,43 +13,43 @@ wheels = [ [[package]] name = "anyio" -version = "4.13.0" +version = "4.14.2" 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/61/cc/a381afa6efea9f496eff839d4a6a1aed3bfafc7b3ab4b0d1b243a12573dd/anyio-4.14.2.tar.gz", hash = "sha256:cfa139f3ed1a23ee8f88a145ddb5ac7605b8bbfd8592baacd7ce3d8bb4313c7f", size = 260176, upload-time = "2026-07-12T20:29:07.082Z" } 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/da/35/f2287558c17e29fafc8ef3daf819bb9834061cfa43bff8014f7df7f63bdc/anyio-4.14.2-py3-none-any.whl", hash = "sha256:9f505dda5ac9f0c8309b5e8bd445a8c2bf7246f3ce950121e45ea15bc41d1494", size = 125813, upload-time = "2026-07-12T20:29:05.763Z" }, ] [[package]] name = "botocore" -version = "1.43.27" +version = "1.43.48" 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/6b/69/76c5576654c0982351a821c544042ccd7a25a060776453a3c15e0486e47e/botocore-1.43.48.tar.gz", hash = "sha256:4f60c1072fb529610359cdb6df92c59615d739df3b0a124091d3bbd28f7ea00c", size = 15700978, upload-time = "2026-07-14T19:29:45.916Z" } 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/7c/b0/28d40443ed912260d55cf7a5d377378fc43e384627fd57b632472cbea7bf/botocore-1.43.48-py3-none-any.whl", hash = "sha256:cc9b4e925c1913d662194507f4f9b37aa744dcd2361af31c013672eafe824490", size = 15385380, upload-time = "2026-07-14T19:29:41.826Z" }, ] [[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 = "0.17.1" source = { editable = "." } dependencies = [ { name = "botocore" }, @@ -299,11 +299,11 @@ wheels = [ [[package]] name = "typing-extensions" -version = "4.15.0" +version = "4.16.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f6/cc/6253133b5bb138fc3306cebfbda2c520f545d36b5be2c7255cc528bb45d6/typing_extensions-4.16.0.tar.gz", hash = "sha256:dc983d19a509c94dba722ee6abd33940f7c05a89e243c47e907eb4db6f1a43e5", size = 113555, upload-time = "2026-07-02T08:40:05.92Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, + { url = "https://files.pythonhosted.org/packages/49/d3/b8441a820a491ddfc024b0b0cf0393375b75ea13866d9c66727e54c2fc80/typing_extensions-4.16.0-py3-none-any.whl", hash = "sha256:481caa481374e813c1b176ada14e97f1f67a4539ce9cfeb3f350d78d6370c2e8", size = 45571, upload-time = "2026-07-02T08:40:04.659Z" }, ] [[package]] @@ -320,11 +320,11 @@ wheels = [ [[package]] name = "tzdata" -version = "2026.2" +version = "2026.3" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ba/19/1b9b0e29f30c6d35cb345486df41110984ea67ae69dddbc0e8a100999493/tzdata-2026.2.tar.gz", hash = "sha256:9173fde7d80d9018e02a662e168e5a2d04f87c41ea174b139fbef642eda62d10", size = 198254, upload-time = "2026-04-24T15:22:08.651Z" } +sdist = { url = "https://files.pythonhosted.org/packages/92/ff/5a28bdfd8c3ebec42564ac7d0e54ca3db65044a9314a97f9564fa7a1e926/tzdata-2026.3.tar.gz", hash = "sha256:4a1518b8993086a7982523e071643f3c0e5f213e75b21318e78bcabfff9d1415", size = 198674, upload-time = "2026-07-10T08:50:37.887Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, + { url = "https://files.pythonhosted.org/packages/e5/6d/b53b99a9f2766d095985947a5782f1702cabb129a34f7a802d7197af832f/tzdata-2026.3-py2.py3-none-any.whl", hash = "sha256:dc096730c87af6cab1b171c9d532be840741ff5d459015e7f6947bd7d7e54931", size = 348168, upload-time = "2026-07-10T08:50:36.46Z" }, ] [[package]]