Adds internal/apps/ package serving the five tool HTMLs at virtual paths based on the surrounding folder name convention: archive every directory (multi-project, project, archive, vendor) classifier any Incoming/Working/Staging directory and subtree mdedit any Working directory and subtree transmittal any Staging directory and subtree landing only at deployment root The current-stable build of every tool is //go:embed'd into the binary at compile time — that's the default with zero config. Operators override per-directory via .zddc apps: entries; closer-to-leaf wins. Spec syntax (in any apps: value): stable / beta / alpha / :stable channel v0.0.4 / v0.0 / v0 / :v0.0.4 version https://my-mirror/releases URL prefix only https://my-mirror/releases:beta URL prefix + channel https://my-fork/archive.html terminal full URL ./local.html / /abs/path.html terminal local path The special apps.default key provides a baseline URL prefix and channel inherited by any app not overridden per-name. Per-axis cascade: a deeper .zddc can override the URL, the channel, or both. Cascade walks root→leaf; default applies first at each level, then the per-app entry. Terminal sources (paths and full .html URLs) short-circuit composition; deeper non-terminal entries override parent terminals. URL sources fetch once on first request and cache forever in <ZDDC_ROOT>/_app/<host>/<path> — different upstreams with the same filename stay distinct. No background refresh, no SHA-256 verification: operators delete the cache file to force a refetch. Concurrent misses for the same source dedupe via a 30-line hand-rolled singleflight. Per-request override: any user can append ?v=<spec> to a tool URL (e.g. ?v=beta, ?v=v0.0.4, ?v=:alpha, ?v=https://mirror/releases:beta) to ask for a different build for one request. Security: ?v= serves ONLY versions already in the cache (cache miss returns 404; path sources are rejected outright with 400). Users cannot trigger arbitrary upstream fetches via crafted URLs. Failed URL fetches (network down, 5xx) fall back to embedded with a one-time WARN log. The X-ZDDC-Source response header reports what served: fetch:URL / cache:URL / path:/abs / embedded:<app>@<build>. Wire-in (cmd/zddc-server/main.go): dispatch routes <dir>/<app>.html through apps.MatchAppHTML + AppAvailableAt + apps.Server.Serve when no real file exists. Direct URL access to /_app/... is blocked at the dispatch layer — cached files must go through the apps resolver so they get correct Content-Type and ACL gating. Schema (internal/zddc/file.go): ZddcFile gains Apps map[string]string for cascade overrides. Validator (internal/zddc/validate.go) accepts the special "default" key alongside the five canonical app names and all spec forms. Removes ZDDC_APPS_* env vars (no admin UI, no refresh interval, no upstream allow-list — the simpler model has fewer knobs). 40+ unit tests across the new package: parser shapes, cascade resolution with default+per-app interactions, terminal short-circuit semantics, ?v= cache-only enforcement, embedded fallback, atomic cache writes, singleflight dedup. Plus end-to-end dispatch tests in cmd/zddc-server/main_test.go. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
61 lines
2.2 KiB
Go
61 lines
2.2 KiB
Go
package zddc
|
|
|
|
import (
|
|
"os"
|
|
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// ACLRules holds email allow/deny lists.
|
|
type ACLRules struct {
|
|
Allow []string `yaml:"allow"`
|
|
Deny []string `yaml:"deny"`
|
|
}
|
|
|
|
// ZddcFile represents the parsed contents of a .zddc configuration file.
|
|
//
|
|
// Admins is honored only in the root .zddc file (<ZDDC_ROOT>/.zddc); subdir
|
|
// .zddc files have their Admins entry ignored by IsAdmin so that someone who
|
|
// can write into a subtree cannot grant themselves admin access. ACL on the
|
|
// other hand cascades — see EffectivePolicy / AllowedWithChain.
|
|
//
|
|
// Title is read only from per-project .zddc files (the file directly inside
|
|
// each project root) by ServeProjectList; it surfaces a human-readable name
|
|
// for the project on the landing-page picker. Optional — projects without a
|
|
// title fall back to displaying the directory name.
|
|
//
|
|
// Apps is a per-directory cascade override mapping app name → source spec.
|
|
// The spec is one of: "stable" / "beta" / "alpha" (channel on the canonical
|
|
// upstream), "v0.0.4" / "v0.0" / "v0" (version pin on the canonical
|
|
// upstream), an absolute "https://..." URL (custom mirror), or a relative
|
|
// or absolute filesystem path (./local.html, /opt/zddc/foo.html).
|
|
//
|
|
// On a request for a tool HTML, zddc-server walks .zddc files leaf→root
|
|
// looking for an Apps entry; first match wins. With no entry anywhere, the
|
|
// server serves the version baked into the binary at compile time (//go:embed).
|
|
// Fetched URL sources are cached in <ZDDC_ROOT>/_app/; the cache is fetch-once
|
|
// and never re-validates — operators delete the file to force a refetch.
|
|
type ZddcFile struct {
|
|
ACL ACLRules `yaml:"acl"`
|
|
Admins []string `yaml:"admins"`
|
|
Title string `yaml:"title"`
|
|
Apps map[string]string `yaml:"apps,omitempty"`
|
|
}
|
|
|
|
// ParseFile reads and parses a .zddc YAML file.
|
|
// Returns an empty ZddcFile (no rules) if the file does not exist.
|
|
func ParseFile(path string) (ZddcFile, error) {
|
|
data, err := os.ReadFile(path)
|
|
if os.IsNotExist(err) {
|
|
return ZddcFile{}, nil
|
|
}
|
|
if err != nil {
|
|
return ZddcFile{}, err
|
|
}
|
|
|
|
var zf ZddcFile
|
|
if err := yaml.Unmarshal(data, &zf); err != nil {
|
|
return ZddcFile{}, err
|
|
}
|
|
return zf, nil
|
|
}
|