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

Jump to bottom

use PyMISP, ExpandedPyMISP is deprecated #2532

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

use PyMISP, ExpandedPyMISP is deprecated #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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