Expose the certificate content from the API

Author: pimterry

src/config.d.ts

@@ -1,6 +1,9 @@
-import { HttpsPathOptions } from "mockttp/dist/util/tls";
-
 export interface HtkConfig {
     configPath: string;
-    https: HttpsPathOptions
+    https: {
+        keyPath: string;
+        certPath: string;
+        certContent: string;
+        keyLength: number;
+    }
 }

src/httptoolkit-server.ts

@@ -35,6 +35,7 @@ const typeDefs = `
 
     type InterceptionConfig {
         certificatePath: String!
+        certificateContent: String!
     }
 
     type Interceptor {
@@ -60,7 +61,8 @@ const buildResolvers = (
             version: () => packageJson.version,
             interceptors: () => _.values(interceptors),
             config: () => ({
-                certificatePath: config.https.certPath
+                certificatePath: config.https.certPath,
+                certificateContent: config.https.certContent
             }),
             networkInterfaces: () => os.networkInterfaces()
         },

src/index.ts

@@ -26,9 +26,12 @@ async function generateHTTPSConfig(configPath: string) {
     const keyPath = path.join(configPath, 'ca.key');
     const certPath = path.join(configPath, 'ca.pem');
 
-    await Promise.all([
+    const [ certContent ] = await Promise.all([
+        readFile(certPath, 'utf8').then((certContent) => {
+            checkCertExpiry(certContent);
+            return certContent;
+        }),
         canAccess(keyPath, fs.constants.R_OK),
-        readFile(certPath, 'utf8').then(checkCertExpiry)
     ]).catch(async () => {
         // Cert doesn't exist, or is too close/past expiry. Generate a new one:
 
@@ -37,14 +40,15 @@ async function generateHTTPSConfig(configPath: string) {
         });
 
         return Promise.all([
-            writeFile(keyPath, newCertPair.key),
-            writeFile(certPath, newCertPair.cert)
+            writeFile(certPath, newCertPair.cert).then(() => newCertPair.cert),
+            writeFile(keyPath, newCertPair.key)
         ]);
     });
 
     return {
         keyPath,
         certPath,
+        certContent,
         keyLength: 2048 // Reasonably secure keys please
     };
 }

test/interceptors/interceptor-test-utils.ts

@@ -18,7 +18,7 @@ const getCertificateDetails = _.memoize(async (configPath: string) => {
     fs.writeFileSync(keyPath, newCertPair.key);
     fs.writeFileSync(certPath, newCertPair.cert);
 
-    return { certPath, keyPath };
+    return { certPath, keyPath, certContent: newCertPair.cert, keyLength: 2048};
 });
 
 type InterceptorSetup = Promise<{