pymisp 2.5.3__tar.gz → 2.5.4__tar.gz

{pymisp-2.5.3 → pymisp-2.5.4}/CHANGELOG.txt

@@ -2,6 +2,64 @@ Changelog
 =========
 
 
+v2.5.4 (2024-12-20)
+-------------------
+
+Changes
+~~~~~~~
+- Update objects templates. [Raphaël Vinot]
+- Make python 3.9 happy. [Raphaël Vinot]
+- Bump deps. [Raphaël Vinot]
+- [AnalystData] Flattening analyst data based on the recent changes on
+  MISP standard format. [Christian Studer]
+
+  - Adding a note or an opinion will always add the
+    new analyst data object to the list of notes or
+    opinions at the parent data layer level
+  - `from_dict` on a JSON blob is also able to parse
+    properly analyst data and generate flat lists
+    regardless of whether the given data described
+    in the new flat or previously nested format
+- Bump deps. [Raphaël Vinot]
+- Bump deps. [Raphaël Vinot]
+
+Fix
+~~~
+- [tests] Removed typing. [Christian Studer]
+- [MISPAnalystData] Added missing typing. [Christian Studer]
+- [MISPAnalystData] Reverted the declaration of Analyst data objects
+  lists back to the mixin parent class. [Christian Studer]
+- [MISPAnalystData] Better handling of the different use cases.
+  [Christian Studer]
+
+  - Additional checks for parent to support both
+    the standalone and attached analyst data objects
+  - Standalone Analyst data objects with nested
+    notes or opinions are defined with the nesting
+    as they have no parent. When they are added to
+    a parent data layer, the nested objects are then
+    flattened
+- [AnalystData] Typo... [Christian Studer]
+- [AnalystData] Avoiding issues with analyst data objects. [Christian
+  Studer]
+
+Other
+~~~~~
+- Chg; Bump version. [Raphaël Vinot]
+- Revert "fix: [tests] Removed typing" [Christian Studer]
+
+  This reverts commit a7cf9dc3f03ffda5ee6c1b614792455fe43d8704.
+- Add: [tests] Testing Analyst Data in different scenarios. [Christian
+  Studer]
+
+  - Testing different ways to attach analyst data
+  - Testing that no matter what object type the
+    analyst data is attached to, the `object_type`
+    & `object_uuid` are correct, and the parent
+    container does contain every analyst data object
+    in flat lists with no nesting
+
+
 v2.5.3 (2024-12-16)
 -------------------
 
@@ -26,6 +84,7 @@ New
 
 Changes
 ~~~~~~~
+- Bump changelog. [Raphaël Vinot]
 - Bump release. [Raphaël Vinot]
 - Bump deps. [Raphaël Vinot]
 

{pymisp-2.5.3 → pymisp-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymisp
-Version: 2.5.3
+Version: 2.5.4
 Summary: Python API for MISP.
 Home-page: https://github.com/MISP/PyMISP
 License: BSD-2-Clause
@@ -36,9 +36,9 @@ Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0) ; extra == "openioc"
 Requires-Dist: deprecated (>=1.2.15,<2.0.0)
 Requires-Dist: docutils (>=0.21.1,<0.22.0) ; (python_version >= "3.10") and (extra == "docs")
 Requires-Dist: extract_msg (>=0.52,<0.53) ; extra == "email"
-Requires-Dist: lief (>=0.15.0,<0.16.0) ; extra == "fileobjects"
+Requires-Dist: lief (>=0.16.0,<0.17.0) ; extra == "fileobjects"
 Requires-Dist: oletools (>=0.60.1,<0.61.0) ; extra == "email"
-Requires-Dist: publicsuffixlist (>=1.0.2.20241216,<2.0.0.0)
+Requires-Dist: publicsuffixlist (>=1.0.2.20241218,<2.0.0.0)
 Requires-Dist: pydeep2 (>=0.5.1,<0.6.0) ; extra == "fileobjects"
 Requires-Dist: pyfaup (>=1.2,<2.0) ; extra == "url"
 Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)

{pymisp-2.5.3 → pymisp-2.5.4}/pymisp/data/misp-objects/README.md

@@ -396,6 +396,7 @@ for a specific attribute. An optional **to_ids** boolean field to disable the ID
 - [objects/sigmf-recording](https://github.com/MISP/misp-objects/blob/main/objects/sigmf-recording/definition.json) - An object representing a single IQ/RF sample in the Signal Metadata Format Specification (SigMF).
 - [objects/social-media-group](https://github.com/MISP/misp-objects/blob/main/objects/social-media-group/definition.json) - Social media group object template describing a public or private group or channel.
 - [objects/software](https://github.com/MISP/misp-objects/blob/main/objects/software/definition.json) - The Software object represents high-level properties associated with software, including software products. STIX 2.1 - 6.14.
+- [objects/spambee-report](https://github.com/MISP/misp-objects/main/objects/spambee-report/definition.json) - A Spambee analysis report.
 - [objects/spearphishing-attachment](https://github.com/MISP/misp-objects/blob/main/objects/spearphishing-attachment/definition.json) - Spearphishing Attachment.
 - [objects/spearphishing-link](https://github.com/MISP/misp-objects/blob/main/objects/spearphishing-link/definition.json) - Spearphishing Link.
 - [objects/splunk](https://github.com/MISP/misp-objects/blob/main/objects/splunk/definition.json) - Splunk / Splunk ES object.

{pymisp-2.5.3 → pymisp-2.5.4}/pymisp/data/misp-objects/objects/android-app/definition.json

@@ -7,11 +7,17 @@
       "ui-priority": 1
     },
     "certificate": {
-      "description": "Android certificate",
+      "description": "Android certificate (SHA1)",
       "misp-attribute": "sha1",
       "multiple": true,
       "ui-priority": 1
     },
+    "certificate-sha256": {
+      "description": "Android certificate (SHA256)",
+      "misp-attribute": "sha256",
+      "multiple": true,
+      "ui-priority": 1
+    },
     "domain": {
       "description": "Domain used by the app",
       "misp-attribute": "domain",
@@ -39,5 +45,5 @@
     "sha256"
   ],
   "uuid": "92836f23-4730-4eae-82ac-9f00d5299735",
-  "version": 1
+  "version": 2
 }

pymisp-2.5.4/pymisp/data/misp-objects/objects/spambee-report/definition.json

@@ -0,0 +1,54 @@
+{
+  "attributes": {
+    "feedback-requested": {
+      "description": "User has requested feedback",
+      "disable_correlation": true,
+      "misp-attribute": "boolean",
+      "ui-priority": 0
+    },
+    "feedback-sent": {
+      "description": "Feedback has been sent to user",
+      "disable_correlation": true,
+      "misp-attribute": "boolean",
+      "ui-priority": 0
+    },
+    "feedback-time": {
+      "description": "Timestamp of the feedback",
+      "disable_correlation": true,
+      "misp-attribute": "datetime",
+      "ui-priority": 0
+    },
+    "privacy": {
+      "description": "User has requested privacy",
+      "disable_correlation": true,
+      "misp-attribute": "boolean",
+      "ui-priority": 0
+    },
+    "report-status": {
+      "categories": [
+        "External analysis"
+      ],
+      "description": "Result of the Spambee analysis for the submitted email",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 0
+    },
+    "report-uid": {
+      "categories": [
+        "Internal reference"
+      ],
+      "description": "Internal reference to the Spambee report",
+      "disable_correlation": true,
+      "misp-attribute": "text",
+      "ui-priority": 0
+    }
+  },
+  "description": "A Spambee analysis report",
+  "meta-category": "network",
+  "name": "spambee-report",
+  "requiredOneOf": [
+    "report-uid"
+  ],
+  "uuid": "305d6e6c-bb4d-4b9a-abf5-9f34d1322352",
+  "version": 3
+}

{pymisp-2.5.3 → pymisp-2.5.4}/pymisp/data/misp-objects/objects/vulnerability/definition.json

@@ -14,13 +14,13 @@
       "ui-priority": 0
     },
     "cvss-score": {
-      "description": "Score of the Common Vulnerability Scoring System (version 3).",
+      "description": "Score of the Common Vulnerability Scoring System.",
       "disable_correlation": true,
       "misp-attribute": "float",
       "ui-priority": 1
     },
     "cvss-string": {
-      "description": "String of the Common Vulnerability Scoring System (version 3).",
+      "description": "String of the Common Vulnerability Scoring System.",
       "disable_correlation": true,
       "misp-attribute": "text",
       "ui-priority": 1
@@ -65,7 +65,8 @@
         "Reviewed",
         "Vulnerability ID Assigned",
         "Reported",
-        "Fixed"
+        "Fixed",
+        "Encoded"
       ],
       "ui-priority": 0
     },
@@ -94,5 +95,5 @@
     "id"
   ],
   "uuid": "81650945-f186-437b-8945-9f31715d32da",
-  "version": 8
+  "version": 9
 }

{pymisp-2.5.3 → pymisp-2.5.4}/pymisp/data/misp-objects/relationships/definition.json

@@ -1907,7 +1907,23 @@
         "misp"
       ],
       "name": "releasable-to"
+    },
+    {
+      "description": "The source object is weakened by the target weakness.",
+      "format": [
+        "misp"
+      ],
+      "name": "weakened-by",
+      "opposite": "weakens"
+    },
+    {
+      "description": "The source weakness weakens the target object.",
+      "format": [
+        "misp"
+      ],
+      "name": "weakens",
+      "opposite": "weakened-by"
     }
   ],
-  "version": 50
+  "version": 51
 }

{pymisp-2.5.3 → pymisp-2.5.4}/pymisp/mispevent.py

@@ -60,28 +60,37 @@ class AnalystDataBehaviorMixin(AbstractMISP):
 
     def add_note(self, note: str, language: str | None = None, **kwargs) -> MISPNote:  # type: ignore[no-untyped-def]
         the_note = MISPNote()
-        the_note.from_dict(note=note, language=language,
-                           object_uuid=self.uuid, object_type=self.analyst_data_object_type,
-                           **kwargs)
+        object_uuid = kwargs.pop('object_uuid', self.uuid)
+        object_type = kwargs.pop('object_type', self.analyst_data_object_type)
+        the_note.from_dict(
+            note=note, language=language, object_uuid=object_uuid,
+            object_type=object_type, contained=True, parent=self, **kwargs
+        )
         self.notes.append(the_note)
         self.edited = True
         return the_note
 
     def add_opinion(self, opinion: int, comment: str | None = None, **kwargs) -> MISPOpinion:  # type: ignore[no-untyped-def]
         the_opinion = MISPOpinion()
-        the_opinion.from_dict(opinion=opinion, comment=comment,
-                              object_uuid=self.uuid, object_type=self.analyst_data_object_type,
-                              **kwargs)
+        object_uuid = kwargs.pop('object_uuid', self.uuid)
+        object_type = kwargs.pop('object_type', self.analyst_data_object_type)
+        the_opinion.from_dict(
+            opinion=opinion, comment=comment, object_uuid=object_uuid,
+            object_type=object_type, contained=True, parent=self, **kwargs
+        )
         self.opinions.append(the_opinion)
         self.edited = True
         return the_opinion
 
     def add_relationship(self, related_object_type: AbstractMISP | str, related_object_uuid: str | None, relationship_type: str, **kwargs) -> MISPRelationship:  # type: ignore[no-untyped-def]
         the_relationship = MISPRelationship()
-        the_relationship.from_dict(related_object_type=related_object_type, related_object_uuid=related_object_uuid,
-                                   relationship_type=relationship_type,
-                                   object_uuid=self.uuid, object_type=self.analyst_data_object_type,
-                                   **kwargs)
+        the_relationship.from_dict(
+            related_object_type=related_object_type,
+            related_object_uuid=related_object_uuid,
+            relationship_type=relationship_type, object_uuid=self.uuid,
+            object_type=self.analyst_data_object_type, contained=True,
+            parent=self, **kwargs
+        )
         self.relationships.append(the_relationship)
         self.edited = True
         return the_relationship
@@ -93,12 +102,8 @@ class AnalystDataBehaviorMixin(AbstractMISP):
         relationships = kwargs.pop('Relationship', [])
         super().from_dict(**kwargs)
         for note in notes:
-            note.pop('object_uuid', None)
-            note.pop('object_type', None)
             self.add_note(**note)
         for opinion in opinions:
-            opinion.pop('object_uuid', None)
-            opinion.pop('object_type', None)
             self.add_opinion(**opinion)
         for relationship in relationships:
             relationship.pop('object_uuid', None)
@@ -2523,6 +2528,10 @@ class MISPAnalystData(AbstractMISP):
                          'Object', 'Note', 'Opinion', 'Relationship', 'Organisation',
                          'SharingGroup'}
 
+    @property
+    def analyst_data_object_type(self) -> str:
+        return self._analyst_data_object_type
+
     @property
     def org(self) -> MISPOrganisation:
         return self.Org
@@ -2538,6 +2547,10 @@ class MISPAnalystData(AbstractMISP):
         else:
             raise PyMISPError('Orgc must be of type MISPOrganisation.')
 
