@finalai/final-agent-provider 0.10.0 → 0.11.0

package/dist/modules/sandboxes/egress.mjs

@@ -7,13 +7,17 @@ import {
   WorkspaceNetworkPolicy,
   workspaceNetworkPolicySchema
 } from "@finalai/agent-protocol/device-egress";
-import { SandboxAccess } from "@finalai/agent-provider";
+import { Capability, FilesAccess, ShellAccess } from "@finalai/agent-protocol";
 import {
+  grantAllows,
   SandboxCapability,
   SandboxExecutionOperation,
   withSandboxNetworking,
   withSandboxOverrides
 } from "@finalai/agent-provider/sandbox";
+import {
+  deviceCredentialsFor
+} from "./access.mjs";
 import {
   createDeviceApiClient,
   deviceApiStatusOf,
@@ -1467,67 +1471,80 @@ const workspaceEgressController = (manager) => ({
     return { expiresAtMs: status.expiresAtMs == null ? null : status.expiresAtMs - 9e4 };
   }
 });
-const createWorkspaceDeviceNetworking = (options) => ({
-  capabilities: [SandboxCapability.Egress],
-  fetch: options.mcpFetch,
-  validateWorkspaceId: (workspaceId) => {
-    deviceEgressWorkspaceIdSchema.parse(workspaceId);
-  },
-  enabled: ({ ctx, workspaceId, teardown, access }) => options.needed({ organizationId: ctx.organizationId, workspaceId, teardown, access }),
-  prepare: async ({ ctx, workspaceId, policy }) => {
-    const client = createDeviceApiClient({ api: options.api });
-    await preserveWorkspaceNetworkPolicy({
-      client,
-      api: options.api,
+const grantConfigures = (grant) => grantAllows(grant, Capability.Shell, ShellAccess.Execute) && grantAllows(grant, Capability.Files, FilesAccess.Write);
+const createWorkspaceDeviceNetworking = (options) => {
+  const credentialsOf = (ctx) => deviceCredentialsFor(options.access, {
+    organizationId: ctx.organizationId,
+    projectId: ctx.projectId
+  });
+  return {
+    capabilities: [SandboxCapability.Egress],
+    fetch: options.mcpFetch,
+    validateWorkspaceId: (workspaceId) => {
+      deviceEgressWorkspaceIdSchema.parse(workspaceId);
+    },
+    enabled: ({ ctx, workspaceId, teardown }) => options.needed({
       organizationId: ctx.organizationId,
-      credentials: ctx.credentials,
+      projectId: ctx.projectId,
       workspaceId,
-      policy
-    });
-    try {
-      const saved = await client.egress.networkState({
+      teardown
+    }),
+    prepare: async ({ ctx, workspaceId, policy }) => {
+      const client = createDeviceApiClient({ api: options.api });
+      const credentials = credentialsOf(ctx);
+      await preserveWorkspaceNetworkPolicy({
+        client,
+        api: options.api,
         organizationId: ctx.organizationId,
-        credentials: ctx.credentials,
-        workspaceId
+        credentials,
+        workspaceId,
+        policy
       });
-      return workspaceNetworkPolicySchema.parse(saved.networkPolicy);
-    } catch {
-      return { mode: WorkspaceNetworkPolicy.DenyAll, allow: [] };
-    }
-  },
-  suspend: ({ ctx, workspaceId }) => suspendWorkspaceEgress({
-    api: options.api,
-    organizationId: ctx.organizationId,
-    credentials: ctx.credentials,
-    workspaceId,
-    actingUser: ctx.actingUser
-  }),
-  controller: (args) => workspaceEgressController(
-    createWorkspaceEgressManager({
-      sandbox: args.sandbox,
-      workspaceId: args.workspaceId,
-      organizationId: args.ctx.organizationId,
-      credentials: args.ctx.credentials,
-      actingUser: args.ctx.actingUser,
+      try {
+        const saved = await client.egress.networkState({
+          organizationId: ctx.organizationId,
+          credentials,
+          workspaceId
+        });
+        return workspaceNetworkPolicySchema.parse(saved.networkPolicy);
+      } catch {
+        return { mode: WorkspaceNetworkPolicy.DenyAll, allow: [] };
+      }
+    },
+    suspend: ({ ctx, workspaceId }) => suspendWorkspaceEgress({
       api: options.api,
-      initialNetworkPolicy: args.initialNetworkPolicy,
-      onNetworkPolicy: args.ctx.platformNetworkPolicy,
-      privilegedRun: args.privilegedRun,
-      afterGuard: args.afterGuard,
-      afterBlock: args.afterBlock,
-      namespaceExists: args.namespaceExists,
-      onClose: args.onClose,
-      allowConfiguration: args.access === SandboxAccess.Write && options.allowConfiguration !== false,
-      allowOwnerChange: args.allowOwnerChange ?? args.access === SandboxAccess.Write,
-      authorizeOwnerChange: (actingUserId) => options.authorizeOwnerChange?.({
-        organizationId: args.ctx.organizationId,
+      organizationId: ctx.organizationId,
+      credentials: credentialsOf(ctx),
+      workspaceId,
+      actingUser: ctx.actingUser
+    }),
+    controller: (args) => workspaceEgressController(
+      createWorkspaceEgressManager({
+        sandbox: args.sandbox,
         workspaceId: args.workspaceId,
-        actingUserId
-      }) ?? Promise.resolve(),
-      onFailure: (event) => args.log?.("workspace_egress.control_failure", { ...event })
-    })
-  )
-});
+        organizationId: args.ctx.organizationId,
+        credentials: credentialsOf(args.ctx),
+        actingUser: args.ctx.actingUser,
+        api: options.api,
+        initialNetworkPolicy: args.initialNetworkPolicy,
+        onNetworkPolicy: args.ctx.platformNetworkPolicy,
+        privilegedRun: args.privilegedRun,
+        afterGuard: args.afterGuard,
+        afterBlock: args.afterBlock,
+        namespaceExists: args.namespaceExists,
+        onClose: args.onClose,
+        allowConfiguration: grantConfigures(args.grant) && options.allowConfiguration !== false,
+        allowOwnerChange: args.allowOwnerChange ?? grantConfigures(args.grant),
+        authorizeOwnerChange: (actingUserId) => options.authorizeOwnerChange?.({
+          organizationId: args.ctx.organizationId,
+          workspaceId: args.workspaceId,
+          actingUserId
+        }) ?? Promise.resolve(),
+        onFailure: (event) => args.log?.("workspace_egress.control_failure", { ...event })
+      })
+    )
+  };
+};
 const withWorkspaceEgress = (options) => withSandboxNetworking({
   ...options,
   controller: workspaceEgressController(options.manager)