From 899170df6b41b44a64230bce4103288cec7ab6b8 Mon Sep 17 00:00:00 2001
From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:04:24 +0200
Subject: [PATCH 1/3] Update requirements.txt

pur to use django 5.1
---
 backend/requirements.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/requirements.txt b/backend/requirements.txt
index 1c8233100..7a8624556 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -1,24 +1,24 @@
-django==5.0.7
+django==5.1
 weasyprint==62.3
 psycopg2-binary==2.9.9
 gunicorn==22.0.0
 pytest-django==4.8.0
 pytest-html==4.1.1
-django-filter==24.2
+django-filter==24.3
 whitenoise==6.7.0
 argon2-cffi==23.1.0
 typing-extensions==4.12.2
 djangorestframework==3.15.2
-django-stubs==5.0.2
-coverage==7.5.4
+django-stubs==5.0.4
+coverage==7.6.1
 django-tailwind==3.8.0
-pyyaml==6.0.1
+pyyaml==6.0.2
 django-structlog==8.1.0
-structlog==24.2.0
+structlog==24.4.0
 python-dotenv==1.0.1
 drf-spectacular==0.27.2
-django-rest-knox==4.2.0
-django-allauth[socialaccount]==0.63.5
-pre-commit==3.7.1
-django-allauth[saml]==0.63.5
-django-allauth==0.63.5
+django-rest-knox==5.0.1
+django-allauth[socialaccount]==64.0.0
+pre-commit==3.8.0
+django-allauth[saml]==64.0.0
+django-allauth==64.0.0

From 46858b10d98c505d4410034b2ba243ccd3eea4b9 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Tue, 27 Aug 2024 15:14:45 +0200
Subject: [PATCH 2/3] Fix Knox AuthToken model imports

---
 backend/app_tests/api/test_utils.py | 2 +-
 backend/app_tests/conftest.py       | 2 +-
 backend/iam/utils.py                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/app_tests/api/test_utils.py b/backend/app_tests/api/test_utils.py
index 0d8ba48ab..e5ce6c909 100644
--- a/backend/app_tests/api/test_utils.py
+++ b/backend/app_tests/api/test_utils.py
@@ -1,5 +1,5 @@
 from django.db import models
-from knox.auth import AuthToken
+from knox.models import AuthToken
 import pytest
 import json
 import re
diff --git a/backend/app_tests/conftest.py b/backend/app_tests/conftest.py
index 8cf15f291..e1aadae93 100644
--- a/backend/app_tests/conftest.py
+++ b/backend/app_tests/conftest.py
@@ -4,7 +4,7 @@
 from test_vars import GROUPS_PERMISSIONS
 from iam.models import User, UserGroup
 from core.apps import startup
-from knox.auth import AuthToken
+from knox.models import AuthToken
 
 
 class Test(dict):
diff --git a/backend/iam/utils.py b/backend/iam/utils.py
index 1cda362ff..1466f8d60 100644
--- a/backend/iam/utils.py
+++ b/backend/iam/utils.py
@@ -1,4 +1,4 @@
-from knox.auth import AuthToken
+from knox.models import AuthToken
 
 
 def generate_token(user):

From 1ef6f54bd5c9339759dbf877a2d33e9c83f0af5d Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Tue, 27 Aug 2024 15:30:08 +0200
Subject: [PATCH 3/3] Fix incompatible hash object usage

---
 backend/ciso_assistant/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/ciso_assistant/settings.py b/backend/ciso_assistant/settings.py
index e97e8257d..2441291bb 100644
--- a/backend/ciso_assistant/settings.py
+++ b/backend/ciso_assistant/settings.py
@@ -200,7 +200,7 @@ def set_ciso_assistant_url(_, __, event_dict):
 }
 
 REST_KNOX = {
-    "SECURE_HASH_ALGORITHM": "cryptography.hazmat.primitives.hashes.SHA512",
+    "SECURE_HASH_ALGORITHM": "hashlib.sha512",
     "AUTH_TOKEN_CHARACTER_LENGTH": 64,
     "TOKEN_TTL": timedelta(seconds=AUTH_TOKEN_TTL),
     "TOKEN_LIMIT_PER_USER": None,