Combined Plugin Framework

Signed-off-by: Yogesh Deshpande <[email protected]>

builtin/schemes.gen.go

@@ -3,7 +3,7 @@ package builtin
 import (
 	"github.com/veraison/services/plugin"
 
-	scheme1 "github.com/veraison/services/scheme/cca-ssd-platform"
+	scheme1 "github.com/veraison/services/scheme/cca"
 	scheme4 "github.com/veraison/services/scheme/psa-iot"
 	scheme2 "github.com/veraison/services/scheme/riot"
 	scheme3 "github.com/veraison/services/scheme/tpm-enacttrust"

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/tbaehler/gin-keycloak v1.5.0
 	github.com/veraison/ccatoken v1.1.0
 	github.com/veraison/cmw v0.1.0
-	github.com/veraison/corim v1.1.2
+	github.com/veraison/corim v1.1.3-0.20240513181923-a0e8f54e1f67
 	github.com/veraison/dice v0.0.1
 	github.com/veraison/ear v1.1.2
 	github.com/veraison/eat v0.0.0-20220117140849-ddaf59d69f53

go.sum

@@ -1063,8 +1063,8 @@ github.com/veraison/ccatoken v1.1.0 h1:U0Z5fOQRsdz3ksvvxVzTITczo+kfRxIlkWahJNP6I
 github.com/veraison/ccatoken v1.1.0/go.mod h1:qh/KBwsrhPyGJqttlh8PU56wt1rPkUCX9A3ZAA/53Nc=
 github.com/veraison/cmw v0.1.0 h1:vD6tBlGPROCW/HlDcG1jh+XUJi5ihrjXatKZBjrv8mU=
 github.com/veraison/cmw v0.1.0/go.mod h1:WoBrlgByc6C1FeHhdze1/bQx1kv5d1sWKO5ezEf4Hs4=
-github.com/veraison/corim v1.1.2 h1:JIk6ZK/OzKEb0FJUFHSnmkn67yyGy+5NChYax0bwttA=
-github.com/veraison/corim v1.1.2/go.mod h1:yoN6+vVQJgzS926nheCbJi68SvOlN0CpiPuTxYSe5FU=
+github.com/veraison/corim v1.1.3-0.20240513181923-a0e8f54e1f67 h1:j67b84ttamX1ZJGlHnV/20NfBS05UdT3DonlDQ0eWnI=
+github.com/veraison/corim v1.1.3-0.20240513181923-a0e8f54e1f67/go.mod h1:mmEA2yMATiwNCGD6xo2L7Afag7z2OdZTOz8QO6IvzNY=
 github.com/veraison/dice v0.0.1 h1:dOm7ByDN/r4WlDsGkEUXzdPMXgTvAPTAksQ8+BwBrD4=
 github.com/veraison/dice v0.0.1/go.mod h1:QPMLc5LVMj08VZ+HNMYk4XxWoVYGAUBVm8Rd5V1hzxs=
 github.com/veraison/ear v1.1.2 h1:Xs41FqAG8IyJaceqNFcX2+nf51Et1uyhmCJV8SZqw/8=

handler/endorsement.go

@@ -11,8 +11,9 @@ const (
 )
 
 type Endorsement struct {
-	Scheme string `json:"scheme"`
-	Type   string `json:"type"`
+	Scheme    string `json:"scheme"`
+	SubScheme string `json:"subscheme"`
+	Type      string `json:"type"`
 
 	SubType    string          `json:"subType"`
 	Attributes json.RawMessage `json:"attributes"`

integration-tests/data/results/cca.freshness-fail.json

@@ -1,5 +1,5 @@
 {
-        "ear.appraisal-policy-id": "policy:CCA_SSD_PLATFORM",
+        "ear.appraisal-policy-id": "policy:CCA_SSD",
         "ear.status": "contraindicated",
         "ear.trustworthiness-vector": {
             "configuration": 99,

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

@@ -10,7 +10,7 @@
                 "sourced-data": 0,
                 "storage-opaque": 2
         },
-        "ear.appraisal-policy-id": "policy:CCA_SSD_PLATFORM",
+        "ear.appraisal-policy-id": "policy:CCA_SSD",
             "ear.veraison.annotated-evidence": {
                 "platform": {
                     "cca-platform-challenge": "Bea1iETGoM0ZOCBpuv2w5JRmKjrc+P3hFHjpM5Ua8XkP9d5ceOPbESPaCiB6i2ZVbgoi8Z7mS9wviZU7azJVXw==",

integration-tests/tests/test_cca_verify_challenge.tavern.yaml

@@ -43,7 +43,7 @@ stages:
   - name: submit cca policy
     request:
       method: POST
-      url: http://{management-service}/management/v1/policy/CCA_SSD_PLATFORM
+      url: http://{management-service}/management/v1/policy/CCA_SSD
       headers:
         content-type: application/vnd.veraison.policy.opa
         accept: application/vnd.veraison.policy+json
@@ -58,7 +58,7 @@ stages:
   - name: activate cca policy
     request:
       method: POST
-      url: http://{management-service}/management/v1/policy/CCA_SSD_PLATFORM/{policy-uuid}/activate
+      url: http://{management-service}/management/v1/policy/CCA_SSD/{policy-uuid}/activate
       headers:
         authorization: '{alt-authorization}' # set via hook
     response:

scheme/Makefile

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 SUBDIR := common
-SUBDIR += cca-ssd-platform
+SUBDIR += cca
 SUBDIR += riot
 SUBDIR += psa-iot
 SUBDIR += tpm-enacttrust