mmisp-lib 0.8.1__tar.gz → 0.8.3__tar.gz

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mmisp-lib
-Version: 0.8.1
+Version: 0.8.3
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -21,6 +21,7 @@ Requires-Dist: nanoid==2.0.0
 Requires-Dist: cryptography==42.0.5
 Requires-Dist: jinja2~=3.1.4
 Requires-Dist: fire
+Requires-Dist: packaging
 Provides-Extra: dev
 Requires-Dist: ruff>=0.3.7; extra == "dev"
 Requires-Dist: mypy==1.8.0; extra == "dev"

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.8.1"
+version = "0.8.3"
 description = ""
 authors = []
 readme = "README.md"
@@ -25,6 +25,7 @@ dependencies = [
   "cryptography==42.0.5",
   "jinja2~=3.1.4",
   "fire",
+  "packaging",
 ]
 
 

mmisp_lib-0.8.3/src/mmisp/api_schemas/object_templates.py

@@ -0,0 +1,50 @@
+from pydantic import BaseModel, Field
+from pydantic.types import UUID
+
+
+class ObjectTemplatesRequirements(BaseModel):
+    requiredOneOf: list[str] | None
+    required: list[str] | None
+
+
+class ObjectTemplate(BaseModel):
+    class Config:
+        allow_population_by_field_name = True
+
+    id: int
+    user_id: int
+    org_id: int
+    uuid: UUID
+    name: str
+    meta_category: str = Field(..., alias="meta-category")
+    description: str
+    version: str
+    requirements: ObjectTemplatesRequirements
+    fixed: bool
+    active: bool
+
+
+class ObjectTemplateElement(BaseModel):
+    class Config:
+        allow_population_by_field_name = True
+
+    id: int
+    object_template_id: int
+    object_relation: str
+    type: str  # AttributeType?
+    ui_priority: int = Field(..., alias="ui-priority")
+    categories: list
+    sane_default: list
+    values_list: list
+    description: str
+    disable_correlation: bool | None
+    multiple: bool
+
+
+class RespObjectTemplateView(BaseModel):
+    ObjectTemplate: ObjectTemplate
+    ObjectTemplateElement: list[ObjectTemplateElement]
+
+
+class RespItemObjectTemplateIndex(BaseModel):
+    ObjectTemplate: ObjectTemplate

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/api_schemas/organisations.py

@@ -23,7 +23,7 @@ class Organisation(BaseOrganisation):
     contacts: str | None = None
     local: bool
     """organisation gains access to the local instance, otherwise treated as external"""
-    restricted_to_domain: str | list | None = None
+    restricted_to_domain: list | str | None = None
     landingpage: str | None = None
 
     class Config:
@@ -45,7 +45,7 @@ class GetOrganisationResponse(BaseModel):
     created_by: str
     contacts: str | None = None
     local: bool
-    restricted_to_domain: str | list | None = None
+    restricted_to_domain: list | str | None = None
     landingpage: str | None = None
 
     def dict(self: Self, *args, **kwargs) -> dict:
@@ -90,7 +90,7 @@ class OrganisationUsersResponse(BaseModel):
     uuid: str | None = None
     contacts: str | None = None
     local: bool | None = None
-    restricted_to_domain: str | list | None = None
+    restricted_to_domain: list | str | None = None
     landingpage: str | None = None
 
 
@@ -105,7 +105,7 @@ class AddOrganisation(BaseModel):
     contacts: str | None = None
     local: bool
     """organisation gains access to the local instance, otherwise treated as external"""
-    restricted_to_domain: str | None = None
+    restricted_to_domain: list[str] | None = None
     landingpage: str | None = None
 
     class Config:
@@ -121,7 +121,7 @@ class EditOrganisation(BaseModel):
     contacts: str | None = None
     local: bool
     """organisation gains access to the local instance, otherwise treated as external"""
-    restricted_to_domain: str | None = None
+    restricted_to_domain: list[str] | None = None
     landingpage: str | None = None
 
     class Config:

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/api_schemas/sharing_groups.py

