From bc77418da35bfdbb6c60765bb106a28143e84bf0 Mon Sep 17 00:00:00 2001
From: whikernel <whitekernel@whitekernel.fr>
Date: Wed, 11 Dec 2024 09:50:21 +0100
Subject: [PATCH 1/3] [FIX] Manual hooks issue

---
 source/app/static/assets/js/iris/common.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/app/static/assets/js/iris/common.js b/source/app/static/assets/js/iris/common.js
index befd2ec56..109139903 100644
--- a/source/app/static/assets/js/iris/common.js
+++ b/source/app/static/assets/js/iris/common.js
@@ -1174,6 +1174,8 @@ function load_menu_mod_options(data_type, table, deletion_fn, additionalOptions
                     type: 'divider'
                 });
 
+                jdata_menu_options = jsdata;
+
                 for (let option in jsdata) {
                     let opt = jsdata[option];
 

From b88db70dbc470292f78d277f2b9afac500fa860c Mon Sep 17 00:00:00 2001
From: whikernel <whitekernel@whitekernel.fr>
Date: Wed, 11 Dec 2024 09:53:06 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Bump=20version:=202.4.16=20=E2=86=92=202.4.?=
 =?UTF-8?q?17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 README.md                   | 4 ++--
 docker-compose.yml          | 8 ++++----
 source/app/configuration.py | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2dbd64e99..e6a5156c9 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.16
+current_version = 2.4.17
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*)-(?P<build>\d+))?
diff --git a/README.md b/README.md
index 04514642c..0cfc40deb 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 <p align="center">
   Incident Response Investigation System
   <br>
-  <i>Current Version v2.4.16</i>
+  <i>Current Version v2.4.17</i>
   <br>
   <a href="https://v200.beta.dfir-iris.org">Online Demonstration</a>
 </p>
@@ -52,7 +52,7 @@ git clone https://github.com/dfir-iris/iris-web.git
 cd iris-web
 
 # Checkout to the last tagged version 
-git checkout v2.4.16
+git checkout v2.4.17
 
 # Copy the environment file 
 cp .env.model .env
diff --git a/docker-compose.yml b/docker-compose.yml
index b9b24a3f1..ce5bbf263 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,25 +25,25 @@ services:
     extends:
       file: docker-compose.base.yml
       service: db
-    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v2.4.16}
+    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v2.4.17}
 
   app:
     extends:
       file: docker-compose.base.yml
       service: app
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.16}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.17}
 
   worker:
     extends:
       file: docker-compose.base.yml
       service: worker
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.16}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.17}
 
   nginx:
     extends:
       file: docker-compose.base.yml
       service: nginx
-    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.16}
+    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.17}
 
 volumes:
   iris-downloads:
diff --git a/source/app/configuration.py b/source/app/configuration.py
index 3585052fd..51187f13b 100644
--- a/source/app/configuration.py
+++ b/source/app/configuration.py
@@ -263,7 +263,7 @@ class CeleryConfig:
 # --------- APP ---------
 class Config:
     # Handled by bumpversion
-    IRIS_VERSION = "v2.4.16" # DO NOT EDIT THIS LINE MANUALLY
+    IRIS_VERSION = "v2.4.17" # DO NOT EDIT THIS LINE MANUALLY
 
     if os.environ.get('IRIS_DEMO_VERSION') is not None and os.environ.get('IRIS_DEMO_VERSION') != 'None':
         IRIS_VERSION = os.environ.get('IRIS_DEMO_VERSION')

From af316de46f856e64b55faca0ffb150550dda2f61 Mon Sep 17 00:00:00 2001
From: whikernel <whitekernel@whitekernel.fr>
Date: Wed, 11 Dec 2024 09:54:04 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=202.4.17=20=E2=86=92=202.4.?=
 =?UTF-8?q?18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 README.md                   | 4 ++--
 docker-compose.yml          | 8 ++++----
 source/app/configuration.py | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e6a5156c9..42b0c1d83 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.17
+current_version = 2.4.18
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*)-(?P<build>\d+))?
diff --git a/README.md b/README.md
index 0cfc40deb..4603c4f52 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 <p align="center">
   Incident Response Investigation System
   <br>
-  <i>Current Version v2.4.17</i>
+  <i>Current Version v2.4.18</i>
   <br>
   <a href="https://v200.beta.dfir-iris.org">Online Demonstration</a>
 </p>
@@ -52,7 +52,7 @@ git clone https://github.com/dfir-iris/iris-web.git
 cd iris-web
 
 # Checkout to the last tagged version 
-git checkout v2.4.17
+git checkout v2.4.18
 
 # Copy the environment file 
 cp .env.model .env
diff --git a/docker-compose.yml b/docker-compose.yml
index ce5bbf263..0b95330e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,25 +25,25 @@ services:
     extends:
       file: docker-compose.base.yml
       service: db
-    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v2.4.17}
+    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v2.4.18}
 
   app:
     extends:
       file: docker-compose.base.yml
       service: app
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.17}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.18}
 
   worker:
     extends:
       file: docker-compose.base.yml
       service: worker
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.17}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.18}
 
   nginx:
     extends:
       file: docker-compose.base.yml
       service: nginx
-    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.17}
+    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.18}
 
 volumes:
   iris-downloads:
diff --git a/source/app/configuration.py b/source/app/configuration.py
index 51187f13b..26539079f 100644
--- a/source/app/configuration.py
+++ b/source/app/configuration.py
@@ -263,7 +263,7 @@ class CeleryConfig:
 # --------- APP ---------
 class Config:
     # Handled by bumpversion
-    IRIS_VERSION = "v2.4.17" # DO NOT EDIT THIS LINE MANUALLY
+    IRIS_VERSION = "v2.4.18" # DO NOT EDIT THIS LINE MANUALLY
 
     if os.environ.get('IRIS_DEMO_VERSION') is not None and os.environ.get('IRIS_DEMO_VERSION') != 'None':
         IRIS_VERSION = os.environ.get('IRIS_DEMO_VERSION')