support legacy format

Author: metachris

common/expected_measurements.go

@@ -4,8 +4,8 @@ package common
 // Helper to load expected measurements from a file or URL, and compare
 // provided measurements against them.
 //
-// Internally this uses the measurements data schema v2 (as served by
-// https://measurements.builder.flashbots.net):
+// Compatible with measurements data schema v2 (see measurements.json)
+// as well as the legacy v1 schema.
 //
 //   [
 //       {
@@ -45,6 +45,8 @@ type MeasurementsContainer struct {
 	Measurements    measurements.M `json:"measurements"`
 }
 
+type LegacyMeasurementsContainer map[string]measurements.M
+
 // NewExpectedMeasurementsFromFile returns an ExpectedMeasurements instance,
 // with the measurements loaded from a file or URL.
 func NewExpectedMeasurementsFromFile(path string) (m *ExpectedMeasurements, err error) {
@@ -69,7 +71,21 @@ func NewExpectedMeasurementsFromFile(path string) (m *ExpectedMeasurements, err
 	}
 
 	m = &ExpectedMeasurements{}
-	err = json.Unmarshal(data, &m.Measurements)
+
+	// Try to load the v2 data schema, if that fails fall back to legacy v1 schema
+	if err = json.Unmarshal(data, &m.Measurements); err != nil {
+		var legacyData LegacyMeasurementsContainer
+		err = json.Unmarshal(data, &legacyData)
+		for measurementID, measurements := range legacyData {
+			container := MeasurementsContainer{
+				MeasurementID:   measurementID,
+				AttestationType: "azure-tdx",
+				Measurements:    measurements,
+			}
+			m.Measurements = append(m.Measurements, container)
+		}
+	}
+
 	return m, err
 }
 

common/expected_measurements_test.go

@@ -2,6 +2,8 @@ package common
 
 import (
 	"encoding/hex"
+	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -18,9 +20,12 @@ func mustBytesFromHex(hexValue string) []byte {
 	return bytes
 }
 
+// Measurements V1 (legacy) JSON (from https://github.com/flashbots/cvm-reverse-proxy/blob/837588b9f87ee49d1bb6dca4712a1c2844eb1ecc/measurements.json)
+var measurementsV1JSON = []byte(`{"azure-tdx-example":{"11":{"expected":"efa43e0beff151b0f251c4abf48152382b1452b4414dbd737b4127de05ca31f7"},"12":{"expected":"0000000000000000000000000000000000000000000000000000000000000000"},"13":{"expected":"0000000000000000000000000000000000000000000000000000000000000000"},"15":{"expected":"0000000000000000000000000000000000000000000000000000000000000000"},"4":{"expected":"ea92ff762767eae6316794f1641c485d4846bc2b9df2eab6ba7f630ce6f4d66f"},"8":{"expected":"0000000000000000000000000000000000000000000000000000000000000000"},"9":{"expected":"c9f429296634072d1063a03fb287bed0b2d177b0a504755ad9194cffd90b2489"}},"dcap-tdx-example":{"0":{"expected":"5d56080eb9ef8ce0bbaf6bdcdadeeb06e7c5b0a4d1ec16be868a85a953babe0c5e54d01c8e050a54fe1ca078372530d2"},"1":{"expected":"4216e925f796f4e282cfa6e72d4c77a80560987afa29155a61fdc33adb80eab0d4112abd52387e5e25a60deefb8a5287"},"2":{"expected":"4274fefb79092c164000b571b64ecb432fa2357adb421fd1c77a867168d7d7f7fe82796d1eba092c7bab35cf43f5ec55"},"3":{"expected":"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"},"4":{"expected":"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}}}`)
+
 // TestExpectedMeasurementsV2 tests the v2 data schema
 func TestExpectedMeasurementsV2(t *testing.T) {
-	// Load expected measurements from JSON file
+	// Load expected measurements from JSON file (in V2 format)
 	m, err := NewExpectedMeasurementsFromFile("../measurements.json")
 	require.NoError(t, err)
 	require.Len(t, m.Measurements, 3)
@@ -65,3 +70,25 @@ func TestExpectedMeasurementsV2(t *testing.T) {
 	require.True(t, exists)
 	require.Equal(t, "dcap-tdx-example-02", foundMeasurement.MeasurementID)
 }
+
+func TestExpectedMeasurementsV1(t *testing.T) {
+	tempDir := t.TempDir()
+	err := os.WriteFile(filepath.Join(tempDir, "measurements.json"), measurementsV1JSON, 0644)
+	require.NoError(t, err)
+
+	// Load expected measurements from JSON file
+	m, err := NewExpectedMeasurementsFromFile(filepath.Join(tempDir, "measurements.json"))
+	require.NoError(t, err)
+	require.Len(t, m.Measurements, 2)
+
+	testMeasurements := TestMeasurements{
+		0: mustBytesFromHex("5d56080eb9ef8ce0bbaf6bdcdadeeb06e7c5b0a4d1ec16be868a85a953babe0c5e54d01c8e050a54fe1ca078372530d2"),
+		1: mustBytesFromHex("4216e925f796f4e282cfa6e72d4c77a80560987afa29155a61fdc33adb80eab0d4112abd52387e5e25a60deefb8a5287"),
+		2: mustBytesFromHex("4274fefb79092c164000b571b64ecb432fa2357adb421fd1c77a867168d7d7f7fe82796d1eba092c7bab35cf43f5ec55"),
+		3: mustBytesFromHex("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
+		4: mustBytesFromHex("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
+	}
+	exists, foundMeasurement := m.Contains(testMeasurements)
+	require.True(t, exists)
+	require.Equal(t, "dcap-tdx-example", foundMeasurement.MeasurementID)
+}