[MRG] Merge pull request #635 from dfir-iris/hotfix_2.4.16

Hotfix 2.4.16
dfir-iris · Nov 14, 2024 · a533e61 · a533e61
2 parents 2c7f55e + 9f3a725
commit a533e61
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.15
+current_version = 2.4.16
 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.15</i>
+  <i>Current Version vv2.4.16</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.15
+git checkout vv2.4.16
 
 # 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.15}
+    image: ${DB_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_db}:${DB_IMAGE_TAG:-v-v2.4.16}
 
   app:
     extends:
       file: docker-compose.base.yml
       service: app
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.15}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v-v2.4.16}
 
   worker:
     extends:
       file: docker-compose.base.yml
       service: worker
-    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v2.4.15}
+    image: ${APP_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_app}:${APP_IMAGE_TAG:-v-v2.4.16}
 
   nginx:
     extends:
       file: docker-compose.base.yml
       service: nginx
-    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v2.4.15}
+    image: ${NGINX_IMAGE_NAME:-ghcr.io/dfir-iris/iriswebapp_nginx}:${NGINX_IMAGE_TAG:-v-v2.4.16}
 
 volumes:
   iris-downloads:

diff --git a/source/app/blueprints/login/login_routes.py b/source/app/blueprints/login/login_routes.py
@@ -253,16 +253,16 @@ def oidc_authorise():
         if user and not user.active:
             return response_error("User not active in IRIS", 403)
 
-        return wrap_login_user(user)
+        return wrap_login_user(user, is_oidc=True)
 
-def wrap_login_user(user):
+def wrap_login_user(user, is_oidc=False):
 
     session['username'] = user.user
 
     if 'SERVER_SETTINGS' not in app.config:
         app.config['SERVER_SETTINGS'] = get_server_settings_as_dict()
 
-    if app.config['SERVER_SETTINGS']['enforce_mfa']:
+    if app.config['SERVER_SETTINGS']['enforce_mfa'] is True and is_oidc is False:
         if "mfa_verified" not in session or session["mfa_verified"] is False:
             return redirect(url_for('mfa_verify'))
 

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.15" # DO NOT EDIT THIS LINE MANUALLY
+    IRIS_VERSION = "v2.4.16" # 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')