Issue #252 Case insensitive login

source/app/blueprints/case/case_tasks_routes.py

@@ -32,6 +32,7 @@
 
 from app import db
 from app.blueprints.case.case_comments import case_comment_update
+from app.datamgmt.manage.manage_users_db import get_user
 from app.datamgmt.case.case_db import get_case
 from app.datamgmt.case.case_tasks_db import add_comment_to_task
 from app.datamgmt.case.case_tasks_db import add_task
@@ -205,10 +206,10 @@ def case_task_view_modal(cur_id, caseid, url_redir):
 
     form.task_title.render_kw = {'value': task.task_title}
     form.task_description.data = task.task_description
-    user_name, = User.query.with_entities(User.name).filter(User.id == task.task_userid_update).first()
+    user = get_user(task.task_userid_update)
     comments_map = get_case_tasks_comments_count([task.id])
 
-    return render_template("modal_add_case_task.html", form=form, task=task, user_name=user_name,
+    return render_template("modal_add_case_task.html", form=form, task=task, user_name=user.name,
                            comments_map=comments_map, attributes=task.custom_attributes)
 
 

source/app/blueprints/case/case_timeline_routes.py

@@ -57,6 +57,7 @@
 from app.datamgmt.case.case_events_db import update_event_iocs
 from app.datamgmt.case.case_iocs_db import get_ioc_by_value
 from app.datamgmt.manage.manage_attribute_db import get_default_custom_attributes
+from app.datamgmt.manage.manage_users_db import get_user
 from app.datamgmt.states import get_timeline_state
 from app.datamgmt.states import update_timeline_state
 from app.forms import CaseEventForm
@@ -749,9 +750,9 @@ def event_view_modal(cur_id, caseid, url_redir):
     iocs_prefill = get_event_iocs_ids(cur_id, caseid)
     comments_map = get_case_events_comments_count([cur_id])
 
-    usr_name, = User.query.filter(User.id == event.user_id).with_entities(User.name).first()
+    user = get_user(event.user_id)
 
-    return render_template("modal_add_case_event.html", form=form, event=event, user_name=usr_name, tags=event_tags,
+    return render_template("modal_add_case_event.html", form=form, event=event, user_name=user.name, tags=event_tags,
                            assets=assets, iocs=iocs, comments_map=comments_map,
                            assets_prefill=assets_prefill, iocs_prefill=iocs_prefill,
                            category=event.category, attributes=event.custom_attributes)

source/app/blueprints/dashboard/dashboard_routes.py

@@ -39,6 +39,8 @@
 from app.datamgmt.dashboard.dashboard_db import get_tasks_status
 from app.datamgmt.dashboard.dashboard_db import list_global_tasks
 from app.datamgmt.dashboard.dashboard_db import list_user_tasks
+from app.datamgmt.manage.manage_users_db import get_user
+from app.datamgmt.manage.manage_users_db import get_users_ordered_by_name
 from app.forms import CaseGlobalTaskForm
 from app.iris_engine.module_handler.module_handler import call_modules_hook
 from app.iris_engine.utils.tracker import track_activity
@@ -267,7 +269,7 @@ def add_gtask_modal(caseid):
 
     form = CaseGlobalTaskForm()
 
-    form.task_assignee_id.choices = [(user.id, user.name) for user in User.query.filter(User.active == True).order_by(User.name).all()]
+    form.task_assignee_id.choices = [(user.id, user.name) for user in get_users_ordered_by_name()]
     form.task_status_id.choices = [(a.id, a.status_name) for a in get_tasks_status()]
 
     return render_template("modal_add_global_task.html", form=form, task=task, uid=current_user.id, user_name=None)
@@ -312,17 +314,16 @@ def add_gtask(caseid):
 def edit_gtask_modal(cur_id, caseid):
     form = CaseGlobalTaskForm()
     task = GlobalTasks.query.filter(GlobalTasks.id == cur_id).first()
-    form.task_assignee_id.choices = [(user.id, user.name) for user in
-                                     User.query.filter(User.active == True).order_by(User.name).all()]
+    form.task_assignee_id.choices = [(user.id, user.name) for user in get_users_ordered_by_name()]
     form.task_status_id.choices = [(a.id, a.status_name) for a in get_tasks_status()]
 
     # Render the task
     form.task_title.render_kw = {'value': task.task_title}
     form.task_description.data = task.task_description
-    user_name, = User.query.with_entities(User.name).filter(User.id == task.task_userid_update).first()
+    user = get_user(task.task_userid_update)
 
     return render_template("modal_add_global_task.html", form=form, task=task,
-                           uid=task.task_assignee_id, user_name=user_name)
+                           uid=task.task_assignee_id, user_name=user.name)
 
 
 @dashboard_blueprint.route('/global/tasks/update/<int:cur_id>', methods=['POST'])
@@ -331,7 +332,7 @@ def edit_gtask(cur_id, caseid):
 
     form = CaseGlobalTaskForm()
     task = GlobalTasks.query.filter(GlobalTasks.id == cur_id).first()
-    form.task_assignee_id.choices = [(user.id, user.name) for user in User.query.filter(User.active == True).order_by(User.name).all()]
+    form.task_assignee_id.choices = [(user.id, user.name) for user in get_users_ordered_by_name()]
     form.task_status_id.choices = [(a.id, a.status_name) for a in get_tasks_status()]
 
     if not task:

source/app/datamgmt/alerts/alerts_db.py

@@ -1187,7 +1187,7 @@ def remove_case_alerts_by_ids(alert_ids: List[int]) -> None:
     db.session.commit()
 
 
-def delete_alerts(alert_ids: List[int]) -> tuple[bool, str]:
+def delete_alerts(alert_ids: List[int]) -> Tuple[bool, str]:
     """
     Delete multiples alerts from the database
 

source/app/datamgmt/case/case_tasks_db.py

@@ -24,6 +24,7 @@
 
 from app import db
 from app.datamgmt.manage.manage_attribute_db import get_default_custom_attributes
+from app.datamgmt.manage.manage_users_db import get_user
 from app.datamgmt.manage.manage_users_db import get_users_list_restricted_from_case
 from app.datamgmt.states import update_tasks_state
 from app.models import CaseTasks, TaskAssignee
@@ -192,7 +193,7 @@ def update_task_assignees(task, task_assignee_list, caseid):
         if uid not in allowed_users:
             continue
 
-        user = User.query.filter(User.id == uid).first()
+        user = get_user(uid)
         if user:
             ta = TaskAssignee()
             ta.task_id = task.id

source/app/datamgmt/manage/manage_groups_db.py

@@ -22,6 +22,7 @@
 from app import db
 from app.datamgmt.case.case_db import get_case
 from app.datamgmt.manage.manage_cases_db import list_cases_id
+from app.datamgmt.manage.manage_users_db import get_user
 from app.iris_engine.access_control.utils import ac_access_level_mask_from_val_list, ac_ldp_group_removal
 from app.iris_engine.access_control.utils import ac_access_level_to_list
 from app.iris_engine.access_control.utils import ac_auto_update_user_effective_access
@@ -168,7 +169,7 @@ def update_group_members(group, members):
     users_to_remove = set_cur_groups - set_members
 
     for uid in users_to_add:
-        user = User.query.filter(User.id == uid).first()
+        user = get_user(uid)
         if user:
             ug = UserGroup()
             ug.group_id = group.group_id

source/app/datamgmt/manage/manage_users_db.py

@@ -40,22 +40,125 @@
 from app.models.authorization import UserOrganisation
 
 
-def get_user(user_id, id_key: str = 'id'):
-    user = User.query.filter(getattr(User, id_key) == user_id).first()
+def get_user(user_id):
+    user = User.query.filter(User.id == user_id).first()
+    return user
+
+
+# TODO Isn't this doing the exact same thing as get_user?
+#      Replace all calls to get_user by calls to get_user_by_id and remove get_user?
+def get_user_by_id(user_id: int):
+    return User.query.get(user_id)
+
+
+def get_user_by_username(username):
+    user = User.query.filter(User.user.ilike(username)).first()
     return user
 
 
+def get_user_by_email(user_email):
+    return User.query.filter(User.email == user_email).first()
+
+
 def get_active_user_by_login(username):
     user = User.query.filter(
-        User.user == username,
+        User.user.ilike(username),
         User.active == True
     ).first()
     return user
 
 
-def list_users_id():
-    users = User.query.with_entities(User.user_id).all()
-    return users
+def get_active_user_by_api_key(api_key):
+    user = User.query.filter(
+        User.api_key == api_key,
+        User.active == True
+    ).first()
+    return user
+
+
+def get_user_details(user_id, include_api_key=False):
+
+    user = get_user(user_id)
+
+    if not user:
+        return None
+
+    row = {}
+    row['user_id'] = user.id
+    row['user_uuid'] = user.uuid
+    row['user_name'] = user.name
+    row['user_login'] = user.user
+    row['user_email'] = user.email
+    row['user_active'] = user.active
+    row['user_is_service_account'] = user.is_service_account
+
+    if include_api_key:
+        row['user_api_key'] = user.api_key
+
+    row['user_groups'] = get_user_groups(user_id)
+    row['user_organisations'] = get_user_organisations(user_id)
+    row['user_permissions'] = get_user_effective_permissions(user_id)
+    row['user_cases_access'] = get_user_cases_access(user_id)
+
+    upg = get_user_primary_org(user_id)
+    row['user_primary_organisation_id'] = upg.org_id if upg else 0
+
+    return row
+
+
+def user_exists(user_name, user_email):
+    user = get_user_by_username(user_name)
+    user_by_email = get_user_by_email(user_email)
+
+    return user or user_by_email
+
+
+def delete_user(user_id):
+    UserCaseAccess.query.filter(UserCaseAccess.user_id == user_id).delete()
+    UserOrganisation.query.filter(UserOrganisation.user_id == user_id).delete()
+    UserGroup.query.filter(UserGroup.user_id == user_id).delete()
+    UserCaseEffectiveAccess.query.filter(UserCaseEffectiveAccess.user_id == user_id).delete()
+
+    User.query.filter(User.id == user_id).delete()
+    db.session.commit()
+
+
+def get_users_ordered_by_name():
+    return User.query.filter(User.active == True).order_by(User.name).all()
+
+
+def get_users_list():
+    users = User.query.all()
+
+    output = []
+    for user in users:
+        row = {}
+        row['user_id'] = user.id
+        row['user_uuid'] = user.uuid
+        row['user_name'] = user.name
+        row['user_login'] = user.user
+        row['user_email'] = user.email
+        row['user_active'] = user.active
+        row['user_is_service_account'] = user.is_service_account
+        output.append(row)
+
+    return output
+
+
+def get_users_list_restricted():
+    users = User.query.all()
+
+    output = []
+    for user in users:
+        row = {}
+        row['user_id'] = user.id
+        row['user_uuid'] = user.uuid
+        row['user_name'] = user.name
+        row['user_login'] = user.user
+        row['user_active'] = user.active
+        output.append(row)
+
+    return output
 
 
 def get_user_effective_permissions(user_id):
@@ -402,36 +505,6 @@ def set_user_case_access(user_id, case_id, access_level):
     return True, 'Case access set to {} for user {}'.format(access_level, user_id)
 
 
-def get_user_details(user_id, include_api_key=False):
-
-    user = User.query.filter(User.id == user_id).first()
-
-    if not user:
-        return None
-
-    row = {}
-    row['user_id'] = user.id
-    row['user_uuid'] = user.uuid
-    row['user_name'] = user.name
-    row['user_login'] = user.user
-    row['user_email'] = user.email
-    row['user_active'] = user.active
-    row['user_is_service_account'] = user.is_service_account
-
-    if include_api_key:
-        row['user_api_key'] = user.api_key
-
-    row['user_groups'] = get_user_groups(user_id)
-    row['user_organisations'] = get_user_organisations(user_id)
-    row['user_permissions'] = get_user_effective_permissions(user_id)
-    row['user_cases_access'] = get_user_cases_access(user_id)
-
-    upg = get_user_primary_org(user_id)
-    row['user_primary_organisation_id'] = upg.org_id if upg else 0
-
-    return row
-
-
 def add_case_access_to_user(user, cases_list, access_level):
     if not user:
         return None, "Invalid user"
@@ -464,45 +537,6 @@ def add_case_access_to_user(user, cases_list, access_level):
     return user, "Updated"
 
 
-def get_user_by_username(username):
-    user = User.query.filter(User.user == username).first()
-    return user
-
-
-def get_users_list():
-    users = User.query.all()
-
-    output = []
-    for user in users:
-        row = {}
-        row['user_id'] = user.id
-        row['user_uuid'] = user.uuid
-        row['user_name'] = user.name
-        row['user_login'] = user.user
-        row['user_email'] = user.email
-        row['user_active'] = user.active
-        row['user_is_service_account'] = user.is_service_account
-        output.append(row)
-
-    return output
-
-
-def get_users_list_restricted():
-    users = User.query.all()
-
-    output = []
-    for user in users:
-        row = {}
-        row['user_id'] = user.id
-        row['user_uuid'] = user.uuid
-        row['user_name'] = user.name
-        row['user_login'] = user.user
-        row['user_active'] = user.active
-        output.append(row)
-
-    return output
-
-
 def get_users_view_from_user_id(user_id):
     organisations = get_user_organisations(user_id)
     orgs_id = [uo.get('org_id') for uo in organisations]
@@ -620,21 +654,3 @@ def update_user(user: User, name: str = None, email: str = None, password: str =
     db.session.commit()
 
     return user
-
-
-def delete_user(user_id):
-    UserCaseAccess.query.filter(UserCaseAccess.user_id == user_id).delete()
-    UserOrganisation.query.filter(UserOrganisation.user_id == user_id).delete()
-    UserGroup.query.filter(UserGroup.user_id == user_id).delete()
-    UserCaseEffectiveAccess.query.filter(UserCaseEffectiveAccess.user_id == user_id).delete()
-
-    User.query.filter(User.id == user_id).delete()
-    db.session.commit()
-
-
-def user_exists(user_name, user_email):
-    user = User.query.filter_by(user=user_name).first()
-    user_by_email = User.query.filter_by(email=user_email).first()
-
-    return user or user_by_email
-