mmisp-lib 0.7.3__tar.gz → 0.7.5__tar.gz

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/PKG-INFO

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

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.7.3"
+version = "0.7.5"
 description = ""
 authors = []
 readme = "README.md"
@@ -45,6 +45,9 @@ dev = [
   "build",
 ]
 
+[project.scripts]
+mmisp-db = "mmisp.commandline_tool.main:main"
+
 [tool.setuptools.package-data]
 "mmisp.lib" = ["py.typed"]
 "mmisp.api_schemas" = ["py.typed"]

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/api_schemas/events.py

@@ -4,6 +4,7 @@ from typing import Any, Type
 from pydantic import BaseModel, PositiveInt, conint, validator
 
 from mmisp.api_schemas.organisations import Organisation
+from mmisp.lib.distribution import DistributionLevels
 
 
 class GetAllEventsGalaxyClusterGalaxy(BaseModel):
@@ -18,6 +19,12 @@ class GetAllEventsGalaxyClusterGalaxy(BaseModel):
     enabled: bool
     local_only: bool
     kill_chain_order: str | None = None
+    created: datetime | str
+    modified: datetime | str
+    org_id: int
+    orgc_id: int
+    default: bool
+    distribution: DistributionLevels
 
 
 class AddEditGetEventGalaxyClusterMeta(BaseModel):
@@ -167,6 +174,12 @@ class AddEditGetEventGalaxy(BaseModel):
     enabled: bool
     local_only: bool
     kill_chain_order: str | None = None
+    created: datetime | str
+    modified: datetime | str
+    org_id: int
+    orgc_id: int
+    default: bool
+    distribution: DistributionLevels
     GalaxyCluster: list[AddEditGetEventGalaxyCluster] = []
 
 

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/api_schemas/galaxies.py

@@ -1,10 +1,13 @@
+from datetime import datetime
 from typing import Any, List
 
 from pydantic import BaseModel
 
 from mmisp.api_schemas.common import TagAttributesResponse
 from mmisp.api_schemas.events import AddEditGetEventGalaxyClusterRelation, GetAllEventsGalaxyClusterGalaxy
+from mmisp.api_schemas.galaxy_common import GetAllSearchGalaxiesAttributes
 from mmisp.api_schemas.organisations import Organisation
+from mmisp.lib.distribution import DistributionLevels
 
 
 class SearchGalaxiesBody(BaseModel):
@@ -72,20 +75,6 @@ class ImportGalaxyBody(BaseModel):
         orm_mode = True
 
 
-class GetAllSearchGalaxiesAttributes(BaseModel):
-    id: int
-    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
 
@@ -111,6 +100,12 @@ class GalaxySchema(BaseModel):
     icon: str
     namespace: str
     kill_chain_order: List[str]
+    created: datetime | str
+    modified: datetime | str
+    org_id: int
+    orgc_id: int
+    default: bool
+    distribution: DistributionLevels
 
     class Config:
         orm_mode = True

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/api_schemas/galaxy_common.py

@@ -1,5 +1,9 @@
+from datetime import datetime
+
 from pydantic import BaseModel
 
+from mmisp.lib.distribution import DistributionLevels
+
 
 class GetAllSearchGalaxiesAttributes(BaseModel):
     id: int
@@ -13,3 +17,9 @@ class GetAllSearchGalaxiesAttributes(BaseModel):
     kill_chain_order: str | None = None
     enabled: bool
     local_only: bool
+    created: datetime | str
+    modified: datetime | str
+    org_id: int
+    orgc_id: int
+    default: bool
+    distribution: DistributionLevels

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/commandline_tool/main.py

@@ -1,5 +1,6 @@
 import fire
 
+import mmisp.db.all_models  # noqa
 from mmisp.commandline_tool import organisation, setup, user
 from mmisp.db.database import sessionmanager
 
@@ -7,12 +8,15 @@ from mmisp.db.database import sessionmanager
 # and organisations and changing their details.
 
 
-async def setup_db() -> str:
+async def setup_db(create_init_values: bool = True) -> str:
     """setup"""
     sessionmanager.init()
     await sessionmanager.create_all()
