chore(express): convert post to get and add logs

TICKET: WP-4376

Author: pranavjain97

modules/express/src/clientRoutes.ts

@@ -1771,8 +1771,9 @@ export function setupSigningRoutes(app: express.Application, config: Config): vo
   );
 }
 
-export function setupEnclavedSigningRoutes(app: express.Application, config: Config): void {
-  app.post('/ping/enclavedExpress', parseBody, prepareBitGo(config), promiseWrapper(handlePingEnclavedExpress));
+export function setupEnclavedExpressRoutes(app: express.Application, config: Config): void {
+  // Keep the ping endpoint for health checks
+  app.get('/ping/enclavedExpress', parseBody, prepareBitGo(config), promiseWrapper(handlePingEnclavedExpress));
 }
 
 export function setupLightningSignerNodeRoutes(app: express.Application, config: Config): void {

modules/express/src/config.ts

@@ -1,6 +1,6 @@
 import { EnvironmentName, V1Network } from 'bitgo';
 import { isNil, isNumber } from 'lodash';
-import { readFileSync } from 'fs';
+import { readFileSync, existsSync } from 'fs';
 import 'dotenv/config';
 
 import { args } from './args';
@@ -170,13 +170,18 @@ function mergeConfigs(...configs: Partial<Config>[]): Config {
       enclavedExpressUrl = forceSecureUrl(enclavedExpressUrl);
       console.log('Using secure enclaved express URL:', enclavedExpressUrl);
     }
-    const enclavedExpressSSLCertPath = get('enclavedExpressSSLCert');
-    if (enclavedExpressSSLCertPath) {
+    const enclavedExpressSSLCertValue = get('enclavedExpressSSLCert');
+    if (enclavedExpressSSLCertValue) {
       try {
-        enclavedExpressSSLCert = readFileSync(enclavedExpressSSLCertPath, { encoding: 'utf8' });
-        console.log('Successfully loaded SSL cert from:', enclavedExpressSSLCertPath);
+        // First try to read it as a file path
+        enclavedExpressSSLCert = existsSync(enclavedExpressSSLCertValue)
+          ? readFileSync(enclavedExpressSSLCertValue, { encoding: 'utf8' })
+          : enclavedExpressSSLCertValue; // If not a file, use the value directly
+        if (existsSync(enclavedExpressSSLCertValue)) {
+          console.log('Successfully loaded SSL cert from:', enclavedExpressSSLCertValue);
+        }
       } catch (e) {
-        console.error(`Failed to load enclaved express SSL cert from path: ${enclavedExpressSSLCertPath}`, e);
+        console.error(`Failed to process enclaved express SSL cert: ${enclavedExpressSSLCertValue}`, e);
       }
     }
   }

modules/express/src/enclavedExpressRoutes/enclavedExpressRoutes.ts

@@ -4,12 +4,13 @@ import * as express from 'express';
 import { retryPromise } from '../retryPromise';
 
 export async function handlePingEnclavedExpress(req: express.Request) {
+  console.log('Making enclaved express request with SSL cert to:', req.config?.enclavedExpressUrl);
   return await retryPromise(
     () =>
       superagent
-        .post(`${req.config?.enclavedExpressUrl}/ping`)
+        .get(`${req.config?.enclavedExpressUrl}/ping`)
         .ca(req.config?.enclavedExpressSSLCert as string)
-        .send({}),
+        .send(),
     (err, tryCount) => {
       debug(`Failed to ping enclavedExpress: ${err.message}`);
     }

modules/express/src/expressApp.ts

@@ -287,7 +287,7 @@ export function setupRoutes(app: express.Application, config: Config): void {
   if (config.signerMode) {
     clientRoutes.setupSigningRoutes(app, config);
   } else if (config.enclavedExpressUrl && config.enclavedExpressSSLCert) {
-    clientRoutes.setupEnclavedSigningRoutes(app, config);
+    clientRoutes.setupEnclavedExpressRoutes(app, config);
   } else {
     if (config.lightningSignerFileSystemPath) {
       clientRoutes.setupLightningSignerNodeRoutes(app, config);

modules/express/test/unit/config.ts

@@ -83,6 +83,8 @@ describe('Config:', () => {
       customrooturi: 'argcustomRootUri',
       custombitcoinnetwork: 'argcustomBitcoinNetwork',
       externalSignerUrl: 'argexternalSignerUrl',
+      enclavedExpressUrl: 'argenclavedExpressUrl',
+      enclavedExpressSSLCert: 'argenclavedExpressSSLCert',
       signerMode: 'argsignerMode',
       signerFileSystemPath: 'argsignerFileSystemPath',
       lightningSignerFileSystemPath: 'arglightningSignerFileSystemPath',
@@ -107,6 +109,8 @@ describe('Config:', () => {
       BITGO_CUSTOM_ROOT_URI: 'envcustomRootUri',
       BITGO_CUSTOM_BITCOIN_NETWORK: 'envcustomBitcoinNetwork',
       BITGO_EXTERNAL_SIGNER_URL: 'envexternalSignerUrl',
+      BITGO_ENCLAVED_EXPRESS_URL: 'envenclavedExpressUrl',
+      BITGO_ENCLAVED_EXPRESS_SSL_CERT: 'envenclavedExpressSSLCert',
       BITGO_SIGNER_MODE: 'envsignerMode',
       BITGO_SIGNER_FILE_SYSTEM_PATH: 'envsignerFileSystemPath',
       BITGO_LIGHTNING_SIGNER_FILE_SYSTEM_PATH: 'envlightningSignerFileSystemPath',
@@ -132,6 +136,8 @@ describe('Config:', () => {
       customBitcoinNetwork: 'argcustomBitcoinNetwork',
       authVersion: 2,
       externalSignerUrl: 'https://argexternalSignerUrl',
+      enclavedExpressUrl: 'https://argenclavedExpressUrl',
+      enclavedExpressSSLCert: 'argenclavedExpressSSLCert',
       signerMode: 'argsignerMode',
       signerFileSystemPath: 'argsignerFileSystemPath',
       lightningSignerFileSystemPath: 'arglightningSignerFileSystemPath',