better printing of measurements

print measurements individually as hex

fix printing of measurements in validator
This commit is contained in:
miampf 2024-03-20 14:14:29 +01:00
parent b34b83d8ae
commit a25dfbd81e
No known key found for this signature in database
GPG Key ID: EF039364B5B6886C
2 changed files with 12 additions and 2 deletions

View File

@ -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)

View File

@ -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 {