Merge branch 'main' into testing8

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+exclude: "tests/data"
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.17.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py38-plus]

CHANGELOG.txt

@@ -2,7 +2,40 @@ Changelog
 =========
 
 
-v2.4.195 (2024-07-26)
+v2.4.197 (2024-09-02)
+---------------------
+
+Changes
+~~~~~~~
+- Bump deps, version, templates. [Raphaël Vinot]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+
+Fix
+~~~
+- Avoid printing huge log when a request fails. [Raphaël Vinot]
+
+  fix #1286
+
+
+v2.4.196 (2024-08-21)
+---------------------
+
+New
+~~~
+- Add pre-commit file. [Raphaël Vinot]
+
+Changes
+~~~~~~~
+- Bump changelog. [Raphaël Vinot]
+- Bump version. [Raphaël Vinot]
+- Bump deps. [Raphaël Vinot]
+
+Fix
+~~~
+- Remove broken config. [Raphaël Vinot]
+
+
+v2.4.195 (2024-07-27)
 ---------------------
 
 New
@@ -14,6 +47,9 @@ New
 
 Changes
 ~~~~~~~
+- Bump Changelog. [Raphaël Vinot]
+- Bump objects. [Raphaël Vinot]
+- Bump Changelog (issue with template) [Raphaël Vinot]
 - Bump changelog. [Raphaël Vinot]
 - Bump version. [Raphaël Vinot]
 - Bump deps. [Raphaël Vinot]

docs/source/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # PyMISP documentation build configuration file, created by
 # sphinx-quickstart on Fri Aug 26 11:39:17 2016.
@@ -444,7 +443,3 @@ epub_exclude_files = ['search.html']
 # If false, no index is generated.
 #
 # epub_use_index = True
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}

pymisp/api.py

@@ -3985,7 +3985,10 @@ class PyMISP:
         """Check if the response from the server is not an unexpected error"""
         if response.status_code >= 500:
             headers_without_auth = {h_name: h_value for h_name, h_value in response.request.headers.items() if h_value != self.key}
-            logger.critical(everything_broken.format(headers_without_auth, response.request.body, response.text))
+            if logger.level == logging.DEBUG:
+                logger.debug(everything_broken.format(headers_without_auth, response.request.body, response.text))
+            else:
+                logger.critical(everything_broken.format(headers_without_auth, response.request.body, f'{response.text[:1000]}... (enable debug mode for more details)'))
             raise MISPServerError(f'Error code 500:\n{response.text}')
 
         if 400 <= response.status_code < 500:

pymisp/data/misp-objects

@@ -1 +1 @@
-Subproject commit 93977fe6eff0d4fd48ccd266fbfa947f39af67a1
+Subproject commit e1c145f6c20b829cc3eeb7ec5c35d628bda5fabd

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pymisp"
-version = "2.4.195"
+version = "2.4.197"
 description = "Python API for MISP."
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-2-Clause"
@@ -48,7 +48,7 @@ python = "^3.8"
 requests = "^2.32.3"
 python-dateutil = "^2.9.0.post0"
 deprecated = "^1.2.14"
-extract_msg = {version = "^0.48.5", optional = true}
+extract_msg = {version = "^0.49", optional = true}
 RTFDE = {version = "^0.1.1", optional = true}
 oletools = {version = "^0.60.1", optional = true}
 python-magic = {version = "^0.4.27", optional = true}
@@ -56,14 +56,17 @@ pydeep2 = {version = "^0.5.1", optional = true}
 lief = {version = "^0.15.0", optional = true}
 beautifulsoup4 = {version = "^4.12.3", optional = true}
 validators = {version = "^0.33.0", optional = true}
-sphinx-autodoc-typehints = {version = "^2.2.3", optional = true, python = ">=3.9"}
+sphinx-autodoc-typehints = {version = "^2.3.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.2", optional = true}
 pyfaup = {version = "^1.2", optional = true}
-publicsuffixlist = {version = "^1.0.2.20240726", optional = true}
+publicsuffixlist = {version = "^1.0.2.20240827", optional = true}
 urllib3 = {extras = ["brotli"], version = "*", optional = true}
-Sphinx =  {version = "^7.4.7", python = ">=3.9", optional = true}
+Sphinx = [
+    {version = "^7.2", python = ">=3.9,<3.10", optional = true},
+    {version = "^8", python = ">=3.10", optional = true}
+]
 
 [tool.poetry.extras]
 fileobjects = ['python-magic', 'pydeep2', 'lief']
@@ -77,16 +80,16 @@ brotli = ['urllib3']
 
 [tool.poetry.group.dev.dependencies]
 requests-mock = "^1.12.1"
-mypy = "^1.11.0"
+mypy = "^1.11.2"
 ipython = [
     {version = "<8.13.0", python = "<3.9"},
     {version = "^8.18.0", python = ">=3.9"},
     {version = "^8.19.0", python = ">=3.10"}
 ]
-jupyterlab = "^4.2.4"
+jupyterlab = "^4.2.5"
 types-requests = "^2.32.0.20240712"
-types-python-dateutil = "^2.9.0.20240316"
-types-redis = "^4.6.0.20240726"
+types-python-dateutil = "^2.9.0.20240821"
+types-redis = "^4.6.0.20240819"
 types-Flask = "^1.1.6"
 pytest-cov = "^5.0.0"