Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(cyclops-cs): allow Omarchy Fleet image (#7253)

Francesco Bonacciadf34404c8a1
diff --git a/libs/fleet/backend/auth/policy_test.go b/libs/fleet/backend/auth/policy_test.go
index 7c8fc73c8b..05327850cc 100644
--- a/libs/fleet/backend/auth/policy_test.go
+++ b/libs/fleet/backend/auth/policy_test.go
@@ -208,6 +208,7 @@ func TestPoolAdmissionImagePullSecret(t *testing.T) {
{"ecr secret disallowed image", "POST", map[string]any{"containerDiskImage": "evil.example/workspace:latest", "imagePullSecret": "ecr-credentials"}, false},
{"repository prefix collision", "POST", map[string]any{"containerDiskImage": "296062593712.dkr.ecr.us-west-2.amazonaws.com/desktop-workspace-evil:latest", "imagePullSecret": "ecr-credentials"}, false},
{"allowlisted digest", "POST", map[string]any{"containerDiskImage": "296062593712.dkr.ecr.us-west-2.amazonaws.com/osgym-workspace@sha256:abc", "imagePullSecret": "ecr-credentials"}, true},
+ {"omarchy digest", "POST", map[string]any{"containerDiskImage": "296062593712.dkr.ecr.us-west-2.amazonaws.com/omarchy-workspace@sha256:c9cdba09d8cd2f742b9e9fa3818ca29dbcb66ee40edd057621e2987098226950", "imagePullSecret": "ecr-credentials"}, true},
{"unrelated patch", "PATCH", map[string]any{"cpuCores": 8}, true},
{"image only patch denied", "PATCH", map[string]any{"containerDiskImage": allowedImage}, false},
{"secret only patch denied", "PATCH", map[string]any{"imagePullSecret": "ecr-credentials"}, false},
diff --git a/libs/fleet/backend/auth/pool_admission.rego b/libs/fleet/backend/auth/pool_admission.rego
index 9c871b7cd2..6d697bd4dc 100644
--- a/libs/fleet/backend/auth/pool_admission.rego
+++ b/libs/fleet/backend/auth/pool_admission.rego
@@ -10,6 +10,7 @@ allowed_image_repositories := {
"296062593712.dkr.ecr.us-west-2.amazonaws.com/cua-gymdriver-dev",
"public.ecr.aws/k5j5w0x5/cua-windows-2022",
"296062593712.dkr.ecr.us-west-2.amazonaws.com/desktop-workspace",
+ "296062593712.dkr.ecr.us-west-2.amazonaws.com/omarchy-workspace",
"public.ecr.aws/k5j5w0x5/cua-ubuntu-24.04",
"296062593712.dkr.ecr.us-west-2.amazonaws.com/osgym-workspace",
"296062593712.dkr.ecr.us-west-2.amazonaws.com/osworld-golden-workspace",
diff --git a/libs/fleet/backend/auth/pool_admission_test.rego b/libs/fleet/backend/auth/pool_admission_test.rego
index 3e5d4fc210..d47a29852f 100644
--- a/libs/fleet/backend/auth/pool_admission_test.rego
+++ b/libs/fleet/backend/auth/pool_admission_test.rego
@@ -10,6 +10,8 @@ allowed_image := "public.ecr.aws/k5j5w0x5/cua-ubuntu-24.04:latest"
osworld_v2_digest := "296062593712.dkr.ecr.us-west-2.amazonaws.com/osworld-v2-ubuntu-x86@sha256:6f981825c5970027df510006fcfc1ef7a502d2911f69ed9884f7f217007931dd"
+omarchy_digest := "296062593712.dkr.ecr.us-west-2.amazonaws.com/omarchy-workspace@sha256:c9cdba09d8cd2f742b9e9fa3818ca29dbcb66ee40edd057621e2987098226950"
+
non_admin := {"sub": "user-1"}
non_admin_flags := {"admin_subs": []}
@@ -78,6 +80,16 @@ test_ecr_secret_osworld_v2_digest_allowed {
}
}
+test_ecr_secret_omarchy_digest_allowed {
+ pool_admission.allow with input as {
+ "method": "POST",
+ "params": {"path": native_path},
+ "body": sprintf(`{"spec":{"vmTemplate":{"containerDiskImage":%q,"imagePullSecret":"ecr-credentials"}}}`, [omarchy_digest]),
+ "user": non_admin,
+ "flags": non_admin_flags,
+ }
+}
+
test_ecr_secret_gymdriver_dev_image_allowed {
pool_admission.allow with input as {
"method": "POST",