diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8758d40d..500efb2c 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: check-yaml - repo: https://github.com/psf/black - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black diff --git a/compose/local/dask/Dockerfile b/compose/local/dask/Dockerfile index 0c1b4bd3..57aacfec 100644 --- a/compose/local/dask/Dockerfile +++ b/compose/local/dask/Dockerfile @@ -1,4 +1,4 @@ -FROM daskdev/dask:2024.9.0-py3.12 +FROM daskdev/dask:2024.9.1-py3.12 ENV DEBIAN_FRONTEND noninteractive ARG local_folder=/uploads @@ -27,7 +27,7 @@ RUN freshclam # Workers should have similar reqs as django WORKDIR / COPY ./requirements /requirements -RUN pip install uv==0.4.12 -e git+https://github.com/dadokkio/volatility3.git@bb6ab45363b834576cf392e5f438a9a5f605610f#egg=volatility3 \ +RUN pip install uv==0.4.21 -e git+https://github.com/dadokkio/volatility3.git@7b0cb4facd1e1714a36793a27c0570461a3f02a1#egg=volatility3 \ && uv pip install --no-cache --system -r /requirements/base.txt COPY ./compose/local/dask/prepare.sh /usr/bin/prepare.sh diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index 26ac4377..ffc063bc 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.5-slim-bookworm as common-base +FROM python:3.12.6-slim-bookworm as common-base ENV DJANGO_SETTINGS_MODULE config.settings.local ENV PYTHONUNBUFFERED 1 @@ -44,7 +44,7 @@ RUN /usr/local/go/bin/go build FROM common-base WORKDIR / COPY ./requirements /requirements -RUN pip install uv==0.4.12 -e git+https://github.com/dadokkio/volatility3.git@bb6ab45363b834576cf392e5f438a9a5f605610f#egg=volatility3 \ +RUN pip install uv==0.4.21 -e git+https://github.com/dadokkio/volatility3.git@7b0cb4facd1e1714a36793a27c0570461a3f02a1#egg=volatility3 \ && uv pip install --no-cache --system -r /requirements/base.txt COPY ./compose/local/__init__.py /src/volatility3/volatility3/framework/constants/__init__.py diff --git a/orochi/api/models.py b/orochi/api/models.py index 312d7ce1..622e0acf 100644 --- a/orochi/api/models.py +++ b/orochi/api/models.py @@ -210,7 +210,7 @@ class Meta: ################################################### class ResultSmallOutSchema(Schema): name: str = Field(..., alias="plugin__name") - comment: str = Field(..., alias="plugin__comment") + comment: Optional[str] = Field(..., alias="plugin__comment") ################################################### diff --git a/orochi/templates/base.html b/orochi/templates/base.html index 29130d53..e07de37b 100644 --- a/orochi/templates/base.html +++ b/orochi/templates/base.html @@ -29,7 +29,7 @@
- {% if dumps %} + {% if main_page %} {% trans "Main" %} diff --git a/orochi/website/views.py b/orochi/website/views.py index bb7135ce..2ca4e19e 100644 --- a/orochi/website/views.py +++ b/orochi/website/views.py @@ -304,16 +304,16 @@ def generate(request): .filter(result__result=RESULT_STATUS_SUCCESS) .annotate( orochi_plugin=F("result__plugin__name"), - orochi_dump_index=F("result__dump__index"), - orochi_dump_name=F("result__dump__name"), + orochi_index=F("result__dump__index"), + orochi_name=F("result__dump__name"), orochi_os=F("result__dump__operating_system"), orochi_color=F("result__dump__color"), orochi_createdAt=F("result__updated_at"), ) .values( "orochi_plugin", - "orochi_dump_index", - "orochi_dump_name", + "orochi_index", + "orochi_name", "orochi_os", "orochi_color", "orochi_createdAt", @@ -328,7 +328,7 @@ def generate(request): res = res.filter( Q(value__icontains=search) | Q(orochi_plugin__icontains=search) - | Q(orochi_dump_name__icontains=search) + | Q(orochi_name__icontains=search) | Q(orochi_os__icontains=search) | Q(orochi_createdAt__icontains=search) ) @@ -491,7 +491,7 @@ def analysis(request): columns = ( [ "orochi_color", - "orochi_dump_name", + "orochi_name", "orochi_plugin", "orochi_os", "orochi_createdAt", @@ -554,7 +554,7 @@ def analysis(request): not in SYSTEM_COLUMNS + [PLUGIN_WITH_CHILDREN[plugin.name.lower()], "__children"] ] - + ["orochi_dump_name", "orochi_color"] + + ["orochi_name", "orochi_color"] ) # If tree we will render tree and get data dynamically @@ -592,14 +592,14 @@ def tree(request): .filter(result__result=RESULT_STATUS_SUCCESS) .annotate( orochi_plugin=F("result__plugin__name"), - orochi_dump_name=F("result__dump__name"), + orochi_name=F("result__dump__name"), orochi_os=F("result__dump__operating_system"), orochi_color=F("result__dump__color"), orochi_createdAt=F("result__updated_at"), ) .values( "orochi_plugin", - "orochi_dump_name", + "orochi_name", "orochi_os", "orochi_color", "orochi_createdAt", @@ -764,14 +764,14 @@ def diff_view(request, index_a, index_b, plugin): .filter(result__result=RESULT_STATUS_SUCCESS) .annotate( orochi_plugin=F("result__plugin__name"), - orochi_dump_name=F("result__dump__name"), + orochi_name=F("result__dump__name"), orochi_os=F("result__dump__operating_system"), orochi_color=F("result__dump__color"), orochi_createdAt=F("result__updated_at"), ) .values( "orochi_plugin", - "orochi_dump_name", + "orochi_name", "orochi_os", "orochi_color", "orochi_createdAt", @@ -791,14 +791,14 @@ def diff_view(request, index_a, index_b, plugin): .filter(result__result=RESULT_STATUS_SUCCESS) .annotate( orochi_plugin=F("result__plugin__name"), - orochi_dump_name=F("result__dump__name"), + orochi_name=F("result__dump__name"), orochi_os=F("result__dump__operating_system"), orochi_color=F("result__dump__color"), orochi_createdAt=F("result__updated_at"), ) .values( "orochi_plugin", - "orochi_dump_name", + "orochi_name", "orochi_os", "orochi_color", "orochi_createdAt", @@ -947,6 +947,7 @@ def bookmarks(request, indexes, plugin, query=None): "dumps": get_objects_for_user(request.user, "website.can_see") .values_list(*INDEX_VALUES_LIST) .order_by("folder__name", "name"), + "main_page": True, "selected_indexes": indexes, "selected_plugin": plugin, "selected_query": query, @@ -992,6 +993,7 @@ def index(request): "dumps": get_objects_for_user(request.user, "website.can_see") .values_list(*INDEX_VALUES_LIST) .order_by("folder__name", "name"), + "main_page": True, "selected_indexes": [], "selected_plugin": None, "selected_query": None, diff --git a/requirements/base.txt b/requirements/base.txt index b65dd001..db5ce7dc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,7 +7,7 @@ argon2-cffi==23.1.0 # https://github.com/evansd/whitenoise whitenoise==6.7.0 # https://github.com/andymccurdy/redis-py -redis==5.0.8 +redis==5.1.1 # https://github.com/redis/hiredis-py hiredis==3.0.0 # https://github.com/psycopg/psycopg2 @@ -20,7 +20,7 @@ python-magic==0.4.27 # Django # ------------------------------------------------------------------------------ # https://www.djangoproject.com/ -django==5.1.1 +django==5.1.2 # https://github.com/django/channels channels[daphne]==4.1.0 # https://github.com/django/daphne @@ -30,7 +30,7 @@ channels_redis==4.2.0 # https://github.com/joke2k/django-environ django-environ==0.11.2 # https://github.com/pennersr/django-allauth -django-allauth[mfa]==64.2.1 +django-allauth[mfa]==65.0.2 # https://github.com/django-crispy-forms/django-crispy-forms django-crispy-forms==2.3 # https://github.com/jazzband/django-redis @@ -43,14 +43,14 @@ django-import-export==4.1.1 # Django Ninja # ------------------------------------------------------------------------------ # https://github.com/adamchainz/django-cors-headers -django-cors-headers==4.4.0 +django-cors-headers==4.5.0 # https://github.com/vitalik/django-ninja django-ninja==1.3.0 # Django tweak # ------------------------------------------------------------------------------ # https://github.com/django-crispy-forms/crispy-bootstrap5 -crispy-bootstrap5==2024.2 +crispy-bootstrap5==2024.10 # https://github.com/fabiocaccamo/django-colorfield django-colorfield==0.11.0 # https://github.com/mbraak/django-file-form @@ -71,23 +71,23 @@ django-json-widget==2.0.1 # Dask & co # ------------------------------------------------------------------------------ # https://github.com/dask/dask -dask==2024.9.0 +dask==2024.9.1 # https://github.com/dask/distributed -distributed==2024.9.0 +distributed==2024.9.1 # https://msgpack.org/ TO BE ALIGNED WITH SCHEDULER msgpack==1.1.0 # https://github.com/python-lz4/python-lz4 lz4==4.3.3 # https://numpy.org/ -numpy==2.1.1 +numpy==2.1.2 # https://github.com/cloudpipe/cloudpickle -cloudpickle==3.0.0 +cloudpickle==3.1.0 # https://pypi.org/project/toolz/ -toolz==0.12.1 +toolz==1.0.0 # https://pypi.org/project/tornado/ tornado==6.4.1 # https://pandas.pydata.org/ -pandas==2.2.2 +pandas==2.2.3 # Plotting # ------------------------------------------------------------------------------ @@ -108,7 +108,7 @@ capstone==5.0.3 # https://github.com/Julian/jsonschema jsonschema==4.23.0 # https://github.com/Legrandin/pycryptodome -pycryptodome==3.20.0 +pycryptodome==3.21.0 # https://github.com/maxmind/GeoIP2-python geoip2==4.8.0 @@ -119,7 +119,7 @@ GitPython==3.1.43 # https://github.com/frostming/marko marko==2.1.2 # https://github.com/VirusTotal/yara-x -yara_x==0.8.0 +yara_x==0.9.0 # symbols dwarf # ------------------------------------------------------------------------------ @@ -135,10 +135,10 @@ pefile==2024.8.26 # misp export # ------------------------------------------------------------------------------ # https://github.com/MISP/PyMISP -pymisp==2.4.198 +pymisp==2.5.0 # ldap # ------------------------------------------------------------------------------ # https://github.com/python-ldap/python-ldap python-ldap==3.4.4 -django-auth-ldap==4.8.0 +django-auth-ldap==5.0.0 diff --git a/requirements/local.txt b/requirements/local.txt index 73fa9bef..556064f0 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -3,9 +3,9 @@ # Testing # ------------------------------------------------------------------------------ # https://github.com/python/mypy -mypy==1.11.2 +mypy==1.12.0 # https://github.com/typeddjango/django-stubs -django-stubs==5.0.4 +django-stubs==5.1.0 # https://github.com/pytest-dev/pytest pytest==8.3.3 # https://github.com/Frozenball/pytest-sugar @@ -18,13 +18,13 @@ flake8==7.1.1 # https://github.com/gforcada/flake8-isort flake8-isort==6.1.1 # https://github.com/nedbat/coveragepy -coverage==7.6.1 +coverage==7.6.3 # https://github.com/ambv/black -black==24.8.0 +black==24.10.0 # https://github.com/PyCQA/pylint-django -pylint-django==2.5.5 +pylint-django==2.6.1 # https://github.com/pre-commit/pre-commit -pre-commit==3.8.0 +pre-commit==4.0.1 # Django # ------------------------------------------------------------------------------