Merge pull request #6568 from oasisprotocol/martin/clean-up-before-kma-policy

go: Clean up before key manager access policy

Author: martintomazic

.changelog/6568.trivial.md

@@ -14,7 +14,6 @@ import (
 	beacon "github.com/oasisprotocol/oasis-core/go/beacon/api"
 	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/cbor"
-	"github.com/oasisprotocol/oasis-core/go/common/crypto/hash"
 	"github.com/oasisprotocol/oasis-core/go/common/crypto/signature"
 	"github.com/oasisprotocol/oasis-core/go/common/prettyprint"
 	"github.com/oasisprotocol/oasis-core/go/common/version"
@@ -46,8 +45,6 @@ var (
 	// to be from the future.
 	ErrAttestationFromFuture = errors.New("node: TEE attestation from the future")
 
-	teeHashContext = []byte("oasis-core/node: TEE RAK binding")
-
 	// AttestationSignatureContext is the signature context used for TEE attestation signatures.
 	AttestationSignatureContext = signature.NewContext("oasis-core/node: TEE attestation signature")
 
@@ -550,6 +547,27 @@ func (h *TEEHardware) FromString(str string) error {
 	return nil
 }
 
+// CapabilityTEEVerifyParams contains parameters required to verify a TEE attestation.
+type CapabilityTEEVerifyParams struct {
+	// Features are the TEE features and defaults advertised by the consensus layer.
+	Features *TEEFeatures
+
+	// Time is the current consensus time.
+	Time time.Time
+
+	// Height is the current consensus height.
+	Height uint64
+
+	// Constraints are the serialized TEE constraints.
+	Constraints []byte
+
+	// NodeID is the node identity the TEE capability must be bound to.
+	NodeID signature.PublicKey
+
+	// IsFeatureVersion261 is true for consensus at version 26.1 or higher.
+	IsFeatureVersion261 bool
+}
+
 // CapabilityTEE represents the node's TEE capability.
 type CapabilityTEE struct {
 	// TEE hardware type.
@@ -565,38 +583,38 @@ type CapabilityTEE struct {
 	Attestation []byte `json:"attestation"`
 }
 
-// HashRAK computes the expected report data hash bound to a given public RAK.
-func HashRAK(rak signature.PublicKey) hash.Hash {
-	hData := make([]byte, 0, len(teeHashContext)+signature.PublicKeySize)
-	hData = append(hData, teeHashContext...)
-	hData = append(hData, rak[:]...)
-	return hash.NewFromBytes(hData)
-}
-
 // Verify verifies the node's TEE capabilities, at the provided timestamp and height.
-func (c *CapabilityTEE) Verify(teeCfg *TEEFeatures, ts time.Time, height uint64, constraints []byte, nodeID signature.PublicKey, isFeatureVersion261 bool) error {
+func (c *CapabilityTEE) Verify(params CapabilityTEEVerifyParams) error {
 	switch c.Hardware {
 	case TEEHardwareIntelSGX:
 		// Parse SGX remote attestation.
 		var sa SGXAttestation
 		if err := cbor.Unmarshal(c.Attestation, &sa); err != nil {
 			return fmt.Errorf("node: malformed SGX attestation: %w", err)
 		}
-		if err := sa.ValidateBasic(teeCfg); err != nil {
+		if err := sa.ValidateBasic(params.Features); err != nil {
 			return fmt.Errorf("node: malformed SGX attestation: %w", err)
 		}
 
 		// Parse SGX constraints.
 		var sc SGXConstraints
-		if err := cbor.Unmarshal(constraints, &sc); err != nil {
+		if err := cbor.Unmarshal(params.Constraints, &sc); err != nil {
 			return fmt.Errorf("node: malformed SGX constraints: %w", err)
 		}
-		if err := sc.ValidateBasic(teeCfg, isFeatureVersion261); err != nil {
+		if err := sc.ValidateBasic(params.Features, params.IsFeatureVersion261); err != nil {
 			return fmt.Errorf("node: malformed SGX constraints: %w", err)
 		}
 
 		// Verify SGX remote attestation.
-		return sa.Verify(teeCfg, ts, height, &sc, c.RAK, c.REK, nodeID)
+		return sa.Verify(
+			params.Features,
+			params.Time,
+			params.Height,
+			&sc,
+			c.RAK,
+			c.REK,
+			params.NodeID,
+		)
 	default:
 		return ErrInvalidTEEHardware
 	}

go/common/node/node.go

@@ -286,6 +286,15 @@ func (sa *SGXAttestation) verifyAttestationSignature(
 	return nil
 }
 
+// HashRAK computes the expected report data hash bound to a given public RAK.
+func HashRAK(rak signature.PublicKey) hash.Hash {
+	const teeHashContext = "oasis-core/node: TEE RAK binding"
+	hData := make([]byte, 0, len(teeHashContext)+signature.PublicKeySize)
+	hData = append(hData, teeHashContext...)
+	hData = append(hData, rak[:]...)
+	return hash.NewFromBytes(hData)
+}
+
 // HashAttestation hashes the required data that needs to be signed by RAK producing the attestation
 // signature. The hash is computed as follows:
 //

go/common/node/sgx.go

@@ -437,14 +437,14 @@ func isSuitableExecutorWorker(
 			if nrt.Capabilities.TEE.Hardware != rt.TEEHardware {
 				return false
 			}
-			if err := nrt.Capabilities.TEE.Verify(
-				registryParams.TEEFeatures,
-				ctx.Now(),
-				uint64(ctx.LastHeight()),
-				activeDeployment.TEE,
-				n.node.ID,
-				isFeatureVersion261,
-			); err != nil {
+			if err := nrt.Capabilities.TEE.Verify(node.CapabilityTEEVerifyParams{
+				Features:            registryParams.TEEFeatures,
+				Time:                ctx.Now(),
+				Height:              uint64(ctx.LastHeight()),
+				Constraints:         activeDeployment.TEE,
+				NodeID:              n.node.ID,
+				IsFeatureVersion261: isFeatureVersion261,
+			}); err != nil {
 				ctx.Logger().Warn("failed to verify node TEE attestation",
 					"err", err,
 					"node_id", n.node.ID,

go/consensus/cometbft/apps/scheduler/scheduler.go

@@ -31,5 +31,13 @@ func TestFakeCapabilitySGX(t *testing.T) {
 
 	ias.SetSkipVerify()
 	ias.SetAllowDebugEnclaves()
-	require.NoError(t, fakeCapabilitiesSGX.TEE.Verify(&teeCfg, time.Now(), 1, cs, nodeID, true), "fakeCapabilitiesSGX not valid")
+	err = fakeCapabilitiesSGX.TEE.Verify(node.CapabilityTEEVerifyParams{
+		Features:            &teeCfg,
+		Time:                time.Now(),
+		Height:              1,
+		Constraints:         cs,
+		NodeID:              nodeID,
+		IsFeatureVersion261: true,
+	})
+	require.NoError(t, err, "fakeCapabilitiesSGX not valid")
 }

go/oasis-node/cmd/debug/byzantine/steps_test.go

@@ -199,8 +199,15 @@ func (n *Node) initRuntimeWorkers(genesisDoc *genesisAPI.Document) error {
 	}
 
 	// Initialize runtime provisioner.
+	policyProvider := &runtimeRegistry.QuotePolicyProvider{Consensus: n.Consensus}
 	var err error
-	n.Provisioner, err = provisioner.New(n.dataDir, n.commonStore, n.Identity, n.Consensus, genesisDoc)
+	n.Provisioner, err = provisioner.New(
+		n.dataDir,
+		n.commonStore,
+		n.Identity,
+		genesisDoc,
+		policyProvider,
+	)
 	if err != nil {
 		return err
 	}

go/oasis-node/cmd/node/node.go

@@ -840,7 +840,14 @@ func VerifyNodeRuntimeEnclaveIDs(
 			continue
 		}
 
-		if err := rt.Capabilities.TEE.Verify(teeCfg, ts, height, rtVersionInfo.TEE, nodeID, isFeatureVersion261); err != nil {
+		if err := rt.Capabilities.TEE.Verify(node.CapabilityTEEVerifyParams{
+			Features:            teeCfg,
+			Time:                ts,
+			Height:              height,
+			Constraints:         rtVersionInfo.TEE,
+			NodeID:              nodeID,
+			IsFeatureVersion261: isFeatureVersion261,
+		}); err != nil {
 			logger.Error("VerifyNodeRuntimeEnclaveIDs: failed to validate attestation",
 				"node_id", nodeID,
 				"runtime_id", rt.ID,

go/registry/api/api.go

@@ -7,6 +7,7 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/node"
 	"github.com/oasisprotocol/oasis-core/go/common/pubsub"
+	"github.com/oasisprotocol/oasis-core/go/common/sgx/quote"
 	"github.com/oasisprotocol/oasis-core/go/common/version"
 	"github.com/oasisprotocol/oasis-core/go/runtime/bundle"
 	"github.com/oasisprotocol/oasis-core/go/runtime/bundle/component"
@@ -38,6 +39,12 @@ type Config struct {
 	Log *log.Log
 }
 
+// QuotePolicyProvider provides quote policies for provisioned components.
+type QuotePolicyProvider interface {
+	// Get returns the applicable quote policy, or nil if there is none.
+	Get(ctx context.Context, runtimeID common.Namespace, compID component.ID, version version.Version) (*quote.Policy, error)
+}
+
 // Provisioner is the runtime provisioner interface.
 type Provisioner interface {
 	// NewRuntime provisions a new runtime.

go/runtime/host/host.go

@@ -1,22 +1,15 @@
 package provisioner
 
 import (
-	"context"
 	"fmt"
 
-	"github.com/oasisprotocol/oasis-core/go/common"
-	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
-	"github.com/oasisprotocol/oasis-core/go/common/node"
 	"github.com/oasisprotocol/oasis-core/go/common/persistent"
 	"github.com/oasisprotocol/oasis-core/go/common/sgx/pcs"
-	sgxQuote "github.com/oasisprotocol/oasis-core/go/common/sgx/quote"
 	"github.com/oasisprotocol/oasis-core/go/common/version"
 	"github.com/oasisprotocol/oasis-core/go/config"
-	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
 	genesisAPI "github.com/oasisprotocol/oasis-core/go/genesis/api"
 	cmdFlags "github.com/oasisprotocol/oasis-core/go/oasis-node/cmd/common/flags"
-	registry "github.com/oasisprotocol/oasis-core/go/registry/api"
 	"github.com/oasisprotocol/oasis-core/go/runtime/bundle/component"
 	rtConfig "github.com/oasisprotocol/oasis-core/go/runtime/config"
 	runtimeHost "github.com/oasisprotocol/oasis-core/go/runtime/host"
@@ -26,7 +19,6 @@ import (
 	hostProtocol "github.com/oasisprotocol/oasis-core/go/runtime/host/protocol"
 	hostSandbox "github.com/oasisprotocol/oasis-core/go/runtime/host/sandbox"
 	hostSgx "github.com/oasisprotocol/oasis-core/go/runtime/host/sgx"
-	sgxCommon "github.com/oasisprotocol/oasis-core/go/runtime/host/sgx/common"
 	hostTdx "github.com/oasisprotocol/oasis-core/go/runtime/host/tdx"
 )
 
@@ -39,8 +31,8 @@ func New(
 	dataDir string,
 	commonStore *persistent.CommonStore,
 	identity *identity.Identity,
-	consensus consensus.Service,
 	genesisDoc *genesisAPI.Document,
+	policyProvider runtimeHost.QuotePolicyProvider,
 ) (runtimeHost.Provisioner, error) {
 	// Configure host environment information.
 	hostInfo, err := createHostInfo(genesisDoc)
@@ -54,8 +46,6 @@ func New(
 		return nil, err
 	}
 
-	policyProvider := &quotePolicyProvider{consensus}
-
 	// Create runtime provisioner.
 	return createProvisioner(dataDir, commonStore, identity, hostInfo, qs, policyProvider)
 }
@@ -87,7 +77,7 @@ func createProvisioner(
 	identity *identity.Identity,
 	hostInfo *hostProtocol.HostInfo,
 	qs pcs.QuoteService,
-	policyProvider sgxCommon.QuotePolicyProvider,
+	policyProvider runtimeHost.QuotePolicyProvider,
 ) (runtimeHost.Provisioner, error) {
 	var err error
 	var insecureNoSandbox bool
@@ -202,26 +192,3 @@ func createProvisioner(
 
 	return provisioner, nil
 }
-
-type quotePolicyProvider struct {
-	cs consensus.Service
-}
-
-func (p *quotePolicyProvider) Get(ctx context.Context, runtimeID common.Namespace, version version.Version) (*sgxQuote.Policy, error) {
-	rt, err := p.cs.Registry().GetRuntime(ctx, &registry.GetRuntimeQuery{
-		Height:           consensus.HeightLatest,
-		ID:               runtimeID,
-		IncludeSuspended: true,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to query runtime descriptor: %w", err)
-	}
-	if d := rt.DeploymentForVersion(version); d != nil {
-		var sc node.SGXConstraints
-		if err = cbor.Unmarshal(d.TEE, &sc); err != nil {
-			return nil, fmt.Errorf("malformed runtime SGX constraints: %w", err)
-		}
-		return sc.Policy, nil
-	}
-	return nil, nil
-}

go/runtime/host/provisioner/provisioner.go

@@ -8,26 +8,18 @@ import (
 
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	"github.com/oasisprotocol/oasis-core/go/common/crypto/signature"
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
 	"github.com/oasisprotocol/oasis-core/go/common/logging"
 	"github.com/oasisprotocol/oasis-core/go/common/node"
 	"github.com/oasisprotocol/oasis-core/go/common/sgx/pcs"
 	sgxQuote "github.com/oasisprotocol/oasis-core/go/common/sgx/quote"
-	"github.com/oasisprotocol/oasis-core/go/common/version"
 	"github.com/oasisprotocol/oasis-core/go/runtime/host"
 	"github.com/oasisprotocol/oasis-core/go/runtime/host/protocol"
 	"github.com/oasisprotocol/oasis-core/go/runtime/host/sandbox"
 )
 
-// QuotePolicyProvider provides quote policies.
-type QuotePolicyProvider interface {
-	// Get returns the quote policy for the specified RONL deployment.
-	Get(ctx context.Context, runtimeID common.Namespace, version version.Version) (*sgxQuote.Policy, error)
-}
-
 // EndorseCapabilityTEE endorses the given CapabilityTEE and submits the signed endorsement to the
 // runtime over the given connection.
 func EndorseCapabilityTEE(