Pass certs on the websocket

Signed-off-by: Chris Bygrave <chris.bygrave@kaleido.io>
hyperledger · May 9, 2023 · da70185 · da70185
1 parent 1ece584
commit da70185
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/event-stream/event-stream.service.ts b/src/event-stream/event-stream.service.ts
@@ -20,7 +20,7 @@ import { AxiosRequestConfig } from 'axios';
 import { lastValueFrom } from 'rxjs';
 import * as WebSocket from 'ws';
 import { IAbiMethod } from '../tokens/tokens.interfaces';
-import { getHttpRequestOptions } from '../utils';
+import { getHttpRequestOptions, getWebsocketOptions } from '../utils';
 import { Context } from '../request-context/request-context.decorator';
 import { FFRequestIDHeader } from '../request-context/constants';
 import {
@@ -58,9 +58,7 @@ export class EventStreamSocket {
     this.disconnectDetected = false;
     this.closeRequested = false;
 
-    const auth =
-      this.username && this.password ? { auth: `${this.username}:${this.password}` } : undefined;
-    this.ws = new WebSocket(this.url, auth);
+    this.ws = new WebSocket(this.url, getWebsocketOptions(this.username, this.password));
     this.ws
       .on('open', () => {
         if (this.disconnectDetected) {

diff --git a/src/utils.ts b/src/utils.ts
@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as https from 'https';
 import { NestApplicationOptions } from '@nestjs/common';
 import { AxiosRequestConfig } from 'axios';
+import { ClientOptions } from 'ws';
 
 interface Certificates {
   key: string;
@@ -29,6 +30,22 @@ const getCertificates = (): Certificates | undefined => {
   return { key, cert, ca };
 };
 
+export const getWebsocketOptions = (username: string, password: string): ClientOptions => {
+  const requestOptions: ClientOptions = {};
+  if (username && username !== '' && password && password !== '') {
+    requestOptions.headers = {
+      Authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
+    };
+  }
+  const certs = getCertificates();
+  if (certs) {
+    requestOptions.ca = certs.ca;
+    requestOptions.cert = certs.cert;
+    requestOptions.key = certs.key;
+  }
+  return requestOptions;
+};
+
 export const getHttpRequestOptions = (username: string, password: string) => {
   const requestOptions: AxiosRequestConfig = {};
   if (username !== '' && password !== '') {