-    async with sessionmanager.session() as session:
-        await setup.setup(session)
+
+    if create_init_values:
+        async with sessionmanager.session() as session:
+            await setup.setup(session)
+
     await sessionmanager.close()
     return "Database setup"
 
@@ -163,7 +167,8 @@ async def delete_user(email: str) -> str:
     return "User deleted with email: {} ".format(email)
 
 
-if __name__ == "__main__":
+def main() -> None:
+    """Main entrypoint for mmisp-db"""
     fire.Fire(
         {
             "setup": setup_db,
@@ -177,3 +182,7 @@ if __name__ == "__main__":
             "delete-user": delete_user,
         }
     )
+
+
+if __name__ == "__main__":
+    main()

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/db/config.py

@@ -1,3 +1,14 @@
+"""This module handels the parameters to connect to the database.
+
+The following environment variables are supported:
+
+- DATABASE_URL
+- DEBUG
+- DB_RETRY: Time to wait before trying new connection attempt. (Default 5)
+- DB_MAX_RETRIES: Limit for retry attempts. (Default 100)
+
+"""
+
 import logging
 from dataclasses import dataclass
 from os import getenv

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/db/mixins.py

@@ -6,6 +6,15 @@ from sqlalchemy.ext.hybrid import hybrid_property
 
 class DictMixin:
     def asdict(self: Self, omit: set[str] | None = None) -> dict:
+        """
+        Return the object as dictionary.
+        Note that attributes starting with `_` are always omited.
+        Omit keys present in *omit*.
+
+        Args:
+            omit: Set of keys to be omitted in the dictionary.
+                If none, all attributes are returned.
+        """
         if omit is None:
             omit = set()
 

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/db/models/galaxy.py

@@ -1,13 +1,16 @@
-from sqlalchemy import Boolean, Integer, String, Text
+from datetime import datetime
+
+from sqlalchemy import Boolean, DateTime, Integer, String, Text
 from sqlalchemy.orm import relationship
 
+from mmisp.db.mixins import DictMixin, UpdateMixin
 from mmisp.db.mypy import Mapped, mapped_column
 from mmisp.lib.uuid import uuid
 
 from ..database import Base
 
 
-class Galaxy(Base):
+class Galaxy(Base, DictMixin, UpdateMixin):
     __tablename__ = "galaxies"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
@@ -23,6 +26,16 @@ class Galaxy(Base):
     enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
     local_only: Mapped[bool] = mapped_column(Boolean, default=False)
 
