From f9ca3fb5ba767300bec3f1fbb13fc5e6552a90e3 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Mon, 12 Oct 2026 16:48:56 -0300 Subject: 9web: restore host namespace and mounted 9P browsing Add explicit filesystem:"/" export with kernel-enforced user access, symlink/mount traversal and normal file operations. Compose the virtual catalogue at /_9web and wrap the workstation user service with 9ns --mntgen so /mnt/9p is live in its own namespace. Fix non-seekable FUSE EOF translation, asynchronous read lifecycle and flush/clunk cancellation, oversized HTTP directory reads and fixed listing buffers, and borrowed WASM reply frames causing InputFull on large browser reads. Remove the sidebar and expose direct follow links without waiting for stream EOF. Document deployed namespace/security implications and the Plan 9 source critique: posted 9P endpoints, manual site configuration and passive HTTP discovery are distinct; pure site/control publication and unified static serving remain future work. Verified ReleaseSafe build, catalogue and host-FS integration, HTTP-FS and 32 existing E2E scenarios, and Chromium fixture/live navigation through /mnt/9p/agents, large history, zmx files and /usr/bin. Installed service enabled and active on [::]:8090, with generated sites still served. --- web/catalog.zig | 299 ++++++++++++++++++++++++++++++++++++++++++++++--- web/client.zig | 4 + web/httpfs.zig | 45 +++++--- web/static/app.mjs | 100 ++++++----------- web/static/catalog.mjs | 6 +- web/static/client.mjs | 3 +- web/static/index.html | 4 - web/static/style.css | 15 +-- 8 files changed, 356 insertions(+), 120 deletions(-) (limited to 'web') diff --git a/web/catalog.zig b/web/catalog.zig index 53bab19..87349bb 100644 --- a/web/catalog.zig +++ b/web/catalog.zig @@ -8,6 +8,7 @@ const fs = c9.fs; const Backend = struct { pub const Req = fs.Req; pub const Reply = fs.Reply; + pub const features: fs.Features = .{ .create = true, .remove = true, .wstat = true }; }; pub const Runner = c9.serve.Runner(Backend, .{ .fid_capacity = 512, .name_capacity = 255 }, .{ .msize = 65536, .connections = 16 }); @@ -22,7 +23,7 @@ pub const Site = struct { // Poll only these source paths for a managed rebuild watcher. inputs: []const []const u8 = &.{}, }; -const Settings = struct { sites: []const Site }; +const Settings = struct { sites: []const Site, filesystem: ?[]const u8 = null }; const State = struct { phase: []const u8 = "idle", watching: bool = false, @@ -55,12 +56,24 @@ pub const Catalog = struct { group: Io.Group = .init, runner: *Runner, http_port: u16 = 0, + host_filesystem: bool = false, + files: [16][512]?Io.File = @splat(@splat(null)), + reads: [16][32]u64 = @splat(@splat(0)), + read_handles: [16][32]u32 = @splat(@splat(0)), + read_groups: [16][32]Io.Group = @splat(@splat(.init)), cursors: [16][64]EventCursor = @splat(@splat(.{})), pub fn init(io: Io, config: []const u8, state_dir: []const u8) !*Catalog { const bytes = try Io.Dir.cwd().readFileAlloc(io, config, A, .limited(1024 * 1024)); defer A.free(bytes); const parsed = try std.json.parseFromSlice(Settings, A, bytes, .{ .allocate = .alloc_always }); + if (parsed.value.filesystem) |root| { + // This is intentionally a whole-host export, not a sandbox/chroot. + if (!std.mem.eql(u8, root, "/")) return error.FilesystemMustBeRoot; + if (Io.Dir.cwd().statFile(io, "/_9web", .{ .follow_symlinks = false })) |_| { + return error.CatalogMountCollision; + } else |err| if (err != error.FileNotFound) return err; + } // Config is immutable for the lifetime of the process. var names: std.StringHashMap(void) = .init(A); defer names.deinit(); @@ -75,9 +88,10 @@ pub const Catalog = struct { try Io.Dir.cwd().createDirPath(io, state_dir); const cat = try A.create(Catalog); cat.* = .{ .io = io, .sites = parsed.value.sites, .states = try A.alloc(State, parsed.value.sites.len), .state_dir = state_dir, .runner = try A.create(Runner) }; + cat.host_filesystem = parsed.value.filesystem != null; @memset(cat.states, .{}); try cat.nodes.append(A, ""); - cat.runner.init(.{ .io = io, .root = 1, .handler = .{ .ctx = cat, .serve = serve } }); + cat.runner.init(.{ .io = io, .root = 1, .handler = .{ .ctx = cat, .serve = serve, .closed = closed } }); return cat; } @@ -130,7 +144,7 @@ pub const Catalog = struct { const rows = try a.alloc(Row, cat.sites.len); for (cat.sites, 0..) |s, i| rows[i] = .{ .name = s.name, .title = s.title, .root = s.root, .port = s.port, .build = s.build.len != 0, .watch = s.watch.len != 0 or s.inputs.len != 0, .status = cat.states[i] }; const listeners = try std.json.parseFromSlice(std.json.Value, a, cat.listeners, .{}); - return std.json.Stringify.valueAlloc(a, .{ .sites = rows, .listeners = listeners.value, .discovery_error = cat.discovery_error }, .{}); + return std.json.Stringify.valueAlloc(a, .{ .sites = rows, .listeners = listeners.value, .discovery_error = cat.discovery_error, .namespace = if (cat.host_filesystem) "/_9web" else "" }, .{}); } fn discoverLoop(cat: *Catalog) void { @@ -304,7 +318,14 @@ pub const Catalog = struct { try cat.nodes.append(A, try A.dupe(u8, path)); return cat.nodes.items.len; } - fn sitePath(cat: *Catalog, path: []const u8) ?struct { i: usize, rest: []const u8 } { + fn virtualPath(cat: *Catalog, path: []const u8) ?[]const u8 { + if (!cat.host_filesystem) return path; + if (std.mem.eql(u8, path, "_9web")) return ""; + if (std.mem.startsWith(u8, path, "_9web/")) return path[6..]; + return null; + } + fn sitePath(cat: *Catalog, raw: []const u8) ?struct { i: usize, rest: []const u8 } { + const path = cat.virtualPath(raw) orelse return null; if (!std.mem.startsWith(u8, path, "sites/")) return null; const rest = path[6..]; const n = std.mem.indexOfScalar(u8, rest, '/') orelse rest.len; @@ -316,14 +337,15 @@ pub const Catalog = struct { result.node = try cat.intern(path); return result; } - fn attrData(cat: *Catalog, a: std.mem.Allocator, path: []const u8) !fs.Attr { - var result: fs.Attr = .{ .name = std.fs.path.basename(path), .mode = 0o444 }; + fn attrData(cat: *Catalog, a: std.mem.Allocator, raw: []const u8) !fs.Attr { + const path = cat.virtualPath(raw) orelse return cat.hostAttr(a, raw); + var result: fs.Attr = .{ .name = std.fs.path.basename(raw), .mode = 0o444 }; if (path.len == 0 or std.mem.eql(u8, path, "sites") or std.mem.eql(u8, path, "services") or std.mem.eql(u8, path, "listeners")) { result.dir = true; result.mode = 0o555; return result; } - if (cat.sitePath(path)) |p| { + if (cat.sitePath(raw)) |p| { if (p.rest.len == 0 or std.mem.eql(u8, p.rest, "public")) { result.dir = true; result.mode = 0o555; @@ -344,11 +366,12 @@ pub const Catalog = struct { return result; } } - const data = try cat.content(a, path); + const data = try cat.content(a, raw); result.size = data.len; return result; } - fn content(cat: *Catalog, a: std.mem.Allocator, path: []const u8) ![]const u8 { + fn content(cat: *Catalog, a: std.mem.Allocator, raw: []const u8) ![]const u8 { + const path = cat.virtualPath(raw) orelse return error.FileNotFound; if (std.mem.eql(u8, path, "index.html")) return @embedFile("static/index.html"); if (std.mem.eql(u8, path, "listeners/index.json")) return cat.listeners; if (std.mem.eql(u8, path, "services/index.json")) { @@ -359,7 +382,7 @@ pub const Catalog = struct { }; return std.json.Stringify.valueAlloc(a, known.items, .{}); } - if (cat.sitePath(path)) |p| { + if (cat.sitePath(raw)) |p| { if (std.mem.eql(u8, p.rest, "status") or std.mem.eql(u8, p.rest, "events")) return std.json.Stringify.valueAlloc(a, cat.states[p.i], .{}); if (std.mem.eql(u8, p.rest, "ctl")) return "build\nwatch on\nwatch off\ncancel\n"; if (std.mem.eql(u8, p.rest, "log")) { @@ -373,11 +396,20 @@ pub const Catalog = struct { } return error.FileNotFound; } - fn children(cat: *Catalog, a: std.mem.Allocator, path: []const u8) ![][]const u8 { + fn children(cat: *Catalog, a: std.mem.Allocator, raw: []const u8) ![][]const u8 { var names: std.ArrayList([]const u8) = .empty; + const path = cat.virtualPath(raw) orelse { + var dir = try Io.Dir.cwd().openDir(cat.io, try hostPath(a, raw), .{ .iterate = true }); + defer dir.close(cat.io); + var it = dir.iterate(); + while (try it.next(cat.io)) |entry| try names.append(a, try a.dupe(u8, entry.name)); + if (raw.len == 0) try names.append(a, "_9web"); + sortNames(names.items); + return names.items; + }; if (path.len == 0) try names.appendSlice(a, &.{ "index.html", "sites", "services", "listeners" }) else if (std.mem.eql(u8, path, "sites")) { for (cat.sites) |s| try names.append(a, s.name); - } else if (std.mem.eql(u8, path, "services") or std.mem.eql(u8, path, "listeners")) try names.append(a, "index.json") else if (cat.sitePath(path)) |p| { + } else if (std.mem.eql(u8, path, "services") or std.mem.eql(u8, path, "listeners")) try names.append(a, "index.json") else if (cat.sitePath(raw)) |p| { if (p.rest.len == 0) try names.appendSlice(a, &.{ "public", "ctl", "status", "log", "events" }) else if (std.mem.eql(u8, p.rest, "public") or std.mem.startsWith(u8, p.rest, "public/")) { const rel = if (p.rest.len == 6) "" else p.rest[7..]; const f = try openBeneath(cat.io, cat.sites[p.i].root, rel); @@ -389,17 +421,46 @@ pub const Catalog = struct { }; } else return error.NotDir; } else return error.NotDir; - std.mem.sort([]const u8, names.items, {}, struct { + sortNames(names.items); + return names.items; + } + fn sortNames(names: [][]const u8) void { + std.mem.sort([]const u8, names, {}, struct { fn less(_: void, x: []const u8, y: []const u8) bool { return std.mem.lessThan(u8, x, y); } }.less); - return names.items; } fn serve(ctx: ?*anyopaque, conn: *Runner.Conn, req: fs.Req) void { const cat: *Catalog = @ptrCast(@alignCast(ctx.?)); var arena = std.heap.ArenaAllocator.init(A); defer arena.deinit(); + if (req.op == .release and req.opened and req.handle != 0) { + cat.mutex.lockUncancelable(cat.io); + const host = req.node > 0 and req.node <= cat.nodes.items.len and cat.virtualPath(cat.nodes.items[@intCast(req.node - 1)]) == null; + var cancel: [32]bool = @splat(false); + if (host) for (cat.reads[conn.index], 0..) |tag, ri| { + cancel[ri] = tag != 0 and cat.read_handles[conn.index][ri] == req.handle; + }; + cat.mutex.unlock(cat.io); + // Flush followed by clunk must interrupt kernel/FUSE reads too, + // not just discard the eventual 9P reply and keep consuming events. + for (cancel, 0..) |yes, ri| if (yes) cat.read_groups[conn.index][ri].cancel(cat.io); + } + // Files may be blocking 9P event streams through FUSE. Never hold the + // catalogue lock while reading/writing them; other connections must run. + if (req.op == .read or req.op == .write) { + cat.mutex.lockUncancelable(cat.io); + const host = req.node > 0 and req.node <= cat.nodes.items.len and cat.virtualPath(cat.nodes.items[@intCast(req.node - 1)]) == null; + const file = if (host and req.handle > 0 and req.handle <= 512) cat.files[conn.index][req.handle - 1] else null; + cat.mutex.unlock(cat.io); + if (host) { + if (req.op == .read) { + cat.startRead(conn, req, file) catch |err| replyError(conn, req.tag, err); + } else cat.hostIo(arena.allocator(), conn, req, file) catch |err| replyError(conn, req.tag, err); + return; + } + } // Controls take their own lock; all other node operations are serialized. if (req.op == .write) { cat.mutex.lockUncancelable(cat.io); @@ -421,13 +482,217 @@ pub const Catalog = struct { } cat.mutex.lockUncancelable(cat.io); defer cat.mutex.unlock(cat.io); - cat.answer(arena.allocator(), conn, req) catch |err| conn.reply(&.{ .tag = req.tag, .status = .err, .ename = if (err == error.FileNotFound) "not found" else @errorName(err) }, ""); + cat.answer(arena.allocator(), conn, req) catch |err| replyError(conn, req.tag, err); + } + fn closed(ctx: ?*anyopaque, conn: *Runner.Conn) void { + const cat: *Catalog = @ptrCast(@alignCast(ctx.?)); + for (&cat.read_groups[conn.index]) |*group| group.cancel(cat.io); + cat.read_groups[conn.index] = @splat(.init); + cat.mutex.lockUncancelable(cat.io); + defer cat.mutex.unlock(cat.io); + cat.reads[conn.index] = @splat(0); + } + fn startRead(cat: *Catalog, conn: *Runner.Conn, req: fs.Req, file: ?Io.File) !void { + const f = file orelse return error.FileNotOpen; + cat.mutex.lockUncancelable(cat.io); + defer cat.mutex.unlock(cat.io); + // Park before dispatch, including retries caused by catalogue changes. + // A completed/flushed request has no ticket and must not be reissued. + _ = conn.hold(&.{ .tag = req.tag, .status = .again }) orelse return; + for (cat.reads[conn.index]) |tag| if (tag == req.tag) return; + var slot: usize = 0; + while (slot < 32 and cat.reads[conn.index][slot] != 0) : (slot += 1) {} + if (slot == 32) return error.TooManyPendingReads; + try cat.read_groups[conn.index][slot].await(cat.io); + cat.read_groups[conn.index][slot] = .init; + // Clunk/flush can release the original handle while this read waits. + const linux = std.os.linux; + const rc = linux.fcntl(f.handle, linux.F.DUPFD_CLOEXEC, 0); + if (linux.errno(rc) != .SUCCESS) return error.TooManyOpenFiles; + const duplicate: Io.File = .{ .handle = @intCast(rc), .flags = f.flags }; + errdefer duplicate.close(cat.io); + cat.reads[conn.index][slot] = req.tag; + cat.read_handles[conn.index][slot] = req.handle; + errdefer cat.reads[conn.index][slot] = 0; + try cat.read_groups[conn.index][slot].concurrent(cat.io, readTask, .{ cat, conn, req, duplicate, slot }); + } + fn readTask(cat: *Catalog, conn: *Runner.Conn, req: fs.Req, file: Io.File, slot: usize) void { + defer file.close(cat.io); + var arena = std.heap.ArenaAllocator.init(A); + defer arena.deinit(); + const b = arena.allocator().alloc(u8, req.size) catch { + cat.mutex.lockUncancelable(cat.io); + defer cat.mutex.unlock(cat.io); + replyError(conn, req.tag, error.OutOfMemory); + cat.reads[conn.index][slot] = 0; + return; + }; + const result = file.readPositional(cat.io, &.{b}, req.off) catch |err| switch (err) { + error.Unseekable => file.readStreaming(cat.io, &.{b}) catch |stream_err| switch (stream_err) { + error.EndOfStream => 0, + else => stream_err, + }, + else => err, + }; + cat.mutex.lockUncancelable(cat.io); + defer cat.mutex.unlock(cat.io); + if (result) |n| conn.reply(&.{ .tag = req.tag }, b[0..n]) else |err| replyError(conn, req.tag, err); + cat.reads[conn.index][slot] = 0; + } + fn replyError(conn: *Runner.Conn, tag: u64, err: anyerror) void { + const message = switch (err) { + error.FileNotFound => "not found", + error.AccessDenied, error.PermissionDenied => "permission denied", + error.PathAlreadyExists => "file exists", + else => @errorName(err), + }; + conn.reply(&.{ .tag = tag, .status = .err, .ename = message }, ""); + } + fn hostPath(a: std.mem.Allocator, path: []const u8) ![]const u8 { + if (!safeRelative(path)) return error.AccessDenied; + return std.fmt.allocPrint(a, "/{s}", .{path}); + } + fn hostAttr(cat: *Catalog, a: std.mem.Allocator, path: []const u8) !fs.Attr { + const full = try hostPath(a, path); + const st = Io.Dir.cwd().statFile(cat.io, full, .{}) catch |err| blk: { + // Keep dangling symlinks visible; an attempt to open reports the error. + if (err != error.FileNotFound) return err; + break :blk try Io.Dir.cwd().statFile(cat.io, full, .{ .follow_symlinks = false }); + }; + return .{ + .name = std.fs.path.basename(path), + .dir = st.kind == .directory, + .size = st.size, + .mtime = @intCast(@min(std.math.maxInt(u32), @max(0, st.mtime.toSeconds()))), + // The 9P engine has no POSIX uid/group/ACL context. The kernel is + // the authority for this export, operating as the service user. + .mode = if (st.kind == .directory) 0o777 else 0o666, + }; + } + fn hostOpen(cat: *Catalog, a: std.mem.Allocator, path: []const u8, mode: u8, truncate: bool) !Io.File { + // Pin the inode with O_PATH, inspect it without opening a device/FIFO, + // then reopen that exact inode. Symlinks and mount points are followed. + const ref = try Io.Dir.cwd().openFile(cat.io, try hostPath(a, path), .{ .path_only = true }); + defer ref.close(cat.io); + const st = try ref.stat(cat.io); + if (st.kind != .file and st.kind != .directory) return error.SpecialFileNotSupported; + const fd_path = try std.fmt.allocPrintSentinel(a, "/proc/self/fd/{d}", .{ref.handle}, 0); + const linux = std.os.linux; + const flags: linux.O = .{ .ACCMODE = switch (mode & 3) { + 1 => .WRONLY, + 2 => .RDWR, + else => .RDONLY, + }, .CLOEXEC = true, .NONBLOCK = true, .NOCTTY = true, .TRUNC = truncate }; + const rc = linux.open(fd_path, flags, 0); + switch (linux.errno(rc)) { + .SUCCESS => return .{ .handle = @intCast(rc), .flags = .{ .nonblocking = true } }, + .ACCES, .PERM => return error.AccessDenied, + .NOENT => return error.FileNotFound, + .ISDIR => return error.IsDir, + .ROFS => return error.PermissionDenied, + else => return error.HostOpenFailed, + } + } + fn hostIo(cat: *Catalog, a: std.mem.Allocator, conn: *Runner.Conn, req: fs.Req, file: ?Io.File) !void { + const f = file orelse return error.FileNotOpen; + if (req.op == .write) { + f.writePositionalAll(cat.io, req.data, req.off) catch |err| switch (err) { + error.Unseekable => try f.writeStreamingAll(cat.io, req.data), + else => return err, + }; + conn.reply(&.{ .tag = req.tag, .written = @intCast(req.data.len) }, ""); + } else { + const b = try a.alloc(u8, req.size); + // A short read is meaningful for synthetic files and event streams. + const n = try f.readPositional(cat.io, &.{b}, req.off); + conn.reply(&.{ .tag = req.tag }, b[0..n]); + } + } + fn hostOperation(cat: *Catalog, a: std.mem.Allocator, conn: *Runner.Conn, req: fs.Req, path: []const u8, reply: *fs.Reply) !void { + const full = try hostPath(a, path); + switch (req.op) { + .open => { + var slot: usize = 0; + while (slot < 512 and cat.files[conn.index][slot] != null) : (slot += 1) {} + if (slot == 512) return error.TooManyOpenFiles; + var next = path; + const f = if (req.create) blk: { + if (!safeName(req.data)) return error.AccessDenied; + next = try std.fs.path.join(a, &.{ path, req.data }); + if (cat.virtualPath(next) != null) return error.PermissionDenied; + const dest = try hostPath(a, next); + if (req.perm & c9.dmdir != 0) { + try Io.Dir.cwd().createDir(cat.io, dest, .fromMode(req.perm & 0o777)); + break :blk try cat.hostOpen(a, next, req.omode, false); + } + break :blk try Io.Dir.cwd().createFile(cat.io, dest, .{ .read = (req.omode & 3) != 1, .exclusive = true, .permissions = .fromMode(req.perm & 0o777) }); + } else try cat.hostOpen(a, path, req.omode, false); + errdefer f.close(cat.io); + reply.attr = try cat.attr(a, next); + reply.handle = @intCast(slot + 1); + cat.files[conn.index][slot] = f; + }, + .release => { + if (req.opened and req.handle > 0 and req.handle <= 512) { + if (cat.files[conn.index][req.handle - 1]) |f| f.close(cat.io); + cat.files[conn.index][req.handle - 1] = null; + } + if (req.remove) { + if (path.len == 0) return error.PermissionDenied; + const st = try Io.Dir.cwd().statFile(cat.io, full, .{ .follow_symlinks = false }); + if (st.kind == .directory) try Io.Dir.cwd().deleteDir(cat.io, full) else try Io.Dir.cwd().deleteFile(cat.io, full); + } + }, + .setattr => { + if (req.set.name and (req.set.mode or req.set.mtime or req.set.length)) return error.CombinedRenameNotSupported; + if (req.set.name) { + if (path.len == 0 or !safeName(req.data)) return error.PermissionDenied; + const next = try std.fs.path.join(a, &.{ std.fs.path.dirname(path) orelse "", req.data }); + if (cat.virtualPath(next) != null) return error.PermissionDenied; + // Allocate replacement names before changing anything on disk. + var replacements: std.ArrayList(struct { index: usize, name: []const u8 }) = .empty; + for (cat.nodes.items, 0..) |n, ni| { + if (std.mem.eql(u8, n, path) or (std.mem.startsWith(u8, n, path) and n.len > path.len and n[path.len] == '/')) + try replacements.append(a, .{ .index = ni, .name = try std.fmt.allocPrint(A, "{s}{s}", .{ next, n[path.len..] }) }); + } + var renamed = false; + errdefer if (!renamed) { + for (replacements.items) |r| A.free(r.name); + }; + try Io.Dir.cwd().renamePreserve(full, .cwd(), try hostPath(a, next), cat.io); + for (replacements.items) |r| { + A.free(cat.nodes.items[r.index]); + cat.nodes.items[r.index] = r.name; + } + renamed = true; + reply.attr = try cat.attr(a, next); + } else { + // OTRUNC must reach FUSE as an open flag, not ftruncate; + // synthetic 9P ctl files often do not implement setattr. + const f = try cat.hostOpen(a, path, if (req.truncate or req.set.length) 1 else 0, req.truncate); + defer f.close(cat.io); + if (req.set.length and !req.truncate) try f.setLength(cat.io, req.length); + if (req.set.mode) try f.setPermissions(cat.io, .fromMode(req.perm & 0o777)); + if (req.set.mtime) try f.setTimestamps(cat.io, .{ .modify_timestamp = .{ .new = .{ .nanoseconds = @as(i96, req.mtime) * std.time.ns_per_s } } }); + reply.attr = try cat.attr(a, path); + } + }, + else => unreachable, + } + } + fn safeName(name: []const u8) bool { + return name.len > 0 and safeRelative(name) and std.mem.indexOfScalar(u8, name, '/') == null; } fn answer(cat: *Catalog, a: std.mem.Allocator, conn: *Runner.Conn, req: fs.Req) !void { if (req.node == 0 or req.node > cat.nodes.items.len) return error.FileNotFound; const path = cat.nodes.items[@intCast(req.node - 1)]; var reply: fs.Reply = .{ .tag = req.tag }; var bytes: []const u8 = ""; + if (cat.virtualPath(path) == null and (req.op == .open or req.op == .release or req.op == .setattr)) { + try cat.hostOperation(a, conn, req, path, &reply); + conn.reply(&reply, ""); + return; + } switch (req.op) { .lookup => { const next = if (std.mem.eql(u8, req.data, ".")) path else if (std.mem.eql(u8, req.data, "..")) (std.fs.path.dirname(path) orelse "") else try std.fs.path.join(a, &.{ path, req.data }); @@ -435,10 +700,11 @@ pub const Catalog = struct { }, .getattr => reply.attr = try cat.attr(a, path), .setattr => { - if (!std.mem.endsWith(u8, path, "/ctl")) return error.PermissionDenied; + if (!std.mem.endsWith(u8, path, "/ctl") or req.set.name or req.set.mode or req.set.mtime or (req.set.length and req.length != 0)) return error.PermissionDenied; reply.attr = try cat.attr(a, path); }, .open => { + if (req.create) return error.PermissionDenied; if ((req.omode & 3) != 0 and !std.mem.endsWith(u8, path, "/ctl")) return error.PermissionDenied; if (std.mem.endsWith(u8, path, "/events")) { var found = false; @@ -452,6 +718,7 @@ pub const Catalog = struct { } }, .release => { + if (req.remove) return error.PermissionDenied; if (req.opened and req.handle != 0) cat.cursors[conn.index][req.handle - 1].used = false; }, .write => unreachable, diff --git a/web/client.zig b/web/client.zig index 2ec9163..54b010b 100644 --- a/web/client.zig +++ b/web/client.zig @@ -60,6 +60,10 @@ fn fail(message: []const u8) i32 { return -1; } fn submit(request: c9.Client.Request) i32 { + // take() lends reply bytes until its next call. JS has copied the result + // before submitting another request; release that frame now, before a + // full-msize reply arrives. Otherwise push() has less than msize free. + if (client.take() != null) return fail("UnexpectedBufferedReply"); _ = client.submit(request) catch |err| return fail(@errorName(err)); return 0; } diff --git a/web/httpfs.zig b/web/httpfs.zig index fa783e5..8af5793 100644 --- a/web/httpfs.zig +++ b/web/httpfs.zig @@ -294,16 +294,35 @@ fn FS(comptime M: type) type { fn listDir(self: *Self, st: wire.Stat) !void { const html = self.wantsHtml(); + var name_buf: [256]u8 = undefined; + const name = name_buf[0..@min(st.name.len, name_buf.len)]; + @memcpy(name, st.name[0..name.len]); const leaf = self.leaf_fid.?; const opened = try self.rpcSmall(.{ .open = .{ .fid = leaf, .mode = c9.oread } }); if (opened.msg == .rerror) return self.rerr(opened.msg.rerror.ename); if (opened.msg != .ropen) return error.Upstream; - // JSON/HTML is built into `big`; directory data is read into `small`. - var w: std.Io.Writer = .fixed(self.big); + // Read frames must fit the RPC scratch buffer. Stream the listing + // so large directories neither overflow `big` nor appear empty. + const count: u32 = @intCast(@min(self.chunk(), self.small.len - 11)); + var r: M.Rpc = .{ .buf = self.small }; + var got = try self.m.rpc(.{ .read = .{ .fid = leaf, .offset = 0, .count = count } }, &r); + if (got.msg == .rerror) return self.rerr(got.msg.rerror.ename); + if (got.msg != .rread) return error.Upstream; + self.responded = true; + var bw = try self.request.respondStreaming(self.big, .{ .respond_options = .{ + .status = .ok, + .keep_alive = false, + .extra_headers = &.{ + .{ .name = "content-type", .value = if (html) "text/html; charset=utf-8" else "application/json" }, + .{ .name = "cache-control", .value = "no-store" }, + .{ .name = "x-content-type-options", .value = "nosniff" }, + }, + } }); + const w = &bw.writer; if (html) { w.writeAll("") catch return error.Upstream; - writeHtml(&w, st.name); + writeHtml(w, name); w.writeAll("") catch return error.Upstream else w.writeByte(']') catch return error.Upstream; - self.responded = true; - self.request.respond(w.buffered(), .{ .status = .ok, .keep_alive = false, .extra_headers = &.{ - .{ .name = "content-type", .value = if (html) "text/html; charset=utf-8" else "application/json" }, - .{ .name = "cache-control", .value = "no-store" }, - .{ .name = "x-content-type-options", .value = "nosniff" }, - } }) catch {}; + try bw.end(); } // -- writes -------------------------------------------------------- diff --git a/web/static/app.mjs b/web/static/app.mjs index f18a103..33d5a08 100644 --- a/web/static/app.mjs +++ b/web/static/app.mjs @@ -21,7 +21,7 @@ function locationView() { return configuration?.catalog && ['sites', 'services'].includes(view) ? view : 'files'; } function viewURL(view, path = currentPath) { - return pathURL(path) + (view === 'files' ? '' : `?view=${view}`); + return pathURL(path) + (view === 'files' ? (current?.stream && path === currentPath ? '?follow=1' : '') : `?view=${view}`); } function showView(view) { activeView = view; @@ -43,7 +43,7 @@ function status(message, error = false) { function controls() { for (const id of ['go', 'reload', 'newfile', 'newdir', 'upload']) $(id).disabled = busy; $('save').disabled = busy || !current || current.stat.directory || $('editor').hidden || !dirty; - $('download').disabled = busy || !current || current.stat.directory; + $('download').disabled = busy || !current || current.stat.directory || current.stream; $('follow').disabled = busy || !current || current.stat.directory; $('rename').disabled = busy || currentPath === '/'; $('delete').disabled = busy || currentPath === '/'; @@ -66,14 +66,14 @@ async function connectedClient() { catch { throw new Error('Unable to reach the file server. Reload to try again.'); } return client; } -async function readPath(path) { +async function readPath(path, metadataOnly = false) { const active = await connectedClient(); - try { return await active.readPath(path); } + try { return await active.readPath(path, metadataOnly); } catch (error) { // A timed-out/closed transport has lost its fids. Retry reads once on a // fresh session. Writes are never replayed after an uncertain result. if (!active.closed) throw error; - return (await connectedClient()).readPath(path); + return (await connectedClient()).readPath(path, metadataOnly); } } function normalizePath(path) { @@ -131,16 +131,16 @@ function breadcrumbs(path) { $('up').href = pathURL(parent); $('up').dataset.path = parent; } -async function navigate(path, historyMode = 'push') { +async function navigate(path, historyMode = 'push', follow = false) { path = normalizePath(path); showView('files'); stopFollow(); status('Loading…'); - const result = await readPath(path); + const result = await readPath(path, follow); current = result; currentPath = path; dirty = false; for (const view of ['files', 'sites', 'services']) $(`view-${view}`).href = viewURL(view); $('path').value = path; - const url = pathURL(path); + const url = pathURL(path) + (follow ? '?follow=1' : ''); if (historyMode === 'push' && location.pathname + location.search + location.hash !== url) history.pushState(null, '', url); document.title = `${path} — 9web`; breadcrumbs(path); @@ -154,6 +154,11 @@ async function navigate(path, historyMode = 'push') { const permissions = document.createElement('td'), name = document.createElement('td'), size = document.createElement('td'); permissions.className = 'mode'; permissions.textContent = mode(entry); name.append(pathLink(entry.name + (entry.directory ? '/' : ''), child(path, entry.name), 'entry' + (entry.directory ? ' directory' : ''))); + if (!entry.directory) { + const followLink = pathLink('follow', child(path, entry.name), 'follow-link'); + followLink.dataset.follow = 'true'; followLink.href += '?follow=1'; + name.append(followLink); + } size.className = 'size'; size.textContent = entry.directory ? '—' : entry.length.toLocaleString(); row.append(permissions, name, size); rows.append(row); } @@ -163,7 +168,7 @@ async function navigate(path, historyMode = 'push') { } else { $('filename').textContent = result.stat.name; $('file-mode').textContent = mode(result.stat); - $('file-size').textContent = `${result.bytes.length.toLocaleString()} bytes`; + $('file-size').textContent = result.stream ? 'stream' : `${result.bytes.length.toLocaleString()} bytes`; let editable = true; try { if (result.bytes.includes(0)) throw new Error('Binary'); @@ -175,7 +180,7 @@ async function navigate(path, historyMode = 'push') { status('File loaded.'); } updateStat(result); - markTree(path); + if (follow && !result.stat.directory) startFollow(); } function mayLeave() { return !dirty || window.confirm('Discard unsaved changes?'); } document.addEventListener('click', event => { @@ -187,19 +192,19 @@ document.addEventListener('click', event => { if (view === activeView) return; history.pushState(null, '', viewURL(view)); showView(view); - if (view === 'files' && !current) action(() => navigate(currentPath, 'none')).then(loadTree); + if (view === 'files' && !current) action(() => navigate(currentPath, 'none')); return; } const link = event.target.closest('a[data-path]'); if (!link || event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return; event.preventDefault(); - if (!busy && mayLeave()) action(() => navigate(link.dataset.path)); + if (!busy && mayLeave()) action(() => navigate(link.dataset.path, 'push', link.dataset.follow === 'true')); }); $('path-form').onsubmit = event => { event.preventDefault(); if (mayLeave()) action(() => navigate($('path').value)); }; -$('reload').onclick = () => { if (mayLeave()) action(() => navigate(current ? currentPath : locationPath(), 'none')); }; +$('reload').onclick = () => { if (mayLeave()) action(() => navigate(current ? currentPath : locationPath(), 'none', Boolean(current?.stream))); }; $('editor').oninput = () => { dirty = true; controls(); }; $('save').onclick = () => action(async () => { const bytes = new TextEncoder().encode($('editor').value); @@ -224,26 +229,20 @@ window.addEventListener('popstate', () => { const view = locationView(), path = locationPath(); if (busy || (view === 'files' && path !== currentPath && !mayLeave())) { history.pushState(null, '', viewURL(activeView)); return; } showView(view); - if (view === 'files' && (!current || path !== currentPath)) action(() => navigate(path, 'none')).then(loadTree); + const follow = new URLSearchParams(location.search).get('follow') === '1'; + if (view === 'files' && (!current || path !== currentPath || Boolean(current.stream) !== follow)) action(() => navigate(path, 'none', follow)); }); window.addEventListener('beforeunload', event => { if (dirty) { event.preventDefault(); event.returnValue = ''; } }); -// ---- HTTP /fs view: tree, stat panel, create/rename/delete/upload, follow ---- +// ---- HTTP /fs view: stat panel, create/rename/delete/upload, follow ---- // These operate over the gateway's HTTP mapping of the same 9P tree, so they // stay independent of the WebSocket editing session above. function fsURL(path) { return '/fs' + path.split('/').map(encodeURIComponent).join('/'); } function parentOf(path) { return path.replace(/\/[^/]+$/, '') || '/'; } function baseName(path) { return path.split('/').filter(Boolean).pop() || ''; } function dirContext() { return current && current.stat.directory ? currentPath : parentOf(currentPath); } -function sortEntries(a, b) { return Number(b.dir) - Number(a.dir) || a.name.localeCompare(b.name); } - -async function fetchDir(path) { - const response = await fetch(fsURL(path) + (path.endsWith('/') ? '' : '/'), { headers: { accept: 'application/json' } }); - if (!response.ok) throw new Error(`list failed: ${response.status}`); - return response.json(); -} function renderStat(rows) { const dl = $('stat'); @@ -276,72 +275,37 @@ function updateStat(result) { }).catch(() => {}); } -function treeItem(entry, path) { - const li = document.createElement('li'); - const node = document.createElement('span'); - node.className = 'node' + (entry.dir ? ' dir' : ''); - node.dataset.node = path; - const twist = document.createElement('span'); - twist.className = 'twist'; - twist.textContent = entry.dir ? '▸' : ' '; - node.append(twist, document.createTextNode(entry.name)); - li.append(node); - node.onclick = () => { - if (entry.dir) toggleTree(li, path, twist); - else if (!busy && mayLeave()) action(() => navigate(path)); - }; - return li; -} -async function toggleTree(li, path, twist) { - const open = li.querySelector(':scope > ul'); - if (open) { open.remove(); twist.textContent = '▸'; return; } - twist.textContent = '▾'; - const ul = document.createElement('ul'); - li.append(ul); - try { - for (const entry of (await fetchDir(path)).sort(sortEntries)) ul.append(treeItem(entry, child(path, entry.name))); - } catch (error) { ul.textContent = '(unavailable)'; } -} -async function loadTree() { - const root = $('filetree'); - try { - const entries = (await fetchDir('/')).sort(sortEntries); - root.replaceChildren(...entries.map(entry => treeItem(entry, '/' + entry.name))); - } catch { /* upstream not ready; leave the last tree in place */ } -} -function markTree(path) { - for (const node of $('filetree').querySelectorAll('.node.current')) node.classList.remove('current'); - const match = $('filetree').querySelector(`.node[data-node="${CSS.escape(path)}"]`); - if (match) match.classList.add('current'); -} let stream = null; -function stopFollow() { +function stopFollow(clear = true) { if (stream) { stream.close(); stream = null; } $('follow').classList.remove('active'); - $('stream').hidden = true; - $('stream').textContent = ''; + if (clear) { $('stream').hidden = true; $('stream').textContent = ''; } } function startFollow() { if (!current || current.stat.directory) return; + current.stream = true; + history.replaceState(null, '', viewURL('files')); + controls(); $('editor').hidden = true; $('binary').hidden = true; $('edit-actions').hidden = true; const view = $('stream'); view.hidden = false; view.textContent = ''; $('follow').classList.add('active'); + status('Following stream…'); stream = new EventSource(fsURL(currentPath) + '?follow=1'); stream.onmessage = event => { view.textContent += event.data + '\n'; view.scrollTop = view.scrollHeight; }; - stream.addEventListener('eof', stopFollow); - stream.onerror = () => { status('Stream ended.'); stopFollow(); }; + stream.addEventListener('eof', () => { stopFollow(false); status('End of stream.'); }); + stream.onerror = () => { status('Stream ended.'); stopFollow(false); }; } $('follow').onclick = () => { - if ($('follow').classList.contains('active')) { stopFollow(); action(() => navigate(currentPath, 'none')); } + if ($('follow').classList.contains('active')) { stopFollow(false); status('Stream stopped.'); } else startFollow(); }; async function mutate(fn, done) { if (busy) return; busy = true; controls(); - try { await fn(); await loadTree(); status(done); } + try { await fn(); status(done); } catch (error) { status(error.message, true); } finally { busy = false; controls(); } } @@ -406,7 +370,7 @@ async function start() { currentPath = locationPath(); const view = locationView(); showView(view); - if (view === 'files') await action(() => navigate(currentPath, 'none')).then(loadTree); + if (view === 'files') await action(() => navigate(currentPath, 'none', new URLSearchParams(location.search).get('follow') === '1')); } catch (error) { status(error.message, true); } } start(); diff --git a/web/static/catalog.mjs b/web/static/catalog.mjs index d1d3444..e110dee 100644 --- a/web/static/catalog.mjs +++ b/web/static/catalog.mjs @@ -12,6 +12,7 @@ function url(address, port, protocol = 'http') { export function catalogViews(pathLink) { let active = 'files', timer = null, request = null, revision = 0, pending = new Set(); const rows = new Map(); + let namespace = ''; function status(view, text, error = false) { const p = $(`${view}-status`); p.textContent = text; p.classList.toggle('error', error); } @@ -19,7 +20,7 @@ export function catalogViews(pathLink) { if (pending.has(site.name)) return; pending.add(site.name); updateSite(site); try { - const r = await fetch(`/fs/sites/${encodeURIComponent(site.name)}/ctl`, { method: 'PUT', body: command }); + const r = await fetch(`/fs${namespace}/sites/${encodeURIComponent(site.name)}/ctl`, { method: 'PUT', body: command }); if (!r.ok) throw new Error(await r.text()); status('sites', `${site.title}: ${command} requested.`); } catch (error) { status('sites', error.message, true); } @@ -35,7 +36,7 @@ export function catalogViews(pathLink) { const tools = element('div'); tools.className = 'site-actions'; const build = element('button', 'build'), watch = element('button', 'watch'), cancel = element('button', 'cancel'); for (const b of [build, watch, cancel]) b.type = 'button'; - tools.append(build, watch, cancel, pathLink('files', `/sites/${site.name}/public`), pathLink('log', `/sites/${site.name}/log`)); + tools.append(build, watch, cancel, pathLink('files', `${namespace}/sites/${site.name}/public`), pathLink('log', `${namespace}/sites/${site.name}/log`)); actions.append(tools); tr.append(name, phase, finished, actions); row = { tr, link, root, phase, finished, build, watch, cancel }; rows.set(site.name, row); $('sites-entries').append(tr); @@ -74,6 +75,7 @@ export function catalogViews(pathLink) { if (!r.ok) throw new Error(`Unable to load ${view}: HTTP ${r.status}`); const data = await r.json(); if (ticket !== revision || active !== view) return; + namespace = data.namespace || ''; if (view === 'sites') { const names = new Set(data.sites.map(s => s.name)); for (const [name, row] of rows) if (!names.has(name)) { row.tr.remove(); rows.delete(name); } diff --git a/web/static/client.mjs b/web/static/client.mjs index 69f44d2..c012fc0 100644 --- a/web/static/client.mjs +++ b/web/static/client.mjs @@ -96,9 +96,10 @@ export class Client { if (live && !this.closed) await this.ask('clunk', 1); } } - readPath(path) { + readPath(path, metadataOnly = false) { return this.serial(() => this.withFile(path, async () => { const stat = JSON.parse(decoder.decode((await this.ask('stat', 1)).data)); + if (metadataOnly && !stat.directory) return { stat, entries: [], bytes: new Uint8Array(), stream: true }; const opened = await this.ask('open', 1, 0); const count = Math.min(this.wasm.max_read(), opened.number || Infinity); let offset = 0; diff --git a/web/static/index.html b/web/static/index.html index 4ed498d..c392e65 100644 --- a/web/static/index.html +++ b/web/static/index.html @@ -33,10 +33,6 @@
-
diff --git a/web/static/style.css b/web/static/style.css index 53ccda3..e17f1e5 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -8,6 +8,7 @@ body { margin: 0; padding: 22px 3%; } a { color: #07539b; text-decoration: none; } a:hover { text-decoration: underline; } +.follow-link { margin-left: 14px; font-size: 11px; color: #777; } header { padding: 0 8px 17px; } .brand { font-size: 30px; font-weight: bold; color: #222; letter-spacing: -1px; } .description { color: #777; margin-top: 1px; } @@ -81,17 +82,7 @@ textarea { display: block; width: 100%; min-height: 420px; resize: vertical; bor #binary { color: #777; padding: 16px 8px; } .actions { display: flex; align-items: center; gap: 12px; margin-top: 10px; font-size: 12px; } #edit-status { color: #777; } -.layout { display: flex; align-items: flex-start; gap: 16px; } -#sidebar { flex: 0 0 220px; border-right: 1px solid #e2e2e2; padding: 8px 10px 0 0; min-width: 0; } -.tree-head { color: #999; font-size: 11px; text-transform: uppercase; letter-spacing: .05em; padding: 4px; } -#filetree, #filetree ul { list-style: none; margin: 0; padding: 0; } -#filetree ul { margin-left: 12px; } -#filetree li { line-height: 1.7; white-space: nowrap; } -#filetree .node { cursor: pointer; font-family: monospace; overflow-wrap: anywhere; } -#filetree .node.dir { font-weight: bold; } -#filetree .node.current { background: #ccc; } -#filetree .twist { display: inline-block; width: 12px; color: #999; } -.layout main { flex: 1 1 auto; min-width: 0; } +.layout main { min-width: 0; } #stat-panel { margin-top: 18px; border-top: 1px solid #eee; padding-top: 8px; } #stat-panel h2 { font-size: 12px; text-transform: uppercase; letter-spacing: .05em; color: #999; margin: 0 0 6px; } #stat { display: grid; grid-template-columns: max-content 1fr; gap: 2px 12px; font: 12px monospace; margin: 0; } @@ -122,6 +113,4 @@ a:focus-visible, button:focus-visible { outline: 2px solid #07539b; outline-offs .summary { align-items: start; } .file-heading { gap: 7px 12px; } textarea { min-height: 350px; } - .layout { flex-direction: column; } - #sidebar { flex: none; width: 100%; border-right: 0; border-bottom: 1px solid #e2e2e2; max-height: 180px; overflow: auto; padding: 0 0 6px; } } -- cgit v1.3