From ceb29b8343830ce35d066fcf63d4819b2e91c56f Mon Sep 17 00:00:00 2001 From: Darshit Date: Wed, 24 Jun 2020 10:22:43 +0530 Subject: [PATCH 1/2] Updated distributor task API Added various timestamp (submitted, completed, delegated and started) associated with cuckoo task in response of /api/task/ API. --- cuckoo/distributed/views/api.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cuckoo/distributed/views/api.py b/cuckoo/distributed/views/api.py index a7e40d32a1..8593e122fb 100644 --- a/cuckoo/distributed/views/api.py +++ b/cuckoo/distributed/views/api.py @@ -295,6 +295,10 @@ def task_get(task_id): node_id=task.node_id, task_id=task.task_id, status=task.status, + submitted=task.submitted, + delegated=task.delegated, + started=task.started, + completed=task.completed, )}) @blueprint.route("/task/", methods=["DELETE"]) From 64dc19eea37f0519939bac4880333e38a077a470 Mon Sep 17 00:00:00 2001 From: Darshit Date: Wed, 24 Jun 2020 17:35:19 +0530 Subject: [PATCH 2/2] Updates rst for API changes in distributed cuckoo Updates rst for API changes in distributed cuckoo --- docs/book/usage/dist.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/book/usage/dist.rst b/docs/book/usage/dist.rst index e2bf27e657..f46efb5b1e 100644 --- a/docs/book/usage/dist.rst +++ b/docs/book/usage/dist.rst @@ -276,21 +276,25 @@ Get basic information about a particular task:: "2": { "id": 2, "clock": null, + "completed": "Tue, 23 Jun 2020 22:44:56 GMT", "custom": null, + "delegated": "Tue, 23 Jun 2020 22:34:56 GMT", "owner": "", "enforce_timeout": null, "machine": null, "memory": null, + "node_id": 2, "options": null, "package": null, "path": "/tmp/tmpPwUeXm", "platform": "windows", "priority": 1, + "started": "Tue, 23 Jun 2020 22:35:15 GMT", + "status": "finished", + "submitted": "Tue, 23 Jun 2020 22:34:30 GMT", "tags": null, "timeout": null, "task_id": 1, - "node_id": 2, - "finished": false } } }