+    default: Mapped[bool] = mapped_column(Boolean, default=False)
+
+    org_id: Mapped[int] = mapped_column(Integer, nullable=False)
+    orgc_id: Mapped[int] = mapped_column(Integer, nullable=False)
+
+    created: Mapped[datetime] = mapped_column(DateTime, nullable=False)
+    modified: Mapped[datetime] = mapped_column(DateTime, nullable=False)
+
+    distribution: Mapped[int] = mapped_column(Integer, nullable=False)
+
     galaxy_clusters = relationship(
         "GalaxyCluster",
         back_populates="galaxy",

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/tests/fixtures.py

@@ -1,4 +1,5 @@
 import asyncio
+from datetime import datetime
 
 import pytest
 import pytest_asyncio
@@ -11,6 +12,7 @@ from mmisp.db.models.attribute import Attribute
 from mmisp.db.models.galaxy import Galaxy
 from mmisp.db.models.galaxy_cluster import GalaxyCluster, GalaxyElement
 from mmisp.db.models.tag import Tag
+from mmisp.lib.distribution import DistributionLevels
 from mmisp.lib.galaxies import galaxy_tag_name
 from mmisp.util.crypto import hash_secret
 from mmisp.util.uuid import uuid
@@ -28,7 +30,6 @@ from .generators.model_generators.correlation_value_generator import (
 )
 from .generators.model_generators.default_correlation_generator import generate_default_correlation
 from .generators.model_generators.event_generator import generate_event
-from .generators.model_generators.galaxy_generator import generate_galaxy
 from .generators.model_generators.object_generator import generate_object
 from .generators.model_generators.organisation_generator import generate_organisation
 from .generators.model_generators.over_correlating_value_generator import (
@@ -135,6 +136,8 @@ async def instance_two_owner_org(db):
 
 @pytest_asyncio.fixture
 async def site_admin_user(db, site_admin_role, instance_owner_org):
+    assert instance_owner_org.local
+
     user = generate_user()
     user.org_id = instance_owner_org.id
     user.server_id = 0
@@ -494,7 +497,18 @@ async def server(db, instance_owner_org):
 
 @pytest_asyncio.fixture
 async def galaxy(db):
-    galaxy = generate_galaxy()
+    galaxy = Galaxy(
+        name="test galaxy",
+        type="test type",
+        description="test",
+        version="version",
+        kill_chain_order="test kill_chain_order",
+        org_id=0,
+        orgc_id=0,
+        distribution=DistributionLevels.ALL_COMMUNITIES,
+        created=datetime.now(),
+        modified=datetime.now(),
+    )
 
     db.add(galaxy)
     await db.commit()
@@ -565,6 +579,11 @@ async def test_default_galaxy(db, galaxy_default_cluster_one_uuid, galaxy_defaul
         uuid=uuid(),
         enabled=True,
         local_only=False,
+        org_id=0,
+        orgc_id=0,
+        distribution=DistributionLevels.ALL_COMMUNITIES,
+        created=datetime.now(),
+        modified=datetime.now(),
     )
 
     db.add(galaxy)
@@ -677,6 +696,11 @@ async def test_galaxy(db, instance_owner_org, galaxy_cluster_one_uuid, galaxy_cl
         uuid=uuid(),
         enabled=True,
         local_only=False,
+        org_id=instance_owner_org.id,
+        orgc_id=instance_owner_org.id,
+        distribution=DistributionLevels.ALL_COMMUNITIES,
+        created=datetime.now(),
+        modified=datetime.now(),
     )
 
     db.add(galaxy)

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/tests/generators/model_generators/galaxy_generator.py

@@ -1,4 +1,7 @@
+from datetime import datetime
+
 from mmisp.db.models.galaxy import Galaxy
+from mmisp.lib.distribution import DistributionLevels
 
 
 def generate_galaxy() -> Galaxy:
@@ -8,4 +11,9 @@ def generate_galaxy() -> Galaxy:
         description="test",
         version="version",
         kill_chain_order="test kill_chain_order",
+        org_id=0,
+        orgc_id=0,
+        distribution=DistributionLevels.ALL_COMMUNITIES,
+        created=datetime.now(),
+        modified=datetime.now(),
     )

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp/workflows/execution.py

@@ -8,6 +8,7 @@ import sqlalchemy as sa
 from jinja2 import BaseLoader, Environment
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.sql.expression import true
 
 from ..db.models.admin_setting import AdminSetting
 from ..db.models.organisation import Organisation
@@ -109,10 +110,10 @@ async def walk_nodes(
 
 async def create_virtual_root_user(db: AsyncSession) -> User:
     god_mode_role_id = (await db.execute(select(Role.id).filter(Role.perm_site_admin == 1))).scalars().first()
-    local_org_id = (await db.execute(select(Organisation.id).filter(Organisation.local))).scalars().first()
-    if not god_mode_role_id:
+    local_org_id = (await db.execute(select(Organisation.id).filter(Organisation.local == true()))).scalars().first()
+    if god_mode_role_id is None:
         raise ValueError("No site admin role found")
-    if not local_org_id:
+    if local_org_id is None:
         raise ValueError("No local_org_id found")
 
     return User(

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp_lib.egg-info/PKG-INFO

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

{mmisp_lib-0.7.3 → mmisp_lib-0.7.5}/src/mmisp_lib.egg-info/SOURCES.txt

@@ -153,6 +153,7 @@ src/mmisp/workflows/py.typed
 src/mmisp_lib.egg-info/PKG-INFO
 src/mmisp_lib.egg-info/SOURCES.txt
 src/mmisp_lib.egg-info/dependency_links.txt
+src/mmisp_lib.egg-info/entry_points.txt
 src/mmisp_lib.egg-info/requires.txt
 src/mmisp_lib.egg-info/top_level.txt
 tests/test_commandline_tool.py

mmisp_lib-0.7.5/src/mmisp_lib.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+mmisp-db = mmisp.commandline_tool.main:main