Skip to content

vm: provide isolated pseudo-terminals for each action #46

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
zbarsky-openai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

vm: provide isolated pseudo-terminals for each action #46

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/action_executor.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2110,6 +2110,8 @@ fn createOutputParent(io: std.Io, work_root: std.Io.Dir, path: []const u8) !void

fn prepareChrootBaseDirs(io: std.Io, chroot_root: std.Io.Dir) !void {
try chroot_root.createDirPath(io, "dev");
try chroot_root.createDirPath(io, "dev/pts");
try chroot_root.symLink(io, "pts/ptmx", "dev/ptmx", .{});
try chroot_root.createDirPath(io, "proc");
try chroot_root.createDirPath(io, "tmp");
try chroot_root.createDirPath(io, "var/tmp");
Expand Down Expand Up @@ -3641,6 +3643,10 @@ test "prepareChrootBaseDirs creates temporary directories" {
defer work_dir.close(std.testing.io);

try prepareChrootBaseDirs(std.testing.io, work_dir);
try work_dir.access(std.testing.io, "dev/pts", .{});
var pseudo_terminal_target: [64]u8 = undefined;
const pseudo_terminal_target_len = try work_dir.readLink(std.testing.io, "dev/ptmx", &pseudo_terminal_target);
try std.testing.expectEqualStrings("pts/ptmx", pseudo_terminal_target[0..pseudo_terminal_target_len]);
try work_dir.access(std.testing.io, "tmp", .{});
try work_dir.access(std.testing.io, "var/tmp", .{});
}
8 changes: 8 additions & 0 deletions src/action_runner.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,14 @@ fn forkAction(action: ForkAction) !std.os.linux.pid_t {
childSyscallName(linux.chroot(action.chroot_dir.ptr), "chroot");
childSyscallName(linux.chdir("/"), "chdir_root");
childSyscallName(linux.mount("proc", "/proc", "proc", linux.MS.NOSUID | linux.MS.NODEV | linux.MS.NOEXEC, 0), "mount_proc");
const pseudo_terminal_mount_data: [:0]const u8 = "newinstance,ptmxmode=0666,mode=0620";
childSyscallName(linux.mount(
"devpts",
"/dev/pts",
"devpts",
linux.MS.NOSUID | linux.MS.NOEXEC,
@intFromPtr(pseudo_terminal_mount_data.ptr),
), "mount_devpts");
childDropPrivileges(action.sandbox_uid, action.sandbox_gid);
childSyscallName(linux.chdir(action.cwd.ptr), "chdir");
childInstallSocketFilter();
Expand Down
1 change: 1 addition & 0 deletions vm/linux.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_VSOCKETS=y
CONFIG_VSOCKETS=y
CONFIG_TTY=y
CONFIG_UNIX98_PTYS=y
# CONFIG_BT is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_MODULES is not set
Expand Down
1 change: 1 addition & 0 deletions vm/linux_x86_64.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_VSOCKETS=y
CONFIG_VSOCKETS=y
CONFIG_TTY=y
CONFIG_UNIX98_PTYS=y
# CONFIG_BT is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_MODULES is not set
Expand Down