From 65865101ce78812b6762954c8605bbb6a3d667c6 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sun, 10 Mar 2024 02:05:38 +0000 Subject: [PATCH] handle large requests --- api/tacticalrmm/apiv3/views.py | 19 ++++++++++++++++++- api/tacticalrmm/tacticalrmm/constants.py | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/api/tacticalrmm/apiv3/views.py b/api/tacticalrmm/apiv3/views.py index 8d3b76b5..fef6f23f 100644 --- a/api/tacticalrmm/apiv3/views.py +++ b/api/tacticalrmm/apiv3/views.py @@ -32,6 +32,8 @@ from logs.models import DebugLog, PendingAction from software.models import InstalledSoftware from tacticalrmm.constants import ( AGENT_DEFER, + TRMM_MAX_REQUEST_SIZE, + AgentHistoryType, AgentMonType, AgentPlat, AuditActionType, @@ -339,6 +341,12 @@ class TaskRunner(APIView): AutomatedTask.objects.select_related("custom_field"), pk=pk ) + content_length = request.META.get("CONTENT_LENGTH") + if content_length and int(content_length) > TRMM_MAX_REQUEST_SIZE: + request.data["stdout"] = "" + request.data["stderr"] = "Content truncated due to excessive request size." + request.data["retcode"] = 1 + # get task result or create if doesn't exist try: task_result = ( @@ -357,7 +365,7 @@ class TaskRunner(APIView): AgentHistory.objects.create( agent=agent, - type=AuditActionType.TASK_RUN, + type=AgentHistoryType.TASK_RUN, command=task.name, script_results=request.data, ) @@ -561,6 +569,15 @@ class AgentHistoryResult(APIView): permission_classes = [IsAuthenticated] def patch(self, request, agentid, pk): + content_length = request.META.get("CONTENT_LENGTH") + if content_length and int(content_length) > TRMM_MAX_REQUEST_SIZE: + + request.data["script_results"]["stdout"] = "" + request.data["script_results"][ + "stderr" + ] = "Content truncated due to excessive request size." + request.data["script_results"]["retcode"] = 1 + hist = get_object_or_404( AgentHistory.objects.filter(agent__agent_id=agentid), pk=pk ) diff --git a/api/tacticalrmm/tacticalrmm/constants.py b/api/tacticalrmm/tacticalrmm/constants.py index c15ee099..d376ac63 100644 --- a/api/tacticalrmm/tacticalrmm/constants.py +++ b/api/tacticalrmm/tacticalrmm/constants.py @@ -34,6 +34,7 @@ ORPHANED_WIN_TASK_LOCK = "orphaned-win-task-lock-key" SYNC_MESH_PERMS_TASK_LOCK = "sync-mesh-perms-lock-key" TRMM_WS_MAX_SIZE = getattr(settings, "TRMM_WS_MAX_SIZE", 100 * 2**20) +TRMM_MAX_REQUEST_SIZE = getattr(settings, "TRMM_MAX_REQUEST_SIZE", 1 * 1024 * 1024) class GoArch(models.TextChoices):