Merge branch 'main' of github.com:misp/pymisp

pull/1097/head
Christian Studer 2023-07-03 17:33:09 +02:00
commit cab642443b
5 changed files with 374 additions and 526 deletions

View File

@ -2,11 +2,50 @@ Changelog
=========
v2.4.172 (2023-06-08)
---------------------
Changes
~~~~~~~
- Bump changelog. [Raphaël Vinot]
- Bump version. [Raphaël Vinot]
- Bump deps. [Raphaël Vinot]
- Bump deps. [Raphaël Vinot]
- [misp-objects] Bumped latest version with updated templates.
[Christian Studer]
- Bump deps. [Raphaël Vinot]
Fix
~~~
- Properly bump version. [Raphaël Vinot]
Other
~~~~~
- Build(deps-dev): bump jupyterlab from 3.6.3 to 4.0.0.
[dependabot[bot]]
Bumps [jupyterlab](https://github.com/jupyterlab/jupyterlab) from 3.6.3 to 4.0.0.
- [Release notes](https://github.com/jupyterlab/jupyterlab/releases)
- [Changelog](https://github.com/jupyterlab/jupyterlab/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jupyterlab/jupyterlab/compare/@jupyterlab/vdom@3.6.3...@jupyterlab/lsp@4.0.0)
---
updated-dependencies:
- dependency-name: jupyterlab
dependency-type: direct:development
update-type: version-update:semver-major
...
- Update settings.default.py - tags not tag. [Alexandre Dulaunoy]
tags is now an array
v2.4.171 (2023-05-16)
---------------------
Changes
~~~~~~~
- Bump changelog. [Raphaël Vinot]
- Bump deps, object templates. [Raphaël Vinot]
- Bump changelog. [Raphaël Vinot]
- Bump changelog. [Raphaël Vinot]

835
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
__version__ = '2.4.171'
__version__ = '2.4.172'
import logging
import sys
import warnings

View File

@ -450,7 +450,7 @@ class PyMISP:
:param event: event to unpublish
"""
event_id = get_uuid_or_id_from_abstract_misp(event)
response = self._prepare_request('POST', f'events/publish/{event_id}')
response = self._prepare_request('POST', f'events/unpublish/{event_id}')
return self._check_json_response(response)
def contact_event_reporter(self, event: Union[MISPEvent, int, str, UUID], message: str) -> Dict:
@ -3704,6 +3704,9 @@ class PyMISP:
if url[0] == '/':
# strip it: it will fail if MISP is in a sub directory
url = url[1:]
# Cake PHP being an idiot, it doesn't accepts %20 (space) in the URL path,
# so we need to make it a + instead and hope for the best
url = url.replace(' ', '+')
url = urljoin(self.root_url, url)
if data == {} or isinstance(data, bytes):
d = data
@ -3721,6 +3724,7 @@ class PyMISP:
# CakePHP params in URL
to_append_url = '/'.join([f'{k}:{v}' for k, v in kw_params.items()])
url = f'{url}/{to_append_url}'
req = requests.Request(request_type, url, data=d, params=params)
user_agent = f'PyMISP {__version__} - Python {".".join(str(x) for x in sys.version_info[:2])}'
if self.tool:

View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "pymisp"
version = "2.4.171"
version = "2.4.172"
description = "Python API for MISP."
authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
license = "BSD-2-Clause"
@ -45,20 +45,20 @@ python = "^3.8"
requests = "^2.31.0"
python-dateutil = "^2.8.2"
jsonschema = "^4.17.3"
deprecated = "^1.2.13"
extract_msg = {version = "^0.41.1", optional = true}
deprecated = "^1.2.14"
extract_msg = {version = "^0.41.2", optional = true}
RTFDE = {version = "^0.0.2", 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.13.0", optional = true}
lief = {version = "^0.13.1", optional = true}
beautifulsoup4 = {version = "^4.12.2", optional = true}
validators = {version = "^0.20.0", optional = true}
sphinx-autodoc-typehints = {version = "^1.23.0", optional = true}
recommonmark = {version = "^0.7.1", optional = true}
reportlab = {version = "^4.0.0", optional = true}
reportlab = {version = "^4.0.4", optional = true}
pyfaup = {version = "^1.2", optional = true}
publicsuffixlist = {version = "^0.10.0.20230506", optional = true}
publicsuffixlist = {version = "^0.10.0.20230608", optional = true}
urllib3 = {extras = ["brotli"], version = "*", optional = true}
[tool.poetry.extras]
@ -78,12 +78,12 @@ ipython = [
{version = "<8.13.0", python = "<3.9"},
{version = "^8.13.0", python = ">=3.9"}
]
jupyterlab = "^4.0.0"
types-requests = "^2.31.0.0"
jupyterlab = "^4.0.1"
types-requests = "^2.31.0.1"
types-python-dateutil = "^2.8.19.13"
types-redis = "^4.5.5.2"
types-Flask = "^1.1.6"
pytest-cov = "^4.0.0"
pytest-cov = "^4.1.0"
[build-system]
requires = ["poetry_core>=1.1", "setuptools"]