fix(scheme): update CCA scheme AppraiseClaims

Update AppraiseClaims to expect the new endorsements format introduced
in d4c39f7.

Also update expected results in integration tests to expect "affirming"
for realm. They were originally "warning" because all schemes were
tested using the same end-to-end test that could only provision one
CoRIM, and so only platform endorsements were provisioned. We have since
switched CCA to use its own flow that provisions both platform and realm
endorsements. The fact that we were still expecting "warning" partially
obscured the other issue being fixed here.

Signed-off-by: Sergei Trofimov <sergei.trofimov@arm.com>

Author: setrofim

integration-tests/data/results/cca.good.json

@@ -51,10 +51,10 @@
   },
   "CCA_REALM": {
     "ear.appraisal-policy-id": "policy:ARM_CCA",
-    "ear.status": "warning",
+    "ear.status": "affirming",
     "ear.trustworthiness-vector": {
       "configuration": 0,
-      "executables": 33,
+      "executables": 2,
       "file-system": 0,
       "hardware": 0,
       "instance-identity": 2,

integration-tests/data/results/cca.verify-challenge.json

@@ -49,10 +49,10 @@
     }
   },
   "CCA_REALM": {
-    "ear.status": "warning",
+    "ear.status": "affirming",
     "ear.trustworthiness-vector": {
       "configuration": 0,
-      "executables": 33,
+      "executables": 2,
       "file-system": 0,
       "hardware": 0,
       "instance-identity": 2,

scheme/arm-cca/scheme.go

@@ -9,22 +9,23 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strconv"
-	"strings"
 
 	"github.com/veraison/ccatoken"
 	"github.com/veraison/ccatoken/platform"
 	"github.com/veraison/ccatoken/realm"
 	"github.com/veraison/corim/comid"
 	"github.com/veraison/corim/profiles/cca"
 	"github.com/veraison/ear"
+	"github.com/veraison/psatoken"
 	"github.com/veraison/services/handler"
 	"github.com/veraison/services/log"
 	"github.com/veraison/services/scheme/common"
 	"github.com/veraison/services/vts/appraisal"
 	"go.uber.org/zap"
 )
 
+const NUM_REMS = 4
+
 var Descriptor = handler.SchemeDescriptor{
 	Name:         "ARM_CCA",
 	VersionMajor: 1,
@@ -113,7 +114,9 @@ func (o *Implementation) GetReferenceValueIDs(
 			Class: trustAnchors[0].Environment.Class,
 		},
 		{
-			Instance: comid.MustNewBytesInstance(rimValue),
+			Class: &comid.Class{
+				ClassID: comid.MustNewBytesClassID(rimValue),
+			},
 		},
 	}, nil
 }
