From c8eae67d7c4180233e31dd94d8f1a1de9ca84a34 Mon Sep 17 00:00:00 2001
From: taylor_socfortress <111797488+taylorwalton@users.noreply.github.com>
Date: Tue, 3 Sep 2024 11:34:32 -0500
Subject: [PATCH] precommit fixes (#281)

---
 .../agents/wazuh/services/vulnerabilities.py  | 19 +++++++------------
 .../velociraptor/services/artifacts.py        |  1 -
 backend/app/schedulers/scheduler.py           |  5 +++--
 .../services/invoke_sigma_queries.py          |  2 +-
 frontend/package.json                         |  2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/backend/app/agents/wazuh/services/vulnerabilities.py b/backend/app/agents/wazuh/services/vulnerabilities.py
index 54cdd63d..4f220cd8 100644
--- a/backend/app/agents/wazuh/services/vulnerabilities.py
+++ b/backend/app/agents/wazuh/services/vulnerabilities.py
@@ -9,7 +9,6 @@
 from app.connectors.wazuh_indexer.utils.universal import create_wazuh_indexer_client
 from app.connectors.wazuh_manager.utils.universal import send_get_request
 
-
 # async def collect_agent_vulnerabilities(agent_id: str, vulnerability_severity: str):
 #     """
 #     Collect agent vulnerabilities from Wazuh Manager.
@@ -41,6 +40,7 @@
 #         message="Vulnerabilities collected successfully",
 #     )
 
+
 async def collect_agent_vulnerabilities(agent_id: str, vulnerability_severity: str):
     """
     Collect agent vulnerabilities from Wazuh Manager.
@@ -150,21 +150,16 @@ async def collect_vulnerabilities(es, vulnerabilities_indices, agent_id, vulnera
                     "bool": {
                         "must": [
                             {"match": {"agent.id": agent_id}},
-                            {"terms": {"vulnerability.severity": ["Low", "Medium", "High", "Critical"]}}
-                        ]
-                    }
-                }
+                            {"terms": {"vulnerability.severity": ["Low", "Medium", "High", "Critical"]}},
+                        ],
+                    },
+                },
             }
         else:
             query = {
                 "query": {
-                    "bool": {
-                        "must": [
-                            {"match": {"agent.id": agent_id}},
-                            {"match": {"vulnerability.severity": vulnerability_severity}}
-                        ]
-                    }
-                }
+                    "bool": {"must": [{"match": {"agent.id": agent_id}}, {"match": {"vulnerability.severity": vulnerability_severity}}]},
+                },
             }
 
         page = es.search(index=index, body=query, scroll="2m")
diff --git a/backend/app/connectors/velociraptor/services/artifacts.py b/backend/app/connectors/velociraptor/services/artifacts.py
index f94de117..bd9c8e36 100644
--- a/backend/app/connectors/velociraptor/services/artifacts.py
+++ b/backend/app/connectors/velociraptor/services/artifacts.py
@@ -241,7 +241,6 @@ async def run_file_collection(
         )
 
 
-
 async def run_remote_command(run_command_body: RunCommandBody) -> RunCommandResponse:
     """
     Run a remote command on a client.
diff --git a/backend/app/schedulers/scheduler.py b/backend/app/schedulers/scheduler.py
index e3569948..3ff2213d 100644
--- a/backend/app/schedulers/scheduler.py
+++ b/backend/app/schedulers/scheduler.py
@@ -15,7 +15,6 @@
 from app.schedulers.models.scheduler import JobMetadata
 from app.schedulers.services.agent_sync import agent_sync
 from app.schedulers.services.invoke_alert_creation import invoke_alert_creation_collect
-from app.schedulers.services.invoke_sigma_queries import invoke_sigma_queries_collect
 from app.schedulers.services.invoke_carbonblack import (
     invoke_carbonblack_integration_collect,
 )
@@ -56,6 +55,7 @@
 from app.schedulers.services.invoke_sap_siem import (
     invoke_sap_siem_integration_suspicious_logins_analysis,
 )
+from app.schedulers.services.invoke_sigma_queries import invoke_sigma_queries_collect
 from app.schedulers.services.wazuh_index_resize import resize_wazuh_index_fields
 
 
@@ -165,6 +165,7 @@ async def initialize_job_metadata():
                 job_metadata.enabled = True
         await session.commit()
 
+
 async def disable_job(session, job_id):
     """
     Disables a job in the database based on the job ID.
@@ -193,7 +194,7 @@ async def schedule_enabled_jobs(scheduler):
             "invoke_wazuh_monitoring_alert",
             "invoke_suricata_monitoring_alert",
             "invoke_office365_exchange_online_alert",
-            "invoke_office365_threat_intel_alert"
+            "invoke_office365_threat_intel_alert",
         ]
 
         # Disable each job in the list
diff --git a/backend/app/schedulers/services/invoke_sigma_queries.py b/backend/app/schedulers/services/invoke_sigma_queries.py
index 6d2fa917..00cdb89e 100644
--- a/backend/app/schedulers/services/invoke_sigma_queries.py
+++ b/backend/app/schedulers/services/invoke_sigma_queries.py
@@ -3,8 +3,8 @@
 from loguru import logger
 from sqlalchemy.future import select
 
-from app.db.db_session import get_db_session
 from app.connectors.wazuh_indexer.routes.sigma import run_active_sigma_queries_endpoint
+from app.db.db_session import get_db_session
 from app.schedulers.models.scheduler import JobMetadata
 
 
diff --git a/frontend/package.json b/frontend/package.json
index 9b34b42d..995bec76 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -139,4 +139,4 @@
 	"engines": {
 		"node": ">=18.0.0"
 	}
-}
\ No newline at end of file
+}