Skip to content

Let generic-worker verify run-task/fetch-content integrity #666

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
jcristau merged 1 commit into from
Apr 10, 2025
Merged

Let generic-worker verify run-task/fetch-content integrity #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions src/taskgraph/transforms/run/run_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"""

import dataclasses
import hashlib
import os
from pathlib import Path

from voluptuous import Any, Optional, Required

Expand All @@ -25,6 +27,9 @@
"powershell": ["powershell.exe", "-ExecutionPolicy", "Bypass"],
}

RUN_TASK_PATH = Path(__file__).parent.parent.parent / "run-task" / "run-task"
FETCH_CONTENT_PATH = Path(__file__).parent.parent.parent / "run-task" / "fetch-content"

run_task_schema = Schema(
{
Required("using"): "run-task",
Expand Down Expand Up @@ -169,10 +174,14 @@ def generic_worker_run_task(config, task, taskdesc):
common_setup(config, task, taskdesc, command)

worker.setdefault("mounts", [])
run_task_sha256 = hashlib.sha256(RUN_TASK_PATH.read_bytes()).hexdigest()
fetch_content_sha256 = hashlib.sha256(FETCH_CONTENT_PATH.read_bytes()).hexdigest()
worker["mounts"].append(
{
"content": {
"url": script_url(config, "run-task"),
"taskId": {"task-reference": "<decision>"},
"artifact": "public/run-task",
"sha256": run_task_sha256,
},
"file": "./run-task",
}
Expand All @@ -181,7 +190,9 @@ def generic_worker_run_task(config, task, taskdesc):
worker["mounts"].append(
{
"content": {
"url": script_url(config, "fetch-content"),
"taskId": {"task-reference": "<decision>"},
"artifact": "public/fetch-content",
"sha256": fetch_content_sha256,
},
"file": "./fetch-content",
}
Expand Down
4 changes: 3 additions & 1 deletion test/test_transforms_run_run_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ def assert_generic_worker(task):
{"cache-name": "checkouts", "directory": "build"},
{
"content": {
"url": "https://tc-tests.localhost/api/queue/v1/task/<TASK_ID>/artifacts/public/run-task"
"artifact": "public/run-task",
"sha256": "581ca6876fac84fa2dd8e8c2c18677d790890e9675229fd34c912c937ae19fae",
"taskId": {"task-reference": "<decision>"},
},
"file": "./run-task",
},
Expand Down
Loading