From a25dfbd81e6279dc4e1b08b41f5e51e9a86e64c1 Mon Sep 17 00:00:00 2001
From: miampf <miampf@proton.me>
Date: Wed, 20 Mar 2024 14:14:29 +0100
Subject: [PATCH] better printing of measurements

print measurements individually as hex

fix printing of measurements in validator
---
 cli/internal/cmd/configfetchmeasurements.go | 7 ++++++-
 joinservice/internal/watcher/validator.go   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cli/internal/cmd/configfetchmeasurements.go b/cli/internal/cmd/configfetchmeasurements.go
index f75f71736..cf9587470 100644
--- a/cli/internal/cmd/configfetchmeasurements.go
+++ b/cli/internal/cmd/configfetchmeasurements.go
@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"net/url"
 	"time"
+	"encoding/hex"
 
 	"github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi"
 	"github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
@@ -157,7 +158,11 @@ func (cfm *configFetchMeasurementsCmd) configFetchMeasurements(
 			return fmt.Errorf("fetching and verifying measurements: %w", err)
 		}
 	}
-	cfm.log.Debug(fmt.Sprintf("Measurements: %#v\n", fetchedMeasurements))
+	measurementsToPrint := "";
+	for i, measurement := range fetchedMeasurements {
+		measurementsToPrint += fmt.Sprintf("\t%d: 0x%s\n", i, hex.EncodeToString(measurement.Expected))
+	}
+	cfm.log.Debug(fmt.Sprintf("Measurements:\n%s", measurementsToPrint))
 
 	cfm.log.Debug("Updating measurements in configuration")
 	conf.UpdateMeasurements(fetchedMeasurements)
diff --git a/joinservice/internal/watcher/validator.go b/joinservice/internal/watcher/validator.go
index 6bf43635e..7024d7e78 100644
--- a/joinservice/internal/watcher/validator.go
+++ b/joinservice/internal/watcher/validator.go
@@ -14,6 +14,7 @@ import (
 	"log/slog"
 	"path/filepath"
 	"sync"
+	"encoding/hex"
 
 	"github.com/edgelesssys/constellation/v2/internal/atls"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/choose"
@@ -79,7 +80,11 @@ func (u *Updatable) Update() error {
 	if err != nil {
 		return fmt.Errorf("unmarshaling config: %w", err)
 	}
-	u.log.Debug(fmt.Sprintf("New expected measurements: %+v", cfg.GetMeasurements()))
+	measurementsToPrint := ""
+	for i, measurement := range cfg.GetMeasurements() {
+		measurementsToPrint += fmt.Sprintf("\t%d: 0x%s\n", i, hex.EncodeToString(measurement.Expected))
+	}
+	u.log.Debug(fmt.Sprintf("New expected measurements: 0x%s", measurementsToPrint))
 
 	cfgWithCerts, err := u.configWithCerts(cfg)
 	if err != nil {