Skip to content

Commit 48eda7d

Browse files
committed
fix(isolation): close service gateway Compose bypasses
Reject Compose truthy and interpolated privileged values, bare interpolation in high-risk fields, and device cgroup or supplementary group grants. Co-authored-by: OpenCode Agent <[email protected]>
1 parent 33a8242 commit 48eda7d

2 files changed

Lines changed: 156 additions & 2 deletions

File tree

‎integrations/isolation/acq-kits/validate-kits.py‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@
110110
# serviceGateways[].interface.protocol values (mirrors the schema enum).
111111
_GATEWAY_PROTOCOLS = {"http", "https", "tcp"}
112112

113+
# Compose accepts these case-insensitive string values wherever it accepts a
114+
# boolean. Treat every truthy spelling as privileged rather than relying on
115+
# PyYAML's representation of the source value.
116+
_COMPOSE_TRUE = frozenset({"true", "yes", "on", "y"})
117+
_COMPOSE_VAR_RE = re.compile(r"\$[A-Za-z_][A-Za-z0-9_]*")
118+
113119
# Docker/OCI image references without an explicit tag or digest, or with the
114120
# floating latest tag, should be reviewed. This is a warning rather than a schema
115121
# error because private registries and local development tags vary.
@@ -225,14 +231,22 @@ def _volume_source(value: object) -> str | None:
225231
def _has_compose_interpolation(value: object) -> bool:
226232
"""True when a Compose field uses env interpolation that validation cannot resolve."""
227233
if isinstance(value, str):
228-
return "${" in value
234+
# Compose treats $$ as a literal dollar sign. Remove escaped dollars
235+
# before detecting either braced (${VAR}) or bare ($VAR) interpolation.
236+
unescaped = value.replace("$$", "")
237+
return "${" in unescaped or _COMPOSE_VAR_RE.search(unescaped) is not None
229238
if isinstance(value, list):
230239
return any(_has_compose_interpolation(item) for item in value)
231240
if isinstance(value, dict):
232241
return any(_has_compose_interpolation(item) for item in value.values())
233242
return False
234243

235244

245+
def _is_compose_true(value: object) -> bool:
246+
"""True when Compose will coerce a boolean field to true."""
247+
return value is True or (isinstance(value, str) and value.strip().lower() in _COMPOSE_TRUE)
248+
249+
236250
def _compose_file_reference_errors(compose_doc: object) -> list[str]:
237251
"""Return errors for Compose features that can read uninspected local files."""
238252
errors: list[str] = []
@@ -265,8 +279,10 @@ def _compose_escape_errors(compose_doc: object, compose_path: Path, kit_dir: Pat
265279
if not isinstance(service, dict):
266280
continue
267281
prefix = f"Compose service {service_name!r}"
268-
if service.get("privileged") is True:
282+
if _is_compose_true(service.get("privileged")):
269283
errors.append(f"{prefix} declares privileged: true")
284+
elif _has_compose_interpolation(service.get("privileged")):
285+
errors.append(f"{prefix} declares privileged with Compose interpolation; validation cannot prove it safe")
270286
if "build" in service:
271287
errors.append(f"{prefix} declares build; service gateways must use prebuilt reviewed images")
272288
for key in ("network_mode", "pid", "ipc", "userns_mode", "cgroup"):
@@ -283,6 +299,16 @@ def _compose_escape_errors(compose_doc: object, compose_path: Path, kit_dir: Pat
283299
errors.append(f"{prefix} declares devices; host device passthrough is outside serviceGateways v1")
284300
if _has_compose_interpolation(service.get("devices")):
285301
errors.append(f"{prefix} declares devices with Compose interpolation; validation cannot prove it safe")
302+
if service.get("device_cgroup_rules"):
303+
errors.append(f"{prefix} declares device_cgroup_rules; device access rules are outside serviceGateways v1")
304+
if _has_compose_interpolation(service.get("device_cgroup_rules")):
305+
errors.append(
306+
f"{prefix} declares device_cgroup_rules with Compose interpolation; validation cannot prove it safe"
307+
)
308+
if service.get("group_add"):
309+
errors.append(f"{prefix} declares group_add; supplementary host groups are outside serviceGateways v1")
310+
if _has_compose_interpolation(service.get("group_add")):
311+
errors.append(f"{prefix} declares group_add with Compose interpolation; validation cannot prove it safe")
286312
if _has_compose_interpolation(service.get("build")):
287313
errors.append(f"{prefix} declares build with Compose interpolation; validation cannot prove it safe")
288314
for opt in _as_list(service.get("security_opt")):

‎scripts/tests/test_validate_kits_service_gateways.py‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,68 @@ def test_rejects_missing_nonlocal_and_privileged_compose(self, tmp_path):
330330
assert any("must be a relative kit-local" in e for e in errors), errors
331331
assert any("privileged: true" in e for e in errors), errors
332332

333+
@pytest.mark.parametrize("value", ["true", '"true"', '"YES"', '"On"', '"y"'])
334+
def test_rejects_compose_truthy_privileged_values(self, tmp_path, value):
335+
validate_kit = _load_validate_kit()
336+
kit = _write_kit(
337+
tmp_path / "privileged",
338+
"schemaVersion: hybrid/v1\n"
339+
"kind: mixin\n"
340+
"name: privileged\n"
341+
"displayName: Privileged\n"
342+
"description: d\n"
343+
"serviceGateways:\n"
344+
" - name: demo-gateway\n"
345+
" runtime:\n"
346+
" compose:\n"
347+
" files: [compose.yaml]\n"
348+
" service: gateway\n"
349+
" interface:\n"
350+
" protocol: http\n"
351+
" port: 8080\n"
352+
" expose:\n"
353+
" env:\n"
354+
" WEB_GATEWAY_URL: url\n",
355+
"services:\n"
356+
" gateway:\n"
357+
" image: ghcr.io/example/gateway:1.0.0\n"
358+
" expose: [8080]\n"
359+
f" privileged: {value}\n",
360+
)
361+
errors, _warnings = validate_kit(kit, _load_schema())
362+
assert any("privileged: true" in error for error in errors), errors
363+
364+
@pytest.mark.parametrize("value", ["${PRIVILEGED}", "$PRIVILEGED"])
365+
def test_rejects_interpolated_privileged_values(self, tmp_path, value):
366+
validate_kit = _load_validate_kit()
367+
kit = _write_kit(
368+
tmp_path / "interpolated-privileged",
369+
"schemaVersion: hybrid/v1\n"
370+
"kind: mixin\n"
371+
"name: interpolated-privileged\n"
372+
"displayName: Interpolated Privileged\n"
373+
"description: d\n"
374+
"serviceGateways:\n"
375+
" - name: demo-gateway\n"
376+
" runtime:\n"
377+
" compose:\n"
378+
" files: [compose.yaml]\n"
379+
" service: gateway\n"
380+
" interface:\n"
381+
" protocol: http\n"
382+
" port: 8080\n"
383+
" expose:\n"
384+
" env:\n"
385+
" WEB_GATEWAY_URL: url\n",
386+
"services:\n"
387+
" gateway:\n"
388+
" image: ghcr.io/example/gateway:1.0.0\n"
389+
" expose: [8080]\n"
390+
f" privileged: {value}\n",
391+
)
392+
errors, _warnings = validate_kit(kit, _load_schema())
393+
assert any("privileged with Compose interpolation" in error for error in errors), errors
394+
333395
@pytest.mark.parametrize(
334396
("compose_yaml", "expected"),
335397
[
@@ -384,15 +446,21 @@ def test_rejects_compose_file_indirection(self, tmp_path, compose_yaml, expected
384446
(" volumes: ['/var/run/docker.sock:/var/run/docker.sock']\n", "Docker socket"),
385447
(" volumes: ['/:/host:ro']\n", "host path mount"),
386448
(" volumes: ['${HOST_ROOT:-/}:/host:ro']\n", "Compose interpolation"),
449+
(" volumes: ['$HOME:/host:ro']\n", "Compose interpolation"),
387450
(" network_mode: host\n", "network_mode: host"),
388451
(" network_mode: ${GW_NETWORK_MODE:-host}\n", "Compose interpolation"),
452+
(" pid: $PIDMODE\n", "Compose interpolation"),
389453
(" pid: host\n", "pid: host"),
390454
(" userns_mode: host\n", "userns_mode: host"),
391455
(" ipc: host\n", "ipc: host"),
392456
(" cgroup: host\n", "cgroup: host"),
393457
(" cap_add: [SYS_ADMIN]\n", "cap_add"),
394458
(" security_opt: ['apparmor:unconfined']\n", "security_opt"),
395459
(" devices: ['/dev/kvm:/dev/kvm']\n", "devices"),
460+
(" device_cgroup_rules: ['b 7:* rmw']\n", "device_cgroup_rules"),
461+
(" device_cgroup_rules: $DEVICE_RULES\n", "device_cgroup_rules with Compose interpolation"),
462+
(" group_add: ['0']\n", "group_add"),
463+
(" group_add: $SUPPLEMENTARY_GROUPS\n", "group_add with Compose interpolation"),
396464
(" build: .\n", "build"),
397465
],
398466
)
@@ -422,6 +490,66 @@ def test_rejects_compose_escape_primitives(self, tmp_path, snippet, expected):
422490
errors, _warnings = validate_kit(kit, _load_schema())
423491
assert any(expected in e for e in errors), errors
424492

493+
def test_allows_compose_escaped_dollar_in_volume_source(self, tmp_path):
494+
validate_kit = _load_validate_kit()
495+
kit = _write_kit(
496+
tmp_path / "escaped-dollar",
497+
"schemaVersion: hybrid/v1\n"
498+
"kind: mixin\n"
499+
"name: escaped-dollar\n"
500+
"displayName: Escaped Dollar\n"
501+
"description: d\n"
502+
"serviceGateways:\n"
503+
" - name: demo-gateway\n"
504+
" runtime:\n"
505+
" compose:\n"
506+
" files: [compose.yaml]\n"
507+
" service: gateway\n"
508+
" interface:\n"
509+
" protocol: http\n"
510+
" port: 8080\n"
511+
" expose:\n"
512+
" env:\n"
513+
" WEB_GATEWAY_URL: url\n",
514+
"services:\n"
515+
" gateway:\n"
516+
" image: ghcr.io/example/gateway:1.0.0\n"
517+
" expose: [8080]\n"
518+
" volumes: ['$$HOME:/container:ro']\n",
519+
)
520+
errors, _warnings = validate_kit(kit, _load_schema())
521+
assert errors == [], errors
522+
523+
def test_allows_compose_escaped_braced_dollar_in_volume_source(self, tmp_path):
524+
validate_kit = _load_validate_kit()
525+
kit = _write_kit(
526+
tmp_path / "escaped-braced-dollar",
527+
"schemaVersion: hybrid/v1\n"
528+
"kind: mixin\n"
529+
"name: escaped-braced-dollar\n"
530+
"displayName: Escaped Braced Dollar\n"
531+
"description: d\n"
532+
"serviceGateways:\n"
533+
" - name: demo-gateway\n"
534+
" runtime:\n"
535+
" compose:\n"
536+
" files: [compose.yaml]\n"
537+
" service: gateway\n"
538+
" interface:\n"
539+
" protocol: http\n"
540+
" port: 8080\n"
541+
" expose:\n"
542+
" env:\n"
543+
" WEB_GATEWAY_URL: url\n",
544+
"services:\n"
545+
" gateway:\n"
546+
" image: ghcr.io/example/gateway:1.0.0\n"
547+
" expose: [8080]\n"
548+
" volumes: ['$${HOME}:/container:ro']\n",
549+
)
550+
errors, _warnings = validate_kit(kit, _load_schema())
551+
assert errors == [], errors
552+
425553
@pytest.mark.parametrize(
426554
("compose_yaml", "expected"),
427555
[

0 commit comments

Comments
 (0)