Skip to content

Fix bug when download_file returns success. #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Fix bug when download_file returns success. #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a262f1
Fix bug when download_file returns success.
Oct 15, 2024
3e8f9eb
Update web_utils.py
doomedraven Oct 15, 2024
5f2aacf
Merge branch 'master' into fix-call-to-download-file
doomedraven Oct 15, 2024
e70c7fc
update
doomedraven Oct 16, 2024
2008efc
ruff
doomedraven Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions lib/cuckoo/common/web_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ def download_file(**kwargs):
if not onesuccess:
return "error", {"error": f"Provided hash not found on {kwargs['service']}"}

return "ok", kwargs["task_ids"], extra_details.get("errors", [])
return "ok", {"task_ids": kwargs["task_ids"], "errors": extra_details.get("errors", [])}


def save_script_to_storage(task_ids, kwargs):
Expand Down Expand Up @@ -1324,15 +1324,19 @@ def thirdpart_aux(samples, prefix, opt_filename, details, settings):
if content:
details["content"] = content

errors = {}
if not details.get("content", False):
status, task_ids_tmp = download_file(**details)
status, tasks_details = download_file(**details)
else:
details["service"] = "Local"
status, task_ids_tmp = download_file(**details)
status, tasks_details = download_file(**details)
if status == "error":
details["errors"].append({h: task_ids_tmp})
details["errors"].append({h: tasks_details})
else:
details["task_ids"] = task_ids_tmp
details["task_ids"] = tasks_details.get("task_ids", [])
errors = tasks_details.get("errors")
if errors:
details["errors"].extend(errors)

return details

Expand Down
35 changes: 10 additions & 25 deletions web/apiv2/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ def tasks_create_file(request):
"user_id": request.user.id or 0,
}

task_ids_tmp = []
task_machines = []
vm_list = [vm.label for vm in db.list_machines()]

Expand Down Expand Up @@ -342,21 +341,13 @@ def tasks_create_file(request):
if tmp_path:
details["path"] = tmp_path
details["content"] = content
demux_error_msgs = []

result = download_file(**details)
if len(result) == 2:
status, task_ids_tmp = result
elif len(result) == 3:
status, task_ids_tmp, demux_error_msgs = result

status, tasks_details = download_file(**details)
if status == "error":
details["errors"].append({os.path.basename(tmp_path).decode(): task_ids_tmp})
details["errors"].append({os.path.basename(tmp_path).decode(): tasks_details})
else:
details["task_ids"] = task_ids_tmp

if demux_error_msgs:
details["errors"].extend(demux_error_msgs)
details["task_ids"] = tasks_details.get("task_ids")
if tasks_details.get("errors"):
details["errors"].extend(tasks_details["errors"])

if details["task_ids"]:
tasks_count = len(details["task_ids"])
Expand Down Expand Up @@ -576,19 +567,13 @@ def tasks_create_dlnexec(request):
"user_id": request.user.id or 0,
}

result = download_file(**details)
if len(result) == 2:
status, task_ids_tmp = result
elif len(result) == 3:
status, task_ids_tmp, demux_error_msgs = result

status, tasks_details = download_file(**details)
if status == "error":
details["errors"].append({os.path.basename(path).decode(): task_ids_tmp})
details["errors"].append({os.path.basename(path).decode(): tasks_details})
else:
details["task_ids"] = task_ids_tmp

if demux_error_msgs:
details["errors"].extend(demux_error_msgs)
details["task_ids"] = tasks_details.get("task_ids")
if tasks_details.get("errors"):
details["errors"].extend(tasks_details["errors"])

if details["task_ids"]:
tasks_count = len(details["task_ids"])
Expand Down
44 changes: 15 additions & 29 deletions web/submission/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ def index(request, task_id=None, resubmit_hash=None):
opt_apikey = opts.get("apikey", False)

status = "ok"
task_ids_tmp = []
existent_tasks = {}
details = {
"errors": [],
Expand Down Expand Up @@ -508,17 +507,13 @@ def index(request, task_id=None, resubmit_hash=None):

details["path"] = path
details["content"] = content
result = download_file(**details)
if len(result) == 2:
status, task_ids_tmp = result
elif len(result) == 3:
status, task_ids_tmp, demux_error_msg = result
if demux_error_msg:
details["errors"].extend(demux_error_msg)
status, tasks_details = download_file(**details)
if status == "error":
details["errors"].append({os.path.basename(filename): task_ids_tmp})
details["errors"].append({os.path.basename(filename): tasks_details})
else:
details["task_ids"] = task_ids_tmp
details["task_ids"] = tasks_details.get("task_ids")
if tasks_details.get("errors"):
details["errors"].extend(tasks_details["errors"])
if web_conf.web_reporting.get("enabled", False) and web_conf.general.get("existent_tasks", False):
records = perform_search("target_sha256", hash, search_limit=5)
if records:
Expand All @@ -543,23 +538,19 @@ def index(request, task_id=None, resubmit_hash=None):

details["path"] = path
details["content"] = content
result = download_file(**details)
if len(result) == 2:
status, task_ids_tmp = result
elif len(result) == 3:
status, task_ids_tmp, demux_error_msg = result
if demux_error_msg:
details["errors"].extend(demux_error_msg)
status, tasks_details = download_file(**details)
if status == "error":
details["errors"].append({os.path.basename(path): task_ids_tmp})
details["errors"].append({os.path.basename(path): tasks_details})
else:
details["task_ids"] = tasks_details.get("task_ids")
if tasks_details.get("errors"):
details["errors"].extend(tasks_details["errors"])
if web_conf.general.get("existent_tasks", False):
records = perform_search("target_sha256", sha256, search_limit=5)
if records:
for record in records:
if record.get("target").get("file", {}).get("sha256"):
existent_tasks.setdefault(record["target"]["file"]["sha256"], []).append(record)
details["task_ids"] = task_ids_tmp

elif task_category == "static":
for content, path, sha256 in list_of_tasks:
Expand Down Expand Up @@ -631,18 +622,13 @@ def index(request, task_id=None, resubmit_hash=None):
details["content"] = content
details["service"] = "DLnExec"
details["source_url"] = samples
result = download_file(**details)
if len(result) == 2:
status, task_ids_tmp = result
elif len(result) == 3:
status, task_ids_tmp, demux_error_msg = result
if demux_error_msg:
details["errors"].extend(demux_error_msg)

status, tasks_details = download_file(**details)
if status == "error":
details["errors"].append({os.path.basename(path): task_ids_tmp})
details["errors"].append({os.path.basename(path): tasks_details})
else:
details["task_ids"] = task_ids_tmp
details["task_ids"] = tasks_details.get("task_ids")
if tasks_details.get("errors"):
details["errors"].extend(tasks_details["errors"])

elif task_category == "vtdl":
if not settings.VTDL_KEY:
Expand Down