@super-protocol/addons-tee 0.8.16-beta.3 → 0.8.17-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/bindings/amd-sev-snp-napi-rs/amd-sev-snp-napi-rs.linux-x64-gnu.node +0 -0
  2. package/bindings/amd-sev-snp-napi-rs/index.d.ts +13 -1
  3. package/bindings/amd-sev-snp-napi-rs/index.js +9 -2
  4. package/bindings/amd-sev-snp-napi-rs/package-lock.json +2 -5
  5. package/bindings/amd-sev-snp-napi-rs/package.json +1 -1
  6. package/bindings/utils/virtee/libsev.so +0 -0
  7. package/bindings/utils/virtee/snpguest +0 -0
  8. package/dist/sgx-native-module/consts.d.ts +1 -1
  9. package/dist/sgx-native-module/consts.js +4 -4
  10. package/dist/sgx-native-module/dcap-quote-verify.service.js +1 -1
  11. package/dist/sgx-native-module/enclave.service.d.ts +5 -4
  12. package/dist/sgx-native-module/enclave.service.js +1 -1
  13. package/dist/sgx-native-module/errors.js +1 -1
  14. package/dist/sgx-native-module/index.d.ts +1 -0
  15. package/dist/sgx-native-module/index.js +2 -1
  16. package/dist/sgx-native-module/pki.service.d.ts +2 -2
  17. package/dist/sgx-native-module/pki.service.js +4 -4
  18. package/dist/sgx-native-module/sev-snp-mrenclave.d.ts +63 -0
  19. package/dist/sgx-native-module/sev-snp-mrenclave.js +290 -0
  20. package/dist/sgx-native-module/sev-snp.d.ts +104 -10
  21. package/dist/sgx-native-module/sev-snp.js +355 -33
  22. package/package.json +13 -12
  23. package/dist/sgx-native-module/helpers/tryWithInterval.d.ts +0 -13
  24. package/dist/sgx-native-module/helpers/tryWithInterval.js +0 -39
  25. package/dist/sgx-native-module/sgx-tests.d.ts +0 -1
  26. package/dist/sgx-native-module/sgx-tests.js +0 -114
  27. package/dist/sgx-native-module/snp-tests.d.ts +0 -1
  28. package/dist/sgx-native-module/snp-tests.js +0 -45
  29. package/dist/sgx-native-module/tdx-tests.d.ts +0 -1
  30. package/dist/sgx-native-module/tdx-tests.js +0 -64
  31. package/test_snp_env/Dockerfile +0 -25
  32. package/test_snp_env/build-and-run-tests.sh +0 -11
@@ -26,42 +26,242 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.SevSNP = exports.SevSNPCertType = exports.SupportedAmdSevSnpGenerations = void 0;
29
+ exports.SevSNP = exports.getDefaultArkHashes = exports.ARK_GENOA = exports.ARK_MILAN = exports.EMPTY_INITRD_SHA256_HASH = exports.AMD_EPYC_MILAN_CPUINFO = exports.SevSNPCertType = exports.SupportedAmdSevSnpGenerations = void 0;
30
30
  const amd_sev_snp_napi_rs_1 = require("../../bindings/amd-sev-snp-napi-rs/");
31
- const tryWithInterval_1 = require("./helpers/tryWithInterval");
31
+ const sdk_js_1 = require("@super-protocol/sdk-js");
32
32
  const axios_1 = __importDefault(require("axios"));
33
33
  const pki_service_1 = require("./pki.service");
34
- const x509_1 = require("@fidm/x509");
34
+ const forge = __importStar(require("node-forge"));
35
35
  const fs = __importStar(require("fs/promises"));
36
36
  const path = __importStar(require("path"));
37
37
  const os = __importStar(require("os"));
38
38
  const child_process_1 = require("child_process");
39
+ const crypto_1 = require("crypto");
40
+ const msgpack5_1 = __importDefault(require("msgpack5"));
39
41
  var SupportedAmdSevSnpGenerations;
40
42
  (function (SupportedAmdSevSnpGenerations) {
41
43
  SupportedAmdSevSnpGenerations["Milan"] = "Milan";
42
44
  SupportedAmdSevSnpGenerations["Genoa"] = "Genoa";
43
- })(SupportedAmdSevSnpGenerations = exports.SupportedAmdSevSnpGenerations || (exports.SupportedAmdSevSnpGenerations = {}));
45
+ })(SupportedAmdSevSnpGenerations || (exports.SupportedAmdSevSnpGenerations = SupportedAmdSevSnpGenerations = {}));
44
46
  var SevSNPCertType;
45
47
  (function (SevSNPCertType) {
46
48
  SevSNPCertType["ARK"] = "ARK";
47
49
  SevSNPCertType["ASK"] = "ASK";
48
50
  SevSNPCertType["VCEK"] = "VCEK";
49
- })(SevSNPCertType = exports.SevSNPCertType || (exports.SevSNPCertType = {}));
51
+ })(SevSNPCertType || (exports.SevSNPCertType = SevSNPCertType = {}));
52
+ exports.AMD_EPYC_MILAN_CPUINFO = {
53
+ family: 25,
54
+ model: 1,
55
+ stepping: 1,
56
+ };
57
+ exports.EMPTY_INITRD_SHA256_HASH = Buffer.from("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "hex");
58
+ exports.ARK_MILAN = `-----BEGIN CERTIFICATE-----
59
+ MIIGYzCCBBKgAwIBAgIDAQAAMEYGCSqGSIb3DQEBCjA5oA8wDQYJYIZIAWUDBAIC
60
+ BQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAICBQCiAwIBMKMDAgEBMHsxFDAS
61
+ BgNVBAsMC0VuZ2luZWVyaW5nMQswCQYDVQQGEwJVUzEUMBIGA1UEBwwLU2FudGEg
62
+ Q2xhcmExCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZBZHZhbmNlZCBNaWNybyBEZXZp
63
+ Y2VzMRIwEAYDVQQDDAlBUkstTWlsYW4wHhcNMjAxMDIyMTcyMzA1WhcNNDUxMDIy
64
+ MTcyMzA1WjB7MRQwEgYDVQQLDAtFbmdpbmVlcmluZzELMAkGA1UEBhMCVVMxFDAS
65
+ BgNVBAcMC1NhbnRhIENsYXJhMQswCQYDVQQIDAJDQTEfMB0GA1UECgwWQWR2YW5j
66
+ ZWQgTWljcm8gRGV2aWNlczESMBAGA1UEAwwJQVJLLU1pbGFuMIICIjANBgkqhkiG
67
+ 9w0BAQEFAAOCAg8AMIICCgKCAgEA0Ld52RJOdeiJlqK2JdsVmD7FktuotWwX1fNg
68
+ W41XY9Xz1HEhSUmhLz9Cu9DHRlvgJSNxbeYYsnJfvyjx1MfU0V5tkKiU1EesNFta
69
+ 1kTA0szNisdYc9isqk7mXT5+KfGRbfc4V/9zRIcE8jlHN61S1ju8X93+6dxDUrG2
70
+ SzxqJ4BhqyYmUDruPXJSX4vUc01P7j98MpqOS95rORdGHeI52Naz5m2B+O+vjsC0
71
+ 60d37jY9LFeuOP4Meri8qgfi2S5kKqg/aF6aPtuAZQVR7u3KFYXP59XmJgtcog05
72
+ gmI0T/OitLhuzVvpZcLph0odh/1IPXqx3+MnjD97A7fXpqGd/y8KxX7jksTEzAOg
73
+ bKAeam3lm+3yKIcTYMlsRMXPcjNbIvmsBykD//xSniusuHBkgnlENEWx1UcbQQrs
74
+ +gVDkuVPhsnzIRNgYvM48Y+7LGiJYnrmE8xcrexekBxrva2V9TJQqnN3Q53kt5vi
75
+ Qi3+gCfmkwC0F0tirIZbLkXPrPwzZ0M9eNxhIySb2npJfgnqz55I0u33wh4r0ZNQ
76
+ eTGfw03MBUtyuzGesGkcw+loqMaq1qR4tjGbPYxCvpCq7+OgpCCoMNit2uLo9M18
77
+ fHz10lOMT8nWAUvRZFzteXCm+7PHdYPlmQwUw3LvenJ/ILXoQPHfbkH0CyPfhl1j
78
+ WhJFZasCAwEAAaN+MHwwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSFrBrRQ/fI
79
+ rFXUxR1BSKvVeErUUzAPBgNVHRMBAf8EBTADAQH/MDoGA1UdHwQzMDEwL6AtoCuG
80
+ KWh0dHBzOi8va2RzaW50Zi5hbWQuY29tL3ZjZWsvdjEvTWlsYW4vY3JsMEYGCSqG
81
+ SIb3DQEBCjA5oA8wDQYJYIZIAWUDBAICBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZI
82
+ AWUDBAICBQCiAwIBMKMDAgEBA4ICAQC6m0kDp6zv4Ojfgy+zleehsx6ol0ocgVel
83
+ ETobpx+EuCsqVFRPK1jZ1sp/lyd9+0fQ0r66n7kagRk4Ca39g66WGTJMeJdqYriw
84
+ STjjDCKVPSesWXYPVAyDhmP5n2v+BYipZWhpvqpaiO+EGK5IBP+578QeW/sSokrK
85
+ dHaLAxG2LhZxj9aF73fqC7OAJZ5aPonw4RE299FVarh1Tx2eT3wSgkDgutCTB1Yq
86
+ zT5DuwvAe+co2CIVIzMDamYuSFjPN0BCgojl7V+bTou7dMsqIu/TW/rPCX9/EUcp
87
+ KGKqPQ3P+N9r1hjEFY1plBg93t53OOo49GNI+V1zvXPLI6xIFVsh+mto2RtgEX/e
88
+ pmMKTNN6psW88qg7c1hTWtN6MbRuQ0vm+O+/2tKBF2h8THb94OvvHHoFDpbCELlq
89
+ HnIYhxy0YKXGyaW1NjfULxrrmxVW4wcn5E8GddmvNa6yYm8scJagEi13mhGu4Jqh
90
+ 3QU3sf8iUSUr09xQDwHtOQUVIqx4maBZPBtSMf+qUDtjXSSq8lfWcd8bLr9mdsUn
91
+ JZJ0+tuPMKmBnSH860llKk+VpVQsgqbzDIvOLvD6W1Umq25boxCYJ+TuBoa4s+HH
92
+ CViAvgT9kf/rBq1d+ivj6skkHxuzcxbk1xv6ZGxrteJxVH7KlX7YRdZ6eARKwLe4
93
+ AFZEAwoKCQ==
94
+ -----END CERTIFICATE-----`;
95
+ exports.ARK_GENOA = `-----BEGIN CERTIFICATE-----
96
+ MIIGYzCCBBKgAwIBAgIDAgAAMEYGCSqGSIb3DQEBCjA5oA8wDQYJYIZIAWUDBAIC
97
+ BQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAICBQCiAwIBMKMDAgEBMHsxFDAS
98
+ BgNVBAsMC0VuZ2luZWVyaW5nMQswCQYDVQQGEwJVUzEUMBIGA1UEBwwLU2FudGEg
99
+ Q2xhcmExCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZBZHZhbmNlZCBNaWNybyBEZXZp
100
+ Y2VzMRIwEAYDVQQDDAlBUkstR2Vub2EwHhcNMjIwMTI2MTUzNDM3WhcNNDcwMTI2
101
+ MTUzNDM3WjB7MRQwEgYDVQQLDAtFbmdpbmVlcmluZzELMAkGA1UEBhMCVVMxFDAS
102
+ BgNVBAcMC1NhbnRhIENsYXJhMQswCQYDVQQIDAJDQTEfMB0GA1UECgwWQWR2YW5j
103
+ ZWQgTWljcm8gRGV2aWNlczESMBAGA1UEAwwJQVJLLUdlbm9hMIICIjANBgkqhkiG
104
+ 9w0BAQEFAAOCAg8AMIICCgKCAgEA3Cd95S/uFOuRIskW9vz9VDBF69NDQF79oRhL
105
+ /L2PVQGhK3YdfEBgpF/JiwWFBsT/fXDhzA01p3LkcT/7LdjcRfKXjHl+0Qq/M4dZ
106
+ kh6QDoUeKzNBLDcBKDDGWo3v35NyrxbA1DnkYwUKU5AAk4P94tKXLp80oxt84ahy
107
+ HoLmc/LqsGsp+oq1Bz4PPsYLwTG4iMKVaaT90/oZ4I8oibSru92vJhlqWO27d/Rx
108
+ c3iUMyhNeGToOvgx/iUo4gGpG61NDpkEUvIzuKcaMx8IdTpWg2DF6SwF0IgVMffn
109
+ vtJmA68BwJNWo1E4PLJdaPfBifcJpuBFwNVQIPQEVX3aP89HJSp8YbY9lySS6PlV
110
+ EqTBBtaQmi4ATGmMR+n2K/e+JAhU2Gj7jIpJhOkdH9firQDnmlA2SFfJ/Cc0mGNz
111
+ W9RmIhyOUnNFoclmkRhl3/AQU5Ys9Qsan1jT/EiyT+pCpmnA+y9edvhDCbOG8F2o
112
+ xHGRdTBkylungrkXJGYiwGrR8kaiqv7NN8QhOBMqYjcbrkEr0f8QMKklIS5ruOfq
113
+ lLMCBw8JLB3LkjpWgtD7OpxkzSsohN47Uom86RY6lp72g8eXHP1qYrnvhzaG1S70
114
+ vw6OkbaaC9EjiH/uHgAJQGxon7u0Q7xgoREWA/e7JcBQwLg80Hq/sbRuqesxz7wB
115
+ WSY254cCAwEAAaN+MHwwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSfXfn+Ddjz
116
+ WtAzGiXvgSlPvjGoWzAPBgNVHRMBAf8EBTADAQH/MDoGA1UdHwQzMDEwL6AtoCuG
117
+ KWh0dHBzOi8va2RzaW50Zi5hbWQuY29tL3ZjZWsvdjEvR2Vub2EvY3JsMEYGCSqG
118
+ SIb3DQEBCjA5oA8wDQYJYIZIAWUDBAICBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZI
119
+ AWUDBAICBQCiAwIBMKMDAgEBA4ICAQAdIlPBC7DQmvH7kjlOznFx3i21SzOPDs5L
120
+ 7SgFjMC9rR07292GQCA7Z7Ulq97JQaWeD2ofGGse5swj4OQfKfVv/zaJUFjvosZO
121
+ nfZ63epu8MjWgBSXJg5QE/Al0zRsZsp53DBTdA+Uv/s33fexdenT1mpKYzhIg/cK
122
+ tz4oMxq8JKWJ8Po1CXLzKcfrTphjlbkh8AVKMXeBd2SpM33B1YP4g1BOdk013kqb
123
+ 7bRHZ1iB2JHG5cMKKbwRCSAAGHLTzASgDcXr9Fp7Z3liDhGu/ci1opGmkp12QNiJ
124
+ uBbkTU+xDZHm5X8Jm99BX7NEpzlOwIVR8ClgBDyuBkBC2ljtr3ZSaUIYj2xuyWN9
125
+ 5KFY49nWxcz90CFa3Hzmy4zMQmBe9dVyls5eL5p9bkXcgRMDTbgmVZiAf4afe8DL
126
+ dmQcYcMFQbHhgVzMiyZHGJgcCrQmA7MkTwEIds1wx/HzMcwU4qqNBAoZV7oeIIPx
127
+ dqFXfPqHqiRlEbRDfX1TG5NFVaeByX0GyH6jzYVuezETzruaky6fp2bl2bczxPE8
128
+ HdS38ijiJmm9vl50RGUeOAXjSuInGR4bsRufeGPB9peTa9BcBOeTWzstqTUB/F/q
129
+ aZCIZKr4X6TyfUuSDz/1JDAGl+lxdM0P9+lLaP9NahQjHCVf0zf1c1salVuGFk2w
130
+ /wMz1R1BHg==
131
+ -----END CERTIFICATE-----`;
132
+ function getDefaultArkHashes() {
133
+ const ark_hashes = {};
134
+ ark_hashes["ARK-Milan"] = SevSNP.getCertHash({
135
+ type: SevSNPCertType.ARK,
136
+ format: pki_service_1.CertificateFormat.PEM,
137
+ cert: exports.ARK_MILAN,
138
+ });
139
+ ark_hashes["ARK-Genoa"] = SevSNP.getCertHash({
140
+ type: SevSNPCertType.ARK,
141
+ format: pki_service_1.CertificateFormat.PEM,
142
+ cert: exports.ARK_GENOA,
143
+ });
144
+ return ark_hashes;
145
+ }
146
+ exports.getDefaultArkHashes = getDefaultArkHashes;
50
147
  class SevSNP {
148
+ static serializeSNPReport(report) {
149
+ const msgpack = (0, msgpack5_1.default)();
150
+ return msgpack.encode(report).slice();
151
+ }
152
+ static deserializeSNPReport(serialized) {
153
+ let parsedReport;
154
+ try {
155
+ const msgpack = (0, msgpack5_1.default)();
156
+ parsedReport = msgpack.decode(serialized);
157
+ }
158
+ catch (e) {
159
+ throw new Error("Failed to decode Buffer" + e.message);
160
+ }
161
+ const requiredFields = [
162
+ {
163
+ key: "report",
164
+ type: "Buffer",
165
+ },
166
+ {
167
+ key: "cmdLineHash",
168
+ type: "Buffer",
169
+ },
170
+ {
171
+ key: "build",
172
+ type: "string",
173
+ },
174
+ {
175
+ key: "cpuSig",
176
+ type: "number",
177
+ },
178
+ {
179
+ key: "cores",
180
+ type: "number",
181
+ },
182
+ ];
183
+ for (const { key, type } of requiredFields) {
184
+ if (type === "Buffer") {
185
+ if (!Buffer.isBuffer(parsedReport[key])) {
186
+ throw new Error(`Invalid or missing field: ${key}`);
187
+ }
188
+ }
189
+ else {
190
+ if (typeof parsedReport[key] !== type) {
191
+ throw new Error(`Invalid or missing field: ${key}`);
192
+ }
193
+ }
194
+ }
195
+ if (!parsedReport.certs || !Array.isArray(parsedReport.certs))
196
+ throw new Error("Invalid or missing field: certs");
197
+ for (const cert of parsedReport.certs) {
198
+ if (!cert.format || typeof cert.format !== "string")
199
+ throw new Error("Invalid or missing field: cert.format");
200
+ if (!cert.type || typeof cert.type !== "string")
201
+ throw new Error("Invalid or missing field: cert.type");
202
+ if (!cert.cert || (typeof cert.cert !== "string" && !Buffer.isBuffer(cert.cert)))
203
+ throw new Error("Invalid or missing field: cert.cert");
204
+ }
205
+ const deserializedReport = {
206
+ ...parsedReport,
207
+ };
208
+ return deserializedReport;
209
+ }
51
210
  static convertCertToPem(cert) {
52
211
  const pemHeader = "-----BEGIN CERTIFICATE-----\n";
53
212
  const pemFooter = "\n-----END CERTIFICATE-----";
54
213
  if (cert.slice(0, pemHeader.length).compare(Buffer.from(pemHeader)) === 0) {
55
- return cert;
214
+ return cert.toString();
56
215
  }
57
216
  const formattedBase64 = cert
58
217
  .toString("base64")
59
218
  .match(/.{1,64}/g)
60
219
  ?.join("\n");
61
- return Buffer.from(pemHeader + formattedBase64 + pemFooter);
220
+ return pemHeader + formattedBase64 + pemFooter;
221
+ }
222
+ static convertPemToDer(cert) {
223
+ return Buffer.from(forge.pki.pemToDer(cert).getBytes(), "binary");
224
+ }
225
+ static splitCerts(certsPem) {
226
+ const certRegex = /-----BEGIN CERTIFICATE-----(?:\s|.)*?-----END CERTIFICATE-----/g;
227
+ const matches = certsPem.match(certRegex);
228
+ return Array.from(matches || []);
62
229
  }
63
- async generateSNPReport(userData, options) {
64
- const report = (0, amd_sev_snp_napi_rs_1.getSnpReport)(userData, 0);
230
+ static async readCmdLine() {
231
+ const data = await fs.readFile("/proc/cmdline", "utf-8");
232
+ // Workaround: VM in direct boot mode sometimes adds to the end of the cmdline initrd=initrd, need to remove it
233
+ return data.replace(/initrd=initrd\s*/, "");
234
+ }
235
+ /**
236
+ * Method for generation AMD SEV-SNP Report
237
+ * @param userData - The data that will be included in the report and will be signed
238
+ */
239
+ static async generateSNPReport(userData) {
240
+ if (userData.length > amd_sev_snp_napi_rs_1.SNP_REPORT_DATA_SIZE) {
241
+ throw new Error(`userData cannot exceed ${amd_sev_snp_napi_rs_1.SNP_REPORT_DATA_SIZE} bytes.`);
242
+ }
243
+ const paddedUserData = Buffer.alloc(64);
244
+ userData.copy(paddedUserData);
245
+ const report = (0, amd_sev_snp_napi_rs_1.getSnpReport)(paddedUserData, 0);
246
+ const cpuInfo = (0, amd_sev_snp_napi_rs_1.getCpuInfo)();
247
+ const cpuSig = (0, amd_sev_snp_napi_rs_1.getCpuSig)(cpuInfo);
248
+ const cores = (0, amd_sev_snp_napi_rs_1.getLogicalCoresCount)();
249
+ const cmdLine = await SevSNP.readCmdLine();
250
+ return {
251
+ report,
252
+ cpuSig,
253
+ cores,
254
+ cmdLineHash: SevSNP.calculateCmdlineHash(cmdLine),
255
+ build: SevSNP.extractBuildFromCmdline(cmdLine),
256
+ };
257
+ }
258
+ /**
259
+ * Method for fetch certificates from AMD KDS
260
+ * @param report - report generated by the `generateSNPReport` method
261
+ * @param options - options for working with HTTP, allows you to configure repetitions and the interval between them,
262
+ * as well as the format of the returned certificates
263
+ */
264
+ static async getReportChain(report, options) {
65
265
  const retryMax = options?.retryMax ?? 2;
66
266
  const retryInterval = options?.retryInterval ?? 10000;
67
267
  const certFormat = options?.certFormat ?? pki_service_1.CertificateFormat.DER;
@@ -72,9 +272,9 @@ class SevSNP {
72
272
  const generations = Object.values(SupportedAmdSevSnpGenerations);
73
273
  for (const generation of generations) {
74
274
  cpuGeneration = generation;
75
- const vcekUrl = (0, amd_sev_snp_napi_rs_1.getVcekKdsUrl)(report, generation);
275
+ const vcekUrl = (0, amd_sev_snp_napi_rs_1.getVcekKdsUrl)(report.report, generation);
76
276
  try {
77
- const response = await (0, tryWithInterval_1.tryWithInterval)({
277
+ const response = await sdk_js_1.helpers.tryWithInterval({
78
278
  checkResult(response) {
79
279
  return { isResultOk: response.status === 200 };
80
280
  },
@@ -104,14 +304,13 @@ class SevSNP {
104
304
  }
105
305
  }
106
306
  const pemVcek = SevSNP.convertCertToPem(vcek);
107
- const vcekCert = x509_1.Certificate.fromPEM(Buffer.from(pemVcek));
108
307
  certs.push({
109
308
  type: SevSNPCertType.VCEK,
110
309
  format: certFormat,
111
- cert: certFormat === pki_service_1.CertificateFormat.PEM ? pemVcek : vcekCert.raw,
310
+ cert: certFormat === pki_service_1.CertificateFormat.PEM ? pemVcek : SevSNP.convertPemToDer(pemVcek),
112
311
  });
113
312
  const caUrl = `${amd_sev_snp_napi_rs_1.KDS_CERT_SITE}/${amd_sev_snp_napi_rs_1.KDS_VCEK}/${cpuGeneration}/cert_chain`;
114
- const response = await (0, tryWithInterval_1.tryWithInterval)({
313
+ const response = await sdk_js_1.helpers.tryWithInterval({
115
314
  checkResult(response) {
116
315
  return { isResultOk: response.status === 200 };
117
316
  },
@@ -130,24 +329,33 @@ class SevSNP {
130
329
  retryInterval,
131
330
  retryMax,
132
331
  });
133
- const CAChain = x509_1.Certificate.fromPEMs(response.data.toString());
332
+ const CAChain = SevSNP.splitCerts(response.data.toString());
134
333
  if (CAChain.length !== 2) {
135
334
  throw new Error("Cert chain must have 2 certificates");
136
335
  }
137
336
  certs.push({
138
337
  type: SevSNPCertType.ARK,
139
338
  format: certFormat,
140
- cert: certFormat === pki_service_1.CertificateFormat.PEM ? SevSNP.convertCertToPem(CAChain[1].raw) : CAChain[1].raw,
339
+ cert: certFormat === pki_service_1.CertificateFormat.PEM ? CAChain[1] : SevSNP.convertPemToDer(CAChain[1]),
141
340
  });
142
341
  certs.push({
143
342
  type: SevSNPCertType.ASK,
144
343
  format: certFormat,
145
- cert: certFormat === pki_service_1.CertificateFormat.PEM ? SevSNP.convertCertToPem(CAChain[0].raw) : CAChain[0].raw,
344
+ cert: certFormat === pki_service_1.CertificateFormat.PEM ? CAChain[0] : SevSNP.convertPemToDer(CAChain[0]),
146
345
  });
346
+ return certs;
347
+ }
348
+ /**
349
+ * Method for generation AMD SEV-SNP Report and fetching certificates
350
+ * @param userData - @see generateSNPReport
351
+ * @param options - @see getReportChain
352
+ */
353
+ static async generateSNPReportWithChain(userData, options) {
354
+ const report = await SevSNP.generateSNPReport(userData);
355
+ const certs = await SevSNP.getReportChain(report, options);
147
356
  return {
148
- report,
149
- cpuGeneration,
150
- certs,
357
+ ...report,
358
+ certs: certs,
151
359
  };
152
360
  }
153
361
  static async runSubProcess(binaryPath, args = [], options = {}) {
@@ -160,7 +368,16 @@ class SevSNP {
160
368
  let stderr = "";
161
369
  subprocess.stdout?.on("data", (chunk) => (stdout += chunk.toString()));
162
370
  subprocess.stderr?.on("data", (chunk) => (stderr += chunk.toString()));
371
+ let timeoutId;
372
+ if (options.timeoutMs && options.timeoutMs > 0) {
373
+ timeoutId = setTimeout(() => {
374
+ subprocess.kill();
375
+ reject(new Error(`Process timed out after ${options.timeoutMs}ms`));
376
+ }, options.timeoutMs);
377
+ }
163
378
  subprocess.on("close", (exitCode) => {
379
+ if (timeoutId)
380
+ clearTimeout(timeoutId);
164
381
  resolve({
165
382
  exitCode: exitCode || 0,
166
383
  stdout,
@@ -168,11 +385,53 @@ class SevSNP {
168
385
  });
169
386
  });
170
387
  subprocess.on("error", (error) => {
388
+ if (timeoutId)
389
+ clearTimeout(timeoutId);
171
390
  reject(new Error(`Failed to start process: ${error.message}`));
172
391
  });
173
392
  });
174
393
  }
175
- async veriryReport(report) {
394
+ static getCertHash(cert) {
395
+ const hash = (0, crypto_1.createHash)("sha256");
396
+ if (cert.format === pki_service_1.CertificateFormat.PEM) {
397
+ hash.update(SevSNP.convertPemToDer(cert.cert));
398
+ }
399
+ else {
400
+ hash.update(cert.cert);
401
+ }
402
+ return hash.digest();
403
+ }
404
+ static isValidArk(ARK, trustedHashes) {
405
+ const ArkCert = forge.pki.certificateFromPem(ARK.format === pki_service_1.CertificateFormat.PEM ? ARK.cert : SevSNP.convertCertToPem(ARK.cert));
406
+ const ArkCN = ArkCert.subject.attributes.find((attr) => attr.name === "commonName")?.value;
407
+ if (!ArkCN) {
408
+ throw new Error("Can't extract CN from ARK certificate");
409
+ }
410
+ const ArkHash = SevSNP.getCertHash(ARK);
411
+ const TrustedHash = (trustedHashes && trustedHashes[ArkCN]) || Buffer.alloc(0);
412
+ return ArkHash.equals(TrustedHash);
413
+ }
414
+ /**
415
+ * AMD SEV-SNP verification method
416
+ * @param report - report with full certificate chain
417
+ * @param options - trustedHashes - map of trusted AMD ARK Certificates (CommonName as Key, Sha256 Hash of Der Certificate as Value) - optional
418
+ * timeoutMs - timeout of the utility snpnost in ms
419
+ * snpGuestBinaryPath - path for snpguest util
420
+ */
421
+ static async verifyReport(report, options) {
422
+ const trustedHashes = options?.trustedHashes ?? getDefaultArkHashes();
423
+ const timeoutMs = options?.timeoutMs ?? 10000;
424
+ const snpGuestBinaryPath = options?.snpGuestBinaryPath ?? path.resolve(__dirname, "../../bindings/utils/virtee/snpguest");
425
+ if (!path.isAbsolute(snpGuestBinaryPath)) {
426
+ throw new Error("snpGuestBinaryPath must be an absolute path");
427
+ }
428
+ const ARK = report.certs.find((cert) => cert.type === SevSNPCertType.ARK);
429
+ if (!ARK) {
430
+ throw new Error("Can't find ARK certificate in certificate chain");
431
+ }
432
+ if (!SevSNP.isValidArk(ARK, trustedHashes)) {
433
+ throw new Error("The supplied certificate chain contains an untrusted root certificate");
434
+ }
176
435
  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "temp-"));
177
436
  try {
178
437
  for (const certEntry of report.certs) {
@@ -182,12 +441,7 @@ class SevSNP {
182
441
  }
183
442
  const reportPath = `${tempDir}/report.bin`;
184
443
  await fs.writeFile(reportPath, report.report);
185
- const snpguestRes = await SevSNP.runSubProcess(`${__dirname}/../../bindings/utils/virtee/snpguest`, [
186
- "verify",
187
- "attestation",
188
- tempDir,
189
- reportPath,
190
- ]);
444
+ const snpguestRes = await SevSNP.runSubProcess(snpGuestBinaryPath, ["verify", "attestation", tempDir, reportPath], { timeoutMs });
191
445
  if (snpguestRes.exitCode != 0) {
192
446
  throw new Error(`Error validating report. Output: ${snpguestRes.stdout}\n${snpguestRes.stderr}`);
193
447
  }
@@ -198,14 +452,82 @@ class SevSNP {
198
452
  force: true,
199
453
  });
200
454
  }
201
- return true;
202
455
  }
203
- async getMrEnclave(report) {
204
- return (0, amd_sev_snp_napi_rs_1.getMrenclave)(report.report);
456
+ static calcMrEnclave(measure, vmpl, policy) {
457
+ const hash = (0, crypto_1.createHash)("sha256");
458
+ hash.update(measure);
459
+ const vmplBuf = Buffer.alloc(4);
460
+ vmplBuf.writeUInt32LE(vmpl, 0);
461
+ hash.update(vmplBuf);
462
+ const policyBuf = Buffer.alloc(8);
463
+ policyBuf.writeBigUint64LE(policy, 0);
464
+ hash.update(policyBuf);
465
+ return hash.digest();
466
+ }
467
+ /**
468
+ * Method for obtaining mrEnclave from report. MrEnclave includes report measure, report vmpl and report policy
469
+ * @param report - report without certificates
470
+ */
471
+ static getMrEnclave(report) {
472
+ const measure = (0, amd_sev_snp_napi_rs_1.getReportMeasure)(report);
473
+ const vmpl = (0, amd_sev_snp_napi_rs_1.getReportVmpl)(report);
474
+ const policy = (0, amd_sev_snp_napi_rs_1.getReportPolicy)(report);
475
+ return SevSNP.calcMrEnclave(measure, vmpl, policy);
476
+ }
477
+ /**
478
+ * Method for obtaining reportData. This data was passed when generating the report
479
+ * @param report - report without certificates
480
+ */
481
+ static async getReportData(report) {
482
+ return (0, amd_sev_snp_napi_rs_1.getReportData)(report);
483
+ }
484
+ /**
485
+ * Method for obtaining measure. Please do not confuse with mrenclave. Report measure is part of mrEnclave.
486
+ * @param report - report without certificates
487
+ */
488
+ static async getReportMeasure(report) {
489
+ return (0, amd_sev_snp_napi_rs_1.getReportMeasure)(report);
490
+ }
491
+ static async calculateFileSha256(filePath) {
492
+ const fileData = await fs.readFile(filePath);
493
+ const hash = (0, crypto_1.createHash)("sha256");
494
+ hash.update(fileData);
495
+ return hash.digest();
496
+ }
497
+ static calculateCmdlineHash(cmdLine) {
498
+ const cmdLineBytes = Buffer.concat([Buffer.from(cmdLine.trim(), "utf-8"), Buffer.from([0])]);
499
+ const hash = (0, crypto_1.createHash)("sha256");
500
+ hash.update(cmdLineBytes);
501
+ return hash.digest();
502
+ }
503
+ /**
504
+ * The method allows to get the expected mrEnclave without generating a report
505
+ * @param params - @see CalcSnpMrEnclaveParams
506
+ */
507
+ static async calcSnpMrEnclave(params) {
508
+ const measure = (0, amd_sev_snp_napi_rs_1.calcSnpMeasure)(params.ovmfPath, params.kernelHash, params.initrdHash ?? exports.EMPTY_INITRD_SHA256_HASH, params.cmdLineHash, params.vcpuSig, params.vcpuCount);
509
+ return SevSNP.calcMrEnclave(measure, params.vmpl ?? 0, params.policy ?? BigInt(0x30000));
510
+ }
511
+ static extractBuildFromCmdline(cmdLine, paramName = "build") {
512
+ const regex = new RegExp(`${paramName}=([^\\s]+)`);
513
+ const match = cmdLine.match(regex);
514
+ if (match) {
515
+ return match[1];
516
+ }
517
+ else {
518
+ throw new Error(`${paramName} parameter not found`);
519
+ }
205
520
  }
206
- async getReportData(report) {
207
- return (0, amd_sev_snp_napi_rs_1.getReportData)(report.report);
521
+ /**
522
+ * Compute the 32-bit CPUID signature from family, model, and stepping.
523
+ * This computation is described in AMD's CPUID Specification, publication #25481
524
+ * https://www.amd.com/system/files/TechDocs/25481.pdf
525
+ * See section: CPUID Fn0000_0001_EAX Family, Model, Stepping Identifiers
526
+ * @param cpuInfo - Structure containing family, model and stepping @see CpuInfo
527
+ */
528
+ static getCpuSig(cpuInfo) {
529
+ return (0, amd_sev_snp_napi_rs_1.getCpuSig)(cpuInfo);
208
530
  }
209
531
  }
210
532
  exports.SevSNP = SevSNP;
211
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sev-snp.js","sourceRoot":"","sources":["../../src/sgx-native-module/sev-snp.ts"],"names":[],"mappings":"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"}
533
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sev-snp.js","sourceRoot":"","sources":["../../src/sgx-native-module/sev-snp.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@super-protocol/addons-tee",
3
- "version": "0.8.16-beta.3",
3
+ "version": "0.8.17-beta.1",
4
4
  "description": "The TEE trusted loader addons",
5
5
  "tags": [
6
6
  "tee"
@@ -38,25 +38,26 @@
38
38
  "test:debug": "node --inspect-brk node_modules/.bin/jest -i"
39
39
  },
40
40
  "dependencies": {
41
- "@fidm/x509": "^1.2.1",
41
+ "@super-protocol/eslint-config-typescript": "2.0.1",
42
42
  "asn1-tree": "^0.1.1",
43
- "axios": "^0.24.0"
43
+ "msgpack5": "^6.0.2",
44
+ "node-forge": "^1.3.1"
45
+ },
46
+ "peerDependencies": {
47
+ "@super-protocol/dto-js": ">=1.0.0-beta.0 <2.0",
48
+ "@super-protocol/sdk-js": ">=3.0.5 <4.0",
49
+ "axios": "^1.5.1"
44
50
  },
45
51
  "devDependencies": {
46
52
  "@peculiar/x509": "^1.9.3",
47
53
  "@types/jest": "^27.5.2",
48
54
  "@types/lodash": "^4.17.5",
55
+ "@types/msgpack5": "^3.4.6",
49
56
  "@types/node": "^17.0.0",
50
- "@typescript-eslint/eslint-plugin": "^5.8.0",
51
- "@typescript-eslint/parser": "^5.8.0",
52
- "eslint": "^8.5.0",
53
- "eslint-config-prettier": "^8.3.0",
54
- "eslint-plugin-prettier": "^4.0.0",
55
- "jest": "^27.5.1",
57
+ "@types/node-forge": "^1.3.1",
58
+ "jest": "^29.7.0",
56
59
  "nodemon": "^2.0.15",
57
- "prettier": "^2.5.1",
58
- "ts-jest": "^27.1.5",
59
- "typescript": "^4.5.4"
60
+ "ts-jest": "^29.1.2"
60
61
  },
61
62
  "jest": {
62
63
  "moduleFileExtensions": [
@@ -1,13 +0,0 @@
1
- export interface TryWithIntervalParams<T> {
2
- handler: () => Promise<T>;
3
- checkResult?: (result: T) => {
4
- isResultOk: boolean;
5
- };
6
- checkError?: (err: unknown) => {
7
- retryable: boolean;
8
- };
9
- startDelay?: number;
10
- retryInterval: number;
11
- retryMax: number;
12
- }
13
- export declare const tryWithInterval: <T>(params: TryWithIntervalParams<T>) => Promise<T>;
@@ -1,39 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.tryWithInterval = void 0;
4
- const tryWithInterval = async (params) => {
5
- let checkedTimes = 0;
6
- const { handler, checkResult, checkError, startDelay = 0, retryInterval, retryMax } = params;
7
- const reachedMaxRetries = () => checkedTimes >= retryMax;
8
- return await new Promise((resolve, reject) => {
9
- const scheduleNewIteration = (delay) => {
10
- checkedTimes += 1;
11
- setTimeout(timeoutFn, delay);
12
- };
13
- const timeoutFn = async () => {
14
- try {
15
- const result = await handler();
16
- const isResultOk = checkResult ? checkResult(result).isResultOk : true;
17
- if (isResultOk) {
18
- resolve(result);
19
- return;
20
- }
21
- if (reachedMaxRetries()) {
22
- reject(new Error(`${exports.tryWithInterval.name}: MaxCheck count reached!`));
23
- return;
24
- }
25
- }
26
- catch (err) {
27
- const isErrorRetryable = checkError ? checkError(err).retryable : true;
28
- if (!isErrorRetryable || reachedMaxRetries()) {
29
- reject(err);
30
- return;
31
- }
32
- }
33
- scheduleNewIteration(retryInterval);
34
- };
35
- scheduleNewIteration(startDelay);
36
- });
37
- };
38
- exports.tryWithInterval = tryWithInterval;
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ5V2l0aEludGVydmFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NneC1uYXRpdmUtbW9kdWxlL2hlbHBlcnMvdHJ5V2l0aEludGVydmFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQVdPLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBSyxNQUFnQyxFQUFjLEVBQUU7SUFDckYsSUFBSSxZQUFZLEdBQUcsQ0FBQyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxVQUFVLEdBQUcsQ0FBQyxFQUFFLGFBQWEsRUFBRSxRQUFRLEVBQUUsR0FBRyxNQUFNLENBQUM7SUFFN0YsTUFBTSxpQkFBaUIsR0FBRyxHQUFZLEVBQUUsQ0FBQyxZQUFZLElBQUksUUFBUSxDQUFDO0lBRWxFLE9BQU8sTUFBTSxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUN6QyxNQUFNLG9CQUFvQixHQUFHLENBQUMsS0FBYSxFQUFRLEVBQUU7WUFDakQsWUFBWSxJQUFJLENBQUMsQ0FBQztZQUNsQixVQUFVLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2pDLENBQUMsQ0FBQztRQUVGLE1BQU0sU0FBUyxHQUFHLEtBQUssSUFBbUIsRUFBRTtZQUN4QyxJQUFJO2dCQUNBLE1BQU0sTUFBTSxHQUFHLE1BQU0sT0FBTyxFQUFFLENBQUM7Z0JBQy9CLE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUN2RSxJQUFJLFVBQVUsRUFBRTtvQkFDWixPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBRWhCLE9BQU87aUJBQ1Y7Z0JBQ0QsSUFBSSxpQkFBaUIsRUFBRSxFQUFFO29CQUNyQixNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsR0FBRyx1QkFBZSxDQUFDLElBQUksMkJBQTJCLENBQUMsQ0FBQyxDQUFDO29CQUV0RSxPQUFPO2lCQUNWO2FBQ0o7WUFBQyxPQUFPLEdBQUcsRUFBRTtnQkFDVixNQUFNLGdCQUFnQixHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUN2RSxJQUFJLENBQUMsZ0JBQWdCLElBQUksaUJBQWlCLEVBQUUsRUFBRTtvQkFDMUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO29CQUVaLE9BQU87aUJBQ1Y7YUFDSjtZQUVELG9CQUFvQixDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3hDLENBQUMsQ0FBQztRQUVGLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3JDLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDO0FBeENXLFFBQUEsZUFBZSxtQkF3QzFCIn0=
@@ -1 +0,0 @@
1
- export {};