@tdxvolt/volt-client-grpc 0.16.0-beta.1 → 0.16.0-beta.12

package/src/volt-client-internal.js

@@ -2,7 +2,6 @@
 import debug from "debug";
 import ip from "ip";
 import bent from "bent";
-import forge from "node-forge";
 import lodash from "lodash";
 import VoltConnection from "./volt-connection.js";
 import { join } from "path";
@@ -17,8 +16,12 @@ import { constants } from "./constants.js";
 import GRPCCall from "./grpc-call.js";
 import RpcInvocation from "./rpc-invocation.js";
 import { v4 as generateId } from "uuid";
+import {
+  publicKeyToPem,
+  removeCarriageReturn,
+  signBase64
+} from "@tdxvolt/volt-client-web";
 
-const { pki } = forge;
 const { filter, pick } = lodash;
 
 const log = debug("volt-client-grpc:volt-client-internal");
@@ -54,8 +57,15 @@ function issueAuthenticate(authenticateRequest, ttl) {
             // This is the signing CA used by the volt.
             this._credential.cache.ca = authenticateResponse.chain;
 
-            // Identity resource id is assigned by the volt.
-            this._credential.cache.client_id = authenticateResponse.session_id;
+            // The session id is assigned by the volt.
+            this._credential.cache.session_id = authenticateResponse.session_id;
+
+            if (!this._credential.cache.identity_did) {
+              // Identity DID has been assigned by the volt.
+              this._credential.cache.identity_did =
+                authenticateResponse.identity_did;
+            }
+
             this._credential.saveCache();
             break;
           }
@@ -66,64 +76,32 @@ function issueAuthenticate(authenticateRequest, ttl) {
           case "POLICY_DECISION_PROMPT":
           case "POLICY_DECISION_PENDING": {
             log("access pending approval - waiting...");
-            break;
-          }
-          default:
-            log(
-              "ignoring unknown bind descision %s",
-              authenticateResponse.status
-            );
-            break;
-        }
-      }
-
-      return authenticateResponse.decision;
-    });
-}
 
-function issueBind(bindRequest, ttl) {
-  // eslint-disable-next-line no-use-before-define
-  return unaryCallInternal
-    .call(this, "Bind", bindRequest)
-    .then((bindResponse) => {
-      log("got binding request response %j", bindResponse);
-      if (bindResponse.status?.code) {
-        log("error in bind response: %s", bindResponse.status.message);
-        return Promise.reject(new Error(bindResponse.status.message));
-      } else {
-        switch (bindResponse.decision) {
-          case "POLICY_DECISION_PERMIT": {
-            //
-            // The request status is permit => cache the bind response info.
-            //
+            // This is the signing CA used by the volt.
+            this._credential.cache.ca = authenticateResponse.chain;
 
-            // This is the certificate assigned to us by the volt.
-            this._credential.cache.cert = bindResponse.cert;
+            // The session id is assigned by the volt.
+            this._credential.cache.session_id = authenticateResponse.session_id;
 
-            // This is the signing CA used by the volt.
-            this._credential.cache.ca = bindResponse.chain;
+            if (!this._credential.cache.identity_did) {
+              // Identity DID has been assigned by the volt.
+              this._credential.cache.identity_did =
+                authenticateResponse.identity_did;
+            }
 
-            // Identity resource id is assigned by the volt.
-            this._credential.cache.client_id = bindResponse.identity_id;
             this._credential.saveCache();
             break;
           }
-          case "POLICY_DECISION_DENY": {
-            log(">>>>>>>>>>>>>>> access request is DENIED <<<<<<<<<<<<<<<<<<<");
-            break;
-          }
-          case "POLICY_DECISION_PROMPT":
-          case "POLICY_DECISION_PENDING": {
-            log("access pending approval - waiting...");
-            break;
-          }
           default:
-            log("ignoring unknown bind descision %s", bindResponse.status);
+            log(
+              "ignoring unknown bind descision %s",
+              authenticateResponse.status
+            );
             break;
         }
       }
 
-      return bindResponse.decision;
+      return authenticateResponse.decision;
     });
 }
 
@@ -136,8 +114,10 @@ function findDIDDocumentService(document, serviceType) {
   return matches;
 }
 
