Three coordinated changes that share the same files. Common theme:
convention beats exception. Where the codebase had a bespoke wire shape
or a special-case route, replace it with the generic shape every other
client already speaks.
== Listing protocol ==
GET / Accept: application/json used to dispatch to a bespoke
ServeProjectList handler returning {name, url, title} per project — a
shape that diverged from every other directory's listing.FileInfo
response. Now:
- listing.FileInfo gains an optional `title` field (read from each
directory's own .zddc title:). Generic clients (landing, browse)
read the same shape from every URL.
- appfs.ListDirectory emits a virtual `.zddc` entry (is_dir:false,
virtual:true) when no on-disk file exists at that path and the
caller asked for ?hidden=1. Opens an editable view of the cascade
defaults; PUT-saving its bytes materialises a real file.
- The bespoke GET / JSON branch in cmd/zddc-server/main.go is gone.
The bare-root landing serve is Accept-gated: HTML requests get the
landing tool (project picker), JSON requests fall through to
ServeDirectory and get the generic listing.
- landing's fetchProjects filters the new generic shape (is_dir,
strip trailing slash) — same pattern fetchParties already used at
/<project>/archive/.
== Form editor retirement ==
`<dir>/.zddc.html` was a server-rendered form for editing per-directory
.zddc files (~900 LOC across zddceditor.go, zddchandler.go, zddc_assets.go).
Browse's YAML/CodeMirror editor (with .zddc-schema lint) already edits
the same files via the generic file-API. Two ways to edit the same data
is exception, not convention.
- Delete zddceditor.go, zddchandler.go, zddc_assets.go and tests.
- `/<dir>/.zddc.html` → 302 redirect to `/<dir>/?file=.zddc` (browse
opens the .zddc in its editor pane).
- /.profile/zddc/* namespace deleted (REST API + assets sub-route).
- Profile page's "Editable .zddc files" list links to browse.
- ServeZddcFile's 405 message + virtual-body comment point at the
browse URL instead of the dead form.
== Admin elevation (Principal model) ==
Sudo-style: admins are treated as normal users by default; opting into
admin powers is per-request and gated by a `zddc-elevate=1` cookie.
- zddc.Principal{Email, Elevated} replaces bare-email arguments on
IsAdmin / IsSubtreeAdmin / CanEditZddc. The signature change makes
the elevation gate compiler-enforced at every admin call site —
audit-fragility is gone. The empty-email short-circuit is no longer
load-bearing for elevation; Principal.gate() is the explicit check.
- handler.ACLMiddleware derives Elevated per request: bearer tokens
are implicitly elevated (CLI clients can't toggle a cookie); browser
sessions elevate only when zddc-elevate=1 is set. PrincipalFromContext(r)
is the one-call-per-site bundling helper.
- Every admin-check call site updated to pass a Principal.
- /.auth/admin (forward_auth target for the dev-shell IDE) explicitly
bypasses elevation with a synthetic-elevated Principal — different
cookie scope than zddc-server origin, documented inline.
- AccessView gains CanElevate (elevation-independent "does this email
have admin authority anywhere?") so the header toggle can render
itself for an un-elevated admin who hasn't opted in yet.
- ServeProjectList is removed; ProjectInfo + EnumerateProjects stay
for the profile page's server-rendered project list.
- MatchAppHTML stays — still used by main.go to route <dir>/<tool>.html
URLs to the apps subsystem when no real file exists.
- Test helpers carry Elevated=true by default (matches the
pre-elevation default; tests for the un-elevated gate use the
explicit form).
Go tests pass across all 14 internal packages. Browse + every other
tool rebuilds clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
77 lines
2.6 KiB
Go
77 lines
2.6 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"codeberg.org/VARASYS/ZDDC/zddc/internal/config"
|
|
"codeberg.org/VARASYS/ZDDC/zddc/internal/policy"
|
|
"codeberg.org/VARASYS/ZDDC/zddc/internal/zddc"
|
|
)
|
|
|
|
// ProjectInfo is a single entry in the EnumerateProjects result.
|
|
// Used by the profile page (server-rendered) to list projects the
|
|
// caller can reach. NOT the wire shape for GET / Accept: application/json
|
|
// anymore — that endpoint now returns listing.FileInfo entries with
|
|
// per-entry Title, matching every other directory listing.
|
|
//
|
|
// Title is read from the project's own .zddc file (its `title:` field) when
|
|
// present; absent or empty means the profile page shows just the directory
|
|
// name. omitempty keeps the JSON small for projects without titles.
|
|
type ProjectInfo struct {
|
|
Name string `json:"name"`
|
|
URL string `json:"url"`
|
|
Title string `json:"title,omitempty"`
|
|
}
|
|
|
|
// EnumerateProjects returns the visible top-level projects for the given
|
|
// caller. Exported for the profile page's server-rendered project list.
|
|
// A nil decider falls back to the internal Go evaluator.
|
|
func EnumerateProjects(ctx context.Context, decider policy.Decider, cfg config.Config, email string) ([]ProjectInfo, error) {
|
|
if decider == nil {
|
|
decider = &policy.InternalDecider{}
|
|
}
|
|
entries, err := os.ReadDir(cfg.Root)
|
|
if err != nil {
|
|
slog.Error("reading root directory", "err", err)
|
|
return nil, err
|
|
}
|
|
|
|
var projects []ProjectInfo
|
|
for _, entry := range entries {
|
|
if !entry.IsDir() {
|
|
continue
|
|
}
|
|
name := entry.Name()
|
|
// Skip hidden directories. Both '.' and '_' are reserved prefixes:
|
|
// '.' for system/internal state (matches the listing-pipeline filter
|
|
// and the dispatch dot-prefix guard); '_' for operator-managed
|
|
// scaffolding like install.zip's _template/ directory that should
|
|
// be reachable by direct URL but not appear in the project picker.
|
|
if strings.HasPrefix(name, ".") || strings.HasPrefix(name, "_") {
|
|
continue
|
|
}
|
|
absPath := filepath.Join(cfg.Root, name)
|
|
chain, err := zddc.EffectivePolicy(cfg.Root, absPath)
|
|
if err != nil {
|
|
slog.Warn("ACL policy error", "path", absPath, "err", err)
|
|
}
|
|
if allowed, _ := policy.AllowFromChain(ctx, decider, chain, email, "/"+name+"/"); !allowed {
|
|
continue
|
|
}
|
|
// Title comes from <project>/.zddc — optional, ignored on parse error.
|
|
var title string
|
|
if zf, err := zddc.ParseFile(filepath.Join(absPath, ".zddc")); err == nil {
|
|
title = zf.Title
|
|
}
|
|
projects = append(projects, ProjectInfo{
|
|
Name: name,
|
|
URL: "/" + name + "/",
|
|
Title: title,
|
|
})
|
|
}
|
|
return projects, nil
|
|
}
|