mmisp-lib 0.6.4__tar.gz → 0.7.1__tar.gz

{mmisp_lib-0.6.4 → mmisp_lib-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.6.4
+Version: 0.7.1
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -33,6 +33,8 @@ Requires-Dist: respx==0.20.2; extra == "dev"
 Requires-Dist: mysql-connector-python==8.3.0; extra == "dev"
 Requires-Dist: icecream; extra == "dev"
 Requires-Dist: asyncio; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: build; extra == "dev"
 
 # Modern MISP - API
 

{mmisp_lib-0.6.4 → mmisp_lib-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.6.4"
+version = "0.7.1"
 description = ""
 authors = []
 readme = "README.md"
@@ -41,6 +41,8 @@ dev = [
   "mysql-connector-python==8.3.0",
   "icecream",
   "asyncio",
+  "twine",
+  "build",
 ]
 
 [tool.setuptools.package-data]

{mmisp_lib-0.6.4 → mmisp_lib-0.7.1}/src/mmisp/api_schemas/attributes.py

@@ -1,4 +1,4 @@
-from typing import Annotated, Any, Dict, Optional
+from typing import Annotated, Any, Dict, Optional, Type
 
 from pydantic import BaseModel, Field, root_validator, validator
 
@@ -13,7 +13,7 @@ from mmisp.lib.attributes import (
 
 
 class GetAttributeTag(BaseModel):
-    id: str
+    id: int
     name: str
     colour: str
     numerical_value: int | None = None
@@ -22,25 +22,25 @@ class GetAttributeTag(BaseModel):
 
 
 class SearchAttributesObject(BaseModel):
-    id: str
+    id: int
     distribution: str
-    sharing_group_id: str
+    sharing_group_id: int
 
 
 class SearchAttributesEvent(BaseModel):
-    id: str
-    org_id: str
+    id: int
+    org_id: int
     distribution: str
     info: str
-    orgc_id: str
+    orgc_id: int
     uuid: str
     publish_timestamp: int
 
 
 class SearchAttributesAttributesDetails(BaseModel):
-    id: str
-    event_id: str | None = None
-    object_id: str | None = None
+    id: int
+    event_id: int | None = None
+    object_id: int | None = None
     object_relation: str | None = None
     category: str
     type: str
@@ -49,12 +49,14 @@ class SearchAttributesAttributesDetails(BaseModel):
     uuid: str
     timestamp: str
     distribution: str
-    sharing_group_id: str | None = None
+    sharing_group_id: int | None = None
     comment: str | None = None
     deleted: bool
     disable_correlation: bool
     first_seen: str | None = None
     last_seen: str | None = None
+    event_uuid: str | None = None
+    data: str | None = None
     Event: SearchAttributesEvent | None = None
     Object: SearchAttributesObject | None = None
     Tag: list[GetAttributeTag] | None = None
@@ -105,6 +107,9 @@ class RestSearchFilter(BaseModel):
 
 
 class SearchAttributesBody(RestSearchFilter):
+    class Config:
+        allow_population_by_field_name = True
+
     returnFormat: str = "json"
     page: int | None = None
     limit: int | None = None
@@ -115,14 +120,14 @@ class SearchAttributesBody(RestSearchFilter):
     attribute_timestamp: str | None = None
     enforce_warninglist: Annotated[bool | None, Field(alias="enforceWarninglist")]
     event_timestamp: str | None = None
-    threat_level_id: str | None = None
+    threat_level_id: int | None = None
     eventinfo: str | None = None
     sharinggroup: list[str] | None = None
     decaying_model: Annotated[str | None, Field(alias="decayingModel")] = None
     score: str | None = None
     first_seen: str | None = None
     last_seen: str | None = None
-    include_event_uuid: Annotated[bool | None, Field(alias="includeEventUuid")] = None
+    include_event_uuid: bool | None = Field(alias="includeEventUuid", default=None)
     include_event_tags: Annotated[bool | None, Field(alias="includeEventTags")] = None
     include_proposals: Annotated[bool | None, Field(alias="includeProposals")] = None
     requested_attributes: list[str] | None = None
@@ -140,9 +145,9 @@ class SearchAttributesBody(RestSearchFilter):
 
 
 class RestoreAttributeResponse(BaseModel):
-    id: str
-    event_id: str
-    object_id: str
+    id: int
+    event_id: int
+    object_id: int
     object_relation: str
     category: str
     type: str
@@ -151,7 +156,7 @@ class RestoreAttributeResponse(BaseModel):
     uuid: str
     timestamp: str
     distribution: str
-    sharing_group_id: str
+    sharing_group_id: int
     comment: str
     deleted: bool
     disable_correlation: bool
@@ -185,9 +190,9 @@ class GetDescribeTypesResponse(BaseModel):
 
 
 class GetAttributeAttributes(BaseModel):
-    id: str
-    event_id: str
-    object_id: str
+    id: int
+    event_id: int
+    object_id: int
     object_relation: Optional[str] = Field(..., nullable=True)
     category: str
     type: str
@@ -196,14 +201,15 @@ class GetAttributeAttributes(BaseModel):
     uuid: str
     timestamp: str
     distribution: str
-    sharing_group_id: str
+    sharing_group_id: int
     comment: str | None = None
-    deleted: bool
-    disable_correlation: bool
+    deleted: bool = False
+    disable_correlation: bool = False
     first_seen: Optional[str] = Field(..., nullable=True)
     last_seen: Optional[str] = Field(..., nullable=True)
     event_uuid: str
-    tag: list[GetAttributeTag] | None = None
+    data: str | None = None
+    Tag: list[GetAttributeTag] | None = None
 
 
 class GetAttributeResponse(BaseModel):
@@ -214,9 +220,9 @@ class GetAttributeResponse(BaseModel):
 
 
 class GetAllAttributesResponse(BaseModel):
-    id: str
-    event_id: str | None = None
-    object_id: str | None = None
+    id: int
+    event_id: int | None = None
+    object_id: int | None = None
     object_relation: str | None = None
     category: str | None = None
     type: str
@@ -226,7 +232,7 @@ class GetAllAttributesResponse(BaseModel):
     uuid: str | None = None
     timestamp: str | None = None
     distribution: str | None = None
-    sharing_group_id: str | None = None
+    sharing_group_id: int | None = None
     comment: str | None = None
     deleted: bool | None = None
     disable_correlation: bool | None = None
@@ -234,8 +240,11 @@ class GetAllAttributesResponse(BaseModel):
     last_seen: str | None = None
     value: str | None = None
 
-    @validator("sharing_group_id", always=True)
-    def check_sharing_group_id(cls, value: Any, values: Dict[str, Any]) -> Optional[int]:  # noqa: ANN101
+    @validator("sharing_group_id", always=True, allow_reuse=True)
+    @classmethod
+    def check_sharing_group_id(
+        cls: Type["GetAllAttributesResponse"], value: Any, values: Dict[str, Any]
+    ) -> Optional[int]:  # noqa: ANN101
         """
         If distribution equals 4, sharing_group_id will be shown.
         """
@@ -249,11 +258,11 @@ class GetAllAttributesResponse(BaseModel):
 
 
 class EditAttributeTag(BaseModel):
-    id: str
+    id: int
     name: str
     colour: str
     exportable: str
-    user_id: str
+    user_id: int
     hide_tag: bool
     numerical_value: int
     is_galaxy: bool
@@ -262,9 +271,9 @@ class EditAttributeTag(BaseModel):
 
 
 class EditAttributeAttributes(BaseModel):
-    id: str
-    event_id: str
-    object_id: str
+    id: int
+    event_id: int
+    object_id: int
     object_relation: str | None = None
     category: str
     type: str
@@ -273,13 +282,13 @@ class EditAttributeAttributes(BaseModel):
     uuid: str
     timestamp: str
     distribution: str
-    sharing_group_id: str
+    sharing_group_id: int
     comment: str | None = None
     deleted: bool
     disable_correlation: bool
     first_seen: str | None = None
     last_seen: str | None = None
-    tag: list[EditAttributeTag]
+    Tag: list[EditAttributeTag]
 
 
 class EditAttributeResponse(BaseModel):
@@ -294,14 +303,14 @@ class EditAttributeBody(BaseModel):
     value: str | None = None
     value1: str | None = None
     value2: str | None = None
-    object_id: str | None = None
+    object_id: int | None = None
     object_relation: str | None = None
     category: str | None = None
     to_ids: bool | None = None
     uuid: str | None = None
     timestamp: str | None = None
     distribution: str | None = None
-    sharing_group_id: str | None = None
+    sharing_group_id: int | None = None
     comment: str | None = None
     deleted: bool | None = None
     disable_correlation: bool | None = None
@@ -318,14 +327,14 @@ class DeleteSelectedAttributeResponse(BaseModel):
     name: str
     message: str
     url: str
-    id: str
+    id: int
 
     class Config:
         orm_mode = True
 
 
 class DeleteSelectedAttributeBody(BaseModel):
-    id: str  # id = "all" deletes all attributes in the event
+    id: str  # ids can be space separated, id = "all" deletes all attributes in the event
     allow_hard_delete: bool | None = None
 
     class Config:
@@ -350,9 +359,9 @@ class AddRemoveTagAttributeResponse(BaseModel):
 
 
 class AddAttributeAttributes(BaseModel):
-    id: str
-    event_id: str
-    object_id: str
+    id: int
+    event_id: int
+    object_id: int
     object_relation: Optional[str] = Field(..., nullable=True)
     category: str
     type: str
@@ -363,7 +372,7 @@ class AddAttributeAttributes(BaseModel):
     uuid: str
     timestamp: str
     distribution: str
-    sharing_group_id: str
+    sharing_group_id: int
     comment: str | None = None
     deleted: bool
     disable_correlation: bool
@@ -384,23 +393,24 @@ class AddAttributeBody(BaseModel):
     value: str | None = None
     value1: str | None = None
     value2: str | None = None
-    event_id: str | None = None
-    object_id: str | None = None
+    event_id: int | None = None
+    object_id: int | None = None
     object_relation: str | None = None
     category: str | None = None
     to_ids: bool | None = None
     uuid: str | None = None
     timestamp: str | None = None
     distribution: str | None = None
-    sharing_group_id: str | None = None
+    sharing_group_id: int | None = None
     comment: str | None = None
     deleted: bool | None = None
     disable_correlation: bool | None = None
     first_seen: str | None = None
     last_seen: str | None = None
 
-    @root_validator
-    def ensure_value_or_value1_is_set(cls, data: dict[str, Any]) -> Optional[dict[str, Any]]:  # noqa: ANN101
+    @root_validator(allow_reuse=True)
+    @classmethod
+    def ensure_value_or_value1_is_set(cls: Type["AddAttributeBody"], data: dict[str, Any]) -> Optional[dict[str, Any]]:  # noqa: ANN101
         required_values: list[str] = [str(data.get("value")), str(data.get("value1"))]
         if all(item is None for item in required_values):
             raise ValueError("value or value1 has to be set")

{mmisp_lib-0.6.4 → mmisp_lib-0.7.1}/src/mmisp/api_schemas/auth_keys.py

@@ -1,23 +1,22 @@
-from datetime import datetime
 from typing import List, Self, Union
 
 from pydantic import BaseModel, PositiveInt, conint, validator
 
 
 class SearchGetAuthKeysResponseItemUser(BaseModel):
-    id: str
+    id: int
     email: str
 
 
 class ViewAuthKeyResponseWrapper(BaseModel):
-    id: str
+    id: int
     uuid: str
     authkey_start: str
     authkey_end: str
-    created: datetime
+    created: str
     expiration: int
     read_only: bool
-    user_id: str
+    user_id: int
     comment: str
     allowed_ips: list[str] | None = None
     unique_ips: list[str] | None = []
@@ -29,21 +28,21 @@ class ViewAuthKeysResponse(BaseModel):
 
 
 class SearchGetAuthKeysResponseItemAuthKey(BaseModel):
-    id: str
+    id: int
     uuid: str
     authkey_start: str
     authkey_end: str
     created: str
     expiration: str
     read_only: bool
-    user_id: str
+    user_id: int
     comment: str | None
     allowed_ips: list[str] | None = None
     unique_ips: list[str] | None = []
 
 
 class SearchGetAuthKeysResponseAuthKey(BaseModel):
-    id: str
+    id: int
     uuid: str
     authkey_start: str
     authkey_end: str
@@ -76,34 +75,34 @@ class SearchGetAuthKeysResponse(BaseModel):
 class SearchAuthKeyBody(BaseModel):
     page: PositiveInt = 1
     limit: conint(gt=0, lt=500) = 25  # type: ignore
-    id: str | None = None
+    id: int | None = None
     uuid: str | None = None
     authkey_start: str | None = None
     authkey_end: str | None = None
     created: str | None = None
     expiration: str | None = None
     read_only: bool | None = None
-    user_id: str | None = None
+    user_id: int | None = None
     comment: str | None = None
     allowed_ips: str | list[str] | None = None
     last_used: str | None = None  # deprecated
 
 
 class EditAuthKeyResponseAuthKey(BaseModel):
-    id: str
+    id: int
     uuid: str
     authkey_start: str
     authkey_end: str
     created: str
     expiration: str
     read_only: bool
-    user_id: str
+    user_id: int
     comment: str
     allowed_ips: str | None = None
 
 
 class EditAuthKeyResponseCompleteAuthKey(BaseModel):
-    id: str
+    id: int
     uuid: str
     authkey_start: str
     authkey_end: str
@@ -117,8 +116,8 @@ class EditAuthKeyResponseCompleteAuthKey(BaseModel):
 
 
 class EditAuthKeyResponseUser(BaseModel):
-    id: str
-    org_id: str
+    id: int
+    org_id: int
 
 
 class EditAuthKeyResponse(BaseModel):
@@ -145,14 +144,14 @@ class EditAuthKeyBody(BaseModel):
 
 
 class AddAuthKeyResponseAuthKey(BaseModel):
-    id: str
+    id: int
     uuid: str
     authkey_start: str
     authkey_end: str
     created: str
     expiration: str | None = "0"
     read_only: bool
-    user_id: str
+    user_id: int
     comment: str | None = None
     allowed_ips: list[str] | None = None
     unique_ips: list[str]

{mmisp_lib-0.6.4 → mmisp_lib-0.7.1}/src/mmisp/api_schemas/authentication.py

@@ -1,6 +1,6 @@
 from enum import Enum
 
-from pydantic import BaseModel
+from pydantic import BaseModel, SecretStr
 
 
 class TokenResponse(BaseModel):
@@ -13,11 +13,11 @@ class ChangeLoginInfoResponse(BaseModel):
 
 class IdentityProviderBody(BaseModel):
     name: str
-    org_id: str
+    org_id: int
     active: bool
     base_url: str
     client_id: str
-    client_secret: str
+    client_secret: SecretStr
     scope: str | None = None
 
 
@@ -28,27 +28,26 @@ class IdentityProviderCallbackBody(BaseModel):
 
 class IdentityProviderEditBody(BaseModel):
     name: str | None = None
-    org_id: str | None = None
+    org_id: int | None = None
     active: bool | None = None
     base_url: str | None = None
     client_id: str | None = None
-    client_secret: str | None = None
+    client_secret: SecretStr | None = None
     scope: str | None = None
 
 
 class GetIdentityProviderResponse(BaseModel):
-    id: str
+    id: int
     name: str
-    org_id: str
+    org_id: int
     active: bool
     base_url: str
     client_id: str
-    client_secret: str
     scope: str | None = None
 
 
 class IdentityProviderInfo(BaseModel):
-    id: str
+    id: int
     name: str
     url: str | None = None
 
@@ -67,17 +66,17 @@ class StartLoginBody(BaseModel):
 
 class PasswordLoginBody(BaseModel):
     email: str
-    password: str
+    password: SecretStr
 
 
 class SetPasswordBody(BaseModel):
-    password: str
+    password: SecretStr
 
 
 class ChangePasswordBody(BaseModel):
     email: str
-    password: str
-    oldPassword: str | None = None
+    password: SecretStr
+    oldPassword: SecretStr | None = None
 
 
 class ExchangeTokenLoginBody(BaseModel):

{mmisp_lib-0.6.4 → mmisp_lib-0.7.1}/src/mmisp/api_schemas/common.py

@@ -2,12 +2,12 @@ from pydantic import BaseModel
 
 
 class TagAttributesResponse(BaseModel):
-    id: str
+    id: int
     name: str
     colour: str
     exportable: bool
-    org_id: str | None = None
-    user_id: str | None = None
+    org_id: int | None = None
+    user_id: int | None = None
     hide_tag: bool | None = None
     numerical_value: str | None = None
     is_galaxy: bool | None = None