summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/9p_io.zig2
-rw-r--r--src/CHANGELOG.md3
-rw-r--r--src/builtins.zig11
-rw-r--r--src/config.zig1
-rw-r--r--src/exec.zig30
-rw-r--r--src/fs-help.txt2
-rw-r--r--src/host_io.zig16
-rw-r--r--src/linux/v9fs.zig201
-rw-r--r--src/panes.zig2
-rw-r--r--src/pardes.zig19
10 files changed, 6 insertions, 281 deletions
diff --git a/src/9p_io.zig b/src/9p_io.zig
index 377440bd..7ae341bd 100644
--- a/src/9p_io.zig
+++ b/src/9p_io.zig
@@ -2283,7 +2283,7 @@ fn exportEnv(socket: ?[]const u8, serial: u32, adopts: bool) void {
/// `$NINE_MOUNT/pardes/<name>`, the name the registry gives the socket.
/// Any other $NINE_MOUNT is a mount of another server, made before this
/// session had a socket: unknown, so unset, and a script falls back to
-/// `9p -a "unix!$PARDES_9P"`. A Tty9p shell sets its own (linux/v9fs.zig).
+/// `9p -a "unix!$PARDES_9P"`.
fn exportMount(sock_path: []const u8) void {
const mntgen = if (libc.getenv("NINE_MNTGEN")) |v| std.mem.eql(u8, std.mem.span(v), "1") else false;
const root = if (libc.getenv("NINE_MOUNT")) |v| std.mem.span(v) else "";
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index fff21d83..f6607176 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -25,6 +25,9 @@
- A click on a tag, a column's or the workspace's puts its cursor there
in normal mode, where it put it in insert mode: `i` types there, Enter
or Tab runs the word under it.
+- `Tty9p` and its `pardes-v9fs` helper are gone (a terminal with the
+ session kernel-mounted through Linux v9fs, a one-off), with their tests;
+ a kernel mount made by hand still works, as the build notes say.
- One `pardes --daemon` per user keeps sessions, started by the first
session and gone once it keeps nothing. `pardes` in a terminal forks
its session off and stays as its stub: `Detach` (`SPC s D`), or a
diff --git a/src/builtins.zig b/src/builtins.zig
index 38a4d835..dc50b85c 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -1486,17 +1486,6 @@ pub const Tty = struct {
}
};
-/// A Linux terminal with the current session mounted through kernel v9fs.
-/// A word of every hosted build, Linux's or not: a build's words are its
-/// Help's rows, which a replica of another build's session makes as its
-/// session did (a Linux client of a FreeBSD one diverged at SPC ?).
-pub const Tty9p = struct {
- pub const enabled = pardes.hosted;
- pub fn run(c: Ctx) void {
- exec.spawnV9fsTty(c.p, c.id);
- }
-};
-
/// Binds this terminal as a language's REPL, so an exec on that language's
/// files is typed into it instead of run. The language is named as the
/// syntax table has it: an exec made on the body of a file in that
diff --git a/src/config.zig b/src/config.zig
index c1f1981c..603e51f2 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -209,7 +209,6 @@ pub const leader_path = paths: {
}
if (builtins.EffectCode.enabled) table.set(.EffectCode, null);
if (builtins.TreeContext.enabled) table.set(.TreeContext, null);
- if (builtins.Tty9p.enabled) table.set(.Tty9p, "n9");
if (pardes.hosted) {
table.set(.ThemeFile, null);
table.set(.DumpThemes, null);
diff --git a/src/exec.zig b/src/exec.zig
index af312c45..ad051c32 100644
--- a/src/exec.zig
+++ b/src/exec.zig
@@ -43,10 +43,6 @@ pub fn takesCommandLine(p: *const Pardes, id: usize) bool {
// (Text in pardes's own edit buffer is not the shell's yet: an exec of
// it, or of anything, types only what it runs.)
if (panes.terminal.promptInputReady(pane) and !panes.terminal.promptInputEmpty(pane)) return false;
- // A mounted shell sits behind sudo's process supervisor. Its OSC 133
- // prompt marks identify input readiness; the launcher's executable is
- // not the shell executable used by the ordinary process heuristic.
- if (pane.v9fs_on_spawn) return panes.terminal.promptInputReady(pane);
return !p.hostTtyTaken(id);
}
@@ -405,29 +401,6 @@ fn askWrite(p: *Pardes, id: usize, serial: u32, path: []const u8) void {
/// Tty: a shell in the caller's directory, raw from the first frame,
/// stacked below the caller like Alt-n's new shell.
pub fn spawnTty(p: *Pardes, from: usize) ?*Pane {
- return spawnTtyWithMount(p, from, false);
-}
-
-pub fn spawnV9fsTty(p: *Pardes, from: usize) void {
- if (comptime !hosted) return p.reportError(from, "Tty9p", error.LinuxRequired);
- // The session's host's and its 9P server's: a replica, of another
- // build too (a Linux client of a FreeBSD session), has their answers.
- if (!pardes.tape.authority(onLinux, .{}))
- return p.reportError(from, "Tty9p", error.LinuxRequired);
- if (!pardes.tape.authority(servesSocket, .{p}))
- return p.reportError(from, "Tty9p", error.SessionSocketRequired);
- _ = spawnTtyWithMount(p, from, true);
-}
-
-fn onLinux() bool {
- return @import("builtin").os.tag == .linux;
-}
-
-fn servesSocket(p: *Pardes) bool {
- return p.fs.socket_path.len != 0;
-}
-
-fn spawnTtyWithMount(p: *Pardes, from: usize, v9fs: bool) ?*Pane {
// No pane asking (an empty window's tag): the session's directory, as
// New's scratch is.
// A directory that is not there makes no terminal: its shell could not
@@ -451,8 +424,7 @@ fn spawnTtyWithMount(p: *Pardes, from: usize, v9fs: bool) ?*Pane {
p.reportError(from, "Tty", err);
return null;
};
- nt.greet = !v9fs;
- nt.v9fs_on_spawn = v9fs;
+ nt.greet = true;
nt.body.mode = .tty;
placeNew(p, from, from, free, .shell);
if (refusedPlacement(p, free)) {
diff --git a/src/fs-help.txt b/src/fs-help.txt
index b62a13b8..35594e6d 100644
--- a/src/fs-help.txt
+++ b/src/fs-help.txt
@@ -23,7 +23,7 @@ pane/<n>/ name body tag ctl addr dot limit data xdata sel dirty mark scroll er
on terminals pty/data (keys in, output out), pty/status, pty/ctl (winsize, sig, exec), pty/run (a line, its exit and output)
os/, src/ the host filesystem; the editor's own sources
-$m below: $PARDES_MOUNT (set under 9ns --mntgen and in a Tty9p shell); without it, 9p -a "unix!$PARDES_9P".
+$m below: $PARDES_MOUNT (set under 9ns --mntgen); without it, 9p -a "unix!$PARDES_9P".
cat $m/index which panes exist
n=$(cat $m/pane/new) make a pane of your own (each open makes one), take its serial
diff --git a/src/host_io.zig b/src/host_io.zig
index b1ed8b4b..3b91ea7e 100644
--- a/src/host_io.zig
+++ b/src/host_io.zig
@@ -2027,13 +2027,6 @@ pub fn forkShell(
command_buf[line.len] = 0;
spawn.argv = Shell.commandArgv(spawn.path, command_buf[0..line.len :0].ptr);
}
- var helper_buf: [4096]u8 = undefined;
- const mounted = one_line == null and if (core) |c| if (c.panes[pane]) |pn| pn.v9fs_on_spawn else false else false;
- const helper: ?[:0]u8 = if (mounted) blk: {
- if (comptime builtin.os.tag != .linux) return error.LinuxRequired;
- if (fs == null) return error.SessionSocketRequired;
- break :blk try @import("linux/v9fs.zig").helperPath(&helper_buf);
- } else null;
// The last argument is whether this session takes its children's Looks —
// every session does but a `--nested` one, and a fork with no core at all
// (the tests below) is nobody's parent.
@@ -2045,15 +2038,6 @@ pub fn forkShell(
// acme's `$winid`: the pane a command was run from, so a script it runs
// can address that pane; unset for a shell and a header tag's command.
exportWinid(if (core) |c| (if (c.panes[pane]) |pn| (if (pn.command != null) pn.command_from else 0) else 0) else 0);
- if (helper) |path| {
- const c = core.?;
- const pn = c.panes[pane].?;
- const socket = ChildEnv.exported("PARDES_9P") orelse return error.SessionSocketRequired;
- var command: std.Io.Writer.Allocating = .init(c.gpa);
- defer command.deinit();
- try @import("linux/v9fs.zig").writeLaunchCommand(&command.writer, path, socket, &spawn.argv);
- if (!try pardes.panes.terminal.queuePendingCommand(pn, command.written())) return error.ShellAlreadyStarted;
- }
// Built here and not after the fork: between fork and exec the child may
// not call setenv, whose malloc can deadlock against a pty reader thread
// that held the heap when the fork took its snapshot.
diff --git a/src/linux/v9fs.zig b/src/linux/v9fs.zig
deleted file mode 100644
index 47be298b..00000000
--- a/src/linux/v9fs.zig
+++ /dev/null
@@ -1,201 +0,0 @@
-//! Linux kernel-mount launcher. Installed as an ordinary executable beside
-//! Pardes; sudo authorizes each launch. Never install setuid.
-const std = @import("std");
-const builtin = @import("builtin");
-
-extern "c" fn unshare(flags: c_int) c_int;
-extern "c" fn mount(source: ?[*:0]const u8, target: [*:0]const u8, filesystemtype: ?[*:0]const u8, flags: c_ulong, data: ?*const anyopaque) c_int;
-extern "c" fn setgroups(size: usize, list: ?[*]const c_uint) c_int;
-extern "c" fn initgroups(user: [*:0]const u8, group: c_uint) c_int;
-extern "c" fn execv(path: [*:0]const u8, argv: [*:null]const ?[*:0]const u8) c_int;
-extern "c" fn execvp(path: [*:0]const u8, argv: [*:null]const ?[*:0]const u8) c_int;
-extern "c" fn mkdtemp(template: [*:0]u8) ?[*:0]u8;
-extern "c" fn setenv(name: [*:0]const u8, value: [*:0]const u8, overwrite: c_int) c_int;
-extern "c" fn unsetenv(name: [*:0]const u8) c_int;
-
-pub const executable = "pardes-v9fs";
-
-/// One command for the normal interactive shell's startup queue. Quote every
-/// argument so paths and shell setup strings remain data in bash, fish and sh.
-pub fn writeLaunchCommand(writer: *std.Io.Writer, helper: []const u8, socket: []const u8, shell_argv: []const ?[*:0]const u8) !void {
- try quote(writer, helper);
- try writer.writeAll(" --launch ");
- try quote(writer, socket);
- try writer.writeAll(" --");
- for (shell_argv) |maybe| {
- const arg = maybe orelse break;
- try writer.writeByte(' ');
- try quote(writer, std.mem.span(arg));
- }
-}
-
-fn quote(writer: *std.Io.Writer, value: []const u8) !void {
- // A literal newline would submit the interactive command before it is
- // complete. These are paths/setup arguments, not arbitrary shell input.
- if (std.mem.indexOfAny(u8, value, "\r\n") != null) return error.MultilineLaunchArgument;
- try writer.writeByte('\'');
- for (value) |byte| {
- if (byte == '\'') try writer.writeAll("'\\''") else try writer.writeByte(byte);
- }
- try writer.writeByte('\'');
-}
-
-fn selfPath(buf: []u8) ![:0]u8 {
- const n = std.c.readlink("/proc/self/exe", buf.ptr, buf.len - 1);
- if (n < 0 or n >= buf.len - 1) return error.ExecutablePathUnavailable;
- const len: usize = @intCast(n);
- buf[len] = 0;
- return buf[0..len :0];
-}
-
-/// Resolve before fork, without relying on the shell's PATH. The override is
-/// useful for build-cache binaries whose helper is in a different directory.
-pub fn helperPath(buf: []u8) ![:0]u8 {
- const path = if (std.c.getenv("PARDES_V9FS_HELPER")) |env| blk: {
- const override = std.mem.span(env);
- if (!std.fs.path.isAbsolute(override)) return error.AbsoluteHelperPathRequired;
- break :blk try std.fmt.bufPrintSentinel(buf, "{s}", .{override}, 0);
- } else blk: {
- var own: [4096]u8 = undefined;
- const parent = std.fs.path.dirname(try selfPath(&own)) orelse return error.ExecutablePathUnavailable;
- break :blk try std.fmt.bufPrintSentinel(buf, "{s}/{s}", .{ parent, executable }, 0);
- };
- if (std.c.access(path.ptr, 1) != 0) return error.V9fsHelperNotFound;
- return path;
-}
-
-fn usage() void {
- std.debug.print(
- \\usage: pardes-v9fs --launch SOCKET -- /absolute/shell [args...]
- \\ Ask sudo in this terminal, mount privately, and start an unprivileged shell.
- \\ PARDES_MOUNT names the mount. The caller's environment is preserved with sudo -E.
- \\internal: pardes-v9fs SOCKET MOUNTPOINT UID GID -- /absolute/command [args...]
- \\ Requires explicit root execution. Never install setuid or grant blanket NOPASSWD.
- \\
- , .{});
-}
-
-var sudo_pid: std.atomic.Value(std.c.pid_t) = .init(-1);
-
-fn forwardSignal(sig: std.posix.SIG) callconv(.c) void {
- const pid = sudo_pid.load(.monotonic);
- if (pid > 0) _ = std.c.kill(pid, sig);
-}
-
-fn launch(arena: std.mem.Allocator, args: []const [:0]const u8) !u8 {
- if (args.len < 5 or !std.mem.eql(u8, args[3], "--")) return error.InvalidArguments;
- if (std.c.geteuid() == 0 or std.c.getuid() != std.c.geteuid()) return error.UnprivilegedLaunchRequired;
- if (!std.fs.path.isAbsolute(args[2]) or !std.fs.path.isAbsolute(args[4])) return error.AbsolutePathRequired;
- var own: [4096]u8 = undefined;
- const helper = try selfPath(&own);
- var target = "/tmp/pardes-v9fs-XXXXXX".*;
- if (mkdtemp(&target) == null) return error.MountDirectoryFailed;
- defer _ = std.c.rmdir(&target);
- try check(setenv("PARDES_MOUNT", &target, 1), "export mount path");
- inline for (.{ "PATH", "HOME", "USER", "LOGNAME", "SHELL" }) |name| {
- const saved = "PARDES_V9FS_" ++ name;
- if (std.c.getenv(name)) |value| {
- try check(setenv(saved, value, 1), "preserve shell environment");
- } else _ = unsetenv(saved);
- }
- const uid = try std.fmt.allocPrintSentinel(arena, "{d}", .{std.c.getuid()}, 0);
- const gid = try std.fmt.allocPrintSentinel(arena, "{d}", .{std.c.getgid()}, 0);
- const prefix = [_]?[*:0]const u8{ "sudo", "-E", "--", helper.ptr, args[2].ptr, &target, uid.ptr, gid.ptr, "--" };
- const argv = try arena.allocSentinel(?[*:0]const u8, prefix.len + args.len - 4, null);
- @memcpy(argv[0..prefix.len], &prefix);
- for (args[4..], prefix.len..) |arg, i| argv[i] = arg.ptr;
- std.debug.print("Mounting Pardes at {s}\n", .{target});
- const pid = std.c.fork();
- if (pid < 0) return error.ForkFailed;
- if (pid == 0) {
- // host_io's resetChildSignals, here in its own module: every signal
- // back to its default and none blocked before the exec.
- const default: std.posix.Sigaction = .{ .handler = .{ .handler = std.posix.SIG.DFL }, .mask = std.posix.sigemptyset(), .flags = 0 };
- var sig: u8 = 1;
- while (sig < 65) : (sig += 1) {
- if (sig == @backingInt(std.posix.SIG.KILL) or sig == @backingInt(std.posix.SIG.STOP)) continue;
- _ = std.c.sigaction(@fromBackingInt(@intCast(sig)), &default, null);
- }
- const none = std.posix.sigemptyset();
- std.posix.sigprocmask(std.posix.SIG.SETMASK, &none, null);
- _ = execvp("sudo", argv.ptr);
- std.c._exit(127);
- }
- sudo_pid.store(pid, .monotonic);
- const action: std.posix.Sigaction = .{ .handler = .{ .handler = forwardSignal }, .mask = std.posix.sigemptyset(), .flags = 0 };
- for ([_]std.posix.SIG{ .HUP, .INT, .TERM }) |sig| std.posix.sigaction(sig, &action, null);
- var status: c_int = 0;
- while (std.c.waitpid(pid, &status, 0) < 0) {
- if (std.posix.errno(-1) != .INTR) return error.WaitFailed;
- }
- sudo_pid.store(-1, .monotonic);
- return if (status & 0x7f == 0) @intCast((status >> 8) & 0xff) else @intCast(128 + (status & 0x7f));
-}
-
-fn check(rc: c_int, operation: []const u8) !void {
- if (rc == 0) return;
- const err = std.posix.errno(rc);
- std.debug.print("v9fs: {s}: {s}\n", .{ operation, @tagName(err) });
- return error.SystemCallFailed;
-}
-
-fn userId(text: []const u8) !c_uint {
- const id = std.fmt.parseInt(c_uint, text, 10) catch return error.InvalidUserId;
- if (id == 0 or id == std.math.maxInt(c_uint)) return error.InvalidUserId;
- return id;
-}
-
-pub fn main(init: std.process.Init) !void {
- if (builtin.os.tag != .linux) return error.LinuxRequired;
- const arena = init.arena.allocator();
- const args = try init.minimal.args.toSlice(arena);
- if (args.len == 2 and std.mem.eql(u8, args[1], "--help")) {
- usage();
- return;
- }
- if (args.len > 1 and std.mem.eql(u8, args[1], "--launch")) {
- const status = try launch(arena, args);
- std.process.exit(status);
- }
- if (args.len < 7 or !std.mem.eql(u8, args[5], "--")) {
- usage();
- return error.InvalidArguments;
- }
- for ([_][]const u8{ args[1], args[2], args[6] }) |path| {
- if (!std.fs.path.isAbsolute(path)) return error.AbsolutePathRequired;
- }
- const uid = try userId(args[3]);
- const gid = try userId(args[4]);
- if (std.c.getuid() != std.c.geteuid()) return error.SetuidInstallationUnsupported;
- if (std.c.geteuid() != 0) {
- std.debug.print("v9fs: native 9P mounts need CAP_SYS_ADMIN in the initial user namespace; use --launch to ask sudo in this terminal.\n", .{});
- return error.MountPrivilegeRequired;
- }
-
- // Prepare everything before changing namespace or credentials.
- const options = try std.fmt.allocPrintSentinel(arena, "trans=unix,version=9p2000,cache=none,access=any,uname={d},dfltuid={d},dfltgid={d}", .{ uid, uid, gid }, 0);
- const argv = try arena.allocSentinel(?[*:0]const u8, args.len - 6, null);
- for (args[6..], 0..) |arg, i| argv[i] = arg.ptr;
-
- try check(unshare(0x00020000), "create private mount namespace (CAP_SYS_ADMIN required)"); // CLONE_NEWNS
- try check(mount(null, "/", null, (1 << 14) | (1 << 18), null), "make mount propagation recursively private"); // MS_REC | MS_PRIVATE
- try check(mount(args[1].ptr, args[2].ptr, "9p", 2 | 4 | 8, options.ptr), "mount 9P2000 over Unix socket (kernel 9p and 9pnet_fd support required)"); // NOSUID | NODEV | NOEXEC
-
- try check(setgroups(0, null), "clear supplementary groups");
- const account = std.c.getpwuid(uid) orelse return error.UserAccountNotFound;
- try check(initgroups(account.name orelse return error.UserAccountNotFound, gid), "restore user groups");
- try check(std.c.setresgid(gid, gid, gid), "drop group privileges");
- try check(std.c.setresuid(uid, uid, uid), "drop user privileges");
- // sudo can replace identity variables and PATH even with -E. Restore
- // those values only after dropping privileges.
- inline for (.{ "PATH", "HOME", "USER", "LOGNAME", "SHELL" }) |name| {
- const saved = "PARDES_V9FS_" ++ name;
- if (std.c.getenv(saved)) |value| {
- try check(setenv(name, value, 1), "restore shell environment");
- _ = unsetenv(saved);
- }
- }
- _ = execv(args[6].ptr, argv.ptr);
- // Namespace destruction releases the mount when its last process exits.
- try check(-1, "execute unprivileged command");
-}
diff --git a/src/panes.zig b/src/panes.zig
index 095e215f..fd3cfab0 100644
--- a/src/panes.zig
+++ b/src/panes.zig
@@ -194,8 +194,6 @@ pub const Pane = struct {
/// at, and which of them: only that word goes ahead on the warning
/// (builtins.zig warnModified).
discard_warned: ?struct { revision: u32, by: Discarding } = null,
- /// Native host queues the Linux v9fs launcher in this pane's initial shell.
- v9fs_on_spawn: bool = false,
file: ?File.State = null,
image: ?Image.State = null,
pdf: PdfSlot = if (Pdf.enabled) null else {},
diff --git a/src/pardes.zig b/src/pardes.zig
index 6c5a01af..4c1d0a10 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -965,25 +965,6 @@ test "a terminal respawned into a closed pane's slot hangs the old shell up firs
try std.testing.expect(closed and spawned);
}
-test "Tty9p marks only the new Linux terminal for a mounted shell" {
- if (comptime !hosted or @import("builtin").os.tag != .linux) return error.SkipZigTest;
- const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true });
- defer p.deinit();
- p.fs.socket_path = "/tmp/pardes-test.sock";
- try std.testing.expect(p.executeBuiltinLine(0, "Tty9p"));
- try std.testing.expect(p.active != 0);
- try std.testing.expect(!p.panes[0].?.v9fs_on_spawn);
- const pane = p.panes[p.active].?;
- try std.testing.expect(pane.isTerminal() and pane.body.mode == .tty);
- try std.testing.expect(pane.v9fs_on_spawn);
- try std.testing.expect(!pane.greet);
- try std.testing.expect(!exec.takesCommandLine(p, p.active));
- panes.terminal.feedOutput(p, pane, "\x1b]133;A\x07$ \x1b]133;B\x07");
- try std.testing.expect(exec.takesCommandLine(p, p.active));
- panes.terminal.feedOutput(p, pane, "\x1b]133;C\x07");
- try std.testing.expect(!exec.takesCommandLine(p, p.active));
-}
-
test "first document fallback splits like Tty from the originating pane" {
for ([_]u16{ 100, 198 }) |width| for (0..3) |from| {
for ([_]bool{ false, true }) |collapsed| {