validator: use slog

edgelesssys · Dec 20, 2023 · 03a9c5a · 03a9c5a
1 parent 1ea799c
commit 03a9c5a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/cli/set.go b/cli/set.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"log/slog"
 	"net"
 	"os"
 
@@ -92,7 +93,8 @@ func runSet(cmd *cobra.Command, args []string) error {
 			RequireIDBlock:            true,
 		},
 	}
-	dialer := dialer.New(atls.NoIssuer, snp.NewValidator(validateOptsGen), &net.Dialer{})
+	// TODO(malt3): pass logger down.
+	dialer := dialer.New(atls.NoIssuer, snp.NewValidator(validateOptsGen, slog.Default()), &net.Dialer{})
 
 	conn, err := dialer.Dial(cmd.Context(), flags.coordinator)
 	if err != nil {

diff --git a/coordinator/intercom.go b/coordinator/intercom.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"log/slog"
 	"net"
 	"time"
 
@@ -28,7 +29,8 @@ type certGetter interface {
 }
 
 func newIntercomServer(meshAuth *meshAuthority, caGetter certChainGetter) (*intercomServer, error) {
-	validator := snp.NewValidatorWithCallbacks(meshAuth, meshAuth)
+	// TODO(malt3): pass logger down.
+	validator := snp.NewValidatorWithCallbacks(meshAuth, slog.Default(), meshAuth)
 	credentials := atlscredentials.New(atls.NoIssuer, []atls.Validator{validator})
 	grpcServer := grpc.NewServer(
 		grpc.Creds(credentials),

diff --git a/internal/attestation/snp/validator.go b/internal/attestation/snp/validator.go
@@ -12,7 +12,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
-	"log"
+	"log/slog"
 
 	"github.com/google/go-sev-guest/abi"
 	"github.com/google/go-sev-guest/proto/sevsnp"
@@ -23,6 +23,7 @@ import (
 type Validator struct {
 	validateOptsGen validateOptsGenerator
 	callbackers     []validateCallbacker
+	logger          *slog.Logger
 }
 
 type validateCallbacker interface {
@@ -41,16 +42,18 @@ func (v *StaticValidateOptsGenerator) SNPValidateOpts(report *sevsnp.Report) (*v
 	return v.Opts, nil
 }
 
-func NewValidator(optsGen validateOptsGenerator) *Validator {
+func NewValidator(optsGen validateOptsGenerator, log *slog.Logger) *Validator {
 	return &Validator{
 		validateOptsGen: optsGen,
+		logger:          log.WithGroup("snp-validator"),
 	}
 }
 
-func NewValidatorWithCallbacks(optsGen validateOptsGenerator, callbacks ...validateCallbacker) *Validator {
+func NewValidatorWithCallbacks(optsGen validateOptsGenerator, log *slog.Logger, callbacks ...validateCallbacker) *Validator {
 	return &Validator{
 		validateOptsGen: optsGen,
 		callbackers:     callbacks,
+		logger:          log.WithGroup("snp-validator"),
 	}
 }
 
@@ -60,10 +63,10 @@ func (v *Validator) OID() asn1.ObjectIdentifier {
 
 // Validate a TPM based attestation.
 func (v *Validator) Validate(ctx context.Context, attDocRaw []byte, nonce []byte, peerPublicKey []byte) (err error) {
-	log.Printf("validator: validate called with nonce %s", hex.EncodeToString(nonce))
+	v.logger.Info("Validate called", "nonce", hex.EncodeToString(nonce))
 	defer func() {
 		if err != nil {
-			log.Printf("Failed to validate attestation document: %s", err)
+			v.logger.Error("Failed to validate attestation document: %s", err)
 		}
 	}()
 
@@ -73,7 +76,7 @@ func (v *Validator) Validate(ctx context.Context, attDocRaw []byte, nonce []byte
 	if _, err = base64.StdEncoding.Decode(reportRaw, attDocRaw); err != nil {
 		return err
 	}
-	log.Printf("validator: Report raw: %v", hex.EncodeToString(reportRaw))
+	v.logger.Info("Report decoded", "reportRaw", hex.EncodeToString(reportRaw))
 
 	report, err := abi.ReportToProto(reportRaw)
 	if err != nil {
@@ -90,7 +93,7 @@ func (v *Validator) Validate(ctx context.Context, attDocRaw []byte, nonce []byte
 	if err := verify.SnpAttestation(attestation, verifyOpts); err != nil {
 		return fmt.Errorf("verifying report: %w", err)
 	}
-	log.Println("validator: Successfully verified report signature")
+	v.logger.Info("Successfully verified report signature")
 
 	// Validate the report data.
 
@@ -103,7 +106,7 @@ func (v *Validator) Validate(ctx context.Context, attDocRaw []byte, nonce []byte
 	if err := validate.SnpAttestation(attestation, validateOpts); err != nil {
 		return fmt.Errorf("validating report claims: %w", err)
 	}
-	log.Println("validator: Successfully validated report data")
+	v.logger.Info("Successfully validated report data")
 
 	// Run callbacks.
 
@@ -113,6 +116,6 @@ func (v *Validator) Validate(ctx context.Context, attDocRaw []byte, nonce []byte
 		}
 	}
 
-	log.Println("validator: done")
+	v.logger.Info("Validate finished successfully")
 	return nil
 }