@@ -1,3 +1,4 @@
+import uuid
 from datetime import datetime
 
 from pydantic import BaseModel, Field
@@ -22,6 +23,28 @@ class SharingGroup(BaseModel):
     roaming: bool
 
 
+#    org_count: int = 0
+
+
+class ShortSharingGroup(BaseModel):
+    id: int
+    name: str
+    releasability: str
+    description: str
+    uuid: str
+    active: bool
+    local: bool
+    roaming: bool
+
+    org_count: int = 0
+
+
+class ShortOrganisation(BaseModel):
+    id: int
+    name: str
+    uuid: uuid.UUID
+
+
 class SharingGroupServer(BaseModel):
     id: int
     sharing_group_id: int
@@ -81,12 +104,39 @@ class ViewUpdateSharingGroupLegacyResponseSharingGroupOrgItem(BaseModel):
     Organisation: ViewUpdateSharingGroupLegacyResponseOrganisationInfo
 
 
-class ViewUpdateSharingGroupLegacyResponse(BaseModel):
+class SharingGroupResponse(BaseModel):
+    SharingGroup: ShortSharingGroup
+    Organisation: ShortOrganisation
+    SharingGroupOrg: list[ViewUpdateSharingGroupLegacyResponseSharingGroupOrgItem]
+    SharingGroupServer: list[ViewUpdateSharingGroupLegacyResponseSharingGroupServerItem]
+
+    editable: bool | None = None
+    deletable: bool | None = None
+
+    class Config:
+        json_encoders = {datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")}
+
+
+class SingleSharingGroupResponse(BaseModel):
     SharingGroup: SharingGroup
     Organisation: Organisation
     SharingGroupOrg: list[ViewUpdateSharingGroupLegacyResponseSharingGroupOrgItem]
     SharingGroupServer: list[ViewUpdateSharingGroupLegacyResponseSharingGroupServerItem]
 
+    class Config:
+        json_encoders = {datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")}
+
+
+class ViewUpdateSharingGroupLegacyResponse(SharingGroupResponse):
+    pass
+
+
+class GetSharingGroupsIndex(BaseModel):
+    response: list[SharingGroupResponse]
+
+    class Config:
+        json_encoders = {datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")}
+
 
 class UpdateSharingGroupLegacyBody(BaseModel):
     id: int | None = None

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/commandline_tool/main.py

@@ -43,7 +43,7 @@ async def create_organisation(
     sector: str | None = None,
     contacts_email: str | None = None,
     local: bool | None = None,
-    restricted_domain: str | None = None,
+    restricted_domain: list[str] | None = None,
     landingpage: str | None = None,
 ) -> str:
     """create-organisation <name> [-admin_email <admin_email>] [- description <description>] [-type <type>]
@@ -115,7 +115,7 @@ async def edit_organisation(
     sector: str | None = None,
     contacts_email: str | None = None,
     local: bool | None = None,
-    restricted_domain: str | None = None,
+    restricted_domain: list[str] | None = None,
     landingpage: str | None = None,
 ) -> str:
     """edit-organisation <organisation> [-new_name <new_name>] [-admin_email <admin_email>] [-description <description>]

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/commandline_tool/organisation.py

@@ -18,7 +18,7 @@ async def create(
     sector: str | None,
     contacts_email: str | None,
     local: bool | None,
-    restricted_domain: str | None,
+    restricted_domain: list[str] | None,
     landingpage: str | None,
 ) -> None:
     organisation = Organisation()
@@ -67,7 +67,7 @@ async def edit_organisation(
     sector: str | None,
     contacts_email: str | None,
     local: bool | None,
-    restricted_domain: str | None,
+    restricted_domain: list[str] | None,
     landingpage: str | None,
 ) -> None:
     if isinstance(organisation, str):
@@ -109,7 +109,7 @@ async def set_attributes(
     sector: str | None,
     contacts_email: str | None,
     local: bool | None,
-    restricted_domain: str | None,
+    restricted_domain: list[str] | None,
     landingpage: str | None,
 ) -> None:
     if name is not None:

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/database.py

@@ -1,6 +1,7 @@
 import contextlib
 import time
 from collections.abc import AsyncIterator
+from contextvars import ContextVar
 from typing import Self, TypeAlias
 
 from sqlalchemy.engine.url import make_url
@@ -20,6 +21,8 @@ Base = declarative_base()
 
 _no_database: str = "DatabaseSessionManager is not initialized"
 
+dry_run: ContextVar[bool] = ContextVar("dry_run", default=False)
+
 
 class DatabaseSessionManager:
     def __init__(self: Self, db_url: str = config.DATABASE_URL) -> None:
@@ -108,6 +111,8 @@ class DatabaseSessionManager:
 async def get_db() -> AsyncIterator[Session]:
     async with sessionmanager.session() as session:
         yield session
+        if dry_run.get():
+            await session.rollback()
 
 
 async def create_all_models() -> None:

mmisp_lib-0.8.3/src/mmisp/db/list_json_type.py

@@ -0,0 +1,31 @@
+import json
+from typing import Any, Self
+
+from sqlalchemy.engine import Dialect
+from sqlalchemy.types import Text, TypeDecorator
+
+
+class DBListJson(TypeDecorator):
+    impl = Text
+
+    def load_dialect_impl(self: Self, dialect: Dialect) -> Any:
+        return dialect.type_descriptor(Text)
+
+    def process_bind_param(self: Self, value: Any, dialect: Dialect) -> str | None:
+        """Handle value before getting into the DB"""
+        if value is None:
+            return None
+        if not isinstance(value, list):
+            raise ValueError("this type should only be used for lists")
+        return json.dumps(value)
+
+    def process_result_value(self: Self, value: Any, dialect: Dialect) -> list | None:
+        """Handle values from the database"""
+        if value is None:
+            return None
+
+        res = json.loads(value)
+        if not isinstance(res, list):
+            raise ValueError("this type should only be used for lists")
+
+        return res

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/mixins.py

@@ -18,6 +18,8 @@ class DictMixin:
         if omit is None:
             omit = set()
 
+        print(self.__mapper__.c.keys())
+
         unloaded = inspect(self).unloaded
         d = {}
         for key in self.__mapper__.c.keys():  # type:ignore[attr-defined]

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/attribute.py

@@ -40,7 +40,7 @@ class Attribute(Base, DictMixin):
         Integer, ForeignKey("events.id", ondelete="CASCADE"), nullable=False, index=True
     )
     object_id: Mapped[int] = mapped_column(Integer, nullable=False, default=0, index=True)
-    object_relation: Mapped[str] = mapped_column(String(255), index=True)
+    object_relation: Mapped[str | None] = mapped_column(String(255), index=True)
     category: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
     type: Mapped[str] = mapped_column(String(100), nullable=False, index=True)
     value1: Mapped[str] = mapped_column(Text, nullable=False)
@@ -49,11 +49,11 @@ class Attribute(Base, DictMixin):
     timestamp: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     distribution: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     sharing_group_id: Mapped[int] = mapped_column(Integer, index=True, default=0)
-    comment: Mapped[str] = mapped_column(Text)
+    comment: Mapped[str | None] = mapped_column(Text)
     deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     disable_correlation: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    first_seen: Mapped[int] = mapped_column(BigInteger, index=True)
-    last_seen: Mapped[int] = mapped_column(BigInteger, index=True)
+    first_seen: Mapped[int | None] = mapped_column(BigInteger, index=True)
+    last_seen: Mapped[int | None] = mapped_column(BigInteger, index=True)
 
     event = relationship("Event", back_populates="attributes", lazy="joined")  # type:ignore[var-annotated]
     mispobject = relationship(

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/auth_key.py

@@ -19,7 +19,7 @@ class AuthKey(Base):
     created: Mapped[int] = mapped_column(Integer, nullable=False, default=time)
     expiration: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     read_only: Mapped[bool] = mapped_column(Boolean, nullable=False, default=0)
-    comment: Mapped[str] = mapped_column(String(255))
-    allowed_ips: Mapped[str] = mapped_column(String(255))
-    unique_ips: Mapped[str] = mapped_column(String(255))
+    comment: Mapped[str | None] = mapped_column(String(255))
+    allowed_ips: Mapped[str | None] = mapped_column(String(255))
+    unique_ips: Mapped[str | None] = mapped_column(String(255))
     user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id"), nullable=False)

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/event.py

@@ -37,7 +37,7 @@ class Event(Base):
     sighting_timestamp: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     disable_correlation: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     extends_uuid: Mapped[str] = mapped_column(String(40), default="", index=True)
-    protected: Mapped[bool] = mapped_column(Boolean)
+    protected: Mapped[bool] = mapped_column(Boolean, default=False)
 
     attributes = relationship("Attribute", back_populates="event")  # type:ignore[assignment,var-annotated]
     mispobjects = relationship("Object", back_populates="event")  # type:ignore[assignment,var-annotated]

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/feed.py

@@ -11,7 +11,7 @@ class Feed(Base):
     name: Mapped[str] = mapped_column(String(255), nullable=False)
     provider: Mapped[str] = mapped_column(String(255), nullable=False)
     url: Mapped[str] = mapped_column(String(255), nullable=False)
-    rules: Mapped[str] = mapped_column(Text, default=None)
+    rules: Mapped[str | None] = mapped_column(Text, default=None)
     enabled: Mapped[bool] = mapped_column(Boolean, default=False)
     distribution: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     sharing_group_id: Mapped[int] = mapped_column(Integer, nullable=False, default=0, index=True)
@@ -23,11 +23,11 @@ class Feed(Base):
     event_id: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     publish: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     override_ids: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    settings: Mapped[str] = mapped_column(Text)
+    settings: Mapped[str | None] = mapped_column(Text)
     input_source: Mapped[str] = mapped_column(String(255), nullable=False, default="network", index=True)
     delete_local_file: Mapped[bool] = mapped_column(Boolean, default=False)
     lookup_visible: Mapped[bool] = mapped_column(Boolean, default=False)
-    headers: Mapped[str] = mapped_column(Text)
+    headers: Mapped[str | None] = mapped_column(Text)
     caching_enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     force_to_ids: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     orgc_id: Mapped[int] = mapped_column(Integer, nullable=False, default=0, index=True)

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/galaxy.py

@@ -21,7 +21,7 @@ class Galaxy(Base, DictMixin, UpdateMixin):
     version: Mapped[str] = mapped_column(String(255), nullable=False)
     icon: Mapped[str] = mapped_column(String(255), nullable=False, default="")
     namespace: Mapped[str] = mapped_column(String(255), nullable=False, default="misp", index=True)
-    kill_chain_order: Mapped[str] = mapped_column(String(255))
+    kill_chain_order: Mapped[str | None] = mapped_column(String(255))
     """must be serialized"""
     enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
     local_only: Mapped[bool] = mapped_column(Boolean, default=False)

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/galaxy_cluster.py

@@ -1,10 +1,7 @@
-import json
-from typing import Self
-
 from sqlalchemy import Boolean, ForeignKey, Integer, String, Text
-from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship
 
+from mmisp.db.list_json_type import DBListJson
 from mmisp.db.mixins import DictMixin, UpdateMixin
 from mmisp.db.mypy import Mapped, mapped_column
 from mmisp.db.uuid_type import DBUUID
@@ -28,7 +25,7 @@ class GalaxyCluster(Base, UpdateMixin, DictMixin):
         Integer, ForeignKey(Galaxy.id, ondelete="CASCADE"), nullable=False, index=True
     )
     source: Mapped[str] = mapped_column(String(255), nullable=False, default="")
-    _authors: Mapped[str] = mapped_column("authors", Text, nullable=False)
+    authors: Mapped[list[str]] = mapped_column(DBListJson, nullable=False)
     version: Mapped[int] = mapped_column(Integer, default=0, index=True)
     distribution: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     sharing_group_id: Mapped[int] = mapped_column(Integer, index=True, nullable=True, default=None)
@@ -36,8 +33,8 @@ class GalaxyCluster(Base, UpdateMixin, DictMixin):
     orgc_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True, default=0)
     default: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, index=True)
     locked: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    extends_uuid: Mapped[str] = mapped_column(String(40), index=True)
