Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use PyMISP, ExpandedPyMISP is deprecated #2532

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+9 −10
Open

use PyMISP, ExpandedPyMISP is deprecated #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
292ff74
use PyMISP, ExpandedPyMISP is deprecated
rvyhnal Oct 18, 2024
a6a86b0
doc: add changelog entry for certtools/intelmq#2532
sebix Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#### Collectors
- `intelmq.bots.collectors.shadowserver.collector_reports_api.py`:
- Fixed behaviour if parameter `types` value is empty string, behave the same way as not set, not like no type.
- `intelmq.bots.collectors.misp`: Use `PyMISP` class instead of deprecated `ExpandedPyMISP` (PR#2532 by Radek Vyhnal)

#### Parsers
- `intelmq.bots.parsers.shadowserver._config`:
Expand All @@ -29,6 +30,7 @@
- Fix to avoid schema download if not configured #2530.

#### Experts
- `intelmq.bots.experts.misp`: Use `PyMISP` class instead of deprecated `ExpandedPyMISP` (PR#2532 by Radek Vyhnal)

#### Outputs

Expand Down
5 changes: 1 addition & 4 deletions intelmq/bots/collectors/misp/collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
from intelmq.lib.exceptions import MissingDependencyError

try:
try:
from pymisp import ExpandedPyMISP as PyMISP
except ImportError:
from pymisp import PyMISP
from pymisp import PyMISP
except ImportError:
PyMISP = None
import_fail_reason = 'import'
Expand Down
12 changes: 6 additions & 6 deletions intelmq/bots/experts/misp/expert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
from intelmq.lib.exceptions import MissingDependencyError

try:
from pymisp import ExpandedPyMISP
from pymisp import PyMISP
except ImportError:
ExpandedPyMISP = None
PyMISP = None


class MISPExpertBot(ExpertBot):
Expand All @@ -28,13 +28,13 @@ class MISPExpertBot(ExpertBot):
misp_url: str = "<insert url of MISP server (with trailing '/')>"

def init(self):
if ExpandedPyMISP is None:
if PyMISP is None:
raise MissingDependencyError('pymisp', '>=2.4.117.3')

# Initialize MISP connection
self.misp = ExpandedPyMISP(self.misp_url,
self.misp_key,
self.http_verify_cert)
self.misp = PyMISP(self.misp_url,
self.misp_key,
self.http_verify_cert)

def process(self):
event = self.receive_message()
Expand Down
Loading