Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions scripts/registryctl-build-output.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ def parse_build_output(
if not isinstance(output_value, str) or not output_value:
raise BuildReportError("the JSON report has no output root")
output = Path(output_value)
if not output.is_absolute():
raise BuildReportError("the JSON report output root is not absolute")

try:
project_root = project_directory.resolve(strict=True)
output_root = output.resolve(strict=True)
output_root = (
output.resolve(strict=True)
if output.is_absolute()
else (project_root / output).resolve(strict=True)
)
output_root.relative_to(project_root)
except (FileNotFoundError, RuntimeError, ValueError) as error:
raise BuildReportError(
Expand Down
23 changes: 23 additions & 0 deletions scripts/test_registryctl_build_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ def test_accepts_the_versioned_project_owned_build_root(self) -> None:
self.output.resolve(),
)

def test_accepts_the_portable_project_relative_build_root(self) -> None:
self.assertEqual(
MODULE.parse_build_output(
self.report(output=".registry-stack/build/local"),
project_directory=self.project,
environment="local",
),
self.output.resolve(),
)

def test_rejects_the_wrong_environment_without_echoing_report_values(self) -> None:
with self.assertRaisesRegex(
MODULE.BuildReportError,
Expand All @@ -84,6 +94,19 @@ def test_rejects_an_output_root_outside_the_project(self) -> None:
environment="local",
)

def test_rejects_a_relative_output_root_that_escapes_the_project(self) -> None:
outside = Path(self.temporary.name) / "outside"
outside.mkdir()
with self.assertRaisesRegex(
MODULE.BuildReportError,
"not a real project-owned directory",
):
MODULE.parse_build_output(
self.report(output="../outside"),
project_directory=self.project,
environment="local",
)

def test_rejects_an_incomplete_product_closure(self) -> None:
(self.output / "private" / "notary" / "config" / "notary.yaml").unlink()
with self.assertRaisesRegex(
Expand Down
Loading