precommit fixes (#281)
taylor_socfortress committed
Sep 3, 2024 at 11:34 UTC
c8eae67d7c4180233e31dd94d8f1a1de9ca84a34
5 files changed
+12
-17
backend/app/agents/wazuh/services/vulnerabilities.py
+7
-12
@@ -9,7 +9,6 @@ from app.connectors.wazuh_indexer.utils.universal import collect_indices
9
from app.connectors.wazuh_indexer.utils.universal import create_wazuh_indexer_client
10
from app.connectors.wazuh_manager.utils.universal import send_get_request
11
12
-
12
# async def collect_agent_vulnerabilities(agent_id: str, vulnerability_severity: str):
13
# """
14
# Collect agent vulnerabilities from Wazuh Manager.
@@ -41,6 +40,7 @@ from app.connectors.wazuh_manager.utils.universal import send_get_request
40
# message="Vulnerabilities collected successfully",
41
# )
42
43
+
44
async def collect_agent_vulnerabilities(agent_id: str, vulnerability_severity: str):
45
"""
46
Collect agent vulnerabilities from Wazuh Manager.
@@ -150,21 +150,16 @@ async def collect_vulnerabilities(es, vulnerabilities_indices, agent_id, vulnera
150
"bool": {
151
"must": [
152
{"match": {"agent.id": agent_id}},
153
- {"terms": {"vulnerability.severity": ["Low", "Medium", "High", "Critical"]}}
154
- ]
155
- }
156
- }
153
+ {"terms": {"vulnerability.severity": ["Low", "Medium", "High", "Critical"]}},
154
+ ],
155
+ },
156
+ },
157
}
158
else:
159
query = {
160
"query": {
161
- "bool": {
162
- "must": [
163
- {"match": {"agent.id": agent_id}},
164
- {"match": {"vulnerability.severity": vulnerability_severity}}
165
- ]
166
- }
167
- }
161
+ "bool": {"must": [{"match": {"agent.id": agent_id}}, {"match": {"vulnerability.severity": vulnerability_severity}}]},
162
+ },
163
}
164
165
page = es.search(index=index, body=query, scroll="2m")
backend/app/connectors/velociraptor/services/artifacts.py
-1
@@ -241,7 +241,6 @@ async def run_file_collection(
241
)
242
243
244
-
244
async def run_remote_command(run_command_body: RunCommandBody) -> RunCommandResponse:
245
"""
246
Run a remote command on a client.
backend/app/schedulers/scheduler.py
+3
-2
@@ -15,7 +15,6 @@ from app.schedulers.models.scheduler import CreateSchedulerRequest
15
from app.schedulers.models.scheduler import JobMetadata
16
from app.schedulers.services.agent_sync import agent_sync
17
from app.schedulers.services.invoke_alert_creation import invoke_alert_creation_collect
18
-from app.schedulers.services.invoke_sigma_queries import invoke_sigma_queries_collect
18
from app.schedulers.services.invoke_carbonblack import (
19
invoke_carbonblack_integration_collect,
20
)
@@ -56,6 +55,7 @@ from app.schedulers.services.invoke_sap_siem import (
55
from app.schedulers.services.invoke_sap_siem import (
56
invoke_sap_siem_integration_suspicious_logins_analysis,
57
)
58
+from app.schedulers.services.invoke_sigma_queries import invoke_sigma_queries_collect
59
from app.schedulers.services.wazuh_index_resize import resize_wazuh_index_fields
60
61
@@ -165,6 +165,7 @@ async def initialize_job_metadata():
165
job_metadata.enabled = True
166
await session.commit()
167
168
+
169
async def disable_job(session, job_id):
170
"""
171
Disables a job in the database based on the job ID.
@@ -193,7 +194,7 @@ async def schedule_enabled_jobs(scheduler):
194
"invoke_wazuh_monitoring_alert",
195
"invoke_suricata_monitoring_alert",
196
"invoke_office365_exchange_online_alert",
196
- "invoke_office365_threat_intel_alert"
197
+ "invoke_office365_threat_intel_alert",
198
]
199
200
# Disable each job in the list
backend/app/schedulers/services/invoke_sigma_queries.py
+1
-1
@@ -3,8 +3,8 @@ from datetime import datetime
3
from loguru import logger
4
from sqlalchemy.future import select
5
6
-from app.db.db_session import get_db_session
6
from app.connectors.wazuh_indexer.routes.sigma import run_active_sigma_queries_endpoint
7
+from app.db.db_session import get_db_session
8
from app.schedulers.models.scheduler import JobMetadata
9
10
frontend/package.json
+1
-1
@@ -139,4 +139,4 @@
139
"engines": {
140
"node": ">=18.0.0"
141
}
142
-}
\ No newline at end of file
142
+}