Skip to content

bcr_presubmit: quote task_id in Buildkite command emission #2585

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

Open
kyakei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bcr_presubmit: quote task_id in Buildkite command emission #2585

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
20 changes: 16 additions & 4 deletions buildkite/bazel-central-registry/bcr_presubmit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import os
import pathlib
import re
import shlex
import sys
import subprocess
import shutil
Expand Down Expand Up @@ -150,8 +151,19 @@ def get_test_module_task_config(module_name, module_version, bazel_version=None)
return {}


# task_id is the YAML key under tasks: in a module's presubmit.yml, which is
# attacker-controllable on every PR. Restrict the chars we accept and the chars
# we'll embed into a Buildkite command line.
VALID_TASK_ID_RE = re.compile(r"\A[A-Za-z0-9_.\-]+\Z")


def add_presubmit_jobs(module_name, module_version, task_configs, pipeline_steps, is_test_module=False, overwrite_bazel_version=None, low_priority=False):
for task_id, task_config in task_configs.items():
if not VALID_TASK_ID_RE.match(task_id):
raise bazelci.BuildkiteException(
"Invalid task id %r in %s@%s presubmit.yml: task ids must match %s"
% (task_id, module_name, module_version, VALID_TASK_ID_RE.pattern)
)
platform_name = get_platform(task_id, task_config)
platform_label = bazelci.PLATFORMS[platform_name]["emoji-name"]
task_name = task_config.get("name", "")
Expand All @@ -162,13 +174,13 @@ def add_presubmit_jobs(module_name, module_version, task_configs, pipeline_steps
if bazel_version and not overwrite_bazel_version:
label = f":bazel:{bazel_version} - {label}"
command = (
'%s bcr_presubmit.py %s --module_name="%s" --module_version="%s" --task=%s %s'
'%s bcr_presubmit.py %s --module_name=%s --module_version=%s --task=%s %s'
% (
bazelci.PLATFORMS[platform_name]["python"],
"test_module_runner" if is_test_module else "anonymous_module_runner",
module_name,
module_version,
task_id,
shlex.quote(module_name),
shlex.quote(module_version),
shlex.quote(task_id),
"--overwrite_bazel_version=%s" % overwrite_bazel_version if overwrite_bazel_version else ""
)
)
Expand Down