-    extends_version: Mapped[int] = mapped_column(Integer, index=True, nullable=True, default=None)
+    extends_uuid: Mapped[str | None] = mapped_column(String(40), index=True)
+    extends_version: Mapped[int | None] = mapped_column(Integer, index=True, nullable=True, default=None)
     published: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
 
@@ -75,20 +72,6 @@ class GalaxyCluster(Base, UpdateMixin, DictMixin):
         uselist=False,
     )  # type:ignore[assignment,var-annotated]
 
-    def __init__(self: Self, *arg, **kwargs) -> None:
-        if "authors" in kwargs:
-            self._authors = json.dumps(kwargs["authors"])
-            del kwargs["authors"]
-        super().__init__(*arg, **kwargs)
-
-    @hybrid_property
-    def authors(self: Self) -> list[str]:
-        return json.loads(self._authors)
-
-    @authors.setter  # type: ignore[no-redef]
-    def authors(self: Self, value: list[str]) -> None:
-        self._authors = json.dumps(value)
-
 
 class GalaxyElement(Base, DictMixin, UpdateMixin):
     __tablename__ = "galaxy_elements"

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/identity_provider.py

@@ -17,7 +17,7 @@ class OIDCIdentityProvider(Base):
     base_url: Mapped[str] = mapped_column(String(255), nullable=False)
     client_id: Mapped[str] = mapped_column(String(255), nullable=False)
     client_secret: Mapped[str] = mapped_column(String(255), nullable=False)
