- Two inbound domains on one upstream could never change its TLS mode,
each save refused for the other (medium): SetTransportAs changes the
mode for every domain on the upstream when the one saving may change
them all; a domain user who may not is refused with the mode, not the
other tenant's domain name (security F1: the first version named it).
- A deletion's leftover DKIM key is removed by Resync (Reload
configuration, a restore's first start) for names no domain has.
- The backup's write deadline moves before Check.
- hasUnsavedEdit skips password and file fields and compares a multiple
select's options; htmx.config.timeout 30 s, so a refresh never answered
ends and is tried again; a failed refresh's promise is handled.
- An empty filtered Outbound log says no message matches the filters.
- The dummy bcrypt hash is made at start; a DMARC part over 8 MiB is
refused for its size like the other two limits.
- Health's Configuration box says what Reload writes (design first,
32dfe4a).
- Docs: CHANGELOG, guide § Inbound, security.md (the shared upstream's
mode, the profile form's "username taken"), architecture.md (owed to an
address), the plan's notes corrected.
Tests: the shared upstream (service, handler), the leftover key, all eight
Health boxes ordered, the subject from before migration 0011, the new JS
cases.
Tested on the test server: go vet + go test of 25 packages, make e2e (all
pass, 636 s) on this tree.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -250,6 +250,8 @@ func firstNonEmpty(ss ...string) string {
|
||||
|
||||
func inboundFlash(r *http.Request) string {
|
||||
switch {
|
||||
case r.URL.Query().Get("shared") != "":
|
||||
return "Upstream saved. Its TLS mode is one for every domain forwarded to it, and the other domains on it were changed too."
|
||||
case r.URL.Query().Get("saved") != "":
|
||||
return "Upstream saved."
|
||||
case r.URL.Query().Get("recipients") != "":
|
||||
@@ -284,12 +286,30 @@ func (h *Handlers) HandleInboundTransport(w http.ResponseWriter, r *http.Request
|
||||
host := r.PostFormValue("host")
|
||||
port := r.PostFormValue("port")
|
||||
tlsMode := r.PostFormValue("tls_mode")
|
||||
if err := h.inbound.SetTransport(d.ID, host, port, tlsMode); err != nil {
|
||||
p, _ := h.principal(r)
|
||||
changed, err := h.inbound.SetTransportAs(d.ID, host, port, tlsMode, func(o store.InboundDomain) bool {
|
||||
return p.CanAccessInboundDomain(o.ID)
|
||||
})
|
||||
var shared *inbound.UpstreamShared
|
||||
if errors.As(err, &shared) {
|
||||
// The other domain is another tenant's: its mode is said, its name
|
||||
// is not (security review of audit stage 4).
|
||||
logf("panel: inbound: save upstream of %s: %v", d.Name, err)
|
||||
h.renderInboundDetail(w, r, http.StatusBadRequest, d, inboundDetailView{
|
||||
TransportErr: "This upstream is also used, with TLS mode " + shared.Mode + ", by an inbound domain you do not manage, and an upstream has one TLS mode: choose " + shared.Mode + ", or ask the administrator to change it for both.",
|
||||
})
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
h.renderInboundDetail(w, r, http.StatusBadRequest, d, inboundDetailView{
|
||||
TransportErr: inboundErrorMessage(err, "upstream", "the upstream"),
|
||||
})
|
||||
return
|
||||
}
|
||||
if changed > 0 {
|
||||
http.Redirect(w, r, fmt.Sprintf("/inbound/domains/%d?saved=1&shared=%d", d.ID, changed), http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
http.Redirect(w, r, fmt.Sprintf("/inbound/domains/%d?saved=1", d.ID), http.StatusSeeOther)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user