mmisp-lib 0.5.0__tar.gz → 0.6.1__tar.gz

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.5.0
+Version: 0.6.1
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.5.0"
+version = "0.6.1"
 description = ""
 authors = []
 readme = "README.md"

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/src/mmisp/api_schemas/galaxies.py

@@ -2,8 +2,8 @@ from typing import List
 
 from pydantic import BaseModel
 
-import mmisp.api_schemas.organisations
-from mmisp.api_schemas.events import AddEditGetEventGalaxyClusterRelation, GetAllEventsGalaxyClusterGalaxy
+from mmisp.api_schemas.galaxy_clusters import GetGalaxyClusterResponse
+from mmisp.api_schemas.galaxy_common import GetAllSearchGalaxiesAttributes
 
 
 class SearchGalaxiesBody(BaseModel):
@@ -38,31 +38,6 @@ class ExportGalaxyGalaxyElement(BaseModel):
     value: str
 
 
-class GetGalaxyClusterResponse(BaseModel):
-    id: str | None = None
-    uuid: str | None = None
-    collection_uuid: str
-    type: str
-    value: str
-    tag_name: str
-    description: str
-    galaxy_id: str
-    source: str
-    authors: list[str]
-    version: str
-    distribution: str
-    sharing_group_id: str
-    org_id: str
-    orgc_id: str
-    default: bool
-    locked: bool
-    extends_uuid: str
-    extends_version: str
-    published: bool
-    deleted: bool
-    GalaxyElement: list[ExportGalaxyGalaxyElement]
-
-
 class ImportGalaxyBody(BaseModel):
     GalaxyCluster: GetGalaxyClusterResponse
     Galaxy: ImportGalaxyGalaxy
@@ -71,20 +46,6 @@ class ImportGalaxyBody(BaseModel):
         orm_mode = True
 
 
-class GetAllSearchGalaxiesAttributes(BaseModel):
-    id: str
-    uuid: str
-    name: str
-    type: str
-    description: str
-    version: str
-    icon: str
-    namespace: str
-    kill_chain_order: str | None = None
-    enabled: bool
-    local_only: bool
-
-
 class GetAllSearchGalaxiesResponse(BaseModel):
     Galaxy: GetAllSearchGalaxiesAttributes
 
@@ -115,38 +76,6 @@ class GalaxySchema(BaseModel):
         orm_mode = True
 
 
-class ExportGalaxyClusterResponse(BaseModel):
-    id: str
-    uuid: str
-    collection_uuid: str
-    type: str
-    value: str
-    tag_name: str
-    description: str
-    galaxy_id: str
-    source: str
-    authors: list[str]
-    version: str
-    distribution: str
-    sharing_group_id: str
-    org_id: str
-    orgc_id: str
-    default: bool
-    locked: bool
-    extends_uuid: str
-    extends_version: str
-    published: bool
-    deleted: bool
-    GalaxyElement: list[ExportGalaxyGalaxyElement]
-    Galaxy: GetAllEventsGalaxyClusterGalaxy
-    GalaxyClusterRelation: list[AddEditGetEventGalaxyClusterRelation] = []
-    Org: mmisp.api_schemas.organisations.Organisation
-    Orgc: mmisp.api_schemas.organisations.Organisation
-
-    class Config:
-        orm_mode = True
-
-
 class ExportGalaxyAttributes(BaseModel):
     default: bool
     custom: bool | None = None

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/src/mmisp/api_schemas/galaxy_clusters.py

@@ -1,10 +1,17 @@
+from datetime import datetime
+
 from pydantic import BaseModel
 
-from mmisp.api_schemas.events.add_edit_get_event_response import AddEditGetEventGalaxyClusterRelation
-from mmisp.api_schemas.events.get_all_events_response import GetAllEventsGalaxyClusterGalaxy
-from mmisp.api_schemas.galaxies import ExportGalaxyGalaxyElement, GetAllSearchGalaxiesAttributes
-from mmisp.api_schemas.organisations import GetOrganisationResponse
-from mmisp.api_schemas.organisations.organisation import Organisation
+from mmisp.api_schemas.events import AddEditGetEventGalaxyClusterRelation, GetAllEventsGalaxyClusterGalaxy
+from mmisp.api_schemas.galaxy_common import GetAllSearchGalaxiesAttributes
+from mmisp.api_schemas.organisations import GetOrganisationResponse, Organisation
+
+
+class ExportGalaxyGalaxyElement(BaseModel):
+    id: str | None = None
+    galaxy_cluster_id: str | None = None
+    key: str
+    value: str
 
 
 class GetGalaxyClusterResponse(BaseModel):
@@ -25,14 +32,23 @@ class GetGalaxyClusterResponse(BaseModel):
     orgc_id: str
     default: bool
     locked: bool
-    extends_uuid: str
+    extends_uuid: str | None = None
     extends_version: str
     published: bool
     deleted: bool
