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

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

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

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

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

{mmisp_lib-0.6.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/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.6.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.6.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.6.0
+Version: 0.6.1
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE

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

@@ -74,10 +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