[HOTFIX] Merge pull request #533 from dfir-iris/develop

Hotfix v2.4.9
dfir-iris · Jul 16, 2024 · 8156f83 · 8156f83
2 parents 602cf05 + 3d4471a
commit 8156f83
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.8
+current_version = 2.4.9
 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
@@ -6,7 +6,7 @@
 <p align="center">
   Incident Response Investigation System
   <br>
-  <i>Current Version v2.4.8</i>
+  <i>Current Version v2.4.9</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.8
+git checkout v2.4.9
 
 # Copy the environment file 
 cp .env.model .env

diff --git 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.8}
+    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v2.4.9}
 
   app:
     extends:
       file: docker-compose.base.yml
       service: app
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.8}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.9}
 
   worker:
     extends:
       file: docker-compose.base.yml
       service: worker
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.8}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.9}
 
   nginx:
     extends:
       file: docker-compose.base.yml
       service: nginx
-    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.8}
+    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.9}
 
 volumes:
   iris-downloads:

diff --git a/source/app/business/notes.py b/source/app/business/notes.py
@@ -120,15 +120,14 @@ def update(identifier: int = None, request_json: dict = None, case_identifier: i
             if latest_version.note_title == request_data.get('note_title') and latest_version.note_content == request_data.get('note_content'):
                 no_changes = True
                 app.logger.debug(f"Note {identifier} has not changed, skipping versioning")
-                print(f"Note {identifier} has not changed, skipping versioning")
 
         if not no_changes:
             note_version = NoteRevisions(
                 note_id=note.note_id,
                 revision_number=revision_number,
                 note_title=note.note_title,
                 note_content=note.note_content,
-                note_user=note.note_user,
+                note_user=current_user.id,
                 revision_timestamp=datetime.utcnow()
             )
             db.session.add(note_version)

diff --git 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.8" # DO NOT EDIT THIS LINE MANUALLY
+    IRIS_VERSION = "v2.4.9" # 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')