ZDDC
4eeb25c0ef
Replaces the URL/channel/version-fetching tool-HTML system with a
local-only override model. No network fetch, no Ed25519 signatures, no
channels/versions, no `apps:` .zddc key.
Tool HTML resolves, in precedence:
1. a real file on disk at the path (operator drops browse.html / archive.html
/ a new mytool.html) — served by the existing static handler;
2. an `<app>.html` member of the site-root <ZDDC_ROOT>/.zddc.zip bundle, read
server-side via internal/zipfs (local file, no fetch, no signature;
re-stat'd each request for free hot-reload);
3. the embedded //go:embed default.
Remove (complete unwire):
- internal/apps/{fetch,verify,cache,singleflight}.go and their tests; the
spec-parsing/cascade machinery in apps.go (ParseSpec/Resolve/PreviewLine/
SpecComponents/appsState, DefaultUpstream*/DefaultChannel/CacheDirName).
- --apps-pubkey / ZDDC_APPS_PUBKEY flag+env+Config field; the setupApps
cache/fetcher/pubkey wiring (now just apps.NewServer(root, version)).
- the `apps:` / `apps_pubkey:` .zddc keys: ZddcFile.Apps/AppsPubKey, the
walker merges, cascade-summary adds, validate.go apps validation
(ValidateAppSourceSpec/validateURLSpec/validateChannelOrVersion/
AppsDefaultKey/IsValidAppsKey), and the isZero/is-empty refs. A stale
apps:/apps_pubkey: in an existing .zddc is now silently ignored
(back-compat), not a parse error. Client .zddc validator (preview-yaml.js)
drops the apps/apps_pubkey keys + appsmap case.
Add:
- internal/apps/bundle.go — nil-safe Bundle over <root>/.zddc.zip with
stat-based hot-reload, size caps, corrupt-zip tolerance.
- handler.go: Server{Bundle}, resolveBytes (bundle→embedded), simplified
Serve; X-ZDDC-Source = bundle:<m> / embedded:<app>@<ver>.
- dispatch: GET /.zddc.zip is 404 for everyone (config, not content); the
server reads members from the filesystem internally.
Tests: new bundle_test.go (member hit/absent/no-file/hot-reload/corrupt);
handler_test.go rewritten for bundle-overrides-embedded, absent-member→
embedded, unknown-tool 503, conditional-GET for both sources; dispatch test
covers bundle override + /.zddc.zip 404 + availability rules. go build/vet/
test ./... all green; gofmt clean. Docs (AGENTS.md, ARCHITECTURE.md) updated.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
121 lines
2.6 KiB
Go
121 lines
2.6 KiB
Go
package zddc
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
func TestValidatePattern(t *testing.T) {
|
|
cases := []struct {
|
|
pattern string
|
|
ok bool
|
|
}{
|
|
{"alice@example.com", true},
|
|
{"*@example.com", true},
|
|
{"alice@*", true},
|
|
{"*", true},
|
|
{"", false},
|
|
{" alice@example.com", false},
|
|
{"alice@example.com ", false},
|
|
{"alice @example.com", false},
|
|
{"alice@ex ample.com", false},
|
|
{"alice@@example.com", false},
|
|
{"@example.com", false},
|
|
{"alice@", false},
|
|
{"@", false},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.pattern, func(t *testing.T) {
|
|
err := ValidatePattern(tc.pattern)
|
|
if tc.ok && err != nil {
|
|
t.Errorf("ValidatePattern(%q) = %v, want nil", tc.pattern, err)
|
|
}
|
|
if !tc.ok && err == nil {
|
|
t.Errorf("ValidatePattern(%q) = nil, want error", tc.pattern)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateFile(t *testing.T) {
|
|
zf := ZddcFile{
|
|
Title: "ok",
|
|
ACL: ACLRules{Permissions: map[string]string{
|
|
"good@example.com": "rwcd",
|
|
"@bad": "rwcd",
|
|
"two@@ats": "",
|
|
}},
|
|
Admins: []string{"@nobody"},
|
|
}
|
|
errs := ValidateFile(zf)
|
|
// expect 3 errors
|
|
if len(errs) != 3 {
|
|
t.Fatalf("got %d errors, want 3: %+v", len(errs), errs)
|
|
}
|
|
wantFields := map[string]bool{
|
|
"acl.permissions[\"@bad\"]": false,
|
|
"acl.permissions[\"two@@ats\"]": false,
|
|
"admins[0]": false,
|
|
}
|
|
for _, e := range errs {
|
|
if _, ok := wantFields[e.Field]; !ok {
|
|
t.Errorf("unexpected error field: %q", e.Field)
|
|
continue
|
|
}
|
|
wantFields[e.Field] = true
|
|
}
|
|
for f, seen := range wantFields {
|
|
if !seen {
|
|
t.Errorf("missing error for field %q", f)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateProjectName(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
ok bool
|
|
}{
|
|
{"alpha", true},
|
|
{"Alpha", true},
|
|
{"a", true},
|
|
{"a1", true},
|
|
{"a-1", true},
|
|
{"a_b", true},
|
|
{"123-project", true},
|
|
{"Site-3", true},
|
|
{"", false},
|
|
{".hidden", false},
|
|
{"_template", false},
|
|
{"-leading-dash", false},
|
|
{"foo bar", false},
|
|
{"foo/bar", false},
|
|
{"foo\\bar", false},
|
|
{"foo.bar", false},
|
|
{"..", false},
|
|
{".", false},
|
|
{string(make([]byte, 65)), false},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err := ValidateProjectName(tc.name)
|
|
if tc.ok && err != nil {
|
|
t.Errorf("ValidateProjectName(%q) = %v, want nil", tc.name, err)
|
|
}
|
|
if !tc.ok && err == nil {
|
|
t.Errorf("ValidateProjectName(%q) = nil, want error", tc.name)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateFileTitleLength(t *testing.T) {
|
|
long := make([]byte, 201)
|
|
for i := range long {
|
|
long[i] = 'a'
|
|
}
|
|
zf := ZddcFile{Title: string(long)}
|
|
errs := ValidateFile(zf)
|
|
if len(errs) != 1 || errs[0].Field != "title" {
|
|
t.Fatalf("expected one title-length error, got %+v", errs)
|
|
}
|
|
}
|