Compare commits

...

2 commits

Author SHA1 Message Date
ae8efc2f64 Validate from_address option via net/mail at the host
All checks were successful
continuous-integration/drone/push Build is passing
Reject malformed addresses up-front instead of letting them surface as
a runtime SMTP failure during Collect.
2026-05-21 18:52:56 +08:00
7fe4e4b3a4 Fix TestDefinitionShape to assert ApplyToService
The checker no longer applies to whole domains (see 62af174 "Apply only
on opt-in services"); align the test with that availability.
2026-05-21 18:52:55 +08:00
2 changed files with 26 additions and 2 deletions

View file

@ -2,6 +2,9 @@ package checker
import ( import (
"encoding/json" "encoding/json"
"fmt"
"net/mail"
"strings"
"time" "time"
sdk "git.happydns.org/checker-sdk-go/checker" sdk "git.happydns.org/checker-sdk-go/checker"
@ -21,6 +24,27 @@ func (p *happyDeliverProvider) Definition() *sdk.CheckerDefinition {
return Definition() return Definition()
} }
// ValidateOptions runs on the host before Collect so bad options are rejected
// up-front rather than surfacing as a runtime SMTP failure.
func (p *happyDeliverProvider) ValidateOptions(opts sdk.CheckerOptions) error {
raw, ok := opts["from_address"]
if !ok {
return nil
}
s, ok := raw.(string)
if !ok {
return fmt.Errorf("from_address must be a string")
}
s = strings.TrimSpace(s)
if s == "" {
return nil
}
if _, err := mail.ParseAddress(s); err != nil {
return fmt.Errorf("invalid from_address: %w", err)
}
return nil
}
func (p *happyDeliverProvider) ExtractMetrics(ctx sdk.ReportContext, collectedAt time.Time) ([]sdk.CheckMetric, error) { func (p *happyDeliverProvider) ExtractMetrics(ctx sdk.ReportContext, collectedAt time.Time) ([]sdk.CheckMetric, error) {
var data HappyDeliverData var data HappyDeliverData
if err := json.Unmarshal(ctx.Data(), &data); err != nil { if err := json.Unmarshal(ctx.Data(), &data); err != nil {

View file

@ -86,8 +86,8 @@ func TestDefinitionShape(t *testing.T) {
if def.ID != "happydeliver" { if def.ID != "happydeliver" {
t.Errorf("ID = %q", def.ID) t.Errorf("ID = %q", def.ID)
} }
if !def.Availability.ApplyToDomain { if !def.Availability.ApplyToService {
t.Error("should apply to domain") t.Error("should apply to service")
} }
if !def.HasMetrics { if !def.HasMetrics {
t.Error("HasMetrics should be true") t.Error("HasMetrics should be true")