@tdxvolt/volt-client-grpc 0.18.9 → 0.18.10

package/lib/index.cjs

@@ -9,12 +9,12 @@ var debug = require('debug');
 var EventEmitter = require('events');
 var fs = require('fs');
 var path = require('path');
-var bent = require('bent');
 var uuid = require('uuid');
 var Protobuf = require('protobufjs');
 var camelCase = require('lodash.camelcase');
 var descriptor = require('protobufjs/ext/descriptor/index.js');
 var jwt = require('jsonwebtoken');
+var crypto = require('crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -24,11 +24,11 @@ var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var bent__default = /*#__PURE__*/_interopDefaultLegacy(bent);
 var Protobuf__default = /*#__PURE__*/_interopDefaultLegacy(Protobuf);
 var camelCase__default = /*#__PURE__*/_interopDefaultLegacy(camelCase);
 var descriptor__default = /*#__PURE__*/_interopDefaultLegacy(descriptor);
 var jwt__default = /*#__PURE__*/_interopDefaultLegacy(jwt);
+var crypto__default = /*#__PURE__*/_interopDefaultLegacy(crypto);
 
 const constants = {
   authTokenName: "volt-token",
@@ -4874,10 +4874,10 @@ async function authenticateInternal(
       host: this._credential.cache.bindIp
     };
 
-    if (this._voltConfig.challenge_code) {
+    if (this._credential.cache.challenge_code) {
       authenticateRequest.challenge = signBase64(
         this._credential.cache.key,
-        this._voltConfig.challenge_code
+        this._credential.cache.challenge_code
       );
     } else {
       log$2(
@@ -5174,8 +5174,15 @@ function streamingCallInternal(methodType, method, request, service) {
 
 async function fetchVoltConfig(discovery_url) {
   try {
-    const getJSON = bent__default["default"]("json");
-    const fullVoltConfig = await getJSON(discovery_url);
+    const response = await fetch(discovery_url, {
+      headers: { Accept: "application/json" }
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+
+    const fullVoltConfig = await response.json();
 
     if (!fullVoltConfig || typeof fullVoltConfig !== "object") {
       throw new Error(`invalid config resolved from: ${discovery_url}`);
@@ -5190,8 +5197,6 @@ async function fetchVoltConfig(discovery_url) {
       "address",
       "http_address",
       "ca_pem",
-      "challenge_code",
-      "cloud",
       "relay"
     );
 
@@ -5210,8 +5215,15 @@ async function fetchVoltConfigFromDIDInternal(volt_did, registryUrl) {
       throw new Error(`Invalid Volt DID: ${volt_did}`);
     }
 
-    const getJSON = bent__default["default"]("json");
-    const didDocument = await getJSON(didResolution);
+    const response = await fetch(didResolution, {
+      headers: { Accept: "application/json" }
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+
+    const didDocument = await response.json();
     const voltConfigServices = findDIDDocumentService(
       didDocument,
       constants.didServiceType.voltConfig
@@ -5251,7 +5263,11 @@ async function fetchVoltConfigFromDID(
     }
   }
 
-  throw new Error(`Failed to fetch Volt config from any of these registries: ${registryList.join(", ")}`);
+  throw new Error(
+    `Failed to fetch Volt config from any of these registries: ${registryList.join(
+      ", "
+    )}`
+  );
 }
 
 /* eslint-disable no-underscore-dangle */
@@ -5306,6 +5322,11 @@ class VoltCredential {
 
       // Extract Volt public key.
       this._voltPublicKey = this._voltConfig.public_key;
+      if (!this._voltPublicKey) {
+        // Extract the public key from the Volt CA cert.
+        const voltCA = new crypto__default["default"].X509Certificate(this._voltConfig.ca_pem);
+        this._voltPublicKey = voltCA.publicKey.export({ type: 'spki', format: 'pem' });
+      }
 
       const voltKey = keyFromPem(this._voltPublicKey).publicKey;
       this._voltFingerprint = fingerprintFromPem(voltKey);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.18.9",
+  "version": "0.18.10",
   "description": "tdx Volt library for nodejs clients",
   "type": "module",
   "exports": {
@@ -37,8 +37,7 @@
   "author": "toby.ealden@gmail.com",
   "license": "ISC",
   "dependencies": {
-    "@tdxvolt/volt-client-web": "^0.18.1",
-    "bent": "^7.3.12",
+    "@tdxvolt/volt-client-web": "^0.18.2",
     "builtin-modules": "^3.3.0",
     "debug": "^4.1.1",
     "ip": "^1.1.5",
@@ -48,4 +47,4 @@
     "protobufjs": "^7.4.0",
     "uuid": "^8.1.0"
   }
-}
+}

package/src/volt-client-internal.js

@@ -1,6 +1,5 @@
 /* eslint-disable no-underscore-dangle */
 import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
-import bent from "bent";
 import debug from "debug";
 import ip from "ip";
 import lodash from "lodash";
@@ -159,10 +158,10 @@ export async function authenticateInternal(
       host: this._credential.cache.bindIp
     };
 
-    if (this._voltConfig.challenge_code) {
+    if (this._credential.cache.challenge_code) {
       authenticateRequest.challenge = signBase64(
         this._credential.cache.key,
-        this._voltConfig.challenge_code
+        this._credential.cache.challenge_code
       );
     } else {
       log(
@@ -459,8 +458,15 @@ export function streamingCallInternal(methodType, method, request, service) {
 
 export async function fetchVoltConfig(discovery_url) {
   try {
-    const getJSON = bent("json");
-    const fullVoltConfig = await getJSON(discovery_url);
+    const response = await fetch(discovery_url, {
+      headers: { Accept: "application/json" }
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+
+    const fullVoltConfig = await response.json();
 
     if (!fullVoltConfig || typeof fullVoltConfig !== "object") {
       throw new Error(`invalid config resolved from: ${discovery_url}`);
@@ -475,8 +481,6 @@ export async function fetchVoltConfig(discovery_url) {
       "address",
       "http_address",
       "ca_pem",
-      "challenge_code",
-      "cloud",
       "relay"
     );
 
@@ -495,8 +499,15 @@ async function fetchVoltConfigFromDIDInternal(volt_did, registryUrl) {
       throw new Error(`Invalid Volt DID: ${volt_did}`);
     }
 
-    const getJSON = bent("json");
-    const didDocument = await getJSON(didResolution);
+    const response = await fetch(didResolution, {
+      headers: { Accept: "application/json" }
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+
+    const didDocument = await response.json();
     const voltConfigServices = findDIDDocumentService(
       didDocument,
       constants.didServiceType.voltConfig
@@ -536,5 +547,9 @@ export async function fetchVoltConfigFromDID(
     }
   }
 
-  throw new Error(`Failed to fetch Volt config from any of these registries: ${registryList.join(", ")}`);
+  throw new Error(
+    `Failed to fetch Volt config from any of these registries: ${registryList.join(
+      ", "
+    )}`
+  );
 }

package/src/volt-credential.js

@@ -1,8 +1,9 @@
 /* eslint-disable no-underscore-dangle */
+import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
+import crypto from "crypto";
 import debug from "debug";
 import fs from "fs";
 import { constants } from "./constants.js";
-import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
 
 const {
   createSigningKey,
@@ -54,6 +55,11 @@ export class VoltCredential {
 
       // Extract Volt public key.
       this._voltPublicKey = this._voltConfig.public_key;
+      if (!this._voltPublicKey) {
+        // Extract the public key from the Volt CA cert.
+        const voltCA = new crypto.X509Certificate(this._voltConfig.ca_pem);
+        this._voltPublicKey = voltCA.publicKey.export({ type: 'spki', format: 'pem' });
+      }
 
       const voltKey = keyFromPem(this._voltPublicKey).publicKey;
       this._voltFingerprint = fingerprintFromPem(voltKey);