Merge 03d7033bba into 7df8d77e97

Related
* https://github.com/MISP/PyMISP/issues/744
* https://github.com/MISP/MISP/issues/7460

CHANGELOG.txt

@@ -2,6 +2,25 @@ Changelog
 =========
 
 
+v2.4.190 (2024-04-18)
+---------------------
+
+Changes
+~~~~~~~
+- Bump object templates. [Raphaël Vinot]
+- Bump changelog. [Raphaël Vinot]
+- Bump version, deps. [Raphaël Vinot]
+- Bump deps, require python 3.9+ for doc. [Raphaël Vinot]
+- Bump deps. [Raphaël Vinot]
+- [data] describeTypes file updated. [Alexandre Dulaunoy]
+- Bump deps. [Raphaël Vinot]
+
+Fix
+~~~
+- [internal] Correct way to convert bytes to string if orjson exists.
+  [Jakub Onderka]
+
+
 v2.4.188 (2024-03-22)
 ---------------------
 
@@ -16,6 +35,7 @@ New
 Changes
 ~~~~~~~
 - Bump changelog. [Raphaël Vinot]
+- Bump changelog. [Raphaël Vinot]
 - Bump deps. [Raphaël Vinot]
 - Bump changelog. [Raphaël Vinot]
 - Bump version, templates. [Raphaël Vinot]

pymisp/data/misp-objects

@@ -1 +1 @@
-Subproject commit 8ccd583d217624c322a6927bcbdb7fe412a2e855
+Subproject commit 96492b9c932a4b307216550abeadddc727e17cec

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pymisp"
-version = "2.4.188"
+version = "2.4.190"
 description = "Python API for MISP."
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-2-Clause"
@@ -52,23 +52,21 @@ python-magic = {version = "^0.4.27", optional = true}
 pydeep2 = {version = "^0.5.1", optional = true}
 lief = {version = "^0.14.1", optional = true}
 beautifulsoup4 = {version = "^4.12.3", optional = true}
-validators = {version = "^0.27.0", optional = true}
-sphinx-autodoc-typehints = {version = "^2.0.0", optional = true}
-recommonmark = {version = "^0.7.1", optional = true}
-reportlab = {version = "^4.1.0", optional = true}
+validators = {version = "^0.28.0", optional = true}
+sphinx-autodoc-typehints = {version = "^2.1.0", optional = true, python = ">=3.9"}
+docutils = {version = "^0.21.1", optional = true, python = ">=3.9"}
+recommonmark = {version = "^0.7.1", optional = true, python = ">=3.9"}
+reportlab = {version = "^4.2.0", optional = true}
 pyfaup = {version = "^1.2", optional = true}
 publicsuffixlist = {version = "^0.10.0.20240403", optional = true}
 urllib3 = {extras = ["brotli"], version = "*", optional = true}
-Sphinx = [
-    {version = "<7.2", python = "<3.9", optional = true},
-    {version = "^7.2", python = ">=3.9", optional = true}
-]
+Sphinx =  {version = "^7.3.7", python = ">=3.9", optional = true}
 
 [tool.poetry.extras]
 fileobjects = ['python-magic', 'pydeep2', 'lief']
 openioc = ['beautifulsoup4']
 virustotal = ['validators']
-docs = ['sphinx-autodoc-typehints', 'recommonmark', 'sphinx']
+docs = ['sphinx-autodoc-typehints', 'recommonmark', 'sphinx', 'docutils']
 pdfexport = ['reportlab']
 url = ['pyfaup']
 email = ['extract_msg', "RTFDE", "oletools"]
@@ -76,16 +74,16 @@ brotli = ['urllib3']
 
 [tool.poetry.group.dev.dependencies]
 requests-mock = "^1.12.1"
-mypy = "^1.9.0"
+mypy = "^1.10.0"
 ipython = [
     {version = "<8.13.0", python = "<3.9"},
     {version = "^8.18.0", python = ">=3.9"},
     {version = "^8.19.0", python = ">=3.10"}
 ]
-jupyterlab = "^4.1.5"
-types-requests = "^2.31.0.20240403"
+jupyterlab = "^4.1.7"
+types-requests = "^2.31.0.20240406"
 types-python-dateutil = "^2.9.0.20240316"
-types-redis = "^4.6.0.20240311"
+types-redis = "^4.6.0.20240425"
 types-Flask = "^1.1.6"
 pytest-cov = "^5.0.0"
 

tests/testlive_comprehensive.py

@@ -3197,6 +3197,24 @@ class TestComprehensive(unittest.TestCase):
             self.admin_misp_connector.delete_event(event)
             self.admin_misp_connector.toggle_global_pythonify()
 
+    def test_change_orgc(self):
+        self.admin_misp_connector.toggle_global_pythonify()
+        event = self.create_simple_event()
+        try:
+            event = self.admin_misp_connector.add_event(event)
+            self.assertEqual(event.Orgc.name, 'ORGNAME')
+            orgc = MISPOrganisation()
+            orgc.name = self.test_org.name
+            orgc.id = self.test_org.id
+            orgc.uuid = self.test_org.uuid
+            event.Orgc = orgc
+            event = self.admin_misp_connector.update_event(event)
+            time.sleep(30)
+            self.assertEqual(event.Orgc.name, 'Test Org')
+        finally:
+            self.admin_misp_connector.delete_event(event)
+            self.admin_misp_connector.toggle_global_pythonify()
+
     @unittest.skip("Internal use only")
     def missing_methods(self) -> None:
         skip = [