[1.2.0] The second MINOR after 1.0.0: domain administrators with per-domain scope, a panel visual refresh on the SelfPost palette, and refinements to navigation and the send log. Upgrading runs one SQLite migration (`0005_panel_users`); the single administrator becomes a global user. Added: - panel: **domain-admin role** — global administrators manage panel users and Fixed: - Docker build: `LICENSE` is no longer excluded by `.dockerignore`, so the - panel: on signed-in pages with a narrow card (**Settings**, the user form) Changed: - panel: navigation session icons are distinct — **Settings** uses a gear, - panel: `/` redirects domain administrators to `/domains`; global users still - panel: **Sign out** in the navigation column uses the same type size and - panel: **visual style** brought in line with the SelfPost mark — brick accent - panel: the send log's **status is a badge**, in the same ok/warn/error/unknown … (1 more in CHANGELOG) [1.2.1] Panel refinements after 1.2.0: navigation icons, status-badge centreing, drill-down back-link placement, and safeguards for the sole global administrator. Upgrading is a tag bump; no migration. Fixed: - panel: status badge text sat low in the box (and below the heading or label - panel: the **Users** navigation icon was two full silhouettes with staggered - panel: the **Settings** navigation icon was a sun-with-rays (circle plus - panel: the user create/edit form placed «Back to users» at the bottom of the Changed: - panel: the user edit form disables role change and delete for the only global - panel: the user create/edit form hides **Assigned domains** when the role is - panel: **Settings** shows panel credentials and DMARC aggregate reports side [1.2.2] Status page layout after 1.2.1: paired cards in a wide column, denser machine and check copy, and a user-form checkbox fix. Upgrading is a tag bump; no migration. Changed: - panel: **Status** is wide again so paired cards fill the column. Layout: Fixed: - panel: cards inside `.split` used `margin: 0 auto`, which in a CSS grid - panel: on the user create/edit form, **Assigned domains** checkboxes stacked [1.2.3] Domain detail layout and panel polish after 1.2.2. Upgrading is a tag bump; no migration. Changed: - panel: the domain detail page is wide with paired cards (DKIM+SPF ‖ DMARC; - panel: Domains list — **Add domain** sits beside the domain field; the - panel: page URLs, browser titles, and headings are aligned — **Settings** is Fixed: - image: `mail.log` rotation no longer silently stops when the build context [1.2.4] Level-2 rate-limit semantics inverted after 1.2.3, plus a small DNS field height fix. Upgrading is a tag bump; no migration. Changed: - rate limiting (level 2): domain ceilings apply to every client IP (no IP Fixed: - panel: on the domain DNS status grid, the Type (TXT) field height matches [1.2.5] Rate-limit form polish after 1.2.4. Upgrading is a tag bump; no migration. Changed: - panel: rate-limit forms refined — level-1 backstop as muted copy on the Squashed CHANGELOG sections: [1.2.0], [1.2.1], [1.2.2], [1.2.3], [1.2.4], [1.2.5]. Full detail: CHANGELOG.md (1.2.0, 1.2.1, 1.2.2, 1.2.3, 1.2.4, 1.2.5).
189 lines
5.7 KiB
Go
189 lines
5.7 KiB
Go
package handlers
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
const defaultRateLimitWindowSeconds = 3600
|
|
|
|
type rateLimitInput struct {
|
|
clear bool
|
|
ips []string
|
|
maxMessages int
|
|
windowSeconds int
|
|
}
|
|
|
|
func (h *Handlers) l1Messages() int {
|
|
if h.cfg.RateLimitMessagesPerIP > 0 {
|
|
return h.cfg.RateLimitMessagesPerIP
|
|
}
|
|
return 100
|
|
}
|
|
|
|
func (h *Handlers) l1Window() int {
|
|
if h.cfg.RateLimitWindowSeconds > 0 {
|
|
return h.cfg.RateLimitWindowSeconds
|
|
}
|
|
return defaultRateLimitWindowSeconds
|
|
}
|
|
|
|
func parseDomainRateLimitForm(r *http.Request, l1Max int) (rateLimitInput, error) {
|
|
if err := r.ParseForm(); err != nil {
|
|
return rateLimitInput{}, fmt.Errorf("invalid form submission")
|
|
}
|
|
if r.PostFormValue("clear") != "" {
|
|
return rateLimitInput{clear: true}, nil
|
|
}
|
|
rawMax := strings.TrimSpace(r.PostFormValue("max_messages"))
|
|
if rawMax == "" {
|
|
return rateLimitInput{clear: true}, nil
|
|
}
|
|
maxMessages, err := parsePositiveInt(rawMax, 0)
|
|
if err != nil || maxMessages <= 0 {
|
|
return rateLimitInput{}, fmt.Errorf("enter a message limit greater than zero")
|
|
}
|
|
if maxMessages > l1Max {
|
|
return rateLimitInput{}, fmt.Errorf("message limit cannot exceed the level-1 backstop (%d)", l1Max)
|
|
}
|
|
windowSeconds, err := parsePositiveInt(r.PostFormValue("window_seconds"), defaultRateLimitWindowSeconds)
|
|
if err != nil || windowSeconds <= 0 {
|
|
return rateLimitInput{}, fmt.Errorf("enter a time window greater than zero seconds")
|
|
}
|
|
return rateLimitInput{maxMessages: maxMessages, windowSeconds: windowSeconds}, nil
|
|
}
|
|
|
|
func parseAppRateLimitForm(r *http.Request, l1Max, domainMax int, domainActive bool) (rateLimitInput, error) {
|
|
if err := r.ParseForm(); err != nil {
|
|
return rateLimitInput{}, fmt.Errorf("invalid form submission")
|
|
}
|
|
if r.PostFormValue("clear") != "" {
|
|
return rateLimitInput{clear: true}, nil
|
|
}
|
|
rawMax := strings.TrimSpace(r.PostFormValue("max_messages"))
|
|
if rawMax == "" {
|
|
return rateLimitInput{clear: true}, nil
|
|
}
|
|
ips, err := parseIPList(r.PostFormValue("allowed_ips"))
|
|
if err != nil {
|
|
return rateLimitInput{}, err
|
|
}
|
|
if len(ips) == 0 {
|
|
return rateLimitInput{}, fmt.Errorf("enter at least one trusted client IP for an application override")
|
|
}
|
|
maxMessages, err := parsePositiveInt(rawMax, 0)
|
|
if err != nil || maxMessages <= 0 {
|
|
return rateLimitInput{}, fmt.Errorf("enter a message limit greater than zero")
|
|
}
|
|
if maxMessages > l1Max {
|
|
return rateLimitInput{}, fmt.Errorf("message limit cannot exceed the level-1 backstop (%d)", l1Max)
|
|
}
|
|
if domainActive && maxMessages <= domainMax {
|
|
return rateLimitInput{}, fmt.Errorf("application override must be greater than the domain limit (%d)", domainMax)
|
|
}
|
|
windowSeconds, err := parsePositiveInt(r.PostFormValue("window_seconds"), defaultRateLimitWindowSeconds)
|
|
if err != nil || windowSeconds <= 0 {
|
|
return rateLimitInput{}, fmt.Errorf("enter a time window greater than zero seconds")
|
|
}
|
|
return rateLimitInput{ips: ips, maxMessages: maxMessages, windowSeconds: windowSeconds}, nil
|
|
}
|
|
|
|
func parseIPList(raw string) ([]string, error) {
|
|
fields := strings.FieldsFunc(raw, func(r rune) bool {
|
|
return r == '\n' || r == '\r' || r == ',' || r == ' ' || r == '\t' || r == ';'
|
|
})
|
|
var out []string
|
|
seen := make(map[string]bool)
|
|
for _, f := range fields {
|
|
ip := net.ParseIP(f)
|
|
if ip == nil {
|
|
return nil, fmt.Errorf("%q is not a valid IP address", f)
|
|
}
|
|
c := ip.String()
|
|
if !seen[c] {
|
|
seen[c] = true
|
|
out = append(out, c)
|
|
}
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func parsePositiveInt(raw string, def int) (int, error) {
|
|
raw = strings.TrimSpace(raw)
|
|
if raw == "" {
|
|
return def, nil
|
|
}
|
|
return strconv.Atoi(raw)
|
|
}
|
|
|
|
func (h *Handlers) HandleDomainRateLimit(w http.ResponseWriter, r *http.Request) {
|
|
d, ok := h.lookupDomain(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
in, err := parseDomainRateLimitForm(r, h.l1Messages())
|
|
if err != nil {
|
|
h.renderDomainDetail(w, r, http.StatusBadRequest, d, detailView{
|
|
FormMode: store.AddressModeWildcard,
|
|
RateLimitErr: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
if err := h.applyRateLimit(in, h.domains.SaveRateLimit, h.domains.ClearRateLimit, d.ID); err != nil {
|
|
logf("panel: domain %d: save rate limit: %v", d.ID, err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
http.Redirect(w, r, fmt.Sprintf("/domains/%d?ratelimit=1", d.ID), http.StatusSeeOther)
|
|
}
|
|
|
|
func (h *Handlers) HandleAppRateLimit(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := h.lookupApplication(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
d, err := h.domains.Get(a.DomainID)
|
|
if err != nil {
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
domainRL, domainOK, err := h.domains.RateLimit(d.ID)
|
|
if err != nil {
|
|
logf("panel: domain %d: rate limit: %v", d.ID, err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
domainActive := domainOK && domainRL.Active()
|
|
in, err := parseAppRateLimitForm(r, h.l1Messages(), domainRL.MaxMessages, domainActive)
|
|
if err != nil {
|
|
h.renderDomainDetail(w, r, http.StatusBadRequest, d, detailView{
|
|
FormMode: store.AddressModeWildcard,
|
|
RateLimitErr: fmt.Sprintf("%s: %s", a.Login, err.Error()),
|
|
})
|
|
return
|
|
}
|
|
if err := h.applyRateLimit(in, h.apps.SaveRateLimit, h.apps.ClearRateLimit, a.ID); err != nil {
|
|
logf("panel: application %d: save rate limit: %v", a.ID, err)
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
http.Redirect(w, r, fmt.Sprintf("/domains/%d?ratelimit=1", a.DomainID), http.StatusSeeOther)
|
|
}
|
|
|
|
func (h *Handlers) applyRateLimit(
|
|
in rateLimitInput,
|
|
save func(id int64, ips []string, maxMessages, windowSeconds int) error,
|
|
clear func(id int64) error,
|
|
id int64,
|
|
) error {
|
|
if in.clear {
|
|
return clear(id)
|
|
}
|
|
return save(id, in.ips, in.maxMessages, in.windowSeconds)
|
|
}
|