Migrate to checker-sdk-go v1.3.0 with standalone build tag
The SDK split the HTTP server scaffolding into the new checker-sdk-go/checker/server subpackage and CheckRule.Evaluate now returns []CheckState. Update main.go to import server and call server.New, switch the rule and the package-level Evaluate helper to the new slice return type, and isolate the interactive form code behind the standalone build tag so plugin/builtin builds skip net/http and html/template entirely.
This commit is contained in:
parent
00de0f9780
commit
d4c1ac348a
10 changed files with 157 additions and 18 deletions
|
|
@ -164,7 +164,7 @@ func (p *delegationProvider) Collect(ctx context.Context, opts sdk.CheckerOption
|
|||
if len(dsMissing) > 0 || len(dsExtra) > 0 {
|
||||
sev := SeverityCrit
|
||||
if len(declaredDS) == 0 {
|
||||
// Service does not declare any DS but parent has some — warn only.
|
||||
// Service does not declare any DS but parent has some, warn only.
|
||||
sev = SeverityWarn
|
||||
}
|
||||
data.Findings = append(data.Findings, DelegationFinding{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ const dnsTimeout = 5 * time.Second
|
|||
|
||||
// dnsExchange sends a single query to the given server using the requested
|
||||
// transport ("" for UDP, "tcp"). The server address must already include a
|
||||
// port. RecursionDesired is forced off — this checker only talks to
|
||||
// port. RecursionDesired is forced off, this checker only talks to
|
||||
// authoritative servers.
|
||||
func dnsExchange(ctx context.Context, proto, server string, q dns.Question, edns bool) (*dns.Msg, error) {
|
||||
client := dns.Client{Net: proto, Timeout: dnsTimeout}
|
||||
|
|
@ -77,7 +77,7 @@ func resolveHost(ctx context.Context, host string) ([]string, error) {
|
|||
// resolver returns NOERROR with an answer.
|
||||
//
|
||||
// If hintParent is non-empty, it is used as the assumed parent and we only
|
||||
// resolve its NS — this matches happyDomain's data model where the parent
|
||||
// resolve its NS, this matches happyDomain's data model where the parent
|
||||
// zone is known.
|
||||
func findParentZone(ctx context.Context, fqdn, hintParent string) (zone string, servers []string, err error) {
|
||||
zone = dns.Fqdn(hintParent)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
// Evaluate folds findings into a single CheckState. The status is the
|
||||
// highest severity observed: any Crit makes the whole result Crit, any Warn
|
||||
// makes it Warn, otherwise OK.
|
||||
func Evaluate(data *DelegationData) sdk.CheckState {
|
||||
func Evaluate(data *DelegationData) []sdk.CheckState {
|
||||
status := sdk.StatusOK
|
||||
var crit, warn, info int
|
||||
for _, f := range data.Findings {
|
||||
|
|
@ -37,7 +37,7 @@ func Evaluate(data *DelegationData) sdk.CheckState {
|
|||
msg = fmt.Sprintf("Delegation of %s: %d critical, %d warning, %d info", data.DelegatedFQDN, crit, warn, info)
|
||||
}
|
||||
|
||||
return sdk.CheckState{
|
||||
return []sdk.CheckState{{
|
||||
Status: status,
|
||||
Message: msg,
|
||||
Code: "delegation_result",
|
||||
|
|
@ -49,5 +49,5 @@ func Evaluate(data *DelegationData) sdk.CheckState {
|
|||
"parent_ds": data.ParentDS,
|
||||
"child_serials": data.ChildSerials,
|
||||
},
|
||||
}
|
||||
}}
|
||||
}
|
||||
|
|
|
|||
136
checker/interactive.go
Normal file
136
checker/interactive.go
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
//go:build standalone
|
||||
|
||||
package checker
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/miekg/dns"
|
||||
|
||||
sdk "git.happydns.org/checker-sdk-go/checker"
|
||||
)
|
||||
|
||||
func (p *delegationProvider) RenderForm() []sdk.CheckerOptionField {
|
||||
return []sdk.CheckerOptionField{
|
||||
{
|
||||
Id: "domain",
|
||||
Type: "string",
|
||||
Label: "Delegated domain",
|
||||
Placeholder: "sub.example.com",
|
||||
Required: true,
|
||||
Description: "Fully-qualified name of the delegated zone to check.",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (p *delegationProvider) ParseForm(r *http.Request) (sdk.CheckerOptions, error) {
|
||||
domain := strings.TrimSpace(r.FormValue("domain"))
|
||||
if domain == "" {
|
||||
return nil, fmt.Errorf("domain is required")
|
||||
}
|
||||
fqdn := dns.Fqdn(domain)
|
||||
labels := dns.SplitDomainName(fqdn)
|
||||
if len(labels) < 2 {
|
||||
return nil, fmt.Errorf("%q has no parent zone", domain)
|
||||
}
|
||||
parentZone := strings.Join(labels[1:], ".")
|
||||
subdomain := labels[0]
|
||||
|
||||
resolver := interactiveResolver()
|
||||
|
||||
ctx := r.Context()
|
||||
var (
|
||||
wg sync.WaitGroup
|
||||
nsRecords []*dns.NS
|
||||
dsRecords []*dns.DS
|
||||
nsErr error
|
||||
dsErr error
|
||||
)
|
||||
wg.Add(2)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
nsRecords, nsErr = lookupRecords[*dns.NS](ctx, resolver, fqdn, dns.TypeNS, false)
|
||||
}()
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
dsRecords, dsErr = lookupRecords[*dns.DS](ctx, resolver, fqdn, dns.TypeDS, true)
|
||||
}()
|
||||
wg.Wait()
|
||||
|
||||
if nsErr != nil {
|
||||
return nil, fmt.Errorf("NS lookup for %s: %w", domain, nsErr)
|
||||
}
|
||||
if len(nsRecords) == 0 {
|
||||
return nil, fmt.Errorf("no NS records found for %s", domain)
|
||||
}
|
||||
if dsErr != nil {
|
||||
return nil, fmt.Errorf("DS lookup for %s: %w", domain, dsErr)
|
||||
}
|
||||
|
||||
body, err := json.Marshal(delegationService{NameServers: nsRecords, DS: dsRecords})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("marshal delegation service: %w", err)
|
||||
}
|
||||
|
||||
svc := serviceMessage{
|
||||
Type: "abstract.Delegation",
|
||||
Domain: parentZone,
|
||||
Service: body,
|
||||
}
|
||||
|
||||
return sdk.CheckerOptions{
|
||||
"domain_name": parentZone,
|
||||
"subdomain": subdomain,
|
||||
"service": svc,
|
||||
}, nil
|
||||
}
|
||||
|
||||
var (
|
||||
resolverOnce sync.Once
|
||||
resolverAddr string
|
||||
|
||||
interactiveClient = &dns.Client{Timeout: dnsTimeout}
|
||||
)
|
||||
|
||||
func interactiveResolver() string {
|
||||
resolverOnce.Do(func() {
|
||||
cfg, err := dns.ClientConfigFromFile("/etc/resolv.conf")
|
||||
if err != nil || len(cfg.Servers) == 0 {
|
||||
resolverAddr = net.JoinHostPort("1.1.1.1", "53")
|
||||
return
|
||||
}
|
||||
resolverAddr = net.JoinHostPort(cfg.Servers[0], cfg.Port)
|
||||
})
|
||||
return resolverAddr
|
||||
}
|
||||
|
||||
func lookupRecords[T dns.RR](ctx context.Context, resolver, fqdn string, qtype uint16, edns bool) ([]T, error) {
|
||||
msg := new(dns.Msg)
|
||||
msg.SetQuestion(fqdn, qtype)
|
||||
msg.RecursionDesired = true
|
||||
if edns {
|
||||
msg.SetEdns0(4096, true)
|
||||
}
|
||||
|
||||
in, _, err := interactiveClient.ExchangeContext(ctx, msg, resolver)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if in.Rcode != dns.RcodeSuccess && in.Rcode != dns.RcodeNameError {
|
||||
return nil, fmt.Errorf("rcode %s", dns.RcodeToString[in.Rcode])
|
||||
}
|
||||
|
||||
var out []T
|
||||
for _, rr := range in.Answer {
|
||||
if t, ok := rr.(T); ok {
|
||||
out = append(out, t)
|
||||
}
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
|
@ -33,14 +33,14 @@ func (r *delegationRule) ValidateOptions(opts sdk.CheckerOptions) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (r *delegationRule) Evaluate(ctx context.Context, obs sdk.ObservationGetter, opts sdk.CheckerOptions) sdk.CheckState {
|
||||
func (r *delegationRule) Evaluate(ctx context.Context, obs sdk.ObservationGetter, opts sdk.CheckerOptions) []sdk.CheckState {
|
||||
var data DelegationData
|
||||
if err := obs.Get(ctx, ObservationKeyDelegation, &data); err != nil {
|
||||
return sdk.CheckState{
|
||||
return []sdk.CheckState{{
|
||||
Status: sdk.StatusError,
|
||||
Message: fmt.Sprintf("Failed to get delegation data: %v", err),
|
||||
Code: "delegation_error",
|
||||
}
|
||||
}}
|
||||
}
|
||||
return Evaluate(&data)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue