Merge pull request #131 from Dstack-TEE/kms-tcb

kms: Add tcbStatus and advisoryIds to BootInfo

Author: kvinwang

kms/auth-eth/contracts/IAppAuth.sol

@@ -10,6 +10,8 @@ interface IAppAuth {
         bytes32 mrAggregated;
         bytes32 mrSystem;
         bytes32 mrImage;
+        string tcbStatus;
+        string[] advisoryIds;
     }
 
     function isAppAllowed(

kms/auth-eth/contracts/KmsAuth.sol

@@ -131,9 +131,7 @@ contract KmsAuth is
     }
 
     // Function to deregister an aggregated MR measurement
-    function removeKmsAggregatedMr(
-        bytes32 mrAggregated
-    ) external onlyOwner {
+    function removeKmsAggregatedMr(bytes32 mrAggregated) external onlyOwner {
         kmsAllowedAggregatedMrs[mrAggregated] = false;
         emit KmsAggregatedMrRemoved(mrAggregated);
     }
@@ -178,6 +176,14 @@ contract KmsAuth is
     function isKmsAllowed(
         AppBootInfo calldata bootInfo
     ) external view returns (bool isAllowed, string memory reason) {
+        // Check if the TCB status is up to date
+        if (
+            keccak256(abi.encodePacked(bootInfo.tcbStatus)) !=
+            keccak256(abi.encodePacked("UpToDate"))
+        ) {
+            return (false, "TCB status is not up to date");
+        }
+
         // Check if the aggregated MR is allowed
         if (!kmsAllowedAggregatedMrs[bootInfo.mrAggregated]) {
             return (false, "Aggregated MR not allowed");

kms/auth-eth/src/ethereum.ts

@@ -36,7 +36,9 @@ export class EthereumBackend {
       deviceId: this.decodeHex(bootInfo.deviceId, 32),
       mrSystem: this.decodeHex(bootInfo.mrSystem, 32),
       mrAggregated: this.decodeHex(bootInfo.mrAggregated, 32),
-      mrImage: this.decodeHex(bootInfo.mrImage, 32)
+      mrImage: this.decodeHex(bootInfo.mrImage, 32),
+      tcbStatus: bootInfo.tcbStatus,
+      advisoryIds: bootInfo.advisoryIds
     };
     let response;
     if (isKms) {

kms/auth-eth/src/types.ts

@@ -1,4 +1,6 @@
 export interface BootInfo {
+  tcbStatus: string;
+  advisoryIds: string[];
   mrAggregated: string;
   mrImage: string;
   mrSystem: string;

kms/auth-eth/test/AppAuth.test.ts

@@ -75,7 +75,9 @@ describe("AppAuth", function () {
         deviceId,
         mrAggregated,
         mrImage,
-        mrSystem
+        mrSystem,
+        tcbStatus: "UpToDate",
+        advisoryIds: []
       };
 
       const [isAllowed, reason] = await appAuth.isAppAllowed(bootInfo);
@@ -85,6 +87,8 @@ describe("AppAuth", function () {
 
     it("Should reject invalid app ID", async function () {
       const bootInfo = {
+        tcbStatus: "UpToDate",
+        advisoryIds: [],
         appId: ethers.Wallet.createRandom().address,
         composeHash,
         instanceId,
@@ -101,6 +105,8 @@ describe("AppAuth", function () {
 
     it("Should reject unallowed compose hash", async function () {
       const bootInfo = {
+        tcbStatus: "UpToDate",
+        advisoryIds: [],
         appId: appId,
         composeHash: ethers.randomBytes(32),
         instanceId,

kms/auth-eth/test/ethereum.integration.test.ts

@@ -38,6 +38,8 @@ describe('Integration Tests', () => {
         mrImage: ethers.encodeBytes32String('22'),
         composeHash: ethers.encodeBytes32String('33'),
         mrSystem: ethers.encodeBytes32String('44'),
+        tcbStatus: "UpToDate",
+        advisoryIds: []
       };
     });
 
@@ -89,6 +91,8 @@ describe('Integration Tests', () => {
     beforeEach(async () => {
       appId = global.testContracts.appId;
       mockBootInfo = {
+        tcbStatus: "UpToDate",
+        advisoryIds: [],
         appId,
         composeHash: ethers.encodeBytes32String("33"),
         instanceId: ethers.Wallet.createRandom().address,

kms/auth-eth/test/ethereum.test.ts

@@ -25,6 +25,8 @@ describe('EthereumBackend', () => {
 
     // Create mock boot info with valid addresses
     mockBootInfo = {
+      tcbStatus: "UpToDate",
+      advisoryIds: [],
       appId,
       composeHash: ethers.encodeBytes32String('0x1234567890abcdef'),
       instanceId: ethers.Wallet.createRandom().address,

kms/auth-eth/test/main.test.ts

@@ -14,6 +14,8 @@ jest.mock('../src/ethereum', () => {
 describe('Server', () => {
   let app: FastifyInstance;
   const mockBootInfo: BootInfo = {
+    tcbStatus: "UpToDate",
+    advisoryIds: [],
     mrAggregated: '0x1234',
     mrImage: '0x5678',
     mrSystem: '0x9012',

kms/auth-eth/test/setup.ts

@@ -45,7 +45,9 @@ beforeAll(async () => {
     deviceId: ethers.encodeBytes32String("test-device-id"),
     mrSystem: ethers.encodeBytes32String("test-mr-system"),
     mrAggregated: ethers.encodeBytes32String("test-mr-aggregated"),
-    mrImage: ethers.encodeBytes32String("test-mr-image")
+    mrImage: ethers.encodeBytes32String("test-mr-image"),
+    tcbStatus: "UpToDate",
+    advisoryIds: []
   };
   // Register some test enclaves and images
   await kmsAuth.addKmsAggregatedMr(ethers.encodeBytes32String("11"));

kms/auth-eth/typechain-types/contracts/AppAuth.ts

@@ -32,6 +32,8 @@ export declare namespace IAppAuth {
     mrAggregated: BytesLike;
     mrSystem: BytesLike;
     mrImage: BytesLike;
+    tcbStatus: string;
+    advisoryIds: string[];
   };
 
   export type AppBootInfoStructOutput = [
@@ -41,7 +43,9 @@ export declare namespace IAppAuth {
     deviceId: string,
     mrAggregated: string,
     mrSystem: string,
-    mrImage: string
+    mrImage: string,
+    tcbStatus: string,
+    advisoryIds: string[]
   ] & {
     appId: string;
     composeHash: string;
@@ -50,6 +54,8 @@ export declare namespace IAppAuth {
     mrAggregated: string;
     mrSystem: string;
     mrImage: string;
+    tcbStatus: string;
+    advisoryIds: string[];
   };
 }