Skip to content

Commit e4ce097

Browse files
authored
Merge branch 'master' into new
2 parents b28a793 + b9769b7 commit e4ce097

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

compose/local/dask/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ COPY ./compose/local/clamav/freshclam.conf /etc/clamav/freshclam.conf
4242
RUN freshclam
4343

4444
FROM golang:alpine3.20 as go-builder
45+
4546
RUN apk add --no-cache git
47+
4648
WORKDIR /
4749
RUN git clone https://github.com/volatilityfoundation/dwarf2json.git
4850
WORKDIR /dwarf2json

compose/local/django/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM python:3.13.6-slim-bookworm as common-base
22

3+
34
ENV DJANGO_SETTINGS_MODULE config.settings.local
45
# DISABLE TZDATA INTERACTION
56
ENV DEBIAN_FRONTEND noninteractive
@@ -80,6 +81,7 @@ COPY ./compose/local/vol_fix/__init__symbols.py /app/.venv/lib/python3.13/site-p
8081
RUN sed -i 's/\["Intel32", "Intel64"\]/\["Intel32", "Intel64", "AArch64"\]/g' /app/.venv/lib/python3.13/site-packages/volatility3/framework/plugins/linux/*.py && \
8182
pip install --force-reinstall --no-cache-dir python-ldap==3.4.4
8283

84+
8385
COPY ./compose/local/django/entrypoint /entrypoint
8486
RUN sed -i 's/\r$//g' /entrypoint && chmod +x /entrypoint
8587

orochi/api/routers/rules.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,14 @@ def upload_rule(request, files: List[UploadedFile] = File(...)):
288288
with open(new_path, "wb") as uf:
289289
uf.write(f.read())
290290
try:
291+
291292
with open(new_path, "rb") as f:
292293
rule = Rule.objects.create(
293294
path=new_path,
294295
ruleset=ruleset,
295296
rule=f.read().decode("utf8", "replace"),
296297
)
298+
297299
except Exception:
298300
rule = Rule.objects.create(
299301
path=new_path, ruleset=ruleset, rule=None

0 commit comments

Comments
 (0)