-    scope: Mapped[str] = mapped_column(String(255))
+    scope: Mapped[str] = mapped_column(String(255), default="openid")
     """Possibility to add more scopes to be requested from the idp in addition to the default scopes,
     currently not used."""
     created: Mapped[DateTime] = mapped_column(DateTime, default=datetime.utcnow)

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/object.py

@@ -1,9 +1,13 @@
-from sqlalchemy import Boolean, ForeignKey, Integer, String
+from typing import Optional
+
+from sqlalchemy import Boolean, ForeignKey, Integer, String, Text
 from sqlalchemy.orm import relationship
 
 from mmisp.db.database import Base
+from mmisp.db.list_json_type import DBListJson
 from mmisp.db.mixins import DictMixin
 from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.db.object_json_type import DBObjectJson
 from mmisp.lib.uuid import uuid
 
 
@@ -13,7 +17,7 @@ class Object(Base, DictMixin):
     id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
     uuid: Mapped[str] = mapped_column(String(255), unique=True, default=uuid, index=True)
     name: Mapped[str] = mapped_column(String(255), index=True)
-    meta_category: Mapped[str] = mapped_column("meta-category", String(255), index=True, key="meta_category")
+    meta_category: Mapped[str] = mapped_column("meta-category", String(255), index=True)
     description: Mapped[str] = mapped_column(String(255))
     template_uuid: Mapped[str] = mapped_column(String(255), index=True, default=None)
     template_version: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
@@ -44,12 +48,41 @@ class ObjectTemplate(Base, DictMixin):
     __tablename__ = "object_templates"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
-    uuid: Mapped[str] = mapped_column(String(255), unique=True, default=uuid, index=True)
-    name: Mapped[str] = mapped_column(String(255), index=True)
     user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id"), index=True, nullable=False)
     org_id: Mapped[int] = mapped_column(Integer, ForeignKey("organisations.id"), index=True, nullable=False)
-    description: Mapped[str] = mapped_column(String(255))
+    uuid: Mapped[str] = mapped_column(String(255), unique=True, default=uuid, index=True)
+    name: Mapped[Optional[str]] = mapped_column(String(255), nullable=True, index=True)
+    meta_category: Mapped[Optional[str]] = mapped_column(
+        "meta-category", String(255), nullable=True, index=True, key="meta_category"
+    )
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     version: Mapped[int] = mapped_column(Integer, nullable=False)
-    requirements: Mapped[str] = mapped_column(String(255))
+    requirements: Mapped[dict | None] = mapped_column(DBObjectJson, nullable=True)
     fixed: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+
+    elements: Mapped[list["ObjectTemplateElement"]] = relationship(
+        "ObjectTemplateElement", back_populates="object_template", lazy="raise_on_sql"
+    )
+
+
+class ObjectTemplateElement(Base, DictMixin):
+    __tablename__ = "object_template_elements"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    object_template_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey(ObjectTemplate.id, ondelete="CASCADE"), nullable=False, index=True
+    )
+    object_relation: Mapped[Optional[str]] = mapped_column(String(255), nullable=True, index=True)
+    type: Mapped[Optional[str]] = mapped_column(Text, nullable=True, index=True)
+    ui_priority: Mapped[int] = mapped_column("ui-priority", Integer, nullable=False, key="ui_priority")
+    categories: Mapped[list[str] | None] = mapped_column(DBListJson, nullable=True)
+    sane_default: Mapped[list[str] | None] = mapped_column(DBListJson, nullable=True)
+    values_list: Mapped[list[str] | None] = mapped_column(DBListJson, nullable=True)
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    disable_correlation: Mapped[Optional[bool]] = mapped_column(Boolean, nullable=True)
+    multiple: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+
+    object_template: Mapped[ObjectTemplate] = relationship(
+        ObjectTemplate, back_populates="elements", lazy="raise_on_sql"
+    )

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/organisation.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from sqlalchemy import Boolean, DateTime, Integer, String, Text
 from sqlalchemy.orm import relationship
 
