chg: Bump deps

pull/876/head
Raphaël Vinot 2024-02-05 16:33:46 +01:00
parent c67f01c775
commit 5368151ce0
14 changed files with 390 additions and 385 deletions

View File

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

View File

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

View File

@ -22,7 +22,7 @@ from typing import Any, MutableMapping, Iterator
import dns.rdatatype import dns.rdatatype
import dns.resolver 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 pyipasnhistory import IPASNHistory # type: ignore[attr-defined]
from redis import Redis from redis import Redis

View File

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

View File

@ -8,7 +8,7 @@ from pathlib import Path
from typing import Any from typing import Any
from urllib.parse import urlsplit 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 redis import Redis
from .default import get_config, get_homedir, get_socket_path from .default import get_config, get_homedir, get_socket_path

View File

@ -17,7 +17,7 @@ from typing import Any
from urllib.parse import urlparse 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 playwrightcapture import get_devices
from publicsuffixlist import PublicSuffixList # type: ignore[import-untyped] from publicsuffixlist import PublicSuffixList # type: ignore[import-untyped]
from pytaxonomies import Taxonomies # type: ignore[attr-defined] from pytaxonomies import Taxonomies # type: ignore[attr-defined]

View File

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

View File

@ -24,7 +24,7 @@ from uuid import uuid4
from zipfile import ZipFile from zipfile import ZipFile
from defang import defang # type: ignore[import-untyped] 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, from lacuscore import (LacusCore,
CaptureStatus as CaptureStatusCore, CaptureStatus as CaptureStatusCore,
# CaptureResponse as CaptureResponseCore) # CaptureResponse as CaptureResponseCore)
@ -38,7 +38,7 @@ from pylacus import (PyLacus,
# CaptureResponseJson as CaptureResponseJsonPy, # CaptureResponseJson as CaptureResponseJsonPy,
# CaptureSettings as CaptureSettingsPy # 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 pysecuritytxt import PySecurityTXT, SecurityTXTNotAvailable
from pylookyloomonitoring import PyLookylooMonitoring # type: ignore[attr-defined] from pylookyloomonitoring import PyLookylooMonitoring # type: ignore[attr-defined]
from redis import ConnectionPool, Redis from redis import ConnectionPool, Redis

View File

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

View File

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

View File

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

View File

@ -7,7 +7,7 @@ import socket
from typing import overload, Literal 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 from .abstractmodule import AbstractModule

715
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -35,9 +35,9 @@ start_website = "bin.start_website:main"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = ">=3.8.1,<3.12" python = ">=3.8.1,<3.13"
requests = "^2.31.0" requests = "^2.31.0"
flask = "^3.0.1" flask = "^3.0.2"
gunicorn = "^21.2.0" gunicorn = "^21.2.0"
charset-normalizer = "^3.3.2" charset-normalizer = "^3.3.2"
redis = {version = "^5.0.1", extras = ["hiredis"]} redis = {version = "^5.0.1", extras = ["hiredis"]}
@ -50,31 +50,31 @@ pysanejs = "^2.0.2"
pylookyloo = "^1.22.2" pylookyloo = "^1.22.2"
dnspython = "^2.5.0" dnspython = "^2.5.0"
pytaxonomies = "^1.5.0" pytaxonomies = "^1.5.0"
pymisp = {version = "^2.4.183", extras = ["url", "fileobjects"]} pymisp = {version = "^2.4.184", extras = ["url", "fileobjects"]}
Pillow = "^10.2.0" Pillow = "^10.2.0"
flask-restx = "^1.3.0" flask-restx = "^1.3.0"
rich = "^13.7.0" rich = "^13.7.0"
pyphishtanklookup = "^1.3.1" pyphishtanklookup = "^1.3.1"
Flask-Cors = "^4.0.0" Flask-Cors = "^4.0.0"
pyhashlookup = "^1.2.1" pyhashlookup = "^1.2.1"
lief = "^0.13.2" lief = "^0.14"
ua-parser = "^0.18.0" ua-parser = "^0.18.0"
Flask-Login = "^0.6.3" Flask-Login = "^0.6.3"
har2tree = "^1.22.2" har2tree = "^1.23.0"
passivetotal = "^2.5.9" passivetotal = "^2.5.9"
werkzeug = "^3.0.1" werkzeug = "^3.0.1"
filetype = "^1.2.0" filetype = "^1.2.0"
pypandora = "^1.6.1" pypandora = "^1.8.0"
lacuscore = "^1.7.11" lacuscore = "^1.8.0"
pylacus = "^1.7.3" pylacus = "^1.8.0"
pyipasnhistory = "^2.1.2" pyipasnhistory = "^2.1.2"
publicsuffixlist = "^0.10.0.20231214" publicsuffixlist = "^0.10.0.20240205"
pyfaup = "^1.2" pyfaup = "^1.2"
chardet = "^5.2.0" chardet = "^5.2.0"
pysecuritytxt = "^1.2.2" pysecuritytxt = "^1.2.2"
pylookyloomonitoring = "^1.1.3" pylookyloomonitoring = "^1.1.3"
pytz = {"version" = "^2023.3.post1", python = "<3.9"} pytz = {"version" = "^2024.1", python = "<3.9"}
s3fs = "^2023.12.2" s3fs = "^2024.2.0"
urllib3 = [ urllib3 = [
{version = "<2", python = "<3.10"}, {version = "<2", python = "<3.10"},
{version = "^2.0.7", python = ">=3.10"} {version = "^2.0.7", python = ">=3.10"}
@ -98,7 +98,7 @@ types-Deprecated = "^1.2.9.20240106"
types-python-dateutil = "^2.8.19.20240106" types-python-dateutil = "^2.8.19.20240106"
types-beautifulsoup4 = "^4.12.0.20240106" types-beautifulsoup4 = "^4.12.0.20240106"
types-Pillow = "^10.2.0.20240125" types-Pillow = "^10.2.0.20240125"
types-pytz = "^2023.3.1.1" types-pytz = "^2024.1.0.20240203"
[build-system] [build-system]
requires = ["poetry_core"] requires = ["poetry_core"]