+    @property
+    def parent(self) -> MISPAttribute | MISPEvent | MISPEventReport | MISPObject:
+        return self.__parent
+
     def __new__(cls, *args, **kwargs):
         if cls is MISPAnalystData:
             raise TypeError(f"only children of '{cls.__name__}' may be instantiated")
@@ -2552,8 +2565,54 @@ class MISPAnalystData(AbstractMISP):
         self.created: float | int | datetime
         self.modified: float | int | datetime
         self.SharingGroup: MISPSharingGroup
+        self._analyst_data_object_type: str  # Must be defined in the child class
+
+    def add_note(self, note: str, language: str | None = None, object_uuid: str | None = None, object_type: str | None = None, parent: MISPEvent | MISPAttribute | MISPObject | MISPEventReport | None = None, **kwargs: dict[str, Any]) -> MISPNote:
+        misp_note = MISPNote()
+        if object_uuid is None:
+            object_uuid = self.uuid
+        if object_type is None:
+            object_type = self.analyst_data_object_type
+        if parent is None and hasattr(self, 'parent'):
+            parent = self.parent
+        misp_note.from_dict(
+            note=note, language=language, object_uuid=object_uuid,
+            object_type=object_type, parent=parent, contained=True, **kwargs
+        )
+        if parent is None:
+            if not hasattr(self, 'Note'):
+                self.Note: list[MISPNote] = []
+            self.Note.append(misp_note)
+        else:
+            self.parent.notes.append(misp_note)
+        self.edited = True
+        return misp_note
+
+    def add_opinion(self, opinion: int, comment: str | None = None, object_uuid: str | None = None, object_type: str | None = None, parent: MISPEvent | MISPAttribute | MISPObject | MISPEventReport | None = None, **kwargs: dict[str, Any]) -> MISPOpinion:
+        misp_opinion = MISPOpinion()
+        if object_uuid is None:
+            object_uuid = self.uuid
+        if object_type is None:
+            object_type = self.analyst_data_object_type
+        if parent is None and hasattr(self, 'parent'):
+            parent = self.parent
+        misp_opinion.from_dict(
+            opinion=opinion, comment=comment, object_uuid=object_uuid,
+            object_type=object_type, parent=parent, contained=True, **kwargs
+        )
+        if parent is None:
+            if not hasattr(self, 'Opinion'):
+                self.Opinion: list[MISPOpinion] = []
+            self.Opinion.append(misp_opinion)
+        else:
+            self.parent.opinions.append(misp_opinion)
+        self.edited = True
+        return misp_opinion
 
     def from_dict(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
+        notes = kwargs.pop('Note', [])
+        opinions = kwargs.pop('Opinion', [])
+        self.__parent = kwargs.pop('parent', None)
         self.distribution = kwargs.pop('distribution', None)
         if self.distribution is not None:
             self.distribution = int(self.distribution)
@@ -2607,6 +2666,11 @@ class MISPAnalystData(AbstractMISP):
 
         super().from_dict(**kwargs)
 
+        for note in notes:
+            self.add_note(**note)
+        for opinion in opinions:
+            self.add_opinion(**opinion)
+
     def _set_default(self) -> None:
         if not hasattr(self, 'created'):
             self.created = datetime.timestamp(datetime.now())
@@ -2614,7 +2678,7 @@ class MISPAnalystData(AbstractMISP):
             self.modified = self.created
 
 
-class MISPNote(AnalystDataBehaviorMixin, MISPAnalystData):
+class MISPNote(MISPAnalystData):
 
     _fields_for_feed: set[str] = MISPAnalystData._fields_for_feed.union({'note', 'language'})
 
@@ -2625,8 +2689,8 @@ class MISPNote(AnalystDataBehaviorMixin, MISPAnalystData):
         self.language: str
         super().__init__(**kwargs)
 
-    def from_dict(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
-        if 'Note' in kwargs:
+    def from_dict(self, contained=False, **kwargs) -> None:  # type: ignore[no-untyped-def]
+        if not contained and 'Note' in kwargs:
             kwargs = kwargs['Note']
         self.note = kwargs.pop('note', None)
         if self.note is None:
@@ -2639,7 +2703,7 @@ class MISPNote(AnalystDataBehaviorMixin, MISPAnalystData):
         return f'<{self.__class__.__name__}(NotInitialized)'
 
 
-class MISPOpinion(AnalystDataBehaviorMixin, MISPAnalystData):
+class MISPOpinion(MISPAnalystData):
 
     _fields_for_feed: set[str] = MISPAnalystData._fields_for_feed.union({'opinion', 'comment'})
 
@@ -2650,8 +2714,8 @@ class MISPOpinion(AnalystDataBehaviorMixin, MISPAnalystData):
         self.comment: str
         super().__init__(**kwargs)
 
-    def from_dict(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
-        if 'Opinion' in kwargs:
+    def from_dict(self, contained=False, **kwargs) -> None:  # type: ignore[no-untyped-def]
+        if not contained and 'Opinion' in kwargs:
             kwargs = kwargs['Opinion']
         self.opinion = kwargs.pop('opinion', None)
         if self.opinion is not None:
@@ -2673,7 +2737,7 @@ class MISPOpinion(AnalystDataBehaviorMixin, MISPAnalystData):
         return f'<{self.__class__.__name__}(NotInitialized)'
 
 
-class MISPRelationship(AnalystDataBehaviorMixin, MISPAnalystData):
+class MISPRelationship(MISPAnalystData):
 
     _fields_for_feed: set[str] = MISPAnalystData._fields_for_feed.union({'related_object_uuid', 'related_object_type', 'relationship_type'})
 
@@ -2685,8 +2749,8 @@ class MISPRelationship(AnalystDataBehaviorMixin, MISPAnalystData):
         self.relationship_type: str
         super().__init__(**kwargs)
 
-    def from_dict(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
-        if 'Relationship' in kwargs:
+    def from_dict(self, contained=False, **kwargs) -> None:  # type: ignore[no-untyped-def]
+        if not contained and 'Relationship' in kwargs:
             kwargs = kwargs['Relationship']
         self.related_object_type = kwargs.pop('related_object_type', None)
         if self.related_object_type is None:

{pymisp-2.5.3 → pymisp-2.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pymisp"
-version = "2.5.3"
+version = "2.5.4"
 description = "Python API for MISP."
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-2-Clause"
@@ -53,7 +53,7 @@ RTFDE = {version = "^0.1.1", optional = true}
 oletools = {version = "^0.60.1", optional = true}
 python-magic = {version = "^0.4.27", optional = true}
 pydeep2 = {version = "^0.5.1", optional = true}
-lief = {version = "^0.15.0", optional = true}
+lief = {version = "^0.16.0", optional = true}
 beautifulsoup4 = {version = "^4.12.3", optional = true}
 validators = {version = "^0.34.0", optional = true}
 sphinx-autodoc-typehints = {version = "^2.5.0", optional = true, python = ">=3.10"}
@@ -61,7 +61,7 @@ docutils = {version = "^0.21.1", optional = true, python = ">=3.10"}
 recommonmark = {version = "^0.7.1", optional = true, python = ">=3.10"}
 reportlab = {version = "^4.2.5", optional = true}
 pyfaup = {version = "^1.2", optional = true}
-publicsuffixlist = {version = "^1.0.2.20241216", optional = true}
+publicsuffixlist = {version = "^1.0.2.20241218", optional = true}
 urllib3 = {extras = ["brotli"], version = "*", optional = true}
 Sphinx = [
     {version = "^8", python = ">=3.10", optional = true}
@@ -84,7 +84,7 @@ ipython = [
     {version = "^8.18.0", python = "<3.10"},
     {version = "^8.19.0", python = ">=3.10"}
 ]
-jupyterlab = "^4.3.3"
+jupyterlab = "^4.3.4"
 types-requests = "^2.32.0.20241016"
 types-python-dateutil = "^2.9.0.20241206"
 types-redis = "^4.6.0.20241004"

pymisp-2.5.4/tests/test_analyst_data.py

@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+
+from __future__ import annotations
+
+import unittest
+from pymisp import (MISPAttribute, MISPEvent, MISPEventReport, MISPNote,
+                    MISPObject, MISPOpinion)
+from uuid import uuid4
+
+
+class TestAnalystData(unittest.TestCase):
+    def setUp(self) -> None:
+        self.note_dict = {
+            "uuid": uuid4(),
+            "note": "note3"
+        }
+        self.opinion_dict = {
+            "uuid": uuid4(),
+            "opinion": 75,
+            "comment": "Agree"
+        }
+
+    def test_analyst_data_on_attribute(self) -> None:
+        attribute = MISPAttribute()
+        attribute.from_dict(type='filename', value='foo.exe')
+        self._attach_analyst_data(attribute)
+
+    def test_analyst_data_on_attribute_alternative(self) -> None:
+        event = MISPEvent()
+        event.info = 'Test on Attribute'
+        event.add_attribute('domain', 'foo.bar')
+        self._attach_analyst_data(event.attributes[0])
+
+    def test_analyst_data_on_event(self) -> None:
+        event = MISPEvent()
+        event.info = 'Test Event'
+        self._attach_analyst_data(event)
+
+    def test_analyst_data_on_event_report(self) -> None:
+        event_report = MISPEventReport()
+        event_report.from_dict(name='Test Report', content='This is a report')
+        self._attach_analyst_data(event_report)
+
+    def test_analyst_data_on_event_report_alternative(self) -> None:
+        event = MISPEvent()
+        event.info = 'Test on Event Report'
+        event.add_event_report('Test Report', 'This is a report')
+        self._attach_analyst_data(event.event_reports[0])
+
+    def test_analyst_data_on_object(self) -> None:
+        misp_object = MISPObject('file')
+        misp_object.add_attribute('filename', 'foo.exe')
+        self._attach_analyst_data(misp_object)
+
+    def test_analyst_data_on_object_alternative(self) -> None:
+        event = MISPEvent()
+        event.info = 'Test on Object'
+        misp_object = MISPObject('file')
+        misp_object.add_attribute('filename', 'foo.exe')
+        event.add_object(misp_object)
+        self._attach_analyst_data(event.objects[0])
+
+    def test_analyst_data_on_object_attribute(self) -> None:
+        misp_object = MISPObject('file')
+        object_attribute = misp_object.add_attribute('filename', 'foo.exe')
+        self._attach_analyst_data(object_attribute)
+
+    def test_analyst_data_object_object_attribute_alternative(self) -> None:
+        misp_object = MISPObject('file')
+        misp_object.add_attribute('filename', 'foo.exe')
+        self._attach_analyst_data(misp_object.attributes[0])
+
+    def _attach_analyst_data(
+            self, container: MISPAttribute | MISPEvent | MISPEventReport | MISPObject) -> None:
+        object_type = container._analyst_data_object_type
+        note1 = container.add_note(note='note1')
+        opinion1 = note1.add_opinion(opinion=25, comment='Disagree')
+        opinion2 = container.add_opinion(opinion=50, comment='Neutral')
+        note2 = opinion2.add_note(note='note2')
+
+        dict_note = MISPNote()
+        dict_note.from_dict(
+            object_type=object_type, object_uuid=container.uuid, **self.note_dict
+        )
+        note3 = container.add_note(**dict_note)
+        dict_opinion = MISPOpinion()
+        dict_opinion.from_dict(
+            object_type='Note', object_uuid=note3.uuid, **self.opinion_dict
+        )
+        container.add_opinion(**dict_opinion)
+
+        self.assertEqual(len(container.notes), 3)
+        self.assertEqual(len(container.opinions), 3)
+
+        misp_note1, misp_note2, misp_note3 = container.notes
+        misp_opinion1, misp_opinion2, misp_opinion3 = container.opinions
+
+        self.assertEqual(misp_note1.object_type, object_type)
+        self.assertEqual(misp_note1.object_uuid, container.uuid)
+        self.assertEqual(misp_note1.note, 'note1')
+
+        self.assertEqual(misp_note2.object_type, 'Opinion')
+        self.assertEqual(misp_note2.object_uuid, opinion2.uuid)
+        self.assertEqual(misp_note2.note, 'note2')
+
+        self.assertEqual(misp_note3.object_type, object_type)
+        self.assertEqual(misp_note3.object_uuid, container.uuid)
+        self.assertEqual(misp_note3.note, 'note3')
+
+        self.assertEqual(misp_opinion1.object_type, 'Note')
+        self.assertEqual(misp_opinion1.object_uuid, note1.uuid)
+        self.assertEqual(misp_opinion1.opinion, 25)
+        self.assertEqual(misp_opinion1.comment, 'Disagree')
+
+        self.assertEqual(misp_opinion2.object_type, object_type)
+        self.assertEqual(misp_opinion2.object_uuid, container.uuid)
+        self.assertEqual(misp_opinion2.opinion, 50)
+        self.assertEqual(misp_opinion2.comment, 'Neutral')
+
+        self.assertEqual(misp_opinion3.object_type, 'Note')
+        self.assertEqual(misp_opinion3.object_uuid, note3.uuid)
+        self.assertEqual(misp_opinion3.opinion, 75)
+        self.assertEqual(misp_opinion3.comment, 'Agree')