+from mmisp.db.list_json_type import DBListJson
 from mmisp.db.mixins import DictMixin
 from mmisp.db.mypy import Mapped, mapped_column
 
@@ -26,7 +27,7 @@ class Organisation(Base, DictMixin):
     uuid: Mapped[str] = mapped_column(String(255), unique=True)
     contacts: Mapped[str] = mapped_column(Text)
     local: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    restricted_to_domain: Mapped[str] = mapped_column(Text)
+    restricted_to_domain: Mapped[list[str]] = mapped_column(DBListJson)
     landingpage: Mapped[str] = mapped_column(Text)
 
     # Relationship to users

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/server.py

@@ -1,12 +1,13 @@
 from sqlalchemy import Boolean, Integer, String, Text
 from sqlalchemy.orm import relationship
 
+from mmisp.db.mixins import DictMixin
 from mmisp.db.mypy import Mapped, mapped_column
 
 from ..database import Base
 
 
-class Server(Base):
+class Server(Base, DictMixin):
     __tablename__ = "servers"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
@@ -21,17 +22,17 @@ class Server(Base):
     pull_galaxy_clusters: Mapped[bool] = mapped_column(Boolean, default=False)
     push_analyst_data: Mapped[bool] = mapped_column(Boolean, default=False)
     pull_analyst_data: Mapped[bool] = mapped_column(Boolean, default=False)
-    last_pulled_id: Mapped[int] = mapped_column("lastpulledid", Integer)
-    last_pushed_id: Mapped[int] = mapped_column("lastpushedid", Integer)
-    organization: Mapped[str] = mapped_column(String(10), default=None)
+    last_pulled_id: Mapped[int] = mapped_column("lastpulledid", Integer, nullable=True)
+    last_pushed_id: Mapped[int] = mapped_column("lastpushedid", Integer, nullable=True)
+    organization: Mapped[str | None] = mapped_column(String(10), default=None)
     remote_org_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
     publish_without_email: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     unpublish_event: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     self_signed: Mapped[bool] = mapped_column(Boolean, nullable=False)
     pull_rules: Mapped[str] = mapped_column(Text, nullable=False)
     push_rules: Mapped[str] = mapped_column(Text, nullable=False)
