mmisp-lib 0.1.8__tar.gz → 0.1.10__tar.gz

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.1.8
+Version: 0.1.10
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastapi==0.104.1
-Requires-Dist: SQLAlchemy[asyncio]==1.4.46
+Requires-Dist: SQLAlchemy[asyncio]~=1.4.46
 Requires-Dist: pydantic==1.10.13
 Requires-Dist: uvicorn==0.24.0.post1
 Requires-Dist: python-dotenv==1.0.0

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.1.8"
+version = "0.1.10"
 description = ""
 authors = []
 readme = "README.md"
@@ -9,7 +9,7 @@ requires-python = ">=3.11.0"
 
 dependencies = [
   "fastapi==0.104.1",
-  "SQLAlchemy[asyncio]==1.4.46",
+  "SQLAlchemy[asyncio]~=1.4.46",
   "pydantic==1.10.13",
   "uvicorn==0.24.0.post1",
   "python-dotenv==1.0.0",
@@ -47,9 +47,11 @@ dev = [
 fix = true
 line-length = 120
 required-version = ">=0.3.7"
+src = ["src"]
+
+[tool.ruff.lint]
 select = ["E", "F", "W", "I", "ICN", "ANN"]
 ignore = ["ANN002", "ANN003", "ANN401"]
-src = ["src"]
 
 [tool.coverage.run]
 concurrency = ["greenlet", "thread"]

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/src/mmisp/api_schemas/auth_keys/add_auth_key_body.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 class AddAuthKeyBody(BaseModel):
     uuid: str | None = None
     read_only: bool | None = None
-    user_id: str | None = None
+    user_id: int | None = None
     comment: str | None = None
     allowed_ips: list[str] | None = None
     expiration: int | str | None = 0

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/src/mmisp/api_schemas/auth_keys/search_auth_keys_body.py

@@ -2,8 +2,8 @@ from pydantic import BaseModel, PositiveInt, conint
 
 
 class SearchAuthKeyBody(BaseModel):
-    page: PositiveInt | None = 1
-    limit: conint(gt=0, lt=500) | None = 25  # type: ignore
+    page: PositiveInt = 1
+    limit: conint(gt=0, lt=500) = 25  # type: ignore
     id: str | None = None
     uuid: str | None = None
     authkey_start: str | None = None

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/src/mmisp/api_schemas/events/add_edit_get_event_response.py

@@ -128,14 +128,14 @@ class AddEditGetEventTag(BaseModel):
     id: str
     name: str
     colour: str
-    exportable: str
+    exportable: bool
     user_id: str
     hide_tag: bool
     numerical_value: int | None = None
     is_galaxy: bool
     is_custom_galaxy: bool
     local_only: bool
-    local: int
+    local: bool
     relationship_type: str | None = None
 
 

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/src/mmisp/api_schemas/noticelists/get_noticelist_response.py

@@ -1,3 +1,4 @@
+from collections.abc import Sequence
 from typing import Any
 
 from pydantic import BaseModel
@@ -28,7 +29,7 @@ class NoticelistAttributes(BaseModel):
 
 
 class NoticelistAttributesResponse(NoticelistAttributes):
-    NoticelistEntry: list[NoticelistEntryResponse]
+    NoticelistEntry: Sequence[NoticelistEntryResponse]
 
 
 class NoticelistResponse(BaseModel):

{mmisp_lib-0.1.8 → mmisp_lib-0.1.10}/src/mmisp/api_schemas/warninglists/create_warninglist_body.py

@@ -1,9 +1,9 @@
-from enum import Enum
+from enum import StrEnum
 
 from pydantic import BaseModel, Field
 
 
-class WarninglistListType(str, Enum):
+class WarninglistListType(StrEnum):
     CIDR = "cidr"
     HOSTNAME = "hostname"
     STRING = "string"
@@ -11,12 +11,13 @@ class WarninglistListType(str, Enum):
     REGEX = "regex"
 
 
-class WarninglistCategory(str, Enum):
+class WarninglistCategory(StrEnum):
     FALSE_POSITIVE = "False positive"
     KNOWN_IDENTIFIER = "Known identifier"
 
 
-class ValidAttribute(str, Enum):
+# todo: use something from the mmisp.lib.attributes
+class ValidAttribute(StrEnum):
     MD5 = "md5"
     SHA12SHA256 = "sha12sha256"
     FILENAME = "filename"

mmisp_lib-0.1.10/src/mmisp/db/models/attribute.py

@@ -0,0 +1,96 @@
+from typing import Self, Type
+
+from sqlalchemy import BigInteger, Boolean, ForeignKey, Integer, String, Text
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm.decl_api import DeclarativeMeta
+
+from mmisp.db.mixins import DictMixin
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.lib.attributes import categories, default_category, mapper_safe_clsname_val, to_ids
+from mmisp.util.uuid import uuid
+
+from ..database import Base
+from .event import Event
+from .tag import Tag
+
+
+class Attribute(Base, DictMixin):
+    __tablename__ = "attributes"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    uuid: Mapped[str] = mapped_column(String(40), unique=True, default=uuid, index=True)
+    event_id: Mapped[int] = mapped_column(
+        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)
+    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)
+    value2: Mapped[str] = mapped_column(Text, nullable=False, default="")
+    to_ids: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
+    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)
+    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)
+
+    event = relationship("Event", back_populates="attributes", lazy="joined")
+
+    __mapper_args__ = {"polymorphic_on": "type"}
+
+    def __init__(self: Self, *arg, **kwargs) -> None:
+        if kwargs["value1"] is None:
+            split_val = kwargs["value"].split("|", 1)
+            kwargs["value1"] = split_val[0]
+            if len(split_val) == 2:
+                kwargs["value2"] = split_val[1]
+
+        super().__init__(*arg, **kwargs)
+
+    @property
+    def event_uuid(self: "Attribute") -> str:
+        return self.event.uuid
+
+    @hybrid_property
+    def value(self: Self) -> str:
+        if self.value2 == "":
+            return self.value1
+        return f"{self.value1}|{self.value2}"
+
+    @value.setter
+    def value(self: Self, value: str) -> None:
+        split = value.split("|", 1)
+        self.value1 = split[0]
+        if len(split) == 2:
+            self.value2 = split[1]
+
+
+class AttributeTag(Base):
+    __tablename__ = "attribute_tags"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    attribute_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey(Attribute.id, ondelete="CASCADE"), nullable=False, index=True
+    )
+    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)
+
+
+class AttributeMeta(DeclarativeMeta):
+    def __new__(cls: Type[type], clsname: str, bases: tuple, dct: dict) -> "AttributeMeta":
+        key = clsname[len("Attribute") :]
+        dct["default_category"] = default_category[mapper_safe_clsname_val[key]]
+        dct["categories"] = categories[mapper_safe_clsname_val[key]]
+        dct["default_to_ids"] = to_ids[mapper_safe_clsname_val[key]]
+        dct["__mapper_args__"] = {"polymorphic_identity": mapper_safe_clsname_val[key]}
+        return super().__new__(cls, clsname, bases, dct)
+
+
+for k, _ in mapper_safe_clsname_val.items():
+    vars()["Attribute" + k] = AttributeMeta("Attribute" + k, (Attribute,), dict())

mmisp_lib-0.1.10/src/mmisp/db/models/auth_key.py

@@ -0,0 +1,25 @@
+from time import time
+
+from sqlalchemy import Boolean, ForeignKey, Integer, String
+
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.util.uuid import uuid
+
+from ..database import Base
+
+
+class AuthKey(Base):
+    __tablename__ = "auth_keys"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    uuid: Mapped[str] = mapped_column(String(255), unique=True, default=uuid, nullable=False)
+    authkey: Mapped[str] = mapped_column(String(255), nullable=False)
+    authkey_start: Mapped[str] = mapped_column(String(255), nullable=False)
+    authkey_end: Mapped[str] = mapped_column(String(255), nullable=False)
+    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))
+    user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id"), nullable=False)

mmisp_lib-0.1.10/src/mmisp/db/models/event.py

@@ -0,0 +1,63 @@
+from datetime import datetime
+
+from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, Text
+from sqlalchemy.orm import relationship
+
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.util.uuid import uuid
+
+from ..database import Base
+from .organisation import Organisation
+from .tag import Tag
+from .user import User
+
+
+class Event(Base):
+    __tablename__ = "events"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    uuid: Mapped[str] = mapped_column(String(40), unique=True, default=uuid, nullable=False, index=True)
+    org_id: Mapped[int] = mapped_column(Integer, ForeignKey(Organisation.id), nullable=False, index=True)
+    date: Mapped[DateTime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
+    info: Mapped[str] = mapped_column(Text, nullable=False)
+    user_id: Mapped[int] = mapped_column(Integer, ForeignKey(User.id), nullable=False)
+    published: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    analysis: Mapped[int] = mapped_column(Integer, nullable=False)
+    attribute_count: Mapped[int] = mapped_column(Integer, default=0)
+    orgc_id: Mapped[int] = mapped_column(Integer, ForeignKey(Organisation.id), nullable=False, index=True)
+    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, nullable=False, index=True, default=0)
+    proposal_email_lock: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    locked: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    threat_level_id: Mapped[int] = mapped_column(Integer, nullable=False)
+    publish_timestamp: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
+    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)
+
+    attributes = relationship("Attribute", back_populates="event")
+
+
+class EventReport(Base):
+    __tablename__ = "event_reports"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    uuid: Mapped[str] = mapped_column(String(40), unique=True, nullable=False, default=uuid)
+    event_id: Mapped[int] = mapped_column(Integer, ForeignKey(Event.id), nullable=False, index=True)
+    name: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
+    content: Mapped[str] = mapped_column(Text)
+    distribution: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
+    sharing_group_id: Mapped[int] = mapped_column(Integer)
+    timestamp: Mapped[int] = mapped_column(Integer, nullable=False)
+    deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+
+
+class EventTag(Base):
+    __tablename__ = "event_tags"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    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)