-
-export async function authenticateInternal() {
+export async function authenticateInternal(
+  sessionOnly = false,
+  ownDID = false
+) {
   try {
     // Check if we need to resolve a Relay volt.
     if (
@@ -149,7 +129,7 @@ export async function authenticateInternal() {
       log("attempting to retrieve Relay information from %s", relayURL);
       this._voltConfig.relay = await fetchVoltConfig.call(
         this,
-        `${relayURL}/discovery`
+        `${relayURL}/discover`
       );
 
       if (this._voltConfig.relay.ca_pem) {
@@ -174,7 +154,9 @@ export async function authenticateInternal() {
     }
 
     const keyPair = this._credential.getKey();
-    const publicKeyPem = pki.publicKeyToPem(keyPair.publicKey);
+    const publicKeyPem = removeCarriageReturn(
+      publicKeyToPem(keyPair.publicKey)
+    );
 
     if (!this._credential.cache.bindIp) {
       // Default the IP address if none is specified. This is used to set the SAN in the
@@ -186,13 +168,12 @@ export async function authenticateInternal() {
 
     // Form the request message.
     const authenticateRequest = {
-      binding_name: this._config.client_name,
-      public_key: publicKeyPem,
-      host: this._credential.cache.bindIp,
+      client_name: this._config.client_name,
+      host: this._credential.cache.bindIp
     };
 
     if (this._voltConfig.challenge_code) {
-      authenticateRequest.challenge = voltUtils.signBase64(
+      authenticateRequest.challenge = signBase64(
         keyPair.privateKey,
         this._voltConfig.challenge_code
       );
@@ -202,161 +183,61 @@ export async function authenticateInternal() {
       );
     }
 
-    log("authenticate TTL is ", this._config.bindRequestTTL);
-
-    // This will block while the request is pending.
-    const pollInterval = 10000;
-    let decision = "";
-    do {
-      if (decision) {
-        // Wait a while before retrying.
-        // eslint-disable-next-line no-await-in-loop
-        await new Promise((resolve) => setTimeout(resolve, pollInterval));
-      }
-      // eslint-disable-next-line no-await-in-loop
-      decision = await issueAuthenticate.call(
-        this,
-        authenticateRequest,
-        this._voltConfig.bindRequestTTL
-      );
-      log("authenticate decision: %s", decision);
-    } while (
-      decision === "POLICY_DECISION_PROMPT" ||
-      decision === "POLICY_DECISION_PENDING"
-    );
-
-    return decision === "POLICY_DECISION_PERMIT";
-  } catch (err) {
-    log("failure binding to Volt [%s]", err.message);
-    throw err;
-  }
-}
-
-export async function bindInternal() {
-  try {
-    // Check if we need to resolve a Relay volt.
-    if (
-      typeof this._voltConfig?.relay === "string" ||
-      this._voltConfig?.relay?.http_address
-    ) {
-      const relayURL =
-        this._voltConfig.relay?.http_address || this._voltConfig.relay;
-      log("attempting to retrieve Relay information from %s", relayURL);
-      this._voltConfig.relay = await fetchVoltConfig.call(
-        this,
-        `${relayURL}/discovery`
-      );
-      if (this._voltConfig.relay.ca_pem) {
-        log(
-          "Auto-fetched Relay CA %s, remote address %s",
-          this._voltConfig.relay.ca_pem,
-          this._voltConfig.relay.address
-        );
+    if (sessionOnly) {
+      // We want to create a session-based authentication based simply on our key, rather than a
+      // fully-blown DID-based authentication.
+      log("creating session-only request");
+      authenticateRequest.public_key = publicKeyPem;
+    } else if (!this._credential.cache.identity_did) {
+      if (!ownDID) {
+        // We don't want to have to manage our own DID, so we ask the Volt to do it for us.
+        // The Volt will create a new DID and return it to us in the response.
+        log("creating DID-based request");
+        authenticateRequest.did_public_key = publicKeyPem;
       } else {
-        throw new Error("Unable to fetch Relay CA - cannot securely connect.");
-      }
-    }
-
-    if (!this._credential.cache.ca) {
-      this._credential.cache.ca = this._voltConfig.ca_pem;
-    }
-
-    if (!this._credential.cache.ca) {
-      throw new Error(
-        "No certificate authority found in configuration for target Volt - check configuration"
-      );
-    }
-
-    const keyPair = this._credential.getKey();
-    const publicKeyPem = voltUtils.removeCarriageReturn(
-      pki.publicKeyToPem(keyPair.publicKey)
-    );
-
-    if (!this._credential.cache.bindIp) {
-      // Default the IP address if none is specified. This is used to set the SAN in the
-      // certificate issued by the Volt.
-      this._credential.cache.bindIp = ip.address();
-    }
-
-    this._credential.saveCache();
-
-    // Form the request message.
-    const bindRequest = {
-      binding_name: this._config.client_name,
-      host: this._credential.cache.bindIp
-    };
+        // We want to create and manage our own DID.
+        const did =
+          (this._credential.cache.identity_did = `did:volt:${generateId()}`);
+
+        // Order of properties in the DID document is important,
+        // they must be in alphabetical order throughout the document.
+        // This is because the DID document is signed and the signature
+        // is over the entire document.
+        const didDocument = {
+          "@context": "https://www.w3.org/ns/did/v1",
+          authentication: [`${did}#key-1`],
+          controller: did,
+          description: this._config.client_name,
+          id: did,
+          verificationMethod: [
+            {
+              id: `${did}#key-1`,
+              publicKeyPem: publicKeyPem,
+              type: "Ed25519VerificationKey2018"
+            }
+          ]
+        };
+
+        // Set the DID document with proof in the authenticate request.
+        authenticateRequest.did_document = JSON.stringify(didDocument, null, 2);
+
+        // Now sign the entire DID document, including the proof and set it in the
+        // bind request. This is required by the Volt to verify that we have the private key for the DID.
+        authenticateRequest.did_document_signature = signBase64(
+          keyPair.privateKey,
+          authenticateRequest.did_document
+        );
 
-    if (this._voltConfig.challenge_code) {
-      bindRequest.challenge = voltUtils.signBase64(
-        keyPair.privateKey,
-        this._voltConfig.challenge_code
-      );
+        log("did document is %s", authenticateRequest.did_document);
+        log("did signature is %s", authenticateRequest.did_document_signature);
+      }
     } else {
-      log(
-        "****no Volt challenge code available**** => not sending challenge signature"
-      );
+      // We already have a DID cached, so re-use it.
+      log("using cached DID %s", this._credential.cache.identity_did);
+      authenticateRequest.did = this._credential.cache.identity_did;
     }
 
-    if (!this._credential.cache.client_id) {
-      // If we don't have a client id, then we need to create a DID.
-      this._credential.cache.client_id = `did:volt:${generateId()}`;
-    }
-
-    const did = this._credential.cache.client_id;
-
-    // Order of properties in the DID document is important,
-    // they must be in alphabetical order throughout the document.
-    // This is because the DID document is signed and the signature
-    // is over the entire document.
-    const didDocument = {
-      "@context": "https://www.w3.org/ns/did/v1",
-      authentication: [`${did}#key-1`],
-      description: this._config.client_name,
-      id: did,
-      verificationMethod: [
-        {
-          controller: did,
-          id: `${did}#key-1`,
-          publicKeyPem: publicKeyPem,
-          type: "RsaSignature2018"
-        }
-      ]
-    };
-
-    const signDocument = JSON.stringify(didDocument, null, 2);
-    log("signing did document");
-    log(signDocument);
-
-    // Sign the DID document.
-    const documentDigest = voltUtils.signBase64(
-      keyPair.privateKey,
-      signDocument
-    );
-
-    const proofSignature = voltUtils.jwsSignature(documentDigest);
-
-    // Create the DID document proof.
-    didDocument.proof = {
-      created: new Date().toISOString(),
-      jws: proofSignature,
-      proofPurpose: "assertionMethod",
-      type: "RsaSignature2018",
-      verificationMethod: `${did}#key-1`
-    };
-
-    // Set the DID document with proof in the bind request.
-    bindRequest.did_document = JSON.stringify(didDocument, null, 2);
-
-    // Now sign the entire DID document, including the proof and set it in the
-    // bind request. This is required by the Volt to verify that we have the private key for the DID.
-    bindRequest.did_document_signature = voltUtils.signBase64(
-      keyPair.privateKey,
-      bindRequest.did_document
-    );
-
-    log("did document is %s", bindRequest.did_document);
-    log("did signature is %s", bindRequest.did_document_signature);
-    log("bind TTL is ", this._config.bindRequestTTL);
+    log("authenticate TTL is ", this._config.bindRequestTTL);
 
     // This will block while the request is pending.
     const pollInterval = 10000;
@@ -368,12 +249,12 @@ export async function bindInternal() {
         await new Promise((resolve) => setTimeout(resolve, pollInterval));
       }
       // eslint-disable-next-line no-await-in-loop
-      decision = await issueBind.call(
+      decision = await issueAuthenticate.call(
         this,
-        bindRequest,
+        authenticateRequest,
         this._voltConfig.bindRequestTTL
       );
-      log("binding decision: %s", decision);
+      log("authenticate decision: %s", decision);
     } while (
       decision === "POLICY_DECISION_PROMPT" ||
       decision === "POLICY_DECISION_PENDING"
@@ -426,6 +307,15 @@ export function connectInternal(helloPayload) {
         onDisconnected();
         this.emit("connected", false);
       }
+
+      if (err.message.endsWith("session invalid")) {
+        log("Volt session invalid - clearing session");
+        delete this._credential.cache.session_id;
+        delete this._credential.cache.cert;
+        this._credential.saveCache();
+      }
+
+      this.emit("connectionError", err);
     });
 
     this._voltConnection.on("evt", (evt) => {
@@ -438,10 +328,24 @@ export function connectInternal(helloPayload) {
 
     this._voltConnection.on("invoke_request", (invoke_request) => {
       const invokeId = invoke_request.invoke_id;
-      if (this._activeRPC[invokeId]) {
-        this._activeRPC[invokeId].parsePayload(invoke_request);
+
+      let rpcInvocation = this._activeRPC[invokeId];
+
+      if (rpcInvocation) {
+        if (rpcInvocation.started) {
+          rpcInvocation.parsePayload(invoke_request);
+        } else {
+          rpcInvocation
+            .initialise(invoke_request)
+            .then(() => {
+              this.emit("invoke_request", rpcInvocation);
+            })
+            .catch((err) => {
+              log("invoke_request - error [%s]", err.message);
+            });
+        }
       } else {
-        const rpcInvocation = new RpcInvocation(this, this._voltConnection);
+        rpcInvocation = new RpcInvocation(this, this._voltConnection);
 
         rpcInvocation.on("end", () => {
           log("removing active RPC [%s]", invokeId);
@@ -450,9 +354,11 @@ export function connectInternal(helloPayload) {
 
         rpcInvocation
           .initialise(invoke_request)
-          .then(() => {
+          .then((response) => {
             this._activeRPC[invokeId] = rpcInvocation;
-            this.emit("invoke_request", rpcInvocation);
+            if (!response.key_exchange) {
+              this.emit("invoke_request", rpcInvocation);
+            }
           })
           .catch((err) => {
             log("invoke_request - error [%s]", err.message);
@@ -598,6 +504,7 @@ export async function fetchVoltConfig(discovery_url) {
       "public_key",
       "fingerprint",
       "address",
+      "http_address",
       "ca_pem",
       "challenge_code",
       "cloud",

package/src/volt-client.js

@@ -6,7 +6,6 @@ import { getServiceDescriptors } from "./proto-utils.js";
 import { createClient as createGrpcClient } from "./grpc-utils.js";
 import {
   authenticateInternal,
-  bindInternal,
   connectInternal,
   fetchVoltConfig,
   fetchVoltConfigFromDID,
@@ -60,6 +59,7 @@ export class VoltClient extends EventEmitter {
   /**
    * Initialises a binding and connection to the volt.
    * @param {string} [config] - the location of the Volt configuration file, or a configuration object
+   * @param {object} [extras] - additional configuration properties
    */
   async initialise(config, extras = {}) {
     try {
@@ -75,10 +75,15 @@ export class VoltClient extends EventEmitter {
         configPath = path.resolve(config);
         log("Attempt to load config from file %s", configPath);
         try {
-          const configContents = await readFile(
-            new URL(configPath, import.meta.url)
-          );
-          configJSON = JSON.parse(configContents);
+          if (fs.existsSync(configPath)) {
+            const configContents = await readFile(
+              new URL(configPath, import.meta.url)
+            );
+            configJSON = JSON.parse(configContents);
+          } else {
+            // There is currently no file at the given configuration path.
+            configJSON = {};
+          }
         } catch (err) {
           log("failure loading config file %s [%s]", configPath, err.message);
           throw new Error(
@@ -95,15 +100,15 @@ export class VoltClient extends EventEmitter {
         throw new Error("config argument is required to be an object");
       }
 
+      this._config = { ...extras, ...configJSON };
+
       if (
-        !configJSON.client_name ||
-        typeof configJSON.client_name !== "string"
+        !this._config.client_name ||
+        typeof this._config.client_name !== "string"
       ) {
         throw new Error("client_name property required in config");
       }
 
-      this._config = { ...configJSON, ...extras };
-
       let voltDID = "";
       let voltHttpAddress = "";
       if (typeof this._config.volt === "string") {
@@ -112,6 +117,7 @@ export class VoltClient extends EventEmitter {
         } else {
           voltHttpAddress = this._config.volt;
         }
+        delete this._config.volt;
       } else if (typeof this._config.volt !== "object") {
         throw new Error("configuration is missing the 'volt' object");
       } else {
@@ -126,7 +132,7 @@ export class VoltClient extends EventEmitter {
       } else if (voltHttpAddress && !this._config?.volt?.id) {
         const discoConfig = await fetchVoltConfig.call(
           this,
-          `${voltHttpAddress}/discovery`
+          `${voltHttpAddress}/discover`
         );
         this._config = {
           ...this._config,
@@ -135,8 +141,12 @@ export class VoltClient extends EventEmitter {
       }
 
       this._voltConfig = this._config.volt;
-      this._voltConfig.did = voltDID;
-      this._voltConfig.http_address = voltHttpAddress;
+      if (voltDID) {
+        this._voltConfig.did = voltDID;
+      }
+      if (voltHttpAddress) {
+        this._voltConfig.http_address = voltHttpAddress;
+      }
 
       if (!this._voltConfig.id || typeof this._voltConfig.id !== "string") {
         throw new Error("'id' property is missing in Volt configuration");
@@ -184,9 +194,12 @@ export class VoltClient extends EventEmitter {
       if (!isBound) {
         // This is usually because of request being denied.
         throw new Error("Volt authentication failed");
+      } else {
+        // Perist the configuration.
+        this._config = this._credential.saveCache();
       }
 
-      return Promise.resolve();
+      return Promise.resolve(this._config);
     } catch (err) {
       log("Failure starting Volt client [%s]", err.message);
       throw err;
@@ -655,6 +668,13 @@ export class VoltClient extends EventEmitter {
     });
   }
 
+  SqlTransaction(request) {
+    const grpcClient = this.getVoltAPIClient();
+
+    const call = new GRPCCall(this, "Transaction", "METHOD_TYPE_BIDI");
+    return call.start(grpcClient, request);
+  }
+
   /**
    * WireAPI
    */

package/src/volt-connection.js

@@ -19,10 +19,9 @@ function _cleanUp(immediateReconnect) {
     this._pingTimeoutTimer = 0;
   }
 
-  if (
-    !this._dying &&
-    (immediateReconnect || (this._autoRetry && !this._reconnectTimer))
-  ) {
+  if (this._dying) {
+    clearTimeout(this._reconnectTimer);
+  } else if (immediateReconnect || (this._autoRetry && !this._reconnectTimer)) {
     this._reconnectTimer = setTimeout(
       () => {
         this._reconnectTimer = 0;
@@ -48,13 +47,18 @@ function _doConnect(connectHello) {
 
   const grpcClient = this._voltClient.getVoltAPIClient();
 
-  let helloPayload = connectHello;
-  if (!helloPayload) {
-    log("defaulting hello payload");
-    helloPayload = {
-      hello: {}
-    };
-  }
+  // Notify the Volt of our ping interval. If the Volt doesn't receive a ping from us
+  // within this time, it will assume the connection is dead.
+  const defaultHello = {
+    ping_interval: this._pingInterval,
+    timestamp: Date.now()
+  };
+
+  const helloPayload = { ...connectHello } || {};
+
+  helloPayload.hello = { ...defaultHello, ...connectHello?.hello };
+
+  log("hello is %j", helloPayload);
 
   this.call.on("error", (err) => {
     log("error on connection stream [%s]", err.message);
@@ -72,17 +76,22 @@ function _doConnect(connectHello) {
           clearTimeout(this._pingTimeoutTimer);
         }
 
-        // Schedule the next ping.
-        _startPingTimer.call(this);
-
         this.emit("ping", response.ping.timestamp);
         break;
       }
       case "acknowledge": {
         if (!this._connectionId) {
           this._connectionId = response.acknowledge.connection_id;
+
+          // Set the ping timeout interval to the value returned by the Volt. If we don't
+          // hear from the Volt in this time, we'll assume the connection is dead.
+          this._timeoutInterval = response.acknowledge.ping_interval;
+
           log("connection id is %s", this._connectionId);
           this.emit("connected", this._connectionId);
+
+          // Schedule the next ping.
+          _startPingTimer.call(this);
         }
         break;
       }
@@ -110,8 +119,6 @@ function _doConnect(connectHello) {
   });
 
   this.call.start(grpcClient, helloPayload);
-
-  _startPingTimer.call(this);
 }
 
 function _startPingTimer() {
@@ -138,6 +145,8 @@ function _startPingTimer() {
       _connectionTimeoutHandler.bind(this),
       this._timeoutInterval
     );
+
+    _startPingTimer.call(this);
   }, this._pingInterval);
 }