-    Galaxy: GetAllSearchGalaxiesAttributes
+    Galaxy: GetAllSearchGalaxiesAttributes | None = None
     GalaxyElement: list[ExportGalaxyGalaxyElement]
-    Org: GetOrganisationResponse
-    Orgc: GetOrganisationResponse
+    GalaxyClusterRelation: list = []
+    RelationshipInbound: list = []
+    Org: GetOrganisationResponse | None = None
+    Orgc: GetOrganisationResponse | None = None
+
+
+class GalaxyClusterResponse(BaseModel):
+    GalaxyCluster: GetGalaxyClusterResponse
+
+    class Config:
+        json_encoders = {datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")}
 
 
 class ExportGalaxyClusterResponse(BaseModel):

mmisp_lib-0.6.1/src/mmisp/api_schemas/galaxy_common.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+
+class GetAllSearchGalaxiesAttributes(BaseModel):
+    id: str
+    uuid: str
+    name: str
+    type: str
+    description: str
+    version: str
+    icon: str
+    namespace: str
+    kill_chain_order: str | None = None
+    enabled: bool
+    local_only: bool

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/src/mmisp/api_schemas/organisations.py

@@ -1,7 +1,10 @@
 from datetime import datetime
+from typing import Self
 
 from pydantic import BaseModel
 
+from mmisp.lib.serialisation_helper import timestamp_or_empty_string
+
 
 class BaseOrganisation(BaseModel):
     id: str | None = None
@@ -34,15 +37,25 @@ class GetOrganisationResponse(BaseModel):
     sector: str | None = None
     type: str | None = None
     uuid: str | None = None
-    date_created: datetime
-    date_modified: datetime
+    # the fallback GENERIC_MISP_ORGANISATION doesn't have this property
+    # str is needed because its returned as string
+    date_created: datetime | None | str = None
+    date_modified: datetime | None | str = None
     description: str | None = None
     created_by: str
     contacts: str | None = None
     local: bool
-    restricted_to_domain: str | None = None
+    restricted_to_domain: str | list | None = None
     landingpage: str | None = None
 
+    def dict(self: Self, *args, **kwargs) -> dict:
+        d = super().dict(*args, **kwargs)
+
+        d["date_created"] = timestamp_or_empty_string(d["date_created"])
+        d["date_modified"] = timestamp_or_empty_string(d["date_modified"])
+
+        return d
+
 
 class GetAllOrganisationsOrganisation(BaseModel):
     id: str

mmisp_lib-0.6.1/src/mmisp/lib/fallbacks.py

@@ -0,0 +1,18 @@
+from mmisp.db.models.organisation import Organisation
+
+GENERIC_MISP_ORGANISATION = Organisation(
+    id="0",
+    name="MISP",
+    date_created=None,
+    date_modified=None,
+    description="Automatically generated MISP organisation",
+    type="",
+    nationality="Not specified",
+    sector="",
+    created_by="0",
+    uuid="0",
+    contacts="",
+    local=True,
+    restricted_to_domain=[],
+    landingpage=None,
+)

mmisp_lib-0.6.1/src/mmisp/lib/galaxies.py

@@ -0,0 +1,17 @@
+import json
+
+
+def json_or_original_string(s: str) -> str | dict | list:
+    try:
+        return json.loads(s)
+    except json.decoder.JSONDecodeError:
+        return s
+
+
+def parse_galaxy_authors(str_authors: str) -> list[str]:
+    parsed_author = json_or_original_string(str_authors)
+    if isinstance(parsed_author, str):
+        parsed_author = [parsed_author]  # force to be a list
+    assert isinstance(parsed_author, list)
+
+    return parsed_author

mmisp_lib-0.6.1/src/mmisp/lib/serialisation_helper.py

@@ -0,0 +1,9 @@
+from datetime import datetime
+
+
+def timestamp_or_empty_string(ts: datetime | str | None) -> str:
+    if isinstance(ts, datetime):
+        return ts.strftime("%Y-%m-%d %H:%M:%S")
+    if ts is None:
+        return ""
+    return ts

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/src/mmisp/tests/fixtures.py

@@ -469,6 +469,16 @@ def galaxy_cluster_collection_uuid():
     return uuid()
 
 
+@pytest.fixture
+def galaxy_default_cluster_one_uuid():
+    return uuid()
+
+
+@pytest.fixture
+def galaxy_default_cluster_two_uuid():
+    return uuid()
+
+
 @pytest.fixture
 def galaxy_cluster_one_uuid():
     return uuid()
@@ -479,6 +489,118 @@ def galaxy_cluster_two_uuid():
     return uuid()
 
 
+@pytest_asyncio.fixture
+async def test_default_galaxy(db, galaxy_default_cluster_one_uuid, galaxy_default_cluster_two_uuid):
+    galaxy = Galaxy(
+        namespace="misp",
+        name="test galaxy",
+        type="test galaxy type",
+        description="test",
+        version="1",
+        kill_chain_order=None,
+        uuid=uuid(),
+        enabled=True,
+        local_only=False,
+    )
+
+    db.add(galaxy)
+    await db.commit()
+    await db.refresh(galaxy)
+
+    galaxy_cluster = GalaxyCluster(
+        uuid=galaxy_default_cluster_one_uuid,
+        collection_uuid="",
+        type="test galaxy type",
+        value="test",
+        tag_name=galaxy_tag_name_from_uuid(galaxy_default_cluster_one_uuid),
+        description="test",
+        galaxy_id=galaxy.id,
+        source="me",
+        authors='["Konstantin Zangerle", "Test Writer"]',
+        version=1,
+        distribution=3,
+        sharing_group_id=None,
+        org_id=0,
+        orgc_id=0,
+        default=0,
+        locked=0,
+        extends_uuid=None,
+        extends_version=None,
+        published=True,
+        deleted=False,
+    )
+    galaxy_cluster2 = GalaxyCluster(
+        uuid=galaxy_default_cluster_two_uuid,
+        collection_uuid="",
+        type="test galaxy type",
+        value="test",
+        tag_name=galaxy_tag_name_from_uuid(galaxy_default_cluster_two_uuid),
+        description="test",
+        galaxy_id=galaxy.id,
+        source="me",
+        authors='["Konstantin Zangerle", "Test Writer"]',
+        version=1,
+        distribution=3,
+        sharing_group_id=None,
+        org_id=0,
+        orgc_id=0,
+        default=0,
+        locked=0,
+        extends_uuid=None,
+        extends_version=None,
+        published=True,
+        deleted=False,
+    )
+
+    db.add(galaxy_cluster)
+    db.add(galaxy_cluster2)
+
+    await db.commit()
+    await db.refresh(galaxy_cluster)
+    await db.refresh(galaxy_cluster2)
+
+    galaxy_element = GalaxyElement(
+        galaxy_cluster_id=galaxy_cluster.id, key="refs", value="http://test-one-one.example.com"
+    )
+    galaxy_element2 = GalaxyElement(
+        galaxy_cluster_id=galaxy_cluster.id, key="refs", value="http://test-one-two.example.com"
+    )
+
+    galaxy_element21 = GalaxyElement(
+        galaxy_cluster_id=galaxy_cluster2.id, key="refs", value="http://test-two-one.example.com"
+    )
+    galaxy_element22 = GalaxyElement(
+        galaxy_cluster_id=galaxy_cluster2.id, key="refs", value="http://test-two-two.example.com"
+    )
+
+    db.add(galaxy_element)
+    db.add(galaxy_element2)
+
+    db.add(galaxy_element21)
+    db.add(galaxy_element22)
+
+    await db.commit()
+
+    yield {
+        "galaxy": galaxy,
+        "galaxy_cluster": galaxy_cluster,
+        "galaxy_cluster2": galaxy_cluster2,
+        "galaxy_element": galaxy_element,
+        "galaxy_element2": galaxy_element2,
+        "galaxy_element21": galaxy_element21,
+        "galaxy_element22": galaxy_element22,
+    }
+
+    await db.delete(galaxy_element22)
+    await db.delete(galaxy_element21)
+    await db.delete(galaxy_element2)
+    await db.delete(galaxy_element)
+    await db.delete(galaxy_cluster2)
+    await db.delete(galaxy_cluster)
+    await db.delete(galaxy)
+    await db.commit()
+
+
 @pytest_asyncio.fixture
 async def test_galaxy(db, instance_owner_org, galaxy_cluster_one_uuid, galaxy_cluster_two_uuid):
     galaxy = Galaxy(

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/src/mmisp_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.5.0
+Version: 0.6.1
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE

{mmisp_lib-0.5.0 → mmisp_lib-0.6.1}/src/mmisp_lib.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/mmisp/api_schemas/events.py
 src/mmisp/api_schemas/feeds.py
 src/mmisp/api_schemas/galaxies.py
 src/mmisp/api_schemas/galaxy_clusters.py
+src/mmisp/api_schemas/galaxy_common.py
 src/mmisp/api_schemas/jobs.py
 src/mmisp/api_schemas/logs.py
 src/mmisp/api_schemas/noticelists.py
@@ -73,9 +74,12 @@ src/mmisp/lib/__init__.py
 src/mmisp/lib/actions.py
 src/mmisp/lib/attribute_search_filter.py
 src/mmisp/lib/attributes.py
+src/mmisp/lib/fallbacks.py
+src/mmisp/lib/galaxies.py
 src/mmisp/lib/logging.py
 src/mmisp/lib/permissions.py
 src/mmisp/lib/py.typed
+src/mmisp/lib/serialisation_helper.py
 src/mmisp/lib/uuid.py
 src/mmisp/plugins/py.typed
 src/mmisp/tests/__init__.py