chg: [deps] Remove pyfaup

misp_modules/__init__.py

@@ -49,47 +49,6 @@
 warnings.filterwarnings("ignore", category=SyntaxWarning)
 
 
-LIBFAUP_PATHS = [
-    "/usr/local/lib/",
-    "/usr/lib/",
-    "/opt/local/lib/",
-]
-
-ARCH_TO_EXTENSION = {
-    "linux": "so",
-    "darwin": "dylib",
-}
-
-
-def _get_libfaup_path(lib_path: str) -> str:
-    extension = ARCH_TO_EXTENSION.get(platform.system().lower(), "lib")
-    return f"{lib_path.rstrip('/')}/libfaupl.{extension}"
-
-
-def _replace_libfaup_path(module_path: str, libfaup_path: str) -> None:
-    with open(module_path, "r") as f:
-        file_data = f.read()
-    file_data = re.sub(r"cdll.LoadLibrary\(.*\)", f"cdll.LoadLibrary(\"{libfaup_path}\")", file_data)
-    with open(module_path, "w") as f:
-        f.write(file_data)
-
-
-def _try_pyfaup_import(lib_path: typing.Optional[str]) -> None:
-    package = pkgutil.get_loader("pyfaup")
-    if not package:
-        return
-    if lib_path:
-        _replace_libfaup_path(package.path, _get_libfaup_path(lib_path))
-    importlib.import_module("pyfaup")
-
-
-for lib_path in [None, *LIBFAUP_PATHS]:
-    try:
-        _try_pyfaup_import(lib_path)
-        break
-    except OSError:
-        continue
-
 try:
     from .modules import *  # noqa
     HAS_PACKAGE_MODULES = True

misp_modules/modules/action_mod/mattermost.py

@@ -1,5 +1,5 @@
 import json
-from pyfaup.faup import Faup
+from pymisp.tools._psl_faup import PSLFaup as Faup
 from mattermostdriver import Driver
 from ._utils import utils
 

misp_modules/modules/expansion/extract_url_components.py

@@ -1,7 +1,7 @@
 import json
 from pymisp import MISPEvent, MISPObject
 from . import check_input_attribute, standard_error_message
-from pyfaup.faup import Faup
+from pymisp.tools._psl_faup import PSLFaup as Faup
 
 misperrors = {'error': 'Error'}
 mispattributes = {'input': ['url'], 'format': 'misp_standard'}

misp_modules/modules/import_mod/email_import.py

@@ -4,11 +4,7 @@
 import zipfile
 import re
 from html.parser import HTMLParser
-from pymisp.tools import EMailObject, make_binary_objects
-try:
-    from pymisp.tools import URLObject
-except ImportError:
-    raise ImportError('Unable to import URLObject, pyfaup missing')
+from pymisp.tools import EMailObject, make_binary_objects, URLObject
 from io import BytesIO
 from pathlib import Path
 

misp_modules/modules/import_mod/url_import.py

@@ -1,7 +1,7 @@
 import json
 import base64
 from pymisp import MISPEvent, MISPObject, MISPAttribute
-from pyfaup.faup import Faup
+from pymisp.tools._psl_faup import PSLFaup as Faup
 
 misperrors = {'error': 'Error'}
 userConfig = {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "misp-modules"
-version = "2.4.200"
+version = "2.4.201"
 description = "MISP modules are autonomous modules that can be used for expansion and other services in MISP"
 authors = [
     {name = "Alexandre Dulaunoy", email = "[email protected]"}
@@ -59,11 +59,10 @@ dependencies = [
     "pycountry",
     "pyeti-python3",
     "pyeupi",
-    "pyfaup",
     "pygeoip",
     "pyintel471",
     "pyipasnhistory",
-    "pymisp[fileobjects, openioc, pdfexport, email, url]",
+    "pymisp[fileobjects, openioc, pdfexport, email]",
     "pypdns",
     "pypssl",
     "pysafebrowsing",