mmisp-lib 0.3.0__tar.gz → 0.4.0__tar.gz

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.3.0
+Version: 0.4.0
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -27,7 +27,7 @@ Requires-Dist: mypy==1.8.0; extra == "dev"
 Requires-Dist: pre-commit==3.6.0; extra == "dev"
 Requires-Dist: pytest==8.0.0; extra == "dev"
 Requires-Dist: pytest-test-groups; extra == "dev"
-Requires-Dist: pytest-asyncio==0.23.5.post1; extra == "dev"
+Requires-Dist: pytest-asyncio==0.21.2; extra == "dev"
 Requires-Dist: pytest-cov==4.1.0; extra == "dev"
 Requires-Dist: respx==0.20.2; extra == "dev"
 Requires-Dist: mysql-connector-python==8.3.0; extra == "dev"

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.3.0"
+version = "0.4.0"
 description = ""
 authors = []
 readme = "README.md"
@@ -35,7 +35,7 @@ dev = [
   "pre-commit==3.6.0",
   "pytest==8.0.0",
   "pytest-test-groups",
-  "pytest-asyncio==0.23.5.post1",
+  "pytest-asyncio==0.21.2",
   "pytest-cov==4.1.0",
   "respx==0.20.2",
   "mysql-connector-python==8.3.0",
@@ -63,6 +63,7 @@ ignore = ["ANN002", "ANN003", "ANN401"]
 
 [tool.ruff.lint.per-file-ignores]
 "tests/**" = ["ANN001", "ANN201", "ANN202", "S101"]
+"src/mmisp/tests/**" = ["ANN001", "ANN201", "ANN202", "S101"]
 
 [tool.coverage.run]
 concurrency = ["greenlet", "thread"]

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/api_schemas/attributes.py

@@ -34,6 +34,7 @@ class SearchAttributesEvent(BaseModel):
     info: str
     orgc_id: str
     uuid: str
+    publish_timestamp: int
 
 
 class SearchAttributesAttributesDetails(BaseModel):
@@ -56,7 +57,7 @@ class SearchAttributesAttributesDetails(BaseModel):
     last_seen: str | None = None
     Event: SearchAttributesEvent | None = None
     Object: SearchAttributesObject | None = None
-    Tag: list[GetAttributeTag] = []
+    Tag: list[GetAttributeTag] | None = None
 
 
 class SearchAttributesAttributes(BaseModel):
@@ -86,10 +87,7 @@ class SearchAttributesModelOverrides(BaseModel):
     base_score_config: SearchAttributesModelOverridesBaseScoreConfig
 
 
-class SearchAttributesBody(BaseModel):
-    returnFormat: str = "json"
-    page: int | None = None
-    limit: int | None = None
+class RestSearchFilter(BaseModel):
     value: str | None = None
     value1: str | None = None
     value2: str | None = None
@@ -101,15 +99,21 @@ class SearchAttributesBody(BaseModel):
     to: str | None = None
     last: int | None = None
     eventid: str | None = None
+    published: bool | None = None
+    to_ids: bool | None = None
+    deleted: bool | None = None
+
+
+class SearchAttributesBody(RestSearchFilter):
+    returnFormat: str = "json"
+    page: int | None = None
+    limit: int | None = None
     with_attachments: Annotated[bool | None, Field(alias="withAttachments")] = None
     uuid: str | None = None
     publish_timestamp: str | None = None
-    published: bool | None = None
     timestamp: str | None = None
     attribute_timestamp: str | None = None
     enforce_warninglist: Annotated[bool | None, Field(alias="enforceWarninglist")]
-    to_ids: bool | None = None
-    deleted: bool | None = None
     event_timestamp: str | None = None
     threat_level_id: str | None = None
     eventinfo: str | None = None
@@ -134,9 +138,6 @@ class SearchAttributesBody(BaseModel):
     include_full_model: Annotated[bool | None, Field(alias="includeFullModel")] = None
     exclude_decayed: Annotated[bool | None, Field(alias="excludeDecayed")] = None
 
-    class Config:
-        orm_mode = True
-
 
 class RestoreAttributeResponse(BaseModel):
     id: str

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/api_schemas/events.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from pydantic import BaseModel, PositiveInt, conint
 
 from mmisp.api_schemas.organisations import Organisation
@@ -89,7 +91,7 @@ class GetAllEventsGalaxyCluster(BaseModel):
     meta: AddEditGetEventGalaxyClusterMeta | None = None
     tag_id: str
     local: bool | None = None
-    relationship_type: str | None = None
+    relationship_type: bool | str | None = None
 
 
 class AddEditGetEventGalaxyClusterRelationTag(BaseModel):
@@ -149,7 +151,7 @@ class AddEditGetEventGalaxyCluster(BaseModel):
     attribute_tag_id: str | None = None
     event_tag_id: str | None = None
     local: bool | None = None
-    relationship_type: str = ""
+    relationship_type: bool | str = ""
 
 
 class AddEditGetEventGalaxy(BaseModel):
@@ -186,7 +188,7 @@ class AddEditGetEventTag(BaseModel):
     is_custom_galaxy: bool
     local_only: bool
     local: bool
-    relationship_type: str | None = None
+    relationship_type: bool | str | None = None
 
 
 class AddEditGetEventAttribute(BaseModel):
@@ -288,7 +290,7 @@ class AddEditGetEventResponse(BaseModel):
     Event: AddEditGetEventDetails
 
     class Config:
-        orm_mode = True
+        json_encoders = {datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")}
 
 
 class GetAllEventsOrg(BaseModel):
@@ -456,7 +458,7 @@ class GetAllEventsEventTag(BaseModel):
     event_id: str
     tag_id: str
     local: bool
-    relationship_type: str | None = None
+    relationship_type: bool | str | None = None
     Tag: GetAllEventsEventTagTag | None = None
 
 

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/api_schemas/organisations.py

@@ -21,7 +21,7 @@ class Organisation(BaseModel):
     landingpage: str | None = None
 
     class Config:
-        orm_mode = True
+        json_encoders = {datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S")}
 
 
 class GetOrganisationResponse(BaseModel):

mmisp_lib-0.4.0/src/mmisp/db/additional_properties.py

@@ -0,0 +1,10 @@
+from sqlalchemy import func, select
+from sqlalchemy.orm import column_property
+
+from mmisp.db.models.organisation import Organisation
+from mmisp.db.models.user import User
+
+Organisation.user_count = column_property(
+    select(func.count(User.id)).where(User.org_id == Organisation.id).correlate_except(User).scalar_subquery(),
+    deferred=False,
+)

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/all_models.py

@@ -13,3 +13,5 @@ model_module_names = map(".".join, zip(itertools.repeat(model_pkg), all_models))
 
 for m in model_module_names:
     importlib.import_module(m)
+
+importlib.import_module("mmisp.db.additional_properties")

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/mixins.py

@@ -6,9 +6,10 @@ from sqlalchemy.ext.hybrid import hybrid_property
 
 class DictMixin:
     def asdict(self: Self) -> dict:
+        unloaded = inspect(self).unloaded
         d = {}
         for key in self.__mapper__.c.keys():  # type:ignore[attr-defined]
-            if not key.startswith("_"):
+            if not key.startswith("_") and key not in unloaded:
                 d[key] = getattr(self, key)
 
         for key, prop in inspect(self.__class__).all_orm_descriptors.items():  # type:ignore[union-attr]

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/attribute.py

@@ -1,7 +1,9 @@
+import typing
 from typing import Self, Type
 
-from sqlalchemy import BigInteger, Boolean, ForeignKey, Integer, String, Text
-from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy import BigInteger, Boolean, ForeignKey, Integer, String, Text, or_
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.ext.hybrid import Comparator, hybrid_property
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm.decl_api import DeclarativeMeta
 
@@ -14,6 +16,20 @@ from ..database import Base
 from .event import Event
 from .tag import Tag
 
+if typing.TYPE_CHECKING:
+    from sqlalchemy import ColumnExpressionArgument
+else:
+    ColumnExpressionArgument = typing.Any
+
+
+class AttributeComparator(Comparator):
+    def __init__(self: Self, cls: typing.Any) -> None:
+        self.cls = cls
+
+    def __eq__(self: Self, other: typing.Any) -> ColumnExpressionArgument:
+        # Overriding equality to check if the value matches either value1 or value1 + "|" + value2
+        return or_(self.cls.value1 == other, self.cls.value1 + "|" + self.cls.value2 == other)
+
 
 class Attribute(Base, DictMixin):
     __tablename__ = "attributes"
@@ -40,11 +56,57 @@ class Attribute(Base, DictMixin):
     last_seen: Mapped[int] = mapped_column(BigInteger, index=True)
 
     event = relationship("Event", back_populates="attributes", lazy="joined")  # type:ignore[var-annotated]
+    mispobject = relationship(
+        "Object",
+        primaryjoin="Attribute.object_id == Object.id",
+        back_populates="attributes",
+        lazy="joined",
+        foreign_keys="Attribute.object_id",
+    )  # type:ignore[var-annotated]
+    tags = relationship("Tag", secondary="attribute_tags", lazy="raise_on_sql", viewonly=True)
+    attributetags = relationship(
+        "AttributeTag",
+        primaryjoin="Attribute.id == AttributeTag.attribute_id",
+        back_populates="attribute",
+        lazy="raise_on_sql",
+        viewonly=True,
+    )
+    attributetags_galaxy = relationship(
+        "AttributeTag",
+        primaryjoin="and_(Attribute.id == AttributeTag.attribute_id, Tag.is_galaxy)",
+        secondary="join(AttributeTag, Tag, AttributeTag.tag_id == Tag.id)",
+        secondaryjoin="AttributeTag.tag_id == Tag.id",
+        lazy="raise_on_sql",
+        viewonly=True,
+    )
+
+    galaxy_tags = relationship(
+        "Tag",
+        secondary="attribute_tags",
+        secondaryjoin="and_(AttributeTag.tag_id == Tag.id, Tag.is_galaxy)",
+        lazy="raise_on_sql",
+        overlaps="tags, events",
+        viewonly=True,
+    )
+    local_tags = relationship(
+        "Tag",
+        secondary="attribute_tags",
+        secondaryjoin="and_(AttributeTag.tag_id == Tag.id, AttributeTag.local)",
+        lazy="raise_on_sql",
+        viewonly=True,
+    )
+    nonlocal_tags = relationship(
+        "Tag",
+        secondary="attribute_tags",
+        secondaryjoin="and_(AttributeTag.tag_id == Tag.id, not_(AttributeTag.local))",
+        lazy="raise_on_sql",
+        viewonly=True,
+    )
 
     __mapper_args__ = {"polymorphic_on": "type"}
 
     def __init__(self: Self, *arg, **kwargs) -> None:
-        if kwargs["value1"] is None:
+        if "value" in kwargs:
             split_val = kwargs["value"].split("|", 1)
             kwargs["value1"] = split_val[0]
             if len(split_val) == 2:
@@ -52,6 +114,14 @@ class Attribute(Base, DictMixin):
 
         super().__init__(*arg, **kwargs)
 
+    async def add_tag(self: Self, db: AsyncSession, tag: "Tag", local: bool = False) -> "AttributeTag":
+        if tag.local_only:
+            local = True
+        attribute_tag = AttributeTag(attribute=self, tag=tag, event_id=self.event_id, local=local)
+        db.add(attribute_tag)
+        await db.commit()
+        return attribute_tag
+
     @property
     def event_uuid(self: "Attribute") -> str:
         return self.event.uuid
@@ -69,6 +139,10 @@ class Attribute(Base, DictMixin):
         if len(split) == 2:
             self.value2 = split[1]
 
+    @value.comparator
+    def value(cls: Self) -> AttributeComparator:
+        return AttributeComparator(cls)
+
 
 class AttributeTag(Base):
     __tablename__ = "attribute_tags"
@@ -80,6 +154,10 @@ class AttributeTag(Base):
     event_id: Mapped[int] = mapped_column(Integer, ForeignKey(Event.id, ondelete="CASCADE"), nullable=False, index=True)
     tag_id: Mapped[int] = mapped_column(Integer, ForeignKey(Tag.id, ondelete="CASCADE"), nullable=False, index=True)
     local: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    relationship_type: Mapped[str] = mapped_column(String(191), nullable=True)
+
+    attribute = relationship("Attribute", back_populates="attributetags", lazy="raise_on_sql")
+    tag = relationship("Tag", back_populates="attributetags", lazy="raise_on_sql")
 
 
 class AttributeMeta(DeclarativeMeta):

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/event.py

@@ -38,6 +38,37 @@ class Event(Base):
     protected: Mapped[bool] = mapped_column(Boolean)
 
     attributes = relationship("Attribute", back_populates="event")  # type:ignore[assignment,var-annotated]
+    mispobjects = relationship("Object", back_populates="event")  # type:ignore[assignment,var-annotated]
+    org = relationship(
+        "Organisation", primaryjoin="Event.org_id == Organisation.id", back_populates="events", lazy="raise_on_sql"
+    )  # type:ignore[assignment,var-annotated]
+    orgc = relationship(
+        "Organisation",
+        primaryjoin="Event.orgc_id == Organisation.id",
+        back_populates="events_created",
+        lazy="raise_on_sql",
+    )  # type:ignore[assignment,var-annotated]
+    creator = relationship("User", primaryjoin="Event.user_id == User.id", lazy="selectin")
+    tags = relationship("Tag", secondary="event_tags", lazy="raise_on_sql", viewonly=True)
+    eventtags = relationship(
+        "EventTag", primaryjoin="Event.id == EventTag.event_id", lazy="raise_on_sql", viewonly=True
+    )
+    eventtags_galaxy = relationship(
+        "EventTag",
+        primaryjoin="and_(Event.id == EventTag.event_id, Tag.is_galaxy)",
+        secondary="join(EventTag, Tag, EventTag.tag_id == Tag.id)",
+        secondaryjoin="EventTag.tag_id == Tag.id",
+        lazy="raise_on_sql",
+        viewonly=True,
+    )
+    galaxy_tags = relationship(
+        "Tag",
+        secondary="event_tags",
+        secondaryjoin="and_(EventTag.tag_id == Tag.id, Tag.is_galaxy)",
+        lazy="raise_on_sql",
+        overlaps="tags, events",
+        viewonly=True,
+    )
 
 
 class EventReport(Base):
@@ -61,3 +92,7 @@ class EventTag(Base):
     event_id: Mapped[int] = mapped_column(Integer, ForeignKey(Event.id, ondelete="CASCADE"), nullable=False, index=True)
     tag_id: Mapped[int] = mapped_column(Integer, ForeignKey(Tag.id, ondelete="CASCADE"), nullable=False, index=True)
     local: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    relationship_type: Mapped[str] = mapped_column(String(191), nullable=True)
+
+    event = relationship("Event", back_populates="eventtags", lazy="raise_on_sql", viewonly=True)
+    tag = relationship("Tag", back_populates="eventtags", lazy="raise_on_sql", viewonly=True)

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/galaxy.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Boolean, Integer, String, Text
+from sqlalchemy.orm import relationship
 
 from mmisp.db.mypy import Mapped, mapped_column
 from mmisp.lib.uuid import uuid
@@ -21,3 +22,9 @@ class Galaxy(Base):
     """must be serialized"""
     enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
     local_only: Mapped[bool] = mapped_column(Boolean, default=False)
+
+    galaxy_clusters = relationship(
+        "GalaxyCluster",
+        back_populates="galaxy",
+        lazy="raise_on_sql",
+    )  # type:ignore[assignment,var-annotated]

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/galaxy_cluster.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Boolean, ForeignKey, Integer, String, Text
+from sqlalchemy.orm import relationship
 
 from mmisp.db.mypy import Mapped, mapped_column
 from mmisp.lib.uuid import uuid
@@ -34,6 +35,31 @@ class GalaxyCluster(Base):
     published: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
 
+    org = relationship(
+        "Organisation",
+        primaryjoin="GalaxyCluster.org_id == Organisation.id",
+        back_populates="galaxy_clusters",
+        lazy="raise_on_sql",
+        foreign_keys="GalaxyCluster.org_id",
+    )  # type:ignore[assignment,var-annotated]
+    orgc = relationship(
+        "Organisation",
+        primaryjoin="GalaxyCluster.orgc_id == Organisation.id",
+        back_populates="galaxy_clusters_created",
+        lazy="raise_on_sql",
+        foreign_keys="GalaxyCluster.orgc_id",
+    )  # type:ignore[assignment,var-annotated]
+    galaxy = relationship(
+        "Galaxy",
+        back_populates="galaxy_clusters",
+        lazy="raise_on_sql",
+    )  # type:ignore[assignment,var-annotated]
+    galaxy_elements = relationship(
+        "GalaxyElement",
+        back_populates="galaxy_cluster",
+        lazy="raise_on_sql",
+    )  # type:ignore[assignment,var-annotated]
+
 
 class GalaxyElement(Base):
     __tablename__ = "galaxy_elements"
@@ -45,6 +71,12 @@ class GalaxyElement(Base):
     key: Mapped[str] = mapped_column(String(255), nullable=False, default="", index=True)
     value: Mapped[str] = mapped_column(Text, nullable=False)
 
+    galaxy_cluster = relationship(
+        "GalaxyCluster",
+        back_populates="galaxy_elements",
+        lazy="raise_on_sql",
+    )  # type:ignore[assignment,var-annotated]
+
 
 class GalaxyReference(Base):
     __tablename__ = "galaxy_reference"

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/object.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Boolean, ForeignKey, Integer, String
+from sqlalchemy.orm import relationship
 
 from mmisp.db.database import Base
 from mmisp.db.mixins import DictMixin
@@ -25,6 +26,19 @@ class Object(Base, DictMixin):
     first_seen: Mapped[int] = mapped_column(Integer, index=True, default=None)
     last_seen: Mapped[int] = mapped_column(Integer, index=True, default=None)
 
+    attributes = relationship(
+        "Attribute",
+        primaryjoin="Object.id == Attribute.object_id",
+        back_populates="mispobject",
+        lazy="raise_on_sql",
+        foreign_keys="Attribute.object_id",
+    )  # type:ignore[var-annotated]
+    event = relationship(
+        "Event",
+        back_populates="mispobjects",
+        lazy="raise_on_sql",
+    )  # type:ignore[var-annotated]
+
 
 class ObjectTemplate(Base, DictMixin):
     __tablename__ = "object_templates"

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/organisation.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
@@ -27,3 +28,30 @@ class Organisation(Base, DictMixin):
     local: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     restricted_to_domain: Mapped[str] = mapped_column(Text)
     landingpage: Mapped[str] = mapped_column(Text)
+
+    # Relationship to users
+    users = relationship("User", back_populates="org", lazy="raise_on_sql")
+    creator = relationship(
+        "User", primaryjoin="Organisation.created_by == User.id", foreign_keys=created_by, lazy="selectin"
+    )
+    events = relationship(
+        "Event", primaryjoin="Organisation.id == Event.org_id", back_populates="org", lazy="raise_on_sql"
+    )  # type:ignore[assignment,var-annotated]
+    events_created = relationship(
+        "Event", primaryjoin="Organisation.id == Event.orgc_id", back_populates="orgc", lazy="raise_on_sql"
+    )  # type:ignore[assignment,var-annotated]
+
+    galaxy_clusters = relationship(
+        "GalaxyCluster",
+        primaryjoin="Organisation.id == GalaxyCluster.org_id",
+        back_populates="org",
+        lazy="raise_on_sql",
+        foreign_keys="GalaxyCluster.org_id",
+    )  # type:ignore[assignment,var-annotated]
+    galaxy_clusters_created = relationship(
+        "GalaxyCluster",
+        primaryjoin="Organisation.id == GalaxyCluster.orgc_id",
+        back_populates="orgc",
+        lazy="raise_on_sql",
+        foreign_keys="GalaxyCluster.orgc_id",
+    )  # type:ignore[assignment,var-annotated]

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/tag.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Boolean, Integer, String
+from sqlalchemy.orm import relationship
 
 from mmisp.db.database import Base
 from mmisp.db.mypy import Mapped, mapped_column
@@ -18,3 +19,6 @@ class Tag(Base):
     is_galaxy: Mapped[bool] = mapped_column(Boolean, default=False)
     is_custom_galaxy: Mapped[bool] = mapped_column(Boolean, default=False)
     local_only: Mapped[bool] = mapped_column(Boolean, default=False)
+
+    attributetags = relationship("AttributeTag", back_populates="tag", lazy="raise_on_sql", viewonly=True)
+    eventtags = relationship("EventTag", back_populates="tag", lazy="raise_on_sql", viewonly=True)

{mmisp_lib-0.3.0 → mmisp_lib-0.4.0}/src/mmisp/db/models/user.py

@@ -1,6 +1,7 @@
 from time import time
 
 from sqlalchemy import BigInteger, Boolean, DateTime, ForeignKey, Integer, String, Text
+from sqlalchemy.orm import relationship
 
 from mmisp.db.mypy import Mapped, mapped_column
 
@@ -44,3 +45,6 @@ class User(Base):
     totp: Mapped[str] = mapped_column(String(255))
     hotp_counter: Mapped[int] = mapped_column(Integer)
     last_pw_change: Mapped[int] = mapped_column(BigInteger)
+
+    # Relationships
+    org = relationship("Organisation", back_populates="users", lazy="raise_on_sql")

mmisp_lib-0.4.0/src/mmisp/lib/attribute_search_filter.py

@@ -0,0 +1,60 @@
+from typing import TYPE_CHECKING
+
+from sqlalchemy import and_
+
+from mmisp.db.models.attribute import Attribute
+
+if TYPE_CHECKING:
+    from sqlalchemy import ColumnExpressionArgument
+else:
+    ColumnExpressionArgument = any
+
+
+def get_search_filters(
+    value: str | None = None,
+    value1: str | None = None,
+    value2: str | None = None,
+    type: str | None = None,
+    category: str | None = None,
+    org: str | None = None,
+    tags: list[str] | None = None,
+    from_: str | None = None,
+    to: str | None = None,
+    last: int | None = None,
+    eventid: str | None = None,
+    published: bool | None = None,
+    to_ids: bool | None = None,
+    deleted: bool | None = None,
+    **kwargs,
+) -> ColumnExpressionArgument:
+    cond = [True]  # for empty filters
+    if value is not None:
+        cond.append(Attribute.value == value)
+    if value1 is not None:
+        cond.append(Attribute.value1 == value1)
+    if value2 is not None:
+        cond.append(Attribute.value2 == value2)
+    if type is not None:
+        cond.append(Attribute.type == type)
+    if category is not None:
+        cond.append(Attribute.category == category)
+    if org is not None:
+        raise NotImplementedError("filtering by org is currently not implemented")
+    if tags is not None:
+        raise NotImplementedError("filtering by tags is currently not implemented")
+    if from_ is not None:
+        raise NotImplementedError("filtering by from is currently not implemented")
+    if to is not None:
+        raise NotImplementedError("filtering by to is currently not implemented")
+    if last is not None:
+        raise NotImplementedError("filtering by last is currently not implemented")
+    if eventid is not None:
+        raise NotImplementedError("filtering by eventid is currently not implemented")
+    if published is not None:
+        raise NotImplementedError("filtering by published is currently not implemented")
+    if to_ids is not None:
+        cond.append(Attribute.to_ids == to_ids)
+    if deleted is not None:
+        cond.append(Attribute.deleted == deleted)
+
+    return and_(*cond)

mmisp_lib-0.4.0/src/mmisp/tests/compatibility_helpers.py

@@ -0,0 +1,56 @@
+import httpx
+from deepdiff import DeepDiff
+from icecream import ic
+
+
+def to_legacy_format(data):
+    if isinstance(data, bool):
+        return data
+    elif isinstance(data, (int, float)):
+        return str(data)
+    elif isinstance(data, dict):
+        return {key: to_legacy_format(value) for key, value in data.items()}
+    elif isinstance(data, list):
+        return [to_legacy_format(x) for x in data]
+    return data
+
+
+def get_legacy_modern_diff(http_method, path, body, auth_key, client):
+    clear_key, auth_key = auth_key
+    headers = {"authorization": clear_key, "accept": "application/json"}
+
+    ic("-" * 50)
+    ic(f"Calling {path}")
+    ic(body)
+
+    kwargs = {"headers": headers}
+    if http_method != "get":
+        kwargs["json"] = body
+
+    call = getattr(client, http_method)
+    response = call(path, **kwargs)
+    response_json = response.json()
+
+    call = getattr(httpx, http_method)
+    legacy_response = call(f"http://misp-core{path}", **kwargs)
+    ic(legacy_response)
+    legacy_response_json = legacy_response.json()
+    ic("Modern MISP Response")
+    ic(response_json)
+    ic("Legacy MISP Response")
+    ic(legacy_response_json)
+
+    diff = DeepDiff(to_legacy_format(response_json), to_legacy_format(legacy_response_json), verbose_level=2)
+    ic(diff)
+
+    # remove None values added in Modern MISP.
+    # They shouldnt hurt and removing all None
+    # overshoots, MISP is inconsistent when to include what.
+    # Note: We don't want the opposite. If MISP includes None, Modern MISP should do this as well!
+    diff["dictionary_item_removed"] = {
+        k: v for k, v in diff["dictionary_item_removed"].items() if v is not None and v != [] and v != {}
+    }
+    if diff["dictionary_item_removed"] == {}:
+        del diff["dictionary_item_removed"]
+
+    return diff