@enactprotocol/shared 1.2.5 → 1.2.7

package/dist/core/EnactCore.js

@@ -288,7 +288,10 @@ export class EnactCore {
                 throw new Error(`Tool ${tool.name} does not have any signatures`);
             }
             const documentForVerification = {
-                command: tool.command
+                command: tool.command,
+                description: tool.description,
+                from: tool.from,
+                name: tool.name,
             };
             const referenceSignature = {
                 signature: tool.signatures[0].value,
@@ -297,14 +300,14 @@ export class EnactCore {
                 timestamp: new Date(tool.signatures[0].created).getTime()
             };
             // Check what canonical document looks like
-            const canonicalDoc = SigningService.getCanonicalDocument(documentForVerification, { includeFields: ['command'] });
+            const canonicalDoc = SigningService.getCanonicalDocument(documentForVerification, { includeFields: ['command', 'description', 'from', 'name'] });
             const docString = JSON.stringify(canonicalDoc);
             const messageHash = CryptoUtils.hash(docString);
             // Test direct crypto verification
             const directVerify = CryptoUtils.verify(referenceSignature.publicKey, messageHash, referenceSignature.signature);
             // Check trusted keys
             // const trustedKeys = KeyManager.getAllTrustedPublicKeys();
-            const isValid = SigningService.verifyDocument(documentForVerification, referenceSignature, { includeFields: ['command'] });
+            const isValid = SigningService.verifyDocument(documentForVerification, referenceSignature, { includeFields: ['command', 'description', 'from', 'name'] });
             // console.log("Final verification result:", isValid);
             if (!isValid) {
                 throw new Error(`Tool ${tool.name} has invalid signatures`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enactprotocol/shared",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Shared utilities and core functionality for Enact Protocol",
   "type": "module",
   "main": "./dist/index.js",

package/src/core/DaggerExecutionProvider.ts

@@ -11,8 +11,7 @@ import { parseTimeout } from "../utils/timeout.js";
 import fs from "fs/promises";
 import path from "path";
 import crypto from "crypto";
-import { spawn, spawnSync } from "child_process";
-import { exit } from "process";
+import { spawnSync } from "child_process";
 
 export interface DaggerExecutionOptions {
 	baseImage?: string; // Default container image

package/src/core/EnactCore.ts

@@ -15,8 +15,6 @@ import { DaggerExecutionProvider } from "./DaggerExecutionProvider.js";
 import { resolveToolEnvironmentVariables } from "../utils/env-loader.js";
 import logger from "../exec/logger.js";
 import yaml from "yaml";
-import fs from "fs";
-import path from "path";
 import { CryptoUtils, KeyManager, SecurityConfigManager, SigningService } from "@enactprotocol/security";
 import { getFrontendUrl, getApiUrl } from "../utils/config";
 
@@ -420,7 +418,10 @@ private async verifyTool(tool: EnactTool, dangerouslySkipVerification: boolean =
 		}
 	
 		const documentForVerification = {
-			command: tool.command
+			command: tool.command,
+			description: tool.description,
+			from: tool.from,
+			name: tool.name,
 		};
 
        	const referenceSignature = {
@@ -432,7 +433,8 @@ private async verifyTool(tool: EnactTool, dangerouslySkipVerification: boolean =
 
         
         // Check what canonical document looks like
-        const canonicalDoc = SigningService.getCanonicalDocument(documentForVerification, { includeFields: ['command'] });
+        const canonicalDoc = SigningService.getCanonicalDocument(documentForVerification,     { includeFields:  ['command', 'description', 'from', 'name'] } 
+);
         
         const docString = JSON.stringify(canonicalDoc);
         const messageHash = CryptoUtils.hash(docString);
@@ -451,7 +453,7 @@ private async verifyTool(tool: EnactTool, dangerouslySkipVerification: boolean =
         const isValid = SigningService.verifyDocument(
             documentForVerification,
             referenceSignature,
-            { includeFields: ['command'] }
+    		{ includeFields: ['command', 'description', 'from', 'name'] }
         );
         
         // console.log("Final verification result:", isValid);