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 renamed CheckerInteractive to server.Interactive. Update main.go to import server and call server.New, switch the compile-time assertion to server.Interactive, and isolate the interactive form code behind the standalone build tag so plugin/builtin builds skip net/http entirely.
This commit is contained in:
parent
19296f4188
commit
eb7b6d1a90
7 changed files with 23 additions and 16 deletions
|
|
@ -19,7 +19,7 @@ const (
|
|||
)
|
||||
|
||||
// Definition is the package-level helper returned to the host by the
|
||||
// plugin entrypoint and used by sdk.NewServer via the provider's
|
||||
// plugin entrypoint and used by server.New via the provider's
|
||||
// CheckerDefinitionProvider implementation.
|
||||
func Definition() *sdk.CheckerDefinition {
|
||||
return &sdk.CheckerDefinition{
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
//go:build standalone
|
||||
|
||||
package checker
|
||||
|
||||
import (
|
||||
|
|
@ -5,14 +7,16 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/miekg/dns"
|
||||
|
||||
sdk "git.happydns.org/checker-sdk-go/checker"
|
||||
"git.happydns.org/checker-sdk-go/checker/server"
|
||||
)
|
||||
|
||||
// RenderForm implements sdk.CheckerInteractive. It exposes the minimal
|
||||
// RenderForm implements server.Interactive. It exposes the minimal
|
||||
// inputs needed to bootstrap a standalone OPENPGPKEY/SMIMEA check: an
|
||||
// email address (the local part is hashed into the owner name) and a
|
||||
// kind selector. The DNS resolver and severity-tuning options mirror
|
||||
|
|
@ -63,7 +67,7 @@ func (p *emailKeyProvider) RenderForm() []sdk.CheckerOptionField {
|
|||
}
|
||||
}
|
||||
|
||||
// ParseForm implements sdk.CheckerInteractive. It validates the inputs,
|
||||
// ParseForm implements server.Interactive. It validates the inputs,
|
||||
// resolves the DNS record matching the requested kind, and returns the
|
||||
// CheckerOptions that Collect expects, including a synthesised service
|
||||
// envelope built from the live DNS answer.
|
||||
|
|
@ -102,7 +106,7 @@ func (p *emailKeyProvider) ParseForm(r *http.Request) (sdk.CheckerOptions, error
|
|||
}
|
||||
|
||||
resolverOpt := strings.TrimSpace(r.FormValue(OptionResolver))
|
||||
owner := dns.Fqdn(ownerHashHex(username) + "." + strings.TrimPrefix(prefix, ".") + "." + domain)
|
||||
owner := dns.Fqdn(ownerHashHex(username) + "." + prefix + "." + domain)
|
||||
|
||||
ctx, cancel := context.WithTimeout(r.Context(), dnsTimeout*3)
|
||||
defer cancel()
|
||||
|
|
@ -160,12 +164,12 @@ func (p *emailKeyProvider) ParseForm(r *http.Request) (sdk.CheckerOptions, error
|
|||
|
||||
// parseFloatOr parses a decimal string, returning fallback on error.
|
||||
func parseFloatOr(s string, fallback float64) float64 {
|
||||
var f float64
|
||||
if _, err := fmt.Sscanf(s, "%f", &f); err != nil {
|
||||
f, err := strconv.ParseFloat(s, 64)
|
||||
if err != nil {
|
||||
return fallback
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
// Compile-time assertion that the provider implements the optional interface.
|
||||
var _ sdk.CheckerInteractive = (*emailKeyProvider)(nil)
|
||||
var _ server.Interactive = (*emailKeyProvider)(nil)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue