Files
fancy-dns/internal/kubeedit/overrides.go
T
matsandClaude Sonnet 5.5 88479b9a12 Add AddressOverride and DomainRule objects for what lived in a ConfigMap and the config file
The address redirects page rewrote an RPZ ConfigMap through the resolver's own
service account, and the domains page rewrote allow_entries/block_entries in the
config file. Both become cluster objects like the rest.

AddressOverride is one name answered with fixed addresses (the name and
everything under it), exactly what an RPZ "name A address" line did. DomainRule
is a block or allow list of inline names. The resolver reads both with the
existing watch: overrides are rendered into the managed RPZ source the blocklist
manager already has, and rule names join the config's inline entries in the
merged overlay, so the file's config is never written to.

Names are checked to be DNS names or wildcard patterns before they are used,
because they are joined into line-oriented parser input and a newline or a
comment character in one would otherwise add a rule of its own.

The console edits both: the address-overrides and domains endpoints now write
objects. The console keeps its added rules in one DomainRule per action
(inline-block, inline-allow) instead of an object per name, and removes a name
from whichever DomainRule holds it, wildcard or not. An end-to-end test drives
the pages' endpoints and checks the resolver's answers.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-16 10:08:08 +02:00

117 lines
3.2 KiB
Go

package kubeedit
import (
"context"
"crypto/sha256"
"encoding/hex"
"fmt"
"strings"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"git.k8s-git-k6n.net/mats/fancy-dns/internal/kubesource"
)
// objectName turns a DNS name into a Kubernetes object name. Most names are
// already one; a name that is not (an underscore, say) is cleaned and given a
// short hash so two different names cannot collide.
func objectName(domain string) string {
var b strings.Builder
changed := false
for _, c := range domain {
if c >= 'a' && c <= 'z' || c >= '0' && c <= '9' || c == '-' || c == '.' {
b.WriteRune(c)
} else {
b.WriteByte('-')
changed = true
}
}
name := strings.Trim(b.String(), "-.")
if name == "" {
name, changed = "root", true
}
if changed {
sum := sha256.Sum256([]byte(domain))
name += "-" + hex.EncodeToString(sum[:3])
}
return name
}
func (e *Editor) overrideObjects(ctx context.Context) ([]unstructured.Unstructured, error) {
return e.list(ctx, kubesource.OverrideGVR)
}
// Overrides lists the address overrides, one entry per name.
func (e *Editor) Overrides(ctx context.Context) ([]kubesource.Override, error) {
items, err := e.overrideObjects(ctx)
if err != nil {
return nil, err
}
var out []kubesource.Override
for i := range items {
var s kubesource.AddressOverrideSpec
if decodeSpec(&items[i], &s) != nil {
continue
}
if o, err := kubesource.CheckOverride(s); err == nil {
out = append(out, o)
}
}
return out, nil
}
// SetOverride makes domain (and everything under it) answer with address,
// replacing whatever it answered with before.
func (e *Editor) SetOverride(ctx context.Context, domain, address, actor string) error {
o, err := kubesource.CheckOverride(kubesource.AddressOverrideSpec{Domain: domain, Addresses: []string{address}})
if err != nil {
return err
}
name := objectName(o.Domain)
items, err := e.overrideObjects(ctx)
if err != nil {
return err
}
for i := range items {
var s kubesource.AddressOverrideSpec
if decodeSpec(&items[i], &s) == nil {
if have, err := kubesource.CheckOverride(s); err == nil && have.Domain == o.Domain {
name = items[i].GetName() // keep the object an operator may have named by hand
break
}
}
}
if err := checkName("address override", name); err != nil {
return err
}
_, err = e.upsert(ctx, kubesource.OverrideGVR, "AddressOverride", name, actor,
kubesource.AddressOverrideSpec{Domain: o.Domain, Addresses: o.Addresses})
return err
}
// DeleteOverride removes the override for domain.
func (e *Editor) DeleteOverride(ctx context.Context, domain string) error {
want := strings.TrimSuffix(strings.ToLower(strings.TrimSpace(domain)), ".")
items, err := e.overrideObjects(ctx)
if err != nil {
return err
}
removed := false
for i := range items {
var s kubesource.AddressOverrideSpec
if decodeSpec(&items[i], &s) != nil {
continue
}
if have, err := kubesource.CheckOverride(s); err == nil && have.Domain == want {
if err := e.remove(ctx, kubesource.OverrideGVR, items[i].GetName()); err != nil {
return err
}
removed = true
}
}
if !removed {
return fmt.Errorf("%w: no address override for %s", ErrNotFound, want)
}
return nil
}