-    cert_file: Mapped[str] = mapped_column(String(255))
-    client_cert_file: Mapped[str] = mapped_column(String(255))
+    cert_file: Mapped[str | None] = mapped_column(String(255))
+    client_cert_file: Mapped[str | None] = mapped_column(String(255))
     internal: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     skip_proxy: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     caching_enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)

{mmisp_lib-0.8.1 → mmisp_lib-0.8.3}/src/mmisp/db/models/sharing_group.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from sqlalchemy import Boolean, DateTime, Integer, String, Text
+from sqlalchemy.orm import relationship
 
 from mmisp.db.mixins import DictMixin
 from mmisp.db.mypy import Mapped, mapped_column
@@ -18,7 +19,7 @@ class SharingGroup(Base, DictMixin):
     description = mapped_column(Text, nullable=False, default="")
     uuid = mapped_column(String(40), unique=True, default=uuid, nullable=False)
     organisation_uuid = mapped_column(String(40), nullable=False)
-    org_id = mapped_column(Integer, nullable=False, index=True)
+    org_id = mapped_column(Integer, nullable=False, index=True)  # the organisation that created the sharing group
     sync_user_id = mapped_column(Integer, nullable=False, default=0, index=True)
     active = mapped_column(Boolean, nullable=False, default=False)
     created = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
@@ -26,6 +27,34 @@ class SharingGroup(Base, DictMixin):
     local = mapped_column(Boolean, nullable=False, default=True)
     roaming = mapped_column(Boolean, default=False, nullable=False)
 
+    creator_org = relationship(
+        "Organisation",
+        primaryjoin="SharingGroup.org_id == Organisation.id",
+        lazy="raise_on_sql",
+        foreign_keys="SharingGroup.org_id",
+    )  # type:ignore[assignment,var-annotated]
+    organisations = relationship(
+        "Organisation",
+        primaryjoin="SharingGroup.id == SharingGroupOrg.sharing_group_id",
+        secondary="sharing_group_orgs",
+        secondaryjoin="SharingGroupOrg.org_id == Organisation.id",
+        lazy="raise_on_sql",
+        viewonly=True,
+    )
+
+    sharing_group_orgs = relationship(
+        "SharingGroupOrg",
+        primaryjoin="SharingGroup.id == SharingGroupOrg.sharing_group_id",
+        lazy="raise_on_sql",
+        foreign_keys="SharingGroupOrg.sharing_group_id",
+    )  # type:ignore[assignment,var-annotated]
+    sharing_group_servers = relationship(
+        "SharingGroupServer",
+        primaryjoin="SharingGroup.id == SharingGroupServer.sharing_group_id",
+        lazy="raise_on_sql",
+        foreign_keys="SharingGroupServer.sharing_group_id",
+    )  # type:ignore[assignment,var-annotated]
+
 
 class SharingGroupOrg(Base, DictMixin):
     __tablename__ = "sharing_group_orgs"
@@ -35,6 +64,13 @@ class SharingGroupOrg(Base, DictMixin):
     org_id = mapped_column(Integer, index=True, nullable=False)
     extend = mapped_column(Boolean, default=False, nullable=False)
 
+    organisation = relationship(
+        "Organisation",
+        primaryjoin="SharingGroupOrg.org_id == Organisation.id",
+        lazy="raise_on_sql",
+        foreign_keys="SharingGroupOrg.org_id",
+    )  # type:ignore[assignment,var-annotated]
+
 
 class SharingGroupServer(Base, DictMixin):
     __tablename__ = "sharing_group_servers"
@@ -43,3 +79,10 @@ class SharingGroupServer(Base, DictMixin):
     sharing_group_id = mapped_column(Integer, index=True, nullable=False)
     server_id = mapped_column(Integer, index=True, nullable=False)
     all_orgs = mapped_column(Boolean, index=True, nullable=False, default=False)
+
+    server = relationship(
+        "Server",
+        primaryjoin="SharingGroupServer.server_id == Server.id",
+        lazy="raise_on_sql",
+        foreign_keys="SharingGroupServer.server_id",
+    )  # type:ignore[assignment,var-annotated]