c0d9aa7518
Codeberg is being retired as the project's public site, so every reference now points at GitHub. That includes the Go module path (codeberg.org/mix/selfpost → github.com/mixeme/selfpost): leaving an import path on a host that is going away would break `go get` and `go install`, so this is not only a docs change. Touches go.mod, test/e2e/go.mod, all imports, Makefile MODULE, the -ldflags version stamp in build/Dockerfile and docs/development.md, the licence headers in the SVG/HTML assets, and README (no more primary/mirror pair). Comments no longer cite the archived specification. "spec 7.6.1", "spec 5.1" and friends pointed into docs/archive/specification-v1.0.md, which is marked as not a source of truth; each is now a reference to the live document that owns the subject — architecture.md (with section), product.md, security.md or the README. The review only asked for the 7.x refs (code-review.md § 4), but 4/5/6/ 8/9 had the same defect, so they went too. Comments only, no behaviour change. Also closes the remaining review items: architecture.md gained a Code layers section with the layer diagram (A2), and TestParseDelivery gained the exotic mail.log cases (§ 3). Fixes a bug that last test found: the delivery-line pattern matched status= greedily, taking the *last* occurrence on the line. Postfix appends the remote server's reply verbatim, so a rejection whose reply quoted "status=sent" was filed as a delivered message in the send log. It now takes the first status= after the recipient, which is the real field. R7 (CONTRIBUTING.md) moved to roadmap 2.x — one developer, no external PR flow, so the file would have no audience yet. R1 (compose image tag) and the git tag stay in roadmap § v1.x as the release-commit steps. gofmt/go vet clean on both modules; go test ./... green except the three known Windows-only failures (file perms, backslash paths, renaming an open file). Not exercised on the dev server — no Docker locally. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
159 lines
5.2 KiB
Go
159 lines
5.2 KiB
Go
package web
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// defaultRateLimitWindowSeconds is the sliding-window length used when an
|
|
// admin sets a message ceiling but leaves the window blank (README § Rate
|
|
// limiting, matching the level-1 default hour; README § Environment variables:
|
|
// RATE_LIMIT_WINDOW_SECONDS).
|
|
const defaultRateLimitWindowSeconds = 3600
|
|
|
|
// rateLimitInput is the validated result of a rate-limit form submission.
|
|
// clear means "remove the differentiated limit" (README § Rate limiting: an
|
|
// empty IP binding leaves only level 1).
|
|
type rateLimitInput struct {
|
|
clear bool
|
|
ips []string
|
|
maxMessages int
|
|
windowSeconds int
|
|
}
|
|
|
|
// parseRateLimitForm validates a rate-limit submission on the server
|
|
// (security.md). It returns clear=true when the admin removes the limit or
|
|
// leaves the IP binding empty; otherwise it requires a positive ceiling and
|
|
// window. The returned error's message is safe to show to the admin.
|
|
func parseRateLimitForm(r *http.Request) (rateLimitInput, error) {
|
|
if err := r.ParseForm(); err != nil {
|
|
return rateLimitInput{}, fmt.Errorf("invalid form submission")
|
|
}
|
|
if r.PostFormValue("clear") != "" {
|
|
return rateLimitInput{clear: true}, nil
|
|
}
|
|
ips, err := parseIPList(r.PostFormValue("allowed_ips"))
|
|
if err != nil {
|
|
return rateLimitInput{}, err
|
|
}
|
|
if len(ips) == 0 {
|
|
// No IP binding: the differentiated limit does not apply (README § Rate
|
|
// limiting).
|
|
return rateLimitInput{clear: true}, nil
|
|
}
|
|
maxMessages, err := parsePositiveInt(r.PostFormValue("max_messages"), 0)
|
|
if err != nil || maxMessages <= 0 {
|
|
return rateLimitInput{}, fmt.Errorf("enter a message limit greater than zero")
|
|
}
|
|
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
|
|
}
|
|
|
|
// parseIPList parses the allowed-IP field (IPs separated by newlines, commas or
|
|
// whitespace) into a deduplicated list of canonical addresses, rejecting any
|
|
// token that is not a valid IP (security.md). The values are only ever stored as
|
|
// SQLite parameters and compared in the milter, never written to a config file.
|
|
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
|
|
}
|
|
|
|
// parsePositiveInt parses a trimmed integer field, returning def when it is
|
|
// blank. A non-numeric value returns an error.
|
|
func parsePositiveInt(raw string, def int) (int, error) {
|
|
raw = strings.TrimSpace(raw)
|
|
if raw == "" {
|
|
return def, nil
|
|
}
|
|
return strconv.Atoi(raw)
|
|
}
|
|
|
|
// handleDomainRateLimit saves or clears a domain-level differentiated rate
|
|
// limit (README § Rate limiting). No reload is needed — the milter reads the
|
|
// row live.
|
|
func (s *Server) handleDomainRateLimit(w http.ResponseWriter, r *http.Request) {
|
|
d, ok := s.lookupDomain(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
in, err := parseRateLimitForm(r)
|
|
if err != nil {
|
|
s.renderDomainDetail(w, r, http.StatusBadRequest, d, detailView{
|
|
FormMode: store.AddressModeWildcard,
|
|
RateLimitErr: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
if err := s.applyRateLimit(in, s.domains.SaveRateLimit, s.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)
|
|
}
|
|
|
|
// handleAppRateLimit saves or clears an application-level differentiated rate
|
|
// limit (README § Rate limiting).
|
|
func (s *Server) handleAppRateLimit(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := s.lookupApplication(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
d, err := s.domains.Get(a.DomainID)
|
|
if err != nil {
|
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
in, err := parseRateLimitForm(r)
|
|
if err != nil {
|
|
s.renderDomainDetail(w, r, http.StatusBadRequest, d, detailView{
|
|
FormMode: store.AddressModeWildcard,
|
|
RateLimitErr: fmt.Sprintf("%s: %s", a.Login, err.Error()),
|
|
})
|
|
return
|
|
}
|
|
if err := s.applyRateLimit(in, s.apps.SaveRateLimit, s.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)
|
|
}
|
|
|
|
// applyRateLimit dispatches a validated input to the save or clear method of the
|
|
// relevant service, keyed by the domain or application id.
|
|
func (s *Server) 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)
|
|
}
|