chg: Bump deps

.github/workflows/instance_test.yml

@@ -13,7 +13,7 @@ jobs:
      strategy:
        fail-fast: false
        matrix:
-         python-version: ["3.8", "3.9", "3.10", "3.11"]
+         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
      steps:
       - uses: actions/checkout@v4

.github/workflows/mypy.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v4

lookyloo/capturecache.py

@@ -22,7 +22,7 @@
 
 import dns.rdatatype
 import dns.resolver
-from har2tree import CrawledTree, Har2TreeError, HarFile  # type: ignore[attr-defined]
+from har2tree import CrawledTree, Har2TreeError, HarFile
 from pyipasnhistory import IPASNHistory  # type: ignore[attr-defined]
 from redis import Redis
 

lookyloo/comparator.py

@@ -7,7 +7,7 @@
 
 from typing import Any, TypedDict
 
-from har2tree import URLNode  # type: ignore[attr-defined]
+from har2tree import URLNode
 
 from redis import ConnectionPool, Redis
 from redis.connection import UnixDomainSocketConnection

lookyloo/context.py

@@ -8,7 +8,7 @@
 from typing import Any
 from urllib.parse import urlsplit
 
-from har2tree import CrawledTree, HostNode, URLNode  # type: ignore[attr-defined]
+from har2tree import CrawledTree, HostNode, URLNode
 from redis import Redis
 
 from .default import get_config, get_homedir, get_socket_path

lookyloo/helpers.py

@@ -17,7 +17,7 @@
 from urllib.parse import urlparse
 
 
-from har2tree import CrawledTree, HostNode, URLNode  # type: ignore[attr-defined]
+from har2tree import CrawledTree, HostNode, URLNode
 from playwrightcapture import get_devices
 from publicsuffixlist import PublicSuffixList  # type: ignore[import-untyped]
 from pytaxonomies import Taxonomies  # type: ignore[attr-defined]

lookyloo/indexing.py

@@ -9,7 +9,7 @@
 from typing import Iterable
 from urllib.parse import urlsplit
 
-from har2tree import CrawledTree  # type: ignore[attr-defined]
+from har2tree import CrawledTree
 from redis import ConnectionPool, Redis
 from redis.connection import UnixDomainSocketConnection
 

lookyloo/lookyloo.py

@@ -24,7 +24,7 @@
 from zipfile import ZipFile
 
 from defang import defang  # type: ignore[import-untyped]
-from har2tree import CrawledTree, HostNode, URLNode  # type: ignore[attr-defined]
+from har2tree import CrawledTree, HostNode, URLNode
 from lacuscore import (LacusCore,
                        CaptureStatus as CaptureStatusCore,
                        # CaptureResponse as CaptureResponseCore)
@@ -38,7 +38,7 @@
                      # CaptureResponseJson as CaptureResponseJsonPy,
                      # CaptureSettings as CaptureSettingsPy
                      )
-from pymisp import MISPAttribute, MISPEvent, MISPObject  # type: ignore[attr-defined]
+from pymisp import MISPAttribute, MISPEvent, MISPObject
 from pysecuritytxt import PySecurityTXT, SecurityTXTNotAvailable
 from pylookyloomonitoring import PyLookylooMonitoring  # type: ignore[attr-defined]
 from redis import ConnectionPool, Redis

lookyloo/modules/hashlookup.py

@@ -4,7 +4,7 @@
 
 import json
 
-from har2tree import CrawledTree  # type: ignore[attr-defined]
+from har2tree import CrawledTree
 from pyhashlookup import Hashlookup  # type: ignore[attr-defined]
 
 from ..default import ConfigError

lookyloo/modules/misp.py

@@ -10,9 +10,9 @@
 from typing import Any, TYPE_CHECKING, Iterator
 
 import requests
-from har2tree import HostNode, URLNode, Har2TreeError  # type: ignore[attr-defined]
-from pymisp import MISPAttribute, MISPEvent, PyMISP, MISPTag  # type: ignore[attr-defined]
-from pymisp.tools import FileObject, URLObject  # type: ignore[attr-defined]
+from har2tree import HostNode, URLNode, Har2TreeError
+from pymisp import MISPAttribute, MISPEvent, PyMISP, MISPTag
+from pymisp.tools import FileObject, URLObject
 
 from ..default import get_config, get_homedir
 from ..helpers import get_public_suffix_list
@@ -198,7 +198,7 @@ def _prepare_push(self, to_push: list[MISPEvent] | MISPEvent, allow_duplicates:
             for tag in self.default_tags:
                 event.add_tag(tag)
             if auto_publish:
-                event.publish()  # type: ignore[no-untyped-call]
+                event.publish()
             events_to_push.append(event)
         return events_to_push
 
@@ -237,14 +237,14 @@ def push(self, to_push: list[MISPEvent] | MISPEvent, allow_duplicates: bool=Fals
 
     def get_existing_event_url(self, permaurl: str) -> str | None:
         attributes = self.client.search('attributes', value=permaurl, limit=1, page=1, pythonify=True)
-        if not attributes or not isinstance(attributes[0], MISPAttribute):
+        if not attributes or not isinstance(attributes, list) or not isinstance(attributes[0], MISPAttribute):
             return None
         url = f'{self.client.root_url}/events/{attributes[0].event_id}'
         return url
 
     def get_existing_event(self, permaurl: str) -> MISPEvent | None:
         attributes = self.client.search('attributes', value=permaurl, limit=1, page=1, pythonify=True)
-        if not attributes or not isinstance(attributes[0], MISPAttribute):
+        if not attributes or not isinstance(attributes, list) or not isinstance(attributes[0], MISPAttribute):
             return None
         event = self.client.get_event(attributes[0].event_id, pythonify=True)
         if isinstance(event, MISPEvent):

lookyloo/modules/pandora.py

@@ -5,7 +5,7 @@
 from io import BytesIO
 from typing import Any
 
-from pypandora import PyPandora  # type: ignore[attr-defined]
+from pypandora import PyPandora
 
 from ..default import ConfigError
 from ..helpers import get_useragent_for_requests

lookyloo/modules/uwhois.py

@@ -7,7 +7,7 @@
 
 from typing import overload, Literal
 
-from har2tree import CrawledTree, Har2TreeError, HostNode  # type: ignore[attr-defined]
+from har2tree import CrawledTree, Har2TreeError, HostNode
 
 from .abstractmodule import AbstractModule