mmisp_lib-0.1.10/src/mmisp/db/models/feed.py

@@ -0,0 +1,33 @@
+from sqlalchemy import Boolean, Integer, String, Text
+
+from mmisp.db.database import Base
+from mmisp.db.mypy import Mapped, mapped_column
+
+
+class Feed(Base):
+    __tablename__ = "feeds"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    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)
+    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)
+    tag_id: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
+    default: Mapped[bool] = mapped_column(Boolean, default=False)
+    source_format: Mapped[str] = mapped_column(String(255), default="misp")
+    fixed_event: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    delta_merge: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    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)
+    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)
+    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.1.10/src/mmisp/db/models/galaxy.py

@@ -0,0 +1,23 @@
+from sqlalchemy import Boolean, Integer, String, Text
+
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.util.uuid import uuid
+
+from ..database import Base
+
+
+class Galaxy(Base):
+    __tablename__ = "galaxies"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    uuid: Mapped[str] = mapped_column(String(255), nullable=False, unique=True, default=uuid)
+    name: Mapped[str] = mapped_column(String(255), nullable=False, default="", index=True)
+    type: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
+    description: Mapped[str] = mapped_column(Text, nullable=False)
+    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))
+    """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.1.10/src/mmisp/db/models/galaxy_cluster.py

@@ -0,0 +1,59 @@
+from sqlalchemy import Boolean, ForeignKey, Integer, String, Text
+
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.util.uuid import uuid
+
+from ..database import Base
+from .galaxy import Galaxy
+
+
+class GalaxyCluster(Base):
+    __tablename__ = "galaxy_clusters"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    uuid: Mapped[str] = mapped_column(String(255), unique=True, default=uuid, index=True)
+    collection_uuid: Mapped[str] = mapped_column(String(255), nullable=False, index=True, default="0")
+    type: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
+    value: Mapped[str] = mapped_column(Text, nullable=False)
+    tag_name: Mapped[str] = mapped_column(String(255), nullable=False, default="", index=True)
+    description: Mapped[str] = mapped_column(Text, nullable=False)
+    galaxy_id: Mapped[int] = mapped_column(
+        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(Text, 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, default=0)
+    org_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True, default=0)
+    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, default=0, index=True)
+    published: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+
+
+class GalaxyElement(Base):
+    __tablename__ = "galaxy_elements"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    galaxy_cluster_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey(GalaxyCluster.id, ondelete="CASCADE"), nullable=False, index=True
+    )
+    key: Mapped[str] = mapped_column(String(255), nullable=False, default="", index=True)
+    value: Mapped[str] = mapped_column(Text, nullable=False)
+
+
+class GalaxyReference(Base):
+    __tablename__ = "galaxy_reference"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    galaxy_cluster_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey(GalaxyCluster.id, ondelete="CASCADE"), nullable=False, index=True
+    )
+    referenced_galaxy_cluster_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
+    referenced_galaxy_cluster_uuid: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
+    referenced_galaxy_cluster_type: Mapped[str] = mapped_column(Text, nullable=False)
+    referenced_galaxy_cluster_value: Mapped[str] = mapped_column(Text, nullable=False)

mmisp_lib-0.1.10/src/mmisp/db/models/identity_provider.py

@@ -0,0 +1,24 @@
+from datetime import datetime
+
+from sqlalchemy import Boolean, DateTime, Integer, String
+
+from mmisp.db.mypy import Mapped, mapped_column
+
+from ..database import Base
+
+
+class OIDCIdentityProvider(Base):
+    __tablename__ = "oidc_identity_providers"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    org_id: Mapped[int] = mapped_column(Integer, nullable=False)
+    active: Mapped[bool] = mapped_column(Boolean, default=True)
+    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))
+    """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)
+    modified: Mapped[DateTime] = mapped_column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)

mmisp_lib-0.1.10/src/mmisp/db/models/noticelist.py

@@ -0,0 +1,23 @@
+from sqlalchemy import Boolean, ForeignKey, Integer, String, Text
+
+from mmisp.db.database import Base
+from mmisp.db.mypy import Mapped, mapped_column
+
+
+class Noticelist(Base):
+    __tablename__ = "noticelists"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
+    expanded_name: Mapped[str] = mapped_column(String(255), nullable=False)
+    ref: Mapped[str] = mapped_column(String(255))  # data serialized as json
+    geographical_area: Mapped[str] = mapped_column(String(255))  # data serialized as json
+    version: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
+    enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+
+
+class NoticelistEntry(Base):
+    __tablename__ = "noticelist_entries"
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    noticelist_id: Mapped[int] = mapped_column(Integer, ForeignKey(Noticelist.id, ondelete="CASCADE"), nullable=False)
+    data: Mapped[str] = mapped_column(Text, nullable=False)  # data serialized as json

mmisp_lib-0.1.10/src/mmisp/db/models/object.py

@@ -0,0 +1,41 @@
+from sqlalchemy import Boolean, ForeignKey, Integer, String
+
+from mmisp.db.database import Base
+from mmisp.db.mixins import DictMixin
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.util.uuid import uuid
+
+
+class Object(Base, DictMixin):
+    __tablename__ = "objects"
+
+    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")
+    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)
+    event_id: Mapped[int] = mapped_column(Integer, ForeignKey("events.id"), index=True, nullable=False)
+    timestamp: Mapped[int] = mapped_column(Integer, index=True, nullable=False, default=0)
+    distribution: Mapped[int] = mapped_column(Integer, index=True, nullable=False, default=0)
+    sharing_group_id: Mapped[int] = mapped_column(Integer, ForeignKey("sharing_groups.id"), index=True)
+    comment: Mapped[str] = mapped_column(String(255), nullable=False)
+    deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    first_seen: Mapped[int] = mapped_column(Integer, index=True, default=None)
+    last_seen: Mapped[int] = mapped_column(Integer, index=True, default=None)
+
+
+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))
+    version: Mapped[int] = mapped_column(Integer, nullable=False)
+    requirements: Mapped[str] = mapped_column(String(255))
+    fixed: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)

mmisp_lib-0.1.10/src/mmisp/db/models/organisation.py

@@ -0,0 +1,30 @@
+from datetime import datetime
+
+from sqlalchemy import Boolean, DateTime, Integer, String, Text
+
+from mmisp.db.mixins import DictMixin
+from mmisp.db.mypy import Mapped, mapped_column
+from mmisp.util.uuid import uuid
+
+from ..database import Base
+
+
+class Organisation(Base, DictMixin):
+    __tablename__ = "organisations"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False, unique=True)
+    date_created: Mapped[DateTime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
+    date_modified: Mapped[DateTime] = mapped_column(
+        DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False
+    )
+    description: Mapped[str] = mapped_column(Text)
+    type: Mapped[str] = mapped_column(String(255))
+    nationality: Mapped[str] = mapped_column(String(255))
+    sector: Mapped[str] = mapped_column(String(255))
+    created_by: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
+    uuid: Mapped[str] = mapped_column(String(255), unique=True, default=uuid)
+    contacts: Mapped[str] = mapped_column(Text)
+    local: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    restricted_to_domain: Mapped[str] = mapped_column(Text)
+    landingpage: Mapped[str] = mapped_column(Text)

mmisp_lib-0.1.10/src/mmisp/db/models/role.py

@@ -0,0 +1,35 @@
+from typing import Self
+
+from sqlalchemy import Boolean, DateTime, Integer, String
+
+from mmisp.db.mypy import mapped_column
+from mmisp.lib.permissions import Permission
+
+from ..database import Base
+
+RoleAttrs = {
+    "__tablename__": "roles",
+    "id": mapped_column(Integer, primary_key=True, nullable=False),
+    "name": mapped_column(String(255), nullable=False),
+    "created": mapped_column(DateTime, default=None),
+    "modified": mapped_column(DateTime, default=None),
+    "default_role": mapped_column(Boolean, nullable=False, default=False),
+    "memory_limit": mapped_column(String(255), default=""),
+    "max_execution_time": mapped_column(String(255), default=""),
+    "restricted_to_site_admin": mapped_column(Boolean, nullable=False, default=False),
+    "enforce_rate_limit": mapped_column(Boolean, nullable=False, default=False),
+    "rate_limit_count": mapped_column(Integer, nullable=False, default=0),
+} | {f"perm_{x.value}": mapped_column(Boolean, default=False) for x in Permission}
+
+RoleModel = type("RoleModel", (Base,), RoleAttrs)
+
+
+class Role(RoleModel):
+    def get_permissions(self: Self) -> set[Permission]:
+        d: list[Permission] = []
+
+        for key in self.__mapper__.c.keys():
+            if key.startswith("perm_") and getattr(self, key):
+                d.append(Permission(key[len("perm_") :]))
+
+        return set(d)

mmisp_lib-0.1.10/src/mmisp/db/models/server.py

@@ -0,0 +1,35 @@
+from sqlalchemy import Boolean, Integer, String, Text
+
+from mmisp.db.mypy import Mapped, mapped_column
+
+from ..database import Base
+
+
+class Server(Base):
+    __tablename__ = "servers"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    url: Mapped[str] = mapped_column(String(255), nullable=False)
+    authkey: Mapped[str] = mapped_column(String(40), nullable=False)
+    org_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
+    push: Mapped[bool] = mapped_column(Boolean, nullable=False)
+    pull: Mapped[bool] = mapped_column(Boolean, nullable=False)
+    push_sightings: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    push_galaxy_clusters: Mapped[bool] = mapped_column(Boolean, default=False)
+    pull_galaxy_clusters: Mapped[bool] = mapped_column(Boolean, default=False)
+    lastpulledid: Mapped[int] = mapped_column(Integer)
+    lastpushedid: Mapped[int] = mapped_column(Integer)
+    organization: Mapped[str] = 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))
+    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)
+    priority: Mapped[int] = mapped_column(Integer, nullable=False, default=0, index=True)