WIP

MISP · Mar 3, 2025 · e98bb29 · e98bb29
1 parent 0e0c428
commit e98bb29
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 160 deletions.
diff --git a/misp_modules/__init__.py b/misp_modules/__init__.py
diff --git a/misp_modules/lib/__init__.py b/misp_modules/lib/__init__.py
@@ -1,12 +0,0 @@
-import joe_mapping
-from .vt_graph_parser import *  # noqa
-
-all = [
-    "joe_parser",
-    "lastline_api",
-    "cof2misp",
-    "qintel_helper",
-    "dnstrails",
-    "onyphe",
-    "ODTReader",
-]

diff --git a/misp_modules/modules/__init__.py b/misp_modules/modules/__init__.py
@@ -1,4 +0,0 @@
-#from .expansion import *  # noqa
-#from .import_mod import *  # noqa
-#from .export_mod import *  # noqa
-#from .action_mod import *  # noqa

diff --git a/misp_modules/modules/action_mod/__init__.py b/misp_modules/modules/action_mod/__init__.py
@@ -1 +0,0 @@
-# __all__ = ["testaction", "mattermost", "slack"]

diff --git a/misp_modules/modules/expansion/__init__.py b/misp_modules/modules/expansion/__init__.py
@@ -1,8 +1,3 @@
-import os
-import sys
-
-
-
 minimum_required_fields = ("type", "uuid", "value")
 
 checking_error = 'containing at least a "type" field and a "value" field'

diff --git a/misp_modules/modules/expansion/cve.py b/misp_modules/modules/expansion/cve.py
@@ -41,7 +41,7 @@ def handler(q=False):
     else:
         return {"error": "Vulnerability Lookup API not accessible."}
     parser = VulnerabilityLookupParser(attribute, api_url)
-    parser.parser_lookup_result(vulnerability)
+    parser.parse_lookup_result(vulnerability)
     return parser.get_results()
 
 

diff --git a/misp_modules/modules/expansion/onyphe.py b/misp_modules/modules/expansion/onyphe.py
@@ -4,10 +4,7 @@
 
 from pymisp import MISPEvent, MISPObject
 
-try:
-    from onyphe import Onyphe
-except ImportError:
-    print("pyonyphe module not installed.")
+from misp_modules.lib.onyphe import Onyphe
 
 misperrors = {"error": "Error"}
 

diff --git a/misp_modules/modules/expansion/onyphe_full.py b/misp_modules/modules/expansion/onyphe_full.py
@@ -2,10 +2,7 @@
 
 import json
 
-try:
-    from onyphe import Onyphe
-except ImportError:
-    print("pyonyphe module not installed.")
+from onyphe import Onyphe
 
 misperrors = {"error": "Error"}
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -120,10 +120,9 @@ optional = true
 black = "*"
 codecov = "*"
 flake8 = "*"
+ipdb = "*"
 nose = "*"
 pytest = "*"
-ipdb = "*"
-# decorator = "*"
 
 [tool.poetry.group.docs]
 optional = true
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		# __all__ = ["testaction", "mattermost", "slack"]