feat: Networks-Members für bridge/bond + System-Rules-Card + Theme-Revert
* Migration 0011: members JSONB für network_interfaces. Bridge/bond brauchen ≥1 Member (NOT VALID-Constraint, schont bestehende Rows). vlan/wireguard/ethernet ignorieren das Feld. * Backend-Validation pro Typ: vlan→parent+vlan_id, bridge/bond→members, ethernet/wireguard→keins. Repo serialisiert via JSONB. * Form Networks: Members-Multi-Select für bridge/bond, Composition- Spalte zeigt vlan-tag bzw. Member-Liste. * Firewall-Rules-Tab zeigt jetzt SystemRulesCard ganz oben — Anti- Lockout (SSH/443), stateful baseline, default-deny-Erklärung. * Theme-Tokens 1:1 mail-gateway: fontSize 13, controlHeight 34 (vorher zu dichtes 12/28). Density kommt vom DataTable size="small". * Makefile publish-amd64 lädt jetzt auch edgeguard-ui_*_all.deb und edgeguard_*_all.deb hoch (vorher nur api). * Version 1.0.0 → 1.0.3. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -66,6 +66,10 @@ func (h *NetworksHandler) Create(c *gin.Context) {
|
||||
response.BadRequest(c, err)
|
||||
return
|
||||
}
|
||||
if err := validateInterface(&req); err != nil {
|
||||
response.BadRequest(c, err)
|
||||
return
|
||||
}
|
||||
out, err := h.Repo.Create(c.Request.Context(), req)
|
||||
if err != nil {
|
||||
response.Internal(c, err)
|
||||
@@ -85,6 +89,10 @@ func (h *NetworksHandler) Update(c *gin.Context) {
|
||||
response.BadRequest(c, err)
|
||||
return
|
||||
}
|
||||
if err := validateInterface(&req); err != nil {
|
||||
response.BadRequest(c, err)
|
||||
return
|
||||
}
|
||||
out, err := h.Repo.Update(c.Request.Context(), id, req)
|
||||
if err != nil {
|
||||
if errors.Is(err, networkifs.ErrNotFound) {
|
||||
@@ -116,6 +124,40 @@ func (h *NetworksHandler) Delete(c *gin.Context) {
|
||||
response.NoContent(c)
|
||||
}
|
||||
|
||||
// validateInterface enforces the per-type rules that the SQL CHECK
|
||||
// constraints alone can't express in a friendly way:
|
||||
// - vlan: parent + vlan_id required
|
||||
// - bridge / bond: ≥ 1 member required, vlan_id forbidden
|
||||
// - ethernet / wireguard: parent + members + vlan_id ignored
|
||||
//
|
||||
// The caller normalises empty members to nil before calling so the
|
||||
// repo always receives [] (NOT NULL).
|
||||
func validateInterface(i *models.NetworkInterface) error {
|
||||
switch i.Type {
|
||||
case "vlan":
|
||||
if i.Parent == nil || *i.Parent == "" {
|
||||
return errors.New("vlan requires parent")
|
||||
}
|
||||
if i.VLANID == nil {
|
||||
return errors.New("vlan requires vlan_id")
|
||||
}
|
||||
i.Members = nil
|
||||
case "bridge", "bond":
|
||||
if len(i.Members) == 0 {
|
||||
return errors.New(i.Type + " requires at least one member interface")
|
||||
}
|
||||
i.Parent = nil
|
||||
i.VLANID = nil
|
||||
case "ethernet", "wireguard":
|
||||
i.Parent = nil
|
||||
i.VLANID = nil
|
||||
i.Members = nil
|
||||
default:
|
||||
return errors.New("unknown interface type")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListIPs surfaces the addresses bound to a single interface — UI
|
||||
// uses this for the per-interface IP-list tab.
|
||||
func (h *NetworksHandler) ListIPs(c *gin.Context) {
|
||||
|
||||
Reference in New Issue
Block a user