[MRG] Merge pull request #340 from dfir-iris/v2.3.5-hf

Patch - v2.3.5

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.3.4
+current_version = 2.3.5
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*)-(?P<build>\d+))?

README.md

@@ -6,7 +6,7 @@
 <p align="center">
   Incident Response Investigation System
   <br>
-  <i>Current Version v2.3.4</i>
+  <i>Current Version v2.3.5</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.3.4
+git checkout v2.3.5
 
 # Copy the environment file 
 cp .env.model .env

docker-compose.yml

@@ -27,7 +27,7 @@ services:
     build:
       context: docker/db
     container_name: iriswebapp_db
-    image: iriswebapp_db:v2.3.4
+    image: iriswebapp_db:v2.3.5
     restart: always
     # Used for debugging purposes, should be deleted for production
     ports:
@@ -47,7 +47,7 @@ services:
     build:
       context: .
       dockerfile: docker/webApp/Dockerfile
-    image: iriswebapp_app:v2.3.4
+    image: iriswebapp_app:v2.3.5
     container_name: iriswebapp_app
     command: ['nohup', './iris-entrypoint.sh', 'iriswebapp']
     volumes:
@@ -85,7 +85,7 @@ services:
     build:
       context: .
       dockerfile: docker/webApp/Dockerfile
-    image: iriswebapp_app:v2.3.4
+    image: iriswebapp_app:v2.3.5
     container_name: iriswebapp_worker
     command: ['./wait-for-iriswebapp.sh', 'app:8000', './iris-entrypoint.sh', 'iris-worker']
     volumes:
@@ -121,7 +121,7 @@ services:
       args:
         NGINX_CONF_GID: 1234
         NGINX_CONF_FILE: nginx.conf
-    image: iriswebapp_nginx:v2.3.4
+    image: iriswebapp_nginx:v2.3.5
     container_name: iriswebapp_nginx
     environment:
       - IRIS_UPSTREAM_SERVER

source/app/blueprints/manage/templates/modal_case_info_from_case.html

@@ -62,8 +62,8 @@ <h4>General info <button class="ml-2 btn btn-sm float-right" onclick="edit_case_
                             </div>
                             <div class="form-group mt--3">
                                 <label>Case tags :</label>
-                                <span type="text" class="text-faded">{% if data.tags %} {% for tag in data.case_tags %}
-                                    <span class="badge badge-pill badge-light ml-1"><i class="fa fa-tag mr-1"></i>{{ tag }}</span> {% endfor %}{% endif %}</span>
+                                <span type="text" class="text-faded">{% if data.tags %} {% for tag in data.tags %}
+                                    <span class="badge badge-pill badge-light ml-1"><i class="fa fa-tag mr-1"></i>{{ tag.tag_title }}</span> {% endfor %}{% endif %}</span>
                             </div>
                             <div class="form-group mt--3">
                                 <label>SOC ID :</label>
@@ -262,7 +262,7 @@ <h4 class=" pb-3">Edit case information</h4>
                                     <label for="asset_tags">Case tags
                                     </label>
                                     <input type="text" id="case_tags"
-                                        class="form-control col-md-12" {% if data.case_tags %} value="{{ data.case_tags }}" {% endif %}/>
+                                        class="form-control col-md-12" {% if data.tags %} value="{% for tag in data.tags %}{{ tag.tag_title }},{% endfor %}" {% endif %}/>
                                 </div>
                                 <div class="form-group px-4 py-4 mt-3" id="protagonists_form_group">
                                     {% if protagonists %}

source/app/configuration.py

@@ -265,7 +265,7 @@ class CeleryConfig:
 # --------- APP ---------
 class Config:
     # Handled by bumpversion
-    IRIS_VERSION = "v2.3.4"
+    IRIS_VERSION = "v2.3.5"
 
     API_MIN_VERSION = "2.0.0"
     API_MAX_VERSION = "2.0.3"