mixandClaude Opus 5.5
bd746c61d7
Stage 1, step 3 (plan § Routes). BREAKING: every panel URL changes and the
old paths are removed without redirects.
Routes (web.go)
- /status -> /overview; /domains -> /outbound/domains with the domain's
settings actions under .../settings/ (reports, ratelimit, export);
/deliveries -> /outbound/log; /mail-queue -> /outbound/queue; /dmarc ->
/outbound/dmarc; /inbound -> /inbound/domains; /system-log ->
/server/log; /backup -> /server/backup (import under it); /users ->
/server/users; recheck and reload under /server/health/.
- One fragment name: <page>/fragment everywhere.
- Everything under /server/ is registered through server(), which wraps
the handler in globalOnly: the subtree is guarded once, where a new
route cannot forget it. Handlers keep their own requireGlobal.
- GET / leads to /overview, /outbound/domains or /inbound/domains.
- The /account -> /settings redirect is gone with /settings.
Account and Server > Settings
- handlers_account.go: GET /account and three POSTs - profile (username,
e-mail; no password asked, as designed), password (current password,
rate-limited like a sign-in, signs out other sessions), dmarc (the
user's default: hosted / account / custom / none, each validated).
This replaces step 1's bridge through the old Settings form.
- handlers_settings.go is the instance's page only: log retention and the
read-only rate limits, global role.
- One legacy template serves both pages by a flag until stage 2 gives each
its own: a new legacy page cannot be added to the ratchet.
Still to come inside stage 1, and why @routes stays on the ratchet:
- step 4: the application routes (one POST, under the domain);
- step 5: GET /server/health.
With @routes removed by hand TestRoutesFollowNavigation reports exactly
those and nothing else - no template links to a path the router lacks.
Old templates, tests and the e2e client are retargeted. The e2e module was
edited but not run here (no Docker, and its dependency could not be
downloaded on this machine).
Tests: Account (page, profile, password, DMARC default in every mode, a
domain administrator's own row only), Server settings (saved without a
password, range, global only), the /server/ subtree answered 404 by the
router for a domain administrator with All on both lists and for no
principal.
go test ./... green except the two Windows-only failures in internal/domain
and internal/logtail.
Roadmap 13/27.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
80 lines
2.9 KiB
Go
80 lines
2.9 KiB
Go
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// wantRunning are the supervisord programs that must be RUNNING once the
|
|
// container is up (build/supervisord.conf). postfix-reload is deliberately
|
|
// excluded: autostart=false, its healthy resting state is STOPPED.
|
|
var wantRunning = []string{"opendkim", "panel", "postfix", "cert-reload", "logrotate"}
|
|
|
|
// checkSupervisorProcesses shells into the container directly (not through the
|
|
// panel's /overview page) so it works before an administrator account even
|
|
// exists — this is the first thing the harness checks after `docker compose
|
|
// up` (plan C.4). Programs take a moment to leave STARTING right after the
|
|
// container starts, so this polls rather than checking once.
|
|
func checkSupervisorProcesses(s *stack) error {
|
|
var lastErr error
|
|
err := waitFor("all supervised programs to reach their steady state", 20*time.Second, 500*time.Millisecond, func() (bool, error) {
|
|
out, execErr := s.execIn("selfpost", "supervisorctl", "-c", "/etc/supervisor/supervisord.conf", "status")
|
|
// supervisorctl exits non-zero when any program is not RUNNING, which
|
|
// is expected for postfix-reload — parse the output regardless of exit
|
|
// status.
|
|
states := parseSupervisorStatus(out)
|
|
if len(states) == 0 {
|
|
lastErr = fmt.Errorf("supervisorctl status produced nothing to parse: %v\n%s", execErr, out)
|
|
return false, lastErr
|
|
}
|
|
for _, name := range wantRunning {
|
|
state, ok := states[name]
|
|
if !ok {
|
|
lastErr = fmt.Errorf("program %q not reported by supervisorctl:\n%s", name, out)
|
|
return false, lastErr
|
|
}
|
|
if state != "RUNNING" {
|
|
lastErr = fmt.Errorf("program %q is %s, want RUNNING:\n%s", name, state, out)
|
|
return false, lastErr
|
|
}
|
|
}
|
|
if state, ok := states["postfix-reload"]; ok && state != "STOPPED" {
|
|
lastErr = fmt.Errorf("program postfix-reload is %s, want STOPPED (autostart=false):\n%s", state, out)
|
|
return false, lastErr
|
|
}
|
|
return true, nil
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("%w\n==== selfpost logs ====\n%s", err, s.logs("selfpost"))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parseSupervisorStatus(out string) map[string]string {
|
|
states := make(map[string]string)
|
|
for _, line := range strings.Split(out, "\n") {
|
|
fields := strings.Fields(line)
|
|
if len(fields) < 2 {
|
|
continue
|
|
}
|
|
states[fields[0]] = fields[1]
|
|
}
|
|
return states
|
|
}
|
|
|
|
// checkInboundRelayOff asserts the default image does not accept mail on
|
|
// port 25: smtp/inet is absent from master.cf (Debian's stock listener is
|
|
// removed when INBOUND_RELAY_ENABLE is not true).
|
|
func checkInboundRelayOff(s *stack) error {
|
|
out, err := s.execIn("selfpost", "postconf", "-M", "smtp/inet")
|
|
combined := out
|
|
if err != nil {
|
|
combined += err.Error()
|
|
}
|
|
if strings.Contains(combined, "smtpd") && !strings.Contains(combined, "warning:") && !strings.Contains(combined, "fatal:") {
|
|
return fmt.Errorf("inbound smtp/inet is present while INBOUND_RELAY_ENABLE is off:\n%s", out)
|
|
}
|
|
return nil
|
|
}
|