IRIS Extension for interactive Webhook execution

docker-compose.base.yml

@@ -32,6 +32,8 @@ services:
       - POSTGRES_ADMIN_USER
       - POSTGRES_ADMIN_PASSWORD
       - POSTGRES_DB
+    env_file:
+      - .env
     networks:
       - iris_backend
     volumes:

docker-compose.yml

@@ -25,28 +25,42 @@ services:
     extends:
       file: docker-compose.base.yml
       service: db
-    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v2.4.20}
-
+    build:
+      context: docker/db
+    image: iriswebapp_db:v2.4.7
+    ports:
+      - "0.0.0.0:5432:5432"
 
   app:
     extends:
       file: docker-compose.base.yml
       service: app
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.20}
+    build:
+      context: .
+      dockerfile: docker/webApp/Dockerfile
+    image: iriswebapp_app:v2.4.7
+    ports:
+      - "0.0.0.0:8000:8000"
 
   worker:
     extends:
       file: docker-compose.base.yml
       service: worker
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.20}
-
+    build:
+      context: .
+      dockerfile: docker/webApp/Dockerfile
+    image: iriswebapp_app:v2.4.7
 
   nginx:
     extends:
       file: docker-compose.base.yml
       service: nginx
-    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.20}
-
+    build:
+      context: ./docker/nginx
+      args:
+        NGINX_CONF_GID: 1234
+        NGINX_CONF_FILE: nginx.conf
+    image: iriswebapp_nginx:v2.4.7
 
 volumes:
   iris-downloads:
@@ -59,4 +73,3 @@ networks:
     name: iris_backend
   iris_frontend:
     name: iris_frontend
-

docker/nginx/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #  IRIS Source Code
 #  Copyright (C) 2021 - Airbus CyberSecurity (SAS)

docker/nginx/nginx.conf

@@ -26,7 +26,11 @@ events {
 
 http {
     map $request_uri $csp_header {
-        default "default-src 'self' https://analytics.dfir-iris.org; script-src 'self' 'unsafe-inline' https://analytics.dfir-iris.org; style-src 'self' 'unsafe-inline'; img-src 'self' data:;";
+       default "default-src 'self' https://analytics.dfir-iris.org https://cdn.jsdelivr.net https://jsoncrack.com https://stackpath.bootstrapcdn.com;
+             script-src 'self' 'unsafe-inline' https://analytics.dfir-iris.org https://cdn.jsdelivr.net https://stackpath.bootstrapcdn.com;
+             style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net;
+             img-src 'self' data:;
+             frame-src 'self' https://jsoncrack.com;";
     }
     include /etc/nginx/mime.types;
 

docker/webApp/Dockerfile

@@ -83,6 +83,8 @@ COPY --from=compile-js-image /ui/dist/ /iriswebapp/static/
 RUN chmod +x /iriswebapp/dependencies/evtxdump_binaries/linux/x64/fd
 RUN chmod +x /iriswebapp/dependencies/evtxdump_binaries/linux/x64/evtx_dump
 
+# RUN chmod +x iris-entrypoint.sh wait-for-iriswebapp.sh entrypoint.sh
+
 RUN chmod +x iris-entrypoint.sh
 RUN chmod +x wait-for-iriswebapp.sh
-#ENTRYPOINT [ "./iris-entrypoint.sh" ]
+#ENTRYPOINT ["./iris-entrypoint.sh"]

source/app/alembic/versions/bf5eab0b7ace_add_case_template_id_to_case_model.py

@@ -0,0 +1,27 @@
+"""Add case_template_id to Case model
+
+Revision ID: bf5eab0b7ace
+Revises: d5a720d1b99b
+Create Date: 2025-05-15 03:28:27.999462
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import String
+from app.alembic.alembic_utils import _table_has_column
+
+# revision identifiers, used by Alembic.
+revision = 'bf5eab0b7ace'
+down_revision = 'd5a720d1b99b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Check if the column doesn't exist before adding it
+    if not _table_has_column('cases', 'case_template_id'):
+        op.add_column('cases', sa.Column('case_template_id', String(length=256), nullable=True))
+
+
+def downgrade():
+    pass