Follows the design and guard commits before it. Written by Sonnet,
reviewed by Opus.
The report address
- Baseline: users.dmarc_default_mode, users.dmarc_default_address and
domains.dmarc_rua_user_id are gone. domains.dmarc_rua alone says
where reports go: '' is no reports (a new domain), the address
SelfPost derives for the domain is the hosted choice (while hosted
reports are on), anything else is a typed address.
- Removed: the user default and its store functions, a domain
following a user, keep / inherit, followCreator, POST /account/dmarc
with its handler, the DMARC box of Account, the user-delete item
about domains losing their address.
- Domain settings offers the three choices; beside the typed address a
"Use my e-mail" button fills in the profile e-mail (panel.js: one
generic data-fill hook; absent without a profile e-mail; it fills,
it does not save).
- The DMARC record's note names the address and no user. This closes
L4 of the security review.
- Domain export / import carries the address as a plain string.
- The ingest allow-list is the generic mailbox plus each domain's
address on this host; the generic mailbox is always open now.
- dev/migrate1x (not in the tree): a 1.x domain that inherited the
instance default gets that address as its own, so no published rua=
changes.
Row actions
- row_action partial (RowAction: Label, Post, Confirm, Danger);
panel.css has the mockup's three rules. A row of the Applications
table is Edit, New password, Delete; the confirmation texts are the
ones the application page's head uses. Both roles, with the checks
of the application page.
Tests cover: a new domain has no reports; each choice saved and shown
selected; hosted refused when hosted reports are off; a bad address
refused with what was typed kept; an untouched save changes nothing in
each state; the fill button with and without a profile e-mail; deleting
a user leaves every domain's address; the row's forms, targets and
confirmations for both roles and a 404 for a stranger.
Known: if hosted reports are switched off later, a stored hosted address
reads as a typed one. docs/guide.md still describes the old choices -
the documentation step.
Evidence
- docs/assets/panel-redesign/evidence/account.png,
out-domain-settings.png, out-domain.png, user-delete.png, help.png:
1440 px wide, headless Edge, real templates served locally with
their fixtures - NOT from the container.
- panel/audit.js on out-domain, out-domain-settings, account, help,
components and user-delete at 1440 and 1280: 1420 texts checked,
problems: [].
- In a browser: the fill button sets the field and does not submit;
the row buttons have the font, size and colour of the Edit link,
Delete the red of the other delete links; data-confirm fires on
both. Hover and focus states were not observed.
- go test -count=1 ./internal/web/... ./internal/store/...
./internal/dmarc/... ./internal/app/... ./internal/inbound/...
./cmd/panel: ok (ten packages; dev/migrate1x also ok).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
195 lines
6.2 KiB
Go
195 lines
6.2 KiB
Go
package store
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
)
|
|
|
|
func TestUpdateUser(t *testing.T) {
|
|
st := openTestStore(t)
|
|
|
|
if err := st.CreateGlobalUser("admin", "hash-one"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
u, err := st.GetUserByUsername("admin")
|
|
if err != nil {
|
|
t.Fatalf("GetUserByUsername: %v", err)
|
|
}
|
|
if err := st.UpdateUser(u.ID, "operator", "hash-two", "reports@hub.example"); err != nil {
|
|
t.Fatalf("UpdateUser: %v", err)
|
|
}
|
|
|
|
got, err := st.GetUser(u.ID)
|
|
if err != nil {
|
|
t.Fatalf("GetUser: %v", err)
|
|
}
|
|
if got.Email != "reports@hub.example" {
|
|
t.Fatalf("email = %q", got.Email)
|
|
}
|
|
// The account e-mail is the user's own: nothing is mirrored into the
|
|
// instance settings.
|
|
if v, err := st.GetSetting("dmarc_report_email"); err == nil && v != "" {
|
|
t.Fatalf("the e-mail leaked into the instance settings: %q", v)
|
|
}
|
|
|
|
if err := st.UpdateUser(u.ID, "operator", "hash-three", ""); err != nil {
|
|
t.Fatalf("clear e-mail: %v", err)
|
|
}
|
|
got, err = st.GetUser(u.ID)
|
|
if err != nil {
|
|
t.Fatalf("GetUser: %v", err)
|
|
}
|
|
if got.Username != "operator" || got.PasswordHash != "hash-three" {
|
|
t.Fatalf("unexpected user after update: %+v", got)
|
|
}
|
|
if got.CreatedAt.IsZero() {
|
|
t.Fatal("update dropped created_at")
|
|
}
|
|
}
|
|
|
|
func TestUpdateUserWithoutUser(t *testing.T) {
|
|
st := openTestStore(t)
|
|
|
|
if err := st.UpdateUser(1, "operator", "hash", ""); !errors.Is(err, ErrUserNotFound) {
|
|
t.Fatalf("UpdateUser without user = %v, want ErrUserNotFound", err)
|
|
}
|
|
exists, err := st.UserExists()
|
|
if err != nil {
|
|
t.Fatalf("UserExists: %v", err)
|
|
}
|
|
if exists {
|
|
t.Fatal("UpdateUser created a user")
|
|
}
|
|
}
|
|
|
|
func TestCreateDomainAdminUser(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.CreateGlobalUser("admin", "hash"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
d, err := st.AddDomain("example.com", "s1")
|
|
if err != nil {
|
|
t.Fatalf("AddDomain: %v", err)
|
|
}
|
|
id, err := st.CreateUser("domainop", "hash2", RoleDomain, Reach{DomainIDs: []int64{d.ID}})
|
|
if err != nil {
|
|
t.Fatalf("CreateUser: %v", err)
|
|
}
|
|
u, err := st.GetUser(id)
|
|
if err != nil {
|
|
t.Fatalf("GetUser: %v", err)
|
|
}
|
|
if len(u.DomainIDs) != 1 || u.DomainIDs[0] != d.ID {
|
|
t.Fatalf("domain ids = %v, want [%d]", u.DomainIDs, d.ID)
|
|
}
|
|
}
|
|
|
|
func TestDeleteLastGlobalUser(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.CreateGlobalUser("admin", "hash"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
u, err := st.GetUserByUsername("admin")
|
|
if err != nil {
|
|
t.Fatalf("GetUserByUsername: %v", err)
|
|
}
|
|
if err := st.DeleteUser(u.ID); !errors.Is(err, ErrLastGlobal) {
|
|
t.Fatalf("DeleteUser = %v, want ErrLastGlobal", err)
|
|
}
|
|
}
|
|
|
|
// A domain user's reach covers two directions that are granted separately,
|
|
// each with an All flag; the store writes and reads all four parts together.
|
|
func TestUserReach(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.CreateGlobalUser("admin", "hash"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
out1, _ := st.AddDomain("one.example.com", "s1")
|
|
out2, _ := st.AddDomain("two.example.com", "s1")
|
|
in1, _ := st.AddInboundDomain("in-one.example.com")
|
|
in2, _ := st.AddInboundDomain("in-two.example.com")
|
|
|
|
if _, err := st.CreateUser("nothing", "h", RoleDomain, Reach{}); !errors.Is(err, ErrEmptyReach) {
|
|
t.Fatalf("a domain user with nothing assigned = %v, want ErrEmptyReach", err)
|
|
}
|
|
if exists, _ := st.GetUserByUsername("nothing"); exists.ID != 0 {
|
|
t.Fatal("the refused user was created")
|
|
}
|
|
|
|
// Inbound alone is enough: the role needs something on either list.
|
|
id, err := st.CreateUser("ops", "h", RoleDomain, Reach{InboundDomainIDs: []int64{in1.ID}})
|
|
if err != nil {
|
|
t.Fatalf("CreateUser: %v", err)
|
|
}
|
|
u, _ := st.GetUser(id)
|
|
if len(u.DomainIDs) != 0 || len(u.InboundDomainIDs) != 1 || u.InboundDomainIDs[0] != in1.ID || u.AllDomains || u.AllInboundDomains {
|
|
t.Fatalf("reach = %+v", u.Reach())
|
|
}
|
|
if got, _ := st.ListDomainsForUser(id); len(got) != 0 {
|
|
t.Errorf("an inbound assignment gave %d sending domains", len(got))
|
|
}
|
|
if got, _ := st.ListInboundDomainsForUser(id); len(got) != 1 || got[0].ID != in1.ID {
|
|
t.Errorf("inbound domains for the user = %+v", got)
|
|
}
|
|
|
|
// All replaces the rows of its direction and leaves the other alone.
|
|
if err := st.SetUserReach(id, Reach{AllDomains: true, DomainIDs: []int64{out1.ID}, InboundDomainIDs: []int64{in1.ID, in2.ID}}); err != nil {
|
|
t.Fatalf("SetUserReach: %v", err)
|
|
}
|
|
u, _ = st.GetUser(id)
|
|
if !u.AllDomains || len(u.DomainIDs) != 0 || len(u.InboundDomainIDs) != 2 {
|
|
t.Fatalf("reach after All = %+v; rows under All must not be stored", u.Reach())
|
|
}
|
|
// ...and All includes a domain added afterwards.
|
|
out3, _ := st.AddDomain("three.example.com", "s1")
|
|
got, err := st.ListDomainsForUser(id)
|
|
if err != nil || len(got) != 3 {
|
|
t.Fatalf("All lists %d sending domains (%v), want 3 including the one added later", len(got), err)
|
|
}
|
|
_ = out2
|
|
_ = out3
|
|
|
|
// Clearing All does not bring an old row back.
|
|
if err := st.SetUserReach(id, Reach{DomainIDs: []int64{out2.ID}, AllInbound: true}); err != nil {
|
|
t.Fatalf("SetUserReach: %v", err)
|
|
}
|
|
u, _ = st.GetUser(id)
|
|
if u.AllDomains || len(u.DomainIDs) != 1 || u.DomainIDs[0] != out2.ID || !u.AllInboundDomains || len(u.InboundDomainIDs) != 0 {
|
|
t.Fatalf("reach = %+v", u.Reach())
|
|
}
|
|
if got, _ := st.ListDomainsForUser(id); len(got) != 1 || got[0].ID != out2.ID {
|
|
t.Errorf("sending domains for the user = %+v", got)
|
|
}
|
|
if got, _ := st.ListInboundDomainsForUser(id); len(got) != 2 {
|
|
t.Errorf("All inbound lists %d domains, want 2", len(got))
|
|
}
|
|
|
|
rows, err := st.ListUserRows()
|
|
if err != nil {
|
|
t.Fatalf("ListUserRows: %v", err)
|
|
}
|
|
for _, r := range rows {
|
|
if r.User.ID != id {
|
|
continue
|
|
}
|
|
if len(r.DomainNames) != 1 || r.DomainNames[0] != "two.example.com" || len(r.InboundDomainNames) != 0 || !r.User.AllInboundDomains {
|
|
t.Errorf("list row = %+v", r)
|
|
}
|
|
}
|
|
|
|
if err := st.SetUserReach(id, Reach{}); !errors.Is(err, ErrEmptyReach) {
|
|
t.Errorf("emptying a domain user's reach = %v, want ErrEmptyReach", err)
|
|
}
|
|
admin, _ := st.GetUserByUsername("admin")
|
|
if err := st.SetUserReach(admin.ID, Reach{AllDomains: true}); err == nil {
|
|
t.Error("a reach was set on a global user")
|
|
}
|
|
if err := st.ClearUserReach(id); err != nil {
|
|
t.Fatalf("ClearUserReach: %v", err)
|
|
}
|
|
if u, _ = st.GetUser(id); !u.Reach().Empty() {
|
|
t.Errorf("reach after clearing = %+v", u.Reach())
|
|
}
|
|
}
|