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>
70 lines
2.9 KiB
HTML
70 lines
2.9 KiB
HTML
{{define "content"}}
|
|
<h1>{{if .IsEdit}}Edit user{{else}}Create user{{end}}</h1>
|
|
|
|
{{template "back_link" (back "/server/users" "Back to users")}}
|
|
|
|
<div class="card narrow">
|
|
{{if .Error}}<p class="error">{{.Error}}</p>{{end}}
|
|
<form method="post" action="{{if .IsEdit}}/server/users/{{.UserID}}{{else}}/server/users/new{{end}}">
|
|
<label for="username">Username</label>
|
|
<input id="username" name="username" autocomplete="username"
|
|
autocapitalize="none" spellcheck="false" value="{{.FormUsername}}" required>
|
|
|
|
<label for="password">Password{{if .IsEdit}} (leave empty to keep){{end}}</label>
|
|
<input id="password" name="password" type="password" autocomplete="new-password" {{if not .IsEdit}}required{{end}}>
|
|
|
|
<label for="role">Role</label>
|
|
{{if .LastGlobalLocked}}<input type="hidden" name="role" value="{{.FormRole}}">{{end}}
|
|
<select id="role" name="role" data-global-role="{{.GlobalRole}}"{{if .LastGlobalLocked}} disabled{{end}}>
|
|
<option value="domain" {{if eq .FormRole "domain"}}selected{{end}}>Domain administrator</option>
|
|
<option value="global" {{if eq .FormRole "global"}}selected{{end}}>Global administrator</option>
|
|
</select>
|
|
{{if .LastGlobalLocked}}<p class="muted">The only global administrator cannot be demoted.</p>{{end}}
|
|
|
|
{{/* Outbound and inbound domains are assigned separately; a domain
|
|
administrator needs at least one on either list. "All" also covers
|
|
domains added later — with it ticked the rows below are ignored. */}}
|
|
<div id="domain-pick" data-domain-pick>
|
|
<fieldset>
|
|
<legend>Outbound domains</legend>
|
|
<p class="muted">A domain administrator needs at least one outbound or inbound domain.</p>
|
|
<label class="check">
|
|
<input type="checkbox" name="all_domains" value="1" {{if .FormAllDomains}}checked{{end}}>
|
|
All, including domains added later
|
|
</label>
|
|
{{range .Domains}}
|
|
<label class="check">
|
|
<input type="checkbox" name="domain_ids" value="{{.ID}}" {{if index $.FormDomains .ID}}checked{{end}}>
|
|
{{.Name}}
|
|
</label>
|
|
{{end}}
|
|
</fieldset>
|
|
{{if .InboundEnabled}}
|
|
<fieldset>
|
|
<legend>Inbound domains</legend>
|
|
<label class="check">
|
|
<input type="checkbox" name="all_inbound_domains" value="1" {{if .FormAllInbound}}checked{{end}}>
|
|
All, including domains added later
|
|
</label>
|
|
{{range .InboundDomains}}
|
|
<label class="check">
|
|
<input type="checkbox" name="inbound_domain_ids" value="{{.ID}}" {{if index $.FormInbound .ID}}checked{{end}}>
|
|
{{.Name}}
|
|
</label>
|
|
{{end}}
|
|
</fieldset>
|
|
{{end}}
|
|
</div>
|
|
|
|
<button type="submit">{{if .IsEdit}}Save{{else}}Create{{end}}</button>
|
|
</form>
|
|
{{if .IsEdit}}
|
|
{{if .LastGlobalLocked}}
|
|
<p class="muted">The only global administrator cannot be deleted.</p>
|
|
{{else}}
|
|
<a class="danger" href="/server/users/{{.UserID}}/delete">Delete user</a>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|