@@ -320,57 +323,66 @@ func AppraiseRealm(
 	appraisal.TrustVector.InstanceIdentity = ear.TrustworthyInstanceClaim
 	appraisal.TrustVector.Executables = ear.UnrecognizedRuntimeClaim
 
+	logger.Debug("collecting realm reference values...")
 	referenceValues := make([]realmReference, 0, len(endorsements))
 	for _, triple := range endorsements {
-		// unset Instance indicates platform endorsements
-		if triple.Environment.Instance == nil {
-			continue
+		refVal := realmReference{
+			ExtensibleMeasurements: make([][]byte, NUM_REMS),
 		}
 
 		for _, measurement := range triple.Measurements.Values {
-			refVal := realmReference{}
+			mkey, err := readMeasurementKey(&measurement)
+			if err != nil {
+				return err
+			}
 
-			if measurement.Val.RawValue != nil {
-				refVal.PersonalizationValue, err = measurement.Val.RawValue.GetBytes()
+			switch mkey {
+			case cca.CCARealmInitialMeasurementMkey:
+				digest, err := readMeasurementDigestBytes(&measurement)
 				if err != nil {
-					return fmt.Errorf("personalization value: %w", err)
+					return fmt.Errorf("%s: %w", cca.CCARealmInitialMeasurementMkey, err)
 				}
-			}
-
-			if measurement.Val.IntegrityRegisters == nil {
-				return errors.New("integrity registers not set in realm reference")
-			}
-
-			numREMs := len(measurement.Val.IntegrityRegisters.IndexMap) - 1
-			refVal.ExtensibleMeasurements = make([][]byte, numREMs)
-
-			for key, digests := range measurement.Val.IntegrityRegisters.IndexMap {
-				dLen := len(digests)
-				if dLen != 1 {
-					return fmt.Errorf("expected 1 digest for integ. reg.; found %d", dLen)
+				refVal.InitialMeasurement = digest
+			case cca.CCARealmExtendedMeasurement0Mkey:
+				digest, err := readMeasurementDigestBytes(&measurement)
+				if err != nil {
+					return fmt.Errorf("%s: %w", cca.CCARealmExtendedMeasurement0Mkey, err)
 				}
-
-				keyText, ok := key.(string)
-				if !ok {
-					return fmt.Errorf("non-string integ. reg. key: %v", key)
+				refVal.ExtensibleMeasurements[0] = digest
+			case cca.CCARealmExtendedMeasurement1Mkey:
+				digest, err := readMeasurementDigestBytes(&measurement)
+				if err != nil {
+					return fmt.Errorf("%s: %w", cca.CCARealmExtendedMeasurement1Mkey, err)
 				}
-
-				if keyText == "rim" {
-					refVal.InitialMeasurement = digests[0].HashValue
-				} else {
-					idxText := strings.Replace(keyText, "rem", "", 1)
-					idx, err := strconv.Atoi(idxText)
-					if err != nil {
-						return fmt.Errorf("bad REM key: %s", keyText)
-					}
-
-					refVal.ExtensibleMeasurements[idx] = digests[0].HashValue
+				refVal.ExtensibleMeasurements[1] = digest
+			case cca.CCARealmExtendedMeasurement2Mkey:
+				digest, err := readMeasurementDigestBytes(&measurement)
+				if err != nil {
+					return fmt.Errorf("%s: %w", cca.CCARealmExtendedMeasurement2Mkey, err)
 				}
+				refVal.ExtensibleMeasurements[2] = digest
+			case cca.CCARealmExtendedMeasurement3Mkey:
+				digest, err := readMeasurementDigestBytes(&measurement)
+				if err != nil {
+					return fmt.Errorf("%s: %w", cca.CCARealmExtendedMeasurement3Mkey, err)
+				}
+				refVal.ExtensibleMeasurements[3] = digest
+			case cca.CCARealmPersonalizationMkey:
+				refVal.PersonalizationValue, err = measurement.Val.RawValue.GetBytes()
+				if err != nil {
+					return fmt.Errorf("%s: %w", cca.CCARealmPersonalizationMkey, err)
+				}
+			default:
+				logger.Debugw("skipping non-realm measurement", "mkey", mkey)
 			}
 
+		}
+
+		if refVal.InitialMeasurement != nil {
 			referenceValues = append(referenceValues, refVal)
 		}
 	}
+	logger.Debug("collected realm reference values", "values", referenceValues)
 
 	for _, refVal := range referenceValues {
 		if !bytes.Equal(refVal.InitialMeasurement, evidenceRIM) {
@@ -428,6 +440,38 @@ func convertToPlatformClaims(v any) (platform.IClaims, error) {
 	return platform.DecodeClaimsFromJSON(encoded)
 }
 
+func readMeasurementKey(measurement *comid.Measurement) (string, error) {
+	if measurement.Key == nil || !measurement.Key.IsSet() {
+		return "", errors.New(" measurement missing mkey")
+	}
+
+	if measurement.Key.Type() != comid.StringType {
+		return "", fmt.Errorf(
+			"measurement mkey must be string, got %s",
+			measurement.Key.Type(),
+		)
+	}
+
+	return measurement.Key.Value.String(), nil
+}
+
+func readMeasurementDigestBytes(measurement *comid.Measurement) ([]byte, error) {
+	// Not a platform-config entry: this must be a platform software component.
+	if measurement.Val.Digests == nil {
+		return nil, errors.New("no digests in reference value measurement")
+	}
+
+	numDigests := len(*measurement.Val.Digests)
+	if numDigests != 1 {
+		return nil, fmt.Errorf(
+			"expected exactly 1 digest in measurement; found %d",
+			numDigests,
+		)
+	}
+
+	return (*measurement.Val.Digests)[0].HashValue, nil
+}
+
 func matchPlatformClaimsToReferenceValues(
 	logger *zap.SugaredLogger,
 	claims platform.IClaims,
@@ -436,30 +480,18 @@ func matchPlatformClaimsToReferenceValues(
 	var err error
 	var referenceConfigValue []byte
 
+	logger.Debug("building platform reference values map...")
 	referenceValues := make(map[string][2]string)
 	for _, triple := range endorsements {
-		// set Instance indicates realm endorsements
-		if triple.Environment.Instance != nil {
-			continue
-		}
-
 		for _, measurement := range triple.Measurements.Values {
-			if measurement.Key == nil || !measurement.Key.IsSet() {
-				return false, false, errors.New("platform reference value measurement missing mkey")
-			}
-
-			if measurement.Key.Type() != comid.StringType {
-				return false, false, fmt.Errorf(
-					"platform reference value measurement mkey must be string, got %s",
-					measurement.Key.Type(),
-				)
+			mkey, err := readMeasurementKey(&measurement)
+			if err != nil {
+				return false, false, err
 			}
 
-			mkey := measurement.Key.Value.String()
-
 			// Check if this is a platform config measurement.
-			if mkey == cca.CCAPlatformConfigMkey {
-
+			switch mkey {
+			case cca.CCAPlatformConfigMkey:
 				if measurement.Val.RawValue == nil {
 					return false, false,
 						errors.New("no raw value in platform config measurement")
@@ -471,42 +503,30 @@ func matchPlatformClaimsToReferenceValues(
 				}
 
 				continue
-			}
-
-			if mkey != "cca.software-component" {
-				return false, false, fmt.Errorf(
-					"invalid mkey %q in platform reference value measurement",
-					mkey,
-				)
-			}
+			case cca.CCASoftwareComponentMkey:
+				digest, err := readMeasurementDigestBytes(&measurement)
+				if err != nil {
+					return false, false, err
+				}
 
-			// Not a platform-config entry: this must be a platform software component.
-			if measurement.Val.Digests == nil {
-				return false, false, errors.New("no digests in reference value measurement")
-			}
+				encoded := base64.StdEncoding.EncodeToString(digest)
+				// Extract label (mtype) and version from measurement value
+				var label, version string
 
-			numDigests := len(*measurement.Val.Digests)
-			if numDigests != 1 {
-				return false, false, fmt.Errorf(
-					"expected exactly 1 digest in measurement; found %d",
-					numDigests,
-				)
-			}
-
-			encoded := base64.StdEncoding.EncodeToString((*measurement.Val.Digests)[0].HashValue)
-			// Extract label (mtype) and version from measurement value
-			var label, version string
+				if measurement.Val.Name != nil {
+					label = *measurement.Val.Name
+				}
+				if measurement.Val.Ver != nil {
+					version = measurement.Val.Ver.Version
+				}
 
-			if measurement.Val.Name != nil {
-				label = *measurement.Val.Name
+				referenceValues[encoded] = [2]string{label, version}
+			default:
+				logger.Debugw("skipping non-platform measurement", "mkey", mkey)
 			}
-			if measurement.Val.Ver != nil {
-				version = measurement.Val.Ver.Version
-			}
-
-			referenceValues[encoded] = [2]string{label, version}
 		}
 	}
+	logger.Debugw("platform reference values", "map", referenceValues)
 
 	evidenceConfigValue, err := claims.GetConfig()
 	if err != nil {
@@ -539,7 +559,7 @@ func matchPlatformClaimsToReferenceValues(
 		}
 
 		mversion, err := swComp.GetVersion()
-		if err != nil {
+		if err != nil  && ! errors.Is(err, psatoken.ErrOptionalFieldMissing) {
 			return false, false, handler.BadEvidence(fmt.Errorf("S/W comp. %d version: %w", i, err))
 		}
 
@@ -571,7 +591,7 @@ func allMatch(lhs, rhs [][]byte) bool {
 	}
 
 	for i, lhsV := range lhs {
-		if !bytes.Equal(lhsV, rhs[i]) {
+		if len(lhsV) > 0 && !bytes.Equal(lhsV, rhs[i]) {
 			return false
 		}
 	}