mixandClaude Opus 5.5
3b86f6c3b6
Stage 1, step 2 (plan § Who sees what).
Store
- Reach{AllDomains, DomainIDs, AllInbound, InboundDomainIDs} is what a
domain user is assigned. CreateUser takes it; SetUserReach / ClearUserReach
replace SetUserDomains / ClearUserDomains and write both directions in one
transaction. A domain user with nothing on either list is refused
(ErrEmptyReach). With All set the rows of that direction are not stored,
so clearing All later brings nothing stale back.
- ListDomainsForUser honours all_domains; ListInboundDomainsForUser is its
inbound twin. Both filter in the query.
Authorization
- auth.Principal carries the whole reach: CanAccessDomain (now also true
with All), CanAccessInboundDomain, HasOutbound, HasInbound. An id or a
name on one list opens nothing on the other.
- Inbound handlers in three strengths: requireInbound (the list, filtered),
requireInboundDomain (one domain: page, DNS re-check, upstream,
recipients), requireInboundGlobal (add, delete confirm, delete). All
answer the same 404.
- domainIDSet and the DMARC report pages go through the principal instead
of looking at p.Domains themselves.
Panel (old templates, until stage 2)
- User form: two lists with All; inbound is offered only where the feature
is on, and saving the form with it off keeps the user's inbound reach.
Promotion to global drops the reach.
- Menu: a group with nothing assigned is absent; / sends an inbound-only
administrator to Inbound. The inbound pages hide add / delete from a
domain administrator.
Tests: every route of one inbound domain against five kinds of refused
request (another tenant's id, a missing id, outbound-only reach, an outbound
domain with the same id, one with the same name, no principal) with the 404
bodies compared; add/delete as every non-global user; the filtered list
including a domain added later; thirteen outbound routes against another
tenant's domain and application id; the user form; the reach in the store;
the principal matrix; the menu; the home redirect. Removing the access check
or the query filter makes the tests fail (checked by hand).
go test ./... green except the two Windows-only failures in internal/domain
and internal/logtail that predate this work.
Roadmap 12/27.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
112 lines
3.1 KiB
Go
112 lines
3.1 KiB
Go
package handlers
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/mixeme/selfpost/internal/dnscheck"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
"github.com/mixeme/selfpost/internal/web/auth"
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
func TestSettingsPageShowsSendLogRetention(t *testing.T) {
|
|
h, _ := settingsServer(t)
|
|
if err := h.store.SetSendLogRetentionDays(45); err != nil {
|
|
t.Fatalf("SetSendLogRetentionDays: %v", err)
|
|
}
|
|
|
|
out := getBody(t, h.HandleSettings, "/settings")
|
|
for _, want := range []string{
|
|
`id="deliveries-retention"`,
|
|
`name="send_log_retention_days"`,
|
|
`value="45"`,
|
|
"Send log retention",
|
|
} {
|
|
if !strings.Contains(out, want) {
|
|
t.Errorf("settings page missing %q:\n%s", want, out)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSubmitSettingsSavesSendLogRetention(t *testing.T) {
|
|
h, password := settingsServer(t)
|
|
|
|
values := url.Values{
|
|
"username": {"admin"},
|
|
"current_password": {password},
|
|
"send_log_retention_days": {"120"},
|
|
}
|
|
req := httptest.NewRequest(http.MethodPost, "/settings", strings.NewReader(values.Encode()))
|
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
|
req = auth.RequestWithPrincipal(req, globalPrincipal)
|
|
|
|
rec := httptest.NewRecorder()
|
|
h.HandleSettings(rec, req)
|
|
if rec.Code != http.StatusSeeOther {
|
|
t.Fatalf("POST /settings = %d, want 303:\n%s", rec.Code, rec.Body.String())
|
|
}
|
|
|
|
got, err := h.store.GetSendLogRetentionDays(90)
|
|
if err != nil {
|
|
t.Fatalf("GetSendLogRetentionDays: %v", err)
|
|
}
|
|
if got != 120 {
|
|
t.Fatalf("retention = %d, want 120", got)
|
|
}
|
|
}
|
|
|
|
func TestSubmitSettingsRejectsOutOfRangeRetention(t *testing.T) {
|
|
h, password := settingsServer(t)
|
|
|
|
values := url.Values{
|
|
"username": {"admin"},
|
|
"current_password": {password},
|
|
"send_log_retention_days": {"3"},
|
|
}
|
|
req := httptest.NewRequest(http.MethodPost, "/settings", strings.NewReader(values.Encode()))
|
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
|
req = auth.RequestWithPrincipal(req, globalPrincipal)
|
|
|
|
rec := httptest.NewRecorder()
|
|
h.HandleSettings(rec, req)
|
|
if rec.Code != http.StatusBadRequest {
|
|
t.Fatalf("POST /settings = %d, want 400:\n%s", rec.Code, rec.Body.String())
|
|
}
|
|
if !strings.Contains(rec.Body.String(), "between 7 and 365") {
|
|
t.Errorf("expected range error in body:\n%s", rec.Body.String())
|
|
}
|
|
}
|
|
|
|
func settingsServer(t *testing.T) (*Handlers, string) {
|
|
t.Helper()
|
|
st, err := store.Open(filepath.Join(t.TempDir(), "test.db"))
|
|
if err != nil {
|
|
t.Fatalf("open store: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = st.Close() })
|
|
|
|
const password = "correct-password-here!"
|
|
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.MinCost)
|
|
if err != nil {
|
|
t.Fatalf("hash password: %v", err)
|
|
}
|
|
if _, err := st.CreateUser("admin", string(hash), store.RoleGlobal, store.Reach{}); err != nil {
|
|
t.Fatalf("create user: %v", err)
|
|
}
|
|
|
|
v := mustView(t)
|
|
a := auth.New(st, auth.Config{}, v, filepath.Join(t.TempDir(), "setup-token"))
|
|
return &Handlers{
|
|
store: st,
|
|
view: v,
|
|
auth: a,
|
|
dns: dnscheck.New(nil),
|
|
cfg: Config{SendLogRetentionEnvDefault: 90},
|
|
}, password
|
|
}
|