PreDjango 4.2 fixes (DefectDojo#9882)

hblankenship · Apr 26, 2024 · 785ecbc · 785ecbc
1 parent 6bf285c
commit 785ecbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/dojo/models.py b/dojo/models.py
@@ -1656,7 +1656,7 @@ def clean(self):
                     action_string = 'Postgres does not accept NULL character. Attempting to replace with %00...'
                     for remove_str in null_char_list:
                         self.path = self.path.replace(remove_str, '%00')
-                    errors.append(ValidationError(f'Path "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}'))
+                    logging.error(f'Path "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
             if self.path == '':
                 self.path = None
 
@@ -1669,7 +1669,7 @@ def clean(self):
                     action_string = 'Postgres does not accept NULL character. Attempting to replace with %00...'
                     for remove_str in null_char_list:
                         self.query = self.query.replace(remove_str, '%00')
-                    errors.append(ValidationError(f'Query "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}'))
+                    logging.error(f'Query "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
             if self.query == '':
                 self.query = None
 
@@ -1682,7 +1682,7 @@ def clean(self):
                     action_string = 'Postgres does not accept NULL character. Attempting to replace with %00...'
                     for remove_str in null_char_list:
                         self.fragment = self.fragment.replace(remove_str, '%00')
-                    errors.append(ValidationError(f'Fragment "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}'))
+                    logging.error(f'Fragment "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
             if self.fragment == '':
                 self.fragment = None
 

diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py
@@ -493,10 +493,7 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
     'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
     'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
     'django.contrib.auth.hashers.BCryptPasswordHasher',
-    'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
-    'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
-    'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
 ]
 
 SOCIAL_AUTH_PIPELINE = (