checker: remove CollectedAt from DANEData
The observation timestamp is already managed by the core; there is no need for the checker to record it separately.
This commit is contained in:
parent
16aa0253a3
commit
e75c97b52b
3 changed files with 4 additions and 11 deletions
|
|
@ -8,7 +8,6 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
sdk "git.happydns.org/checker-sdk-go/checker"
|
sdk "git.happydns.org/checker-sdk-go/checker"
|
||||||
tlscontract "git.happydns.org/checker-tls/contract"
|
tlscontract "git.happydns.org/checker-tls/contract"
|
||||||
|
|
@ -194,7 +193,6 @@ func (p *daneProvider) Collect(ctx context.Context, opts sdk.CheckerOptions) (an
|
||||||
data := &DANEData{
|
data := &DANEData{
|
||||||
Targets: targets,
|
Targets: targets,
|
||||||
Invalid: invalid,
|
Invalid: invalid,
|
||||||
CollectedAt: time.Now().UTC(),
|
|
||||||
}
|
}
|
||||||
if v, ok := opts[OptionDNSSECValidated]; ok {
|
if v, ok := opts[OptionDNSSECValidated]; ok {
|
||||||
if b, ok := v.(bool); ok {
|
if b, ok := v.(bool); ok {
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,6 @@ func (p *daneProvider) GetHTMLReport(ctx sdk.ReportContext) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
view := reportView{
|
view := reportView{
|
||||||
CollectedAt: data.CollectedAt.Format("2006-01-02 15:04 MST"),
|
|
||||||
TargetCount: len(data.Targets),
|
TargetCount: len(data.Targets),
|
||||||
Diagnoses: diagnose(data, probes),
|
Diagnoses: diagnose(data, probes),
|
||||||
Rows: rows,
|
Rows: rows,
|
||||||
|
|
@ -65,7 +64,6 @@ func (p *daneProvider) GetHTMLReport(ctx sdk.ReportContext) (string, error) {
|
||||||
// the per-row status label/class and leaf string keeps the template free of
|
// the per-row status label/class and leaf string keeps the template free of
|
||||||
// branching beyond simple range/if.
|
// branching beyond simple range/if.
|
||||||
type reportView struct {
|
type reportView struct {
|
||||||
CollectedAt string
|
|
||||||
TargetCount int
|
TargetCount int
|
||||||
Diagnoses []diagnosis
|
Diagnoses []diagnosis
|
||||||
Rows []reportRow
|
Rows []reportRow
|
||||||
|
|
@ -246,7 +244,7 @@ var reportTemplate = template.Must(template.New("dane").Parse(`<!DOCTYPE html>
|
||||||
</head>
|
</head>
|
||||||
<body><main>
|
<body><main>
|
||||||
<h1>DANE / TLSA</h1>
|
<h1>DANE / TLSA</h1>
|
||||||
<p class="meta">Collected {{.CollectedAt}} · {{.TargetCount}} endpoint(s).</p>
|
<p class="meta">{{.TargetCount}} endpoint(s).</p>
|
||||||
{{with .Diagnoses}}<section class="diagnosis">
|
{{with .Diagnoses}}<section class="diagnosis">
|
||||||
<h2>Action required</h2>
|
<h2>Action required</h2>
|
||||||
{{range .}}<article class="finding sev-{{.Severity}}">
|
{{range .}}<article class="finding sev-{{.Severity}}">
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@
|
||||||
// SHA-512) are matched against the chain slot implied by the usage.
|
// SHA-512) are matched against the chain slot implied by the usage.
|
||||||
package checker
|
package checker
|
||||||
|
|
||||||
import "time"
|
|
||||||
|
|
||||||
// ObservationKeyDANE is the observation key this checker writes.
|
// ObservationKeyDANE is the observation key this checker writes.
|
||||||
const ObservationKeyDANE = "dane_checks"
|
const ObservationKeyDANE = "dane_checks"
|
||||||
|
|
||||||
|
|
@ -90,7 +88,6 @@ type DANEData struct {
|
||||||
// flow (lookupTLSA); nil in managed mode where records come from the
|
// flow (lookupTLSA); nil in managed mode where records come from the
|
||||||
// user's zone config and DNSSEC posture is checked elsewhere.
|
// user's zone config and DNSSEC posture is checked elsewhere.
|
||||||
DNSSECValidated *bool `json:"dnssec_validated,omitempty"`
|
DNSSECValidated *bool `json:"dnssec_validated,omitempty"`
|
||||||
CollectedAt time.Time `json:"collected_at"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// InvalidRecord describes a TLSA record dropped during Collect.
|
// InvalidRecord describes a TLSA record dropped during Collect.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue