DNS: fix SOA

pkg/roles/dhcp/dhcp_handler4_discover_test.go

@@ -44,9 +44,7 @@ func TestDHCPDiscover(t *testing.T) {
 			},
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPDiscoverPayload)
@@ -122,9 +120,7 @@ func TestDHCPDiscover_Gateway(t *testing.T) {
 			},
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPDiscoverGatewayPayload)
@@ -200,9 +196,7 @@ func TestDHCPDiscover_RequestedIP_WrongSubnet(t *testing.T) {
 			},
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPDiscoverGatewayPayload)
@@ -249,9 +243,7 @@ func TestDHCPDiscoverDNS(t *testing.T) {
 		}),
 	))
 
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPDiscoverPayload)

pkg/roles/dhcp/dhcp_handler4_release_test.go

@@ -54,9 +54,7 @@ func TestDHCPRelease(t *testing.T) {
 			Hostname:   "linux-test.home.arpa",
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPReleasePayload)

pkg/roles/dhcp/dhcp_handler4_request_bench_test.go

@@ -74,9 +74,7 @@ func BenchmarkRoleDHCP_Request(b *testing.B) {
 		}),
 	))
 
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 	c, err := netip.ParsePrefix("10.100.0.0/24")
 	if err != nil {

pkg/roles/dhcp/dhcp_handler4_request_test.go

@@ -43,9 +43,7 @@ func TestDHCPRequest(t *testing.T) {
 			},
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPRequestPayload)
@@ -89,9 +87,7 @@ func TestDHCPRequest_Hook(t *testing.T) {
 			}`,
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPRequestPayload)
@@ -138,9 +134,7 @@ func TestDHCPRequest_Hook_UniFi(t *testing.T) {
 			}`,
 		}),
 	))
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPRequestPayload)
@@ -188,9 +182,7 @@ func TestDHCPRequestDNS(t *testing.T) {
 		}),
 	))
 
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	req, err := dhcpv4.FromBytes(DHCPRequestPayload)
@@ -258,9 +250,7 @@ func TestDHCPRequestDNS_ChangedScope(t *testing.T) {
 		}),
 	))
 
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	// First ensure the lease is created as we expect
@@ -353,9 +343,7 @@ func TestDHCP_Parallel(t *testing.T) {
 		}),
 	))
 
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	wg := sync.WaitGroup{}

pkg/roles/dhcp/ipam_internal_test.go

@@ -78,9 +78,7 @@ func TestIPAMInternal_NextFreeAddress_UniqueParallel(t *testing.T) {
 	}
 
 	role := dhcp.New(inst)
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 	ipam, err := dhcp.NewInternalIPAM(role, &scope)
 	assert.NoError(t, err)

pkg/roles/dhcp/role.go

@@ -95,6 +95,10 @@ func (r *Role) Start(ctx context.Context, config []byte) error {
 	go r.startWatchScopes()
 	go r.startWatchLeases()
 
+	if r.cfg.Port < 1 {
+		return nil
+	}
+
 	err := r.initServer4()
 	if err != nil {
 		r.log.Warn("failed to setup server", zap.Error(err))

pkg/roles/dhcp/role_config_test.go

@@ -15,9 +15,7 @@ func TestAPIRoleConfigGet(t *testing.T) {
 	ctx := tests.Context()
 	inst := rootInst.ForRole("dhcp", ctx)
 	role := dhcp.New(inst)
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	var output dhcp.APIRoleConfigOutput
@@ -31,9 +29,7 @@ func TestAPIRoleConfigPut(t *testing.T) {
 	ctx := tests.Context()
 	inst := rootInst.ForRole("dhcp", ctx)
 	role := dhcp.New(inst)
-	tests.PanicIfError(role.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
-	}))))
+	tests.PanicIfError(role.Start(ctx, RoleConfig()))
 	defer role.Stop()
 
 	assert.NoError(t, role.APIRoleConfigPut().Interact(ctx, dhcp.APIRoleConfigInput{

pkg/roles/dhcp/role_test.go

@@ -9,6 +9,12 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func RoleConfig() []byte {
+	return []byte(tests.MustJSON(dhcp.RoleConfig{
+		Port: 0,
+	}))
+}
+
 func TestRoleStartNoConfig(t *testing.T) {
 	defer tests.Setup(t)()
 	rootInst := instance.New()

pkg/roles/discovery/api_devices_test.go

@@ -66,7 +66,7 @@ func TestDeviceApplyDHCP(t *testing.T) {
 	// Create DHCP role to register events
 	dhcpRole := dhcp.New(rootInst.ForRole("dhcp", ctx))
 	tests.PanicIfError(dhcpRole.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
+		Port: 0,
 	}))))
 	defer dhcpRole.Stop()
 
@@ -156,7 +156,7 @@ func TestDeviceApplyDHCPWithDNS(t *testing.T) {
 	// Create DHCP role to register events
 	dhcpRole := dhcp.New(rootInst.ForRole("dhcp", ctx))
 	tests.PanicIfError(dhcpRole.Start(ctx, []byte(tests.MustJSON(dhcp.RoleConfig{
-		Port: 1067,
+		Port: 0,
 	}))))
 	defer dhcpRole.Stop()
 	// Create DNS role to register events
@@ -276,7 +276,7 @@ func TestDeviceApplyDNSWithReverse(t *testing.T) {
 	// Create DNS role to register events
 	dnsRole := dns.New(rootInst.ForRole("dns", ctx))
 	tests.PanicIfError(dnsRole.Start(ctx, []byte(tests.MustJSON(dns.RoleConfig{
-		Port: 1054,
+		Port: 0,
 	}))))
 	defer dnsRole.Stop()
 

pkg/roles/dns/api_zones.go

@@ -69,7 +69,10 @@
 			recordCount := slices.Collect(func(yield func(int) bool) {
 				for _, v := range rawRecords.Kvs {
 					if strings.HasPrefix(string(v.Key), _zone.etcdKey+"/") {
-						yield(1)
+						ok := yield(1)
+						if !ok {
+							return
+						}
 					}
 				}
 			})

pkg/roles/dns/handler_int_soa.go

@@ -0,0 +1,47 @@
+package dns
+
+import (
+	"fmt"
+
+	"beryju.io/gravity/pkg/roles/dns/utils"
+	"github.com/miekg/dns"
+)
+
+type SOAIntHandler struct {
+	zone *Zone
+}
+
+func (sih *SOAIntHandler) Identifier() string {
+	return "int_soa"
+}
+
+func (sih *SOAIntHandler) Handle(w *utils.FakeDNSWriter, r *utils.DNSRequest) *dns.Msg {
+	if !sih.zone.Authoritative {
+		return nil
+	}
+	m := new(dns.Msg)
+	m.Authoritative = true
+	m.Answer = []dns.RR{
+		&dns.SOA{
+			Hdr: dns.RR_Header{
+				Name:   sih.zone.Name,
+				Rrtype: dns.TypeSOA,
+				Class:  dns.ClassINET,
+				Ttl:    sih.zone.DefaultTTL,
+			},
+			Ns:      sih.zone.Name,
+			Mbox:    fmt.Sprintf("root.%s", sih.zone.Name),
+			Serial:  1337,
+			Refresh: 600,
+			Retry:   15,
+			Expire:  5,
+			Minttl:  sih.zone.DefaultTTL,
+		},
+	}
+	for _, qs := range r.Question {
+		if qs.Qtype == dns.TypeSOA {
+			return m
+		}
+	}
+	return nil
+}

pkg/roles/dns/handler_int_soa_test.go

@@ -0,0 +1,53 @@
+package dns_test
+
+import (
+	"testing"
+
+	"beryju.io/gravity/pkg/instance"
+	"beryju.io/gravity/pkg/roles/dns"
+	"beryju.io/gravity/pkg/roles/dns/types"
+	"beryju.io/gravity/pkg/tests"
+	d "github.com/miekg/dns"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRoleDNS_SOA(t *testing.T) {
+	defer tests.Setup(t)()
+	rootInst := instance.New()
+	ctx := tests.Context()
+	inst := rootInst.ForRole("dns", ctx)
+	tests.PanicIfError(inst.KV().Put(
+		ctx,
+		inst.KV().Key(
+			types.KeyRole,
+			types.KeyZones,
+			".",
+		).String(),
+		tests.MustJSON(dns.Zone{
+			Authoritative: true,
+			HandlerConfigs: []map[string]interface{}{
+				{
+					"type": "forward_ip",
+					"to":   "127.0.0.1:1053",
+				},
+			},
+		}),
+	))
+	role := dns.New(inst)
+	assert.NotNil(t, role)
+	assert.Nil(t, role.Start(ctx, RoleConfig()))
+	defer role.Stop()
+
+	fw := NewNullDNSWriter()
+	role.Handler(fw, &d.Msg{
+		Question: []d.Question{
+			{
+				Name:   ".",
+				Qtype:  d.TypeSOA,
+				Qclass: d.ClassINET,
+			},
+		},
+	})
+	ans := fw.Msg().Answer[0]
+	assert.Equal(t, ".", ans.(*d.SOA).Ns)
+}

pkg/roles/dns/role.go

@@ -100,6 +100,9 @@ func (r *Role) Start(ctx context.Context, config []byte) error {
 			),
 		),
 	)
+	if r.cfg.Port < 1 {
+		return nil
+	}
 	listen := extconfig.Get().Listen(r.cfg.Port)
 	if runtime.GOOS == "darwin" {
 		listen = fmt.Sprintf(":%d", r.cfg.Port)

pkg/roles/dns/role_config_test.go

@@ -34,7 +34,7 @@ func TestAPIRoleConfigPut(t *testing.T) {
 
 	assert.NoError(t, role.APIRoleConfigPut().Interact(ctx, dns.APIRoleConfigInput{
 		Config: dns.RoleConfig{
-			Port: 1054,
+			Port: 0,
 		},
 	}, &struct{}{}))
 }

pkg/roles/dns/role_test.go

@@ -11,7 +11,7 @@ import (
 
 func RoleConfig() []byte {
 	return []byte(tests.MustJSON(dns.RoleConfig{
-		Port: 1054,
+		Port: